Merge remote-tracking branch 'origin/qa_1.1.6' into qa_1.1.6

2020-09-29 09:33:24 +08:00
parent 2c3d468325 e4710837bb
commit cf1a083d92
21 changed files with 3 additions and 3 deletions
--- a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png
+++ b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png
--- a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png
+++ b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png
--- a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png
+++ b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png
--- a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
+++ b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
--- a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
+++ b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
--- a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
+++ b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
--- a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
+++ b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
--- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="heart_ratingbar_width">20px</dimen>
+    <dimen name="heart_ratingbar_width">22px</dimen>
    <dimen name="heart_ratingbar_height">16px</dimen>
    <dimen name="v2x_panel_loading_top">120px</dimen>
    <dimen name="v2x_share_btn_width">150px</dimen>
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1054,7 +1054,7 @@
    <dimen name="sp_48">48px</dimen>
    <dimen name="module_common_shadow_width">-10px</dimen>
    <dimen name="module_common_shadow_width_pos">10px</dimen>
-    <dimen name="heart_ratingbar_width">36px</dimen>
+    <dimen name="heart_ratingbar_width">40px</dimen>
    <dimen name="heart_ratingbar_height">30px</dimen>
    <dimen name="v2x_panel_loading_top">300px</dimen>
    <dimen name="v2x_share_btn_width">281px</dimen>
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -75,7 +75,7 @@
    <dimen name="share_index_bottom_padding">16px</dimen>
    <dimen name="share_btn_middle_padding">29px</dimen>
    <dimen name="v2x_panel_btn_translationY">-8px</dimen>
-    <dimen name="module_v2x_panel_tab_height">84px</dimen>
+    <dimen name="module_v2x_panel_tab_height">84px</dimen>w

    <dimen name="share_item_text_size">16px</dimen>
    <dimen name="share_item_padding">20px</dimen>
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-ldpi/icon_heart_choose_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-ldpi/icon_heart_choose_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-ldpi/icon_heart_second_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-ldpi/icon_heart_second_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-ldpi/icon_heart_unchoose_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-ldpi/icon_heart_unchoose_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-mdpi/icon_heart_choose_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-mdpi/icon_heart_choose_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-mdpi/icon_heart_second_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-mdpi/icon_heart_second_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-mdpi/icon_heart_unchoose_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-mdpi/icon_heart_unchoose_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-xhdpi/icon_heart_choose_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-xhdpi/icon_heart_choose_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-xhdpi/icon_heart_second_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-xhdpi/icon_heart_second_light.png
--- a/skin/mogo-skin-light/src/main/module-commons-res/drawable-xhdpi/icon_heart_unchoose_light.png
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable-xhdpi/icon_heart_unchoose_light.png