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

2020-09-28 20:11:41 +08:00
parent 0d84238be4 e3708d7197
commit 01ee94f55c
24 changed files with 37 additions and 42 deletions
--- 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,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="heart_ratingbar_width">17px</dimen>
-    <dimen name="heart_ratingbar_height">14px</dimen>
+    <dimen name="heart_ratingbar_width">20px</dimen>
+    <dimen name="heart_ratingbar_height">16px</dimen>
    <dimen name="v2x_panel_loading_top">120px</dimen>
    <dimen name="v2x_share_btn_width">150px</dimen>
    <dimen name="v2x_share_btn_height">48px</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,8 +1054,8 @@
    <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">31.9px</dimen>
-    <dimen name="heart_ratingbar_height">26px</dimen>
+    <dimen name="heart_ratingbar_width">36px</dimen>
+    <dimen name="heart_ratingbar_height">30px</dimen>
    <dimen name="v2x_panel_loading_top">300px</dimen>
    <dimen name="v2x_share_btn_width">281px</dimen>
    <dimen name="v2x_share_btn_height">90px</dimen>
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1045,8 +1045,8 @@
 	<dimen name="sp_48">26.2500px</dimen>
 	<dimen name="module_common_shadow_width">-8px</dimen>
 	<dimen name="module_common_shadow_width_pos">8px</dimen>
-	<dimen name="heart_ratingbar_width">16px</dimen>
-	<dimen name="heart_ratingbar_height">20px</dimen>
+	<dimen name="heart_ratingbar_width">20px</dimen>
+	<dimen name="heart_ratingbar_height">16px</dimen>
 	<dimen name="v2x_panel_loading_top">120px</dimen>
 	<dimen name="v2x_share_btn_width">150px</dimen>
 	<dimen name="v2x_share_btn_height">48px</dimen>
--- a/modules/mogo-module-common/src/main/res/values/styles.xml
+++ b/modules/mogo-module-common/src/main/res/values/styles.xml
@@ -18,10 +18,10 @@


    <style name="customHeartHeartRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
-        <item name="android:minHeight">@dimen/heart_ratingbar_height</item>
-        <item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
        <item name="android:maxWidth">@dimen/heart_ratingbar_width</item>
        <item name="android:minWidth">@dimen/heart_ratingbar_width</item>
+        <item name="android:minHeight">@dimen/heart_ratingbar_height</item>
+        <item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
        <item name="android:numStars">5</item>
        <item name="android:rating">1</item>
        <item name="android:stepSize">0.5</item>