From 083da0a7c1173179cd6e4cec1230f8ac8b6e13d2 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 22 Sep 2020 19:28:38 +0800
Subject: [PATCH] ratingbar->commons

---
 .../res/drawable-ldpi/icon_heart_choose.png}     | Bin
 .../res/drawable-ldpi/icon_heart_second.png}     | Bin
 .../res/drawable-ldpi/icon_heart_unchoose.png}   | Bin
 .../res/drawable-mdpi/icon_heart_choose.png}     | Bin
 .../res/drawable-mdpi/icon_heart_second.png}     | Bin
 .../res/drawable-mdpi/icon_heart_unchoose.png}   | Bin
 .../res/drawable-xhdpi/icon_heart_choose.png}    | Bin
 .../res/drawable-xhdpi/icon_heart_second.png}    | Bin
 .../res/drawable-xhdpi/icon_heart_unchoose.png}  | Bin
 .../module_commons_heart_ratingbar_drawable.xml} |   6 +++---
 .../module_commons_layout_heart_ratingbar.xml    |   6 ++++++
 .../src/main/res/values-mdpi/dimens.xml          |   5 +++++
 .../src/main/res/values-xhdpi/dimens.xml         |   2 ++
 .../src/main/res/values/dimens.xml               |   2 ++
 .../src/main/res/values/styles.xml               |  15 +++++++++++++++
 .../module_v2x_event_share_description.xml       |   2 +-
 .../src/main/res/values-mdpi/dimens.xml          |   3 +--
 .../main/res/values-xhdpi-1920x1000/dimens.xml   |   2 --
 .../src/main/res/values-xhdpi/dimens.xml         |   3 +--
 .../src/main/res/values/dimens.xml               |   2 --
 .../src/main/res/values/style.xml                |  11 -----------
 21 files changed, 36 insertions(+), 23 deletions(-)
 rename modules/{mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png => mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png => mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png => mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_choose.png => mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_second.png => mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_unchoose.png => mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_choose.png => mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_second.png => mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_unchoose.png => mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png} (100%)
 rename modules/{mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml => mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml} (63%)
 create mode 100644 modules/mogo-module-common/src/main/res/layout/module_commons_layout_heart_ratingbar.xml
 create mode 100644 modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml

diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_choose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_choose.png
rename to modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_second.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_second.png
rename to modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_enthusiasm_unchoose.png
rename to modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_choose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_choose.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_second.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_second.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_enthusiasm_unchoose.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml
similarity index 63%
rename from modules/mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml
index afded5aacb..ee83cb56c4 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/share_rating_bar.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml
@@ -2,15 +2,15 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@android:id/background"
-        android:drawable="@drawable/icon_enthusiasm_unchoose">
+        android:drawable="@drawable/icon_heart_unchoose">
     </item>
     <item
         android:id="@android:id/secondaryProgress"
-        android:drawable="@drawable/icon_enthusiasm_second">
+        android:drawable="@drawable/icon_heart_second">
     </item>
     <item
         android:id="@android:id/progress"
-        android:drawable="@drawable/icon_enthusiasm_choose">
+        android:drawable="@drawable/icon_heart_choose">
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_heart_ratingbar.xml b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_heart_ratingbar.xml
new file mode 100644
index 0000000000..61a4490a43
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_heart_ratingbar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..d1a19e49b6
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="heart_ratingbar_width">17px</dimen>
+    <dimen name="heart_ratingbar_height">14px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index ca1346e002..4e810485fc 100644
--- 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,5 +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">31.9px</dimen>
+    <dimen name="heart_ratingbar_height">26px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index 170c5a430d..a292d9e1b4 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1045,4 +1045,6 @@
 	<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>
 </resources>
diff --git a/modules/mogo-module-common/src/main/res/values/styles.xml b/modules/mogo-module-common/src/main/res/values/styles.xml
index 10ca997feb..122d4944f8 100644
--- a/modules/mogo-module-common/src/main/res/values/styles.xml
+++ b/modules/mogo-module-common/src/main/res/values/styles.xml
@@ -14,4 +14,19 @@
         <item name="android:topDark">@android:color/transparent</item>
         <item name="android:borderlessButtonStyle">@android:color/transparent</item>
     </style>
+
+
+
+    <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:numStars">5</item>
+        <item name="android:rating">1</item>
+        <item name="android:stepSize">0.5</item>
+        <item name="android:progressDrawable">@drawable/module_commons_heart_ratingbar_drawable</item>
+    </style>
+
+
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
index 836cc77d1f..67abcccd31 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -107,7 +107,7 @@
 
             <RatingBar
                 android:id="@+id/rating_bar"
-                style="@style/customRatingBarStyle"
+                style="@style/customHeartHeartRatingBarStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:isIndicator="true" />
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 16cfb44d2c..56f8efe5eb 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -61,8 +61,7 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
-    <dimen name="module_v2x_des_index_width">17px</dimen>
-    <dimen name="module_v2x_des_index_height">14px</dimen>
+
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index a7faf7fc01..adda1e011f 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -58,8 +58,6 @@
     <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">42px</dimen>
     <dimen name="module_v2x_panel_width">120px</dimen>
 
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 17b9d0b340..21d1f7de8c 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -59,8 +59,7 @@
     <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
-    <dimen name="module_v2x_des_index_width">31.9px</dimen>
-    <dimen name="module_v2x_des_index_height">26px</dimen>
+
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_panel_width">140px</dimen>
     <dimen name="share_empty_icon_width">219px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index cc787677d3..0a2a6ea64b 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -57,8 +57,6 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
-    <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">20px</dimen>
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index a6641ea9c8..41038019b1 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -4,17 +4,6 @@
         <attr name="roundLayoutRadius" format="dimension" />
     </declare-styleable>
 
-    <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
-        <item name="android:minHeight">@dimen/module_v2x_des_index_height</item>
-        <item name="android:maxHeight">@dimen/module_v2x_des_index_height</item>
-        <item name="android:maxWidth">@dimen/module_v2x_des_index_width</item>
-        <item name="android:minWidth">@dimen/module_v2x_des_index_width</item>
-        <item name="android:numStars">5</item>
-        <item name="android:rating">1</item>
-        <item name="android:stepSize">0.5</item>
-        <item name="android:progressDrawable">@drawable/share_rating_bar</item>
-    </style>
-
     <style name="customTabLayoutTextAppearance" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">@dimen/dp_40</item>
     </style>