From 179c16d5963a87fb53eedc0829f7e9d30eb26b09 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 5 Jun 2020 21:08:15 +0800
Subject: [PATCH] Use outline icon for multireddit. Fix black report icon in
 dark theme. Add a colon between sort type and sort time in toolbar.

---
 .../infinityforreddit/Utils/Utils.java            |  2 +-
 .../res/drawable-night/ic_multi_reddit_24dp.xml   |  4 ++--
 .../main/res/drawable-night/ic_report_24dp.xml    | 15 +++++++++++++++
 .../main/res/drawable/ic_multi_reddit_24dp.xml    |  4 ++--
 ...c_report_black_24dp.xml => ic_report_24dp.xml} |  0
 .../layout/fragment_comment_more_bottom_sheet.xml |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/ic_report_24dp.xml
 rename app/src/main/res/drawable/{ic_report_black_24dp.xml => ic_report_24dp.xml} (100%)

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/Utils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/Utils.java
index 5bbb2e73..159b03f0 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/Utils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/Utils.java
@@ -111,7 +111,7 @@ public class Utils {
     public static void displaySortTypeInToolbar(SortType sortType, Toolbar toolbar) {
         if (sortType != null) {
             if (sortType.getTime() != null) {
-                toolbar.setSubtitle(sortType.getType().fullName + " " + sortType.getTime().fullName);
+                toolbar.setSubtitle(sortType.getType().fullName + ": " + sortType.getTime().fullName);
             } else {
                 toolbar.setSubtitle(sortType.getType().fullName);
             }
diff --git a/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml b/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml
index cd680d79..0dd56678 100644
--- a/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_multi_reddit_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M3,6c-0.55,0 -1,0.45 -1,1v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,20c-0.55,0 -1,-0.45 -1,-1L4,7c0,-0.55 -0.45,-1 -1,-1zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,11h-8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM14,15h-4c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h4c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM18,7h-8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+      android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L8,16L8,4h12v12zM10,9h8v2h-8zM10,12h4v2h-4zM10,6h8v2h-8z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable-night/ic_report_24dp.xml b/app/src/main/res/drawable-night/ic_report_24dp.xml
new file mode 100644
index 00000000..252ebc72
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_report_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.73,3H8.27L3,8.27v7.46L8.27,21h7.46L21,15.73V8.27L15.73,3zM19,14.9L14.9,19H9.1L5,14.9V9.1L9.1,5h5.8L19,9.1v5.8z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M11,7h2v7h-2z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_multi_reddit_24dp.xml b/app/src/main/res/drawable/ic_multi_reddit_24dp.xml
index 74b886ad..c4235218 100644
--- a/app/src/main/res/drawable/ic_multi_reddit_24dp.xml
+++ b/app/src/main/res/drawable/ic_multi_reddit_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
-      android:pathData="M3,6c-0.55,0 -1,0.45 -1,1v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,20c-0.55,0 -1,-0.45 -1,-1L4,7c0,-0.55 -0.45,-1 -1,-1zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,11h-8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM14,15h-4c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h4c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM18,7h-8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+      android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L8,16L8,4h12v12zM10,9h8v2h-8zM10,12h4v2h-4zM10,6h8v2h-8z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_report_black_24dp.xml b/app/src/main/res/drawable/ic_report_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_report_black_24dp.xml
rename to app/src/main/res/drawable/ic_report_24dp.xml
diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
index ddd3e572..d0d57e55 100644
--- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
@@ -87,7 +87,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_report_black_24dp"
+            android:drawableStart="@drawable/ic_report_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:gravity="center_vertical"