From 2f4cc3e49380a20f15be6639a26c10d214981e3e Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 4 Sep 2020 09:23:27 +0800
Subject: [PATCH] =?UTF-8?q?wmdlg=20=E6=8D=A2=E8=82=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ....xml => module_commons_shape_dlg_round_bkg.xml} |  2 +-
 ...t.xml => module_commons_shape_left_btn_bkg.xml} |  0
 ....xml => module_commons_shape_right_btn_bkg.xml} |  0
 .../res/layout/module_commons_layout_wm_dialog.xml | 14 +++++++-------
 .../src/main/res/values/colors.xml                 |  5 +++++
 .../module_commons_shape_dlg_round_bkg_light.xml   |  7 +++++++
 .../module_commons_shape_left_btn_bkg_light.xml    | 14 ++++++++++++++
 .../module_commons_shape_right_btn_bkg_light.xml   | 11 +++++++++++
 .../src/main/module-commons-res/values/colors.xml  |  2 ++
 9 files changed, 47 insertions(+), 8 deletions(-)
 rename modules/mogo-module-common/src/main/res/drawable/{module_commons_shape_round_gray.xml => module_commons_shape_dlg_round_bkg.xml} (73%)
 rename modules/mogo-module-common/src/main/res/drawable/{moddule_commons_shape_react_blue_grident.xml => module_commons_shape_left_btn_bkg.xml} (100%)
 rename modules/mogo-module-common/src/main/res/drawable/{module_commons_shape_react_gray_grident.xml => module_commons_shape_right_btn_bkg.xml} (100%)
 create mode 100644 modules/mogo-module-common/src/main/res/values/colors.xml
 create mode 100644 skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml
 create mode 100644 skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml
 create mode 100644 skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml

diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml
similarity index 73%
rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml
index f4bb94cb0a..98f1fc7633 100644
--- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
   <corners android:radius="@dimen/dp_30" />
-  <solid android:color="#3F4057" />
+  <gradient android:startColor="#3F4057" android:endColor="#2A2B38"/>
 </shape>
 
diff --git a/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml
similarity index 100%
rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml
diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
index bec43b7c93..b4aaabda53 100644
--- a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
+++ b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#7f000000"
+    android:background="@color/module_commons_dlg_bkg"
     android:layout_gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/dp_790"
         android:layout_height="@dimen/dp_440"
         android:layout_gravity="center"
-        android:background="@drawable/module_commons_shape_round_gray">
+        android:background="@drawable/module_commons_shape_dlg_round_bkg">
 
         <TextView
             android:id="@+id/module_commons_wm_dialog_content"
@@ -19,7 +19,7 @@
             android:layout_height="@dimen/dp_56"
             android:layout_marginTop="@dimen/dp_134"
             android:maxLines="1"
-            android:textColor="@android:color/white"
+            android:textColor="@color/module_commons_wm_dialog_text_textColor"
             android:textSize="@dimen/sp_40"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -31,9 +31,9 @@
             android:id="@+id/module_commons_wm_dialog_button_ok"
             android:layout_width="@dimen/dp_395"
             android:layout_height="@dimen/dp_128"
-            android:background="@drawable/moddule_commons_shape_react_blue_grident"
+            android:background="@drawable/module_commons_shape_left_btn_bkg"
             android:gravity="center"
-            android:textColor="@android:color/white"
+            android:textColor="@color/module_commons_wm_dialog_text_textColor"
             android:textSize="@dimen/dp_40"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -43,9 +43,9 @@
             android:id="@+id/module_commons_wm_dialog_button_cancel"
             android:layout_width="@dimen/dp_395"
             android:layout_height="@dimen/dp_128"
-            android:background="@drawable/module_commons_shape_react_gray_grident"
+            android:background="@drawable/module_commons_shape_right_btn_bkg"
             android:gravity="center"
-            android:textColor="@android:color/white"
+            android:textColor="@color/module_commons_wm_dialog_text_textColor"
             android:textSize="@dimen/dp_40"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toRightOf="parent"
diff --git a/modules/mogo-module-common/src/main/res/values/colors.xml b/modules/mogo-module-common/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..993e412000
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="module_commons_dlg_bkg">#7f000000</color>
+    <color name="module_commons_wm_dialog_text_textColor">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml
new file mode 100644
index 0000000000..93887743bb
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <corners android:radius="@dimen/dp_30" />
+  <gradient android:startColor="#FFFFFF" android:endColor="#E2F5F5F5"/>
+</shape>
+
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml
new file mode 100644
index 0000000000..387c9ca303
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"
+    >
+
+    <gradient
+        android:angle="180"
+        android:endColor="#FFFFfF"
+        android:startColor="#FFFFfF" />
+
+    <corners
+        android:bottomLeftRadius="@dimen/dp_30"
+        />
+</shape>
+
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml
new file mode 100644
index 0000000000..1b269d1650
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+
+    <gradient
+        android:angle="180"
+        android:endColor="#E8E8E8"
+        android:startColor="#E8E8E8" />
+    <corners android:bottomRightRadius="@dimen/dp_30"/>
+
+</shape>
+
diff --git a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml
index 51e1eac4ef..f7dcb3f6c3 100644
--- a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="modules_commons_toast_text_color_light">#FF333333</color>
+    <color name="module_commons_dlg_bkg_light">#66000000</color>
+    <color name="module_commons_wm_dialog_text_textColor_light">#333333</color>
 </resources>
\ No newline at end of file