From 6801f5f50f57d6fc705d176098783834e845eee4 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 14 Sep 2020 13:22:30 +0800 Subject: [PATCH] opt tanlu ui --- .../src/main/res/drawable/tanlu_dialog_bg.xml | 6 +++--- .../res/drawable/tanlu_dialog_bottom_button_right_bg.xml | 2 +- .../src/main/res/drawable/tanlu_dialog_button_bg.xml | 4 ++-- .../src/main/res/layout/tanlu_dialog_cutom_layout.xml | 8 ++++---- .../src/main/res/layout/tanlu_dialog_neterror_layout.xml | 4 ++-- modules/mogo-module-tanlu/src/main/res/values/colors.xml | 9 +++++++++ .../src/main/module-tanlu-res/values/colors.xml | 9 +++++++++ 7 files changed, 30 insertions(+), 12 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml index 61251bd7a5..80015e691b 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml @@ -1,9 +1,9 @@ + android:angle="0" + android:endColor="@color/tanlu_dialog_endcolor" + android:startColor="@color/tanlu_dialog_startcolor" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml index 21152d5aac..21a7a34f19 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml index b4f3a4a62e..03926e4a3a 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml @@ -2,8 +2,8 @@ + android:endColor="@color/tanlu_dialog_bt_endcolor" + android:startColor="@color/tanlu_dialog_bt_startcolor" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml index 7e4ab5e49f..87fcf17536 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="抱歉,无法获取到相关数据" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_textcolor" android:textSize="@dimen/tanlu_dialog_content_size" /> @@ -74,7 +74,7 @@ android:background="@drawable/tanlu_dialog_bottom_button_right_bg" android:gravity="center" android:text="取消" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_bt_defalt_text_color" android:textSize="@dimen/tanlu_dialog_content_size" android:textStyle="bold" /> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml index 8b19f35380..3babec8500 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="由于网络原因上传失败" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_textcolor" android:textSize="@dimen/tanlu_dialog_content_size" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 24181bdd65..8f5388e27d 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -41,4 +41,13 @@ #59FFFFFF #FFFFFF + #FFFFFF + #3F4057 + #2A2B38 + #FFFFFF + #FFFFFF + #3E7FFC + #5CC1FF + #50526E + diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml index abd5bac484..d0216dca8d 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml @@ -3,4 +3,13 @@ #333333 #666666 + #333333 + #F5F5F5 + #FFFFFF + #333333 + #2896FF + #FFFFFF + #FFFFFF + #E8E8E8 +