From c6e2b78c4045449e9151c3e14341df70849922e6 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 24 Oct 2020 00:04:25 +0800
Subject: [PATCH] Fix color of some icons.

---
 .../infinityforreddit/Activity/MainActivity.java     |  2 +-
 .../Activity/ViewSubredditDetailActivity.java        |  2 +-
 app/src/main/res/drawable-night/ic_random_24dp.xml   | 12 ++++++------
 app/src/main/res/drawable/ic_search_toolbar_24dp.xml |  5 +++++
 app/src/main/res/drawable/ic_sort_toolbar_24dp.xml   |  9 +++++++++
 app/src/main/res/menu/filtered_posts_activity.xml    |  4 ++--
 app/src/main/res/menu/main_activity.xml              |  4 ++--
 app/src/main/res/menu/search_activity.xml            |  2 +-
 app/src/main/res/menu/search_result_activity.xml     |  4 ++--
 .../res/menu/subreddit_multiselection_activity.xml   |  2 +-
 .../main/res/menu/subreddit_selection_activity.xml   |  2 +-
 .../res/menu/view_multi_reddit_detail_activity.xml   |  4 ++--
 .../main/res/menu/view_subreddit_detail_activity.xml |  4 ++--
 app/src/main/res/menu/view_user_detail_activity.xml  |  4 ++--
 14 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_search_toolbar_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_sort_toolbar_24dp.xml

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
index e02c3bc3..448d3d64 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
@@ -572,7 +572,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                     fab.setImageResource(R.drawable.ic_refresh_24dp);
                     break;
                 case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE:
-                    fab.setImageResource(R.drawable.ic_sort_24dp);
+                    fab.setImageResource(R.drawable.ic_sort_toolbar_24dp);
                     break;
                 case SharedPreferencesUtils.MAIN_ACTIVITY_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT:
                     fab.setImageResource(R.drawable.ic_post_layout_24dp);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
index 5d9ddd72..b34ba388 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
@@ -673,7 +673,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                     fab.setImageResource(R.drawable.ic_refresh_24dp);
                     break;
                 case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE:
-                    fab.setImageResource(R.drawable.ic_sort_24dp);
+                    fab.setImageResource(R.drawable.ic_sort_toolbar_24dp);
                     break;
                 case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_POST_LAYOUT:
                     fab.setImageResource(R.drawable.ic_post_layout_24dp);
diff --git a/app/src/main/res/drawable-night/ic_random_24dp.xml b/app/src/main/res/drawable-night/ic_random_24dp.xml
index bd0bc639..b80a99cf 100644
--- a/app/src/main/res/drawable-night/ic_random_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_random_24dp.xml
@@ -5,20 +5,20 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14z"
-      android:fillColor="#000000"/>
+      android:fillColor="#FFFFFF"/>
   <path
       android:pathData="M7.5,16.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#000000"/>
+      android:fillColor="#FFFFFF"/>
   <path
       android:pathData="M7.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#000000"/>
+      android:fillColor="#FFFFFF"/>
   <path
       android:pathData="M12,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#000000"/>
+      android:fillColor="#FFFFFF"/>
   <path
       android:pathData="M16.5,16.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#000000"/>
+      android:fillColor="#FFFFFF"/>
   <path
       android:pathData="M16.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#000000"/>
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_toolbar_24dp.xml b/app/src/main/res/drawable/ic_search_toolbar_24dp.xml
new file mode 100644
index 00000000..9bece0ba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_toolbar_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sort_toolbar_24dp.xml b/app/src/main/res/drawable/ic_sort_toolbar_24dp.xml
new file mode 100644
index 00000000..6cef6369
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sort_toolbar_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="#000000"
+      android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/app/src/main/res/menu/filtered_posts_activity.xml b/app/src/main/res/menu/filtered_posts_activity.xml
index 296af78c..6e826b5a 100644
--- a/app/src/main/res/menu/filtered_posts_activity.xml
+++ b/app/src/main/res/menu/filtered_posts_activity.xml
@@ -5,14 +5,14 @@
         android:id="@+id/action_sort_filtered_thing_activity"
         android:orderInCategory="1"
         android:title="@string/action_sort"
-        android:icon="@drawable/ic_sort_24dp"
+        android:icon="@drawable/ic_sort_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_refresh_filtered_thing_activity"
         android:orderInCategory="2"
         android:title="@string/action_refresh"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/menu/main_activity.xml b/app/src/main/res/menu/main_activity.xml
index 127bbb43..2e3062b1 100644
--- a/app/src/main/res/menu/main_activity.xml
+++ b/app/src/main/res/menu/main_activity.xml
@@ -8,14 +8,14 @@
         android:id="@+id/action_search_main_activity"
         android:orderInCategory="1"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_sort_main_activity"
         android:orderInCategory="2"
         android:title="@string/action_sort"
-        android:icon="@drawable/ic_sort_24dp"
+        android:icon="@drawable/ic_sort_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/app/src/main/res/menu/search_activity.xml b/app/src/main/res/menu/search_activity.xml
index 599901d0..94119685 100644
--- a/app/src/main/res/menu/search_activity.xml
+++ b/app/src/main/res/menu/search_activity.xml
@@ -7,6 +7,6 @@
         android:id="@+id/action_search_search_activity"
         android:orderInCategory="1"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/search_result_activity.xml b/app/src/main/res/menu/search_result_activity.xml
index 9cd243a5..d503471f 100644
--- a/app/src/main/res/menu/search_result_activity.xml
+++ b/app/src/main/res/menu/search_result_activity.xml
@@ -5,14 +5,14 @@
         android:id="@+id/action_sort_search_result_activity"
         android:orderInCategory="1"
         android:title="@string/action_sort"
-        android:icon="@drawable/ic_sort_24dp"
+        android:icon="@drawable/ic_sort_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_search_search_result_activity"
         android:orderInCategory="2"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/app/src/main/res/menu/subreddit_multiselection_activity.xml b/app/src/main/res/menu/subreddit_multiselection_activity.xml
index 1ca3dd37..ea842fd3 100644
--- a/app/src/main/res/menu/subreddit_multiselection_activity.xml
+++ b/app/src/main/res/menu/subreddit_multiselection_activity.xml
@@ -12,6 +12,6 @@
         android:id="@+id/action_search_subreddit_multiselection_activity"
         android:orderInCategory="2"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/subreddit_selection_activity.xml b/app/src/main/res/menu/subreddit_selection_activity.xml
index 28abcb17..a55e1b97 100644
--- a/app/src/main/res/menu/subreddit_selection_activity.xml
+++ b/app/src/main/res/menu/subreddit_selection_activity.xml
@@ -5,6 +5,6 @@
         android:id="@+id/action_search_subreddit_selection_activity"
         android:orderInCategory="1"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
index 06257308..0da0d682 100644
--- a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml
@@ -7,14 +7,14 @@
         android:id="@+id/action_sort_view_multi_reddit_detail_activity"
         android:orderInCategory="1"
         android:title="@string/action_sort"
-        android:icon="@drawable/ic_sort_24dp"
+        android:icon="@drawable/ic_sort_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_search_view_multi_reddit_detail_activity"
         android:orderInCategory="2"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_refresh_view_multi_reddit_detail_activity"
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index a558d9a6..67a7bf24 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -7,14 +7,14 @@
         android:id="@+id/action_sort_view_subreddit_detail_activity"
         android:orderInCategory="1"
         android:title="@string/action_sort"
-        android:icon="@drawable/ic_sort_24dp"
+        android:icon="@drawable/ic_sort_toolbar_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_search_view_subreddit_detail_activity"
         android:orderInCategory="2"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_refresh_view_subreddit_detail_activity"
diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml
index 352114a1..a06c2677 100644
--- a/app/src/main/res/menu/view_user_detail_activity.xml
+++ b/app/src/main/res/menu/view_user_detail_activity.xml
@@ -6,13 +6,13 @@
         android:id="@+id/action_sort_view_user_detail_activity"
         android:orderInCategory="1"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_sort_24dp"
+        android:icon="@drawable/ic_sort_toolbar_24dp"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_search_view_user_detail_activity"
         android:orderInCategory="2"
         android:title="@string/action_search"
-        android:icon="@drawable/ic_search_24dp"
+        android:icon="@drawable/ic_search_toolbar_24dp"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_refresh_view_user_detail_activity"