From 0694c471c4ba39fa8235e1ecfcc4e8e40ad13ad2 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 25 Mar 2020 18:06:43 +0800 Subject: Fix some bugs in CustomizeThemeActivity. --- app/src/main/res/layout/item_custom_theme.xml | 22 ----------- .../res/layout/item_predefined_custom_theme.xml | 25 ++++++++++++ app/src/main/res/layout/item_theme_name.xml | 24 ++++++++++++ app/src/main/res/layout/item_user_custom_theme.xml | 44 ++++++++++++++++++++++ app/src/main/res/values/strings.xml | 11 +++--- app/src/main/res/xml/theme_preferences.xml | 4 +- 6 files changed, 101 insertions(+), 29 deletions(-) delete mode 100644 app/src/main/res/layout/item_custom_theme.xml create mode 100644 app/src/main/res/layout/item_predefined_custom_theme.xml create mode 100644 app/src/main/res/layout/item_theme_name.xml create mode 100644 app/src/main/res/layout/item_user_custom_theme.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/item_custom_theme.xml b/app/src/main/res/layout/item_custom_theme.xml deleted file mode 100644 index 1aba3472..00000000 --- a/app/src/main/res/layout/item_custom_theme.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_predefined_custom_theme.xml b/app/src/main/res/layout/item_predefined_custom_theme.xml new file mode 100644 index 00000000..432628b1 --- /dev/null +++ b/app/src/main/res/layout/item_predefined_custom_theme.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_theme_name.xml b/app/src/main/res/layout/item_theme_name.xml new file mode 100644 index 00000000..84c49d7c --- /dev/null +++ b/app/src/main/res/layout/item_theme_name.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_custom_theme.xml b/app/src/main/res/layout/item_user_custom_theme.xml new file mode 100644 index 00000000..fe610557 --- /dev/null +++ b/app/src/main/res/layout/item_user_custom_theme.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b8d4e657..56a0e264 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -362,7 +362,7 @@ Light Theme Dark Theme Amoled Theme - Select and Customize Themes + Manage Themes Custom themes cannot be applied to settings page. Cannot get the link @@ -467,10 +467,11 @@ Saving the image. Please wait. Saving the gif. Please wait. - Customize Light Theme - Customize Dark Theme - Customize Amoled Theme - + Tap to change the name of this theme. + You cannot change the name of this predefined theme. + Set as Light Theme + Set as Dark Theme + Set as Amoled Theme Color Primary Applied to: Toolbar Color Primary Dark diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml index 5bcc5ef3..e6aec71f 100644 --- a/app/src/main/res/xml/theme_preferences.xml +++ b/app/src/main/res/xml/theme_preferences.xml @@ -34,9 +34,9 @@ app:title="@string/settings_customize_amoled_theme_title" /> + app:title="@string/settings_manage_themes_title" />