From 6ad725762ba11100b7373767d8c3c3feee88364c Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 27 Mar 2020 09:51:53 +0800
Subject: Still implementing custom themes.

---
 app/src/main/res/drawable-night/ic_add_bottom_app_bar_24dp.xml | 9 ---------
 app/src/main/res/drawable-night/ic_add_day_night_24dp.xml      | 9 +++++++++
 app/src/main/res/drawable/ic_add_bottom_app_bar_24dp.xml       | 9 ---------
 app/src/main/res/drawable/ic_add_day_night_24dp.xml            | 9 +++++++++
 app/src/main/res/layout/activity_custom_theme_listing.xml      | 2 +-
 app/src/main/res/layout/activity_multi_reddit_listing.xml      | 2 +-
 app/src/main/res/layout/activity_view_subreddit_detail.xml     | 2 +-
 app/src/main/res/layout/app_bar_main.xml                       | 2 +-
 app/src/main/res/layout/item_predefined_custom_theme.xml       | 2 +-
 app/src/main/res/layout/item_user_custom_theme.xml             | 2 +-
 app/src/main/res/values/strings.xml                            | 3 ++-
 11 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/drawable-night/ic_add_bottom_app_bar_24dp.xml
 create mode 100644 app/src/main/res/drawable-night/ic_add_day_night_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_add_bottom_app_bar_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_add_day_night_24dp.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-night/ic_add_bottom_app_bar_24dp.xml b/app/src/main/res/drawable-night/ic_add_bottom_app_bar_24dp.xml
deleted file mode 100644
index b6814bc2..00000000
--- a/app/src/main/res/drawable-night/ic_add_bottom_app_bar_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_add_day_night_24dp.xml b/app/src/main/res/drawable-night/ic_add_day_night_24dp.xml
new file mode 100644
index 00000000..b6814bc2
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_add_day_night_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_add_bottom_app_bar_24dp.xml b/app/src/main/res/drawable/ic_add_bottom_app_bar_24dp.xml
deleted file mode 100644
index ed95d188..00000000
--- a/app/src/main/res/drawable/ic_add_bottom_app_bar_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_day_night_24dp.xml b/app/src/main/res/drawable/ic_add_day_night_24dp.xml
new file mode 100644
index 00000000..ed95d188
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_day_night_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_custom_theme_listing.xml b/app/src/main/res/layout/activity_custom_theme_listing.xml
index 260453e6..37b8f878 100644
--- a/app/src/main/res/layout/activity_custom_theme_listing.xml
+++ b/app/src/main/res/layout/activity_custom_theme_listing.xml
@@ -45,7 +45,7 @@
         android:layout_margin="@dimen/fab_margin"
         android:layout_gravity="bottom|end"
         app:backgroundTint="?attr/colorPrimaryLightTheme"
-        app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
+        app:srcCompat="@drawable/ic_add_day_night_24dp"
         app:tint="@android:color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_multi_reddit_listing.xml b/app/src/main/res/layout/activity_multi_reddit_listing.xml
index ea101e05..65285189 100644
--- a/app/src/main/res/layout/activity_multi_reddit_listing.xml
+++ b/app/src/main/res/layout/activity_multi_reddit_listing.xml
@@ -78,7 +78,7 @@
         android:layout_margin="@dimen/fab_margin"
         android:layout_gravity="bottom|end"
         app:backgroundTint="?attr/colorPrimaryLightTheme"
-        app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
+        app:srcCompat="@drawable/ic_add_day_night_24dp"
         app:tint="@android:color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index 5f2c2294..3337fc67 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -201,7 +201,7 @@
         android:layout_margin="@dimen/fab_margin"
         android:visibility="gone"
         app:backgroundTint="?attr/colorPrimaryLightTheme"
-        app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
+        app:srcCompat="@drawable/ic_add_day_night_24dp"
         app:tint="@android:color/white"
         app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" />
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index cc63287c..b1d9b330 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -132,7 +132,7 @@
         android:layout_margin="@dimen/fab_margin"
         android:visibility="gone"
         app:backgroundTint="?attr/colorPrimaryLightTheme"
-        app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
+        app:srcCompat="@drawable/ic_add_day_night_24dp"
         app:tint="@android:color/white"
         app:layout_anchor="@id/bottom_navigation_main_activity" />
 
diff --git a/app/src/main/res/layout/item_predefined_custom_theme.xml b/app/src/main/res/layout/item_predefined_custom_theme.xml
index cbc6bb20..37dcdb0c 100644
--- a/app/src/main/res/layout/item_predefined_custom_theme.xml
+++ b/app/src/main/res/layout/item_predefined_custom_theme.xml
@@ -29,6 +29,6 @@
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
-        android:src="@drawable/ic_add_24dp" />
+        android:src="@drawable/ic_add_day_night_24dp" />
 
 </LinearLayout>
\ 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
index e4ea128d..55891961 100644
--- a/app/src/main/res/layout/item_user_custom_theme.xml
+++ b/app/src/main/res/layout/item_user_custom_theme.xml
@@ -29,7 +29,7 @@
         android:layout_height="24dp"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
-        android:src="@drawable/ic_add_24dp"
+        android:src="@drawable/ic_add_day_night_24dp"
         android:background="?attr/selectableItemBackgroundBorderless" />
 
     <ImageView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 57e85a64..22b971ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -365,7 +365,7 @@
     <string name="settings_customize_dark_theme_title">Dark Theme</string>
     <string name="settings_customize_amoled_theme_title">Amoled Theme</string>
     <string name="settings_manage_themes_title">Manage Themes</string>
-    <string name="settings_custom_theme_cannot_apply_to_settings_page_title">Custom themes cannot be applied to settings page.</string>
+    <string name="settings_custom_theme_cannot_apply_to_settings_page_title">Custom themes cannot be applied to settings page (except toolbar, status bar and navigation bar).</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
@@ -617,6 +617,7 @@
     <string name="edit_theme_name">Edit Theme Name</string>
     <string name="edit_theme">Edit Theme</string>
     <string name="delete_theme">Delete Theme</string>
+    <string name="delete_theme_dialog_message">Are you sure to delete %1$s?</string>
     <string name="share_theme">Share Theme</string>
     <string name="change_theme_name">Change Name</string>
 
-- 
cgit v1.2.3