From e74e7b4a9d40ced92e36f319cf8617bfd9f6d983 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Sat, 17 Oct 2020 21:09:32 +0800
Subject: [PATCH] Add buttons to open right drawer

---
 .../com/hippo/ehviewer/ui/scene/DownloadsScene.java    |  4 ++++
 .../com/hippo/ehviewer/ui/scene/FavoritesScene.java    |  7 +++++--
 .../com/hippo/ehviewer/ui/scene/GalleryListScene.java  |  7 +++++--
 app/src/main/res/drawable/ic_baseline_label_24.xml     | 10 ++++++++++
 app/src/main/res/layout/scene_favorites.xml            |  9 +++++++++
 app/src/main/res/layout/scene_gallery_list.xml         |  9 +++++++++
 app/src/main/res/menu/scene_download.xml               |  6 ++++++
 7 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_label_24.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 17bd2385f..7a1397803 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -552,6 +552,10 @@ public class DownloadsScene extends ToolbarScene
                 }
                 return true;
             }
+            case R.id.action_open_download_labels: {
+                openDrawer(Gravity.RIGHT);
+                return true;
+            }
             case R.id.action_reset_reading_progress: {
                 new MaterialAlertDialogBuilder(getContext())
                         .setMessage(R.string.reset_reading_progress_message)
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index 71b7e34e5..baaf8bc1a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -755,12 +755,15 @@ public class FavoritesScene extends BaseScene implements
 
         if (!mRecyclerView.isInCustomChoice()) {
             switch (position) {
-                case 0: // Go to
+                case 0: // Open right
+                    openDrawer(Gravity.RIGHT);
+                    break;
+                case 1: // Go to
                     if (mHelper.canGoTo()) {
                         showGoToDialog();
                     }
                     break;
-                case 1: // Refresh
+                case 2: // Refresh
                     mHelper.refresh();
                     break;
             }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index b6752535a..c38054120 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -937,12 +937,15 @@ public final class GalleryListScene extends BaseScene
         }
 
         switch (position) {
-            case 0: // Go to
+            case 0: // Open right
+                openDrawer(Gravity.RIGHT);
+                break;
+            case 1: // Go to
                 if (mHelper.canGoTo()) {
                     showGoToDialog();
                 }
                 break;
-            case 1: // Refresh
+            case 2: // Refresh
                 mHelper.refresh();
                 break;
         }
diff --git a/app/src/main/res/drawable/ic_baseline_label_24.xml b/app/src/main/res/drawable/ic_baseline_label_24.xml
new file mode 100644
index 000000000..f23f1b693
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_label_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
+</vector>
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index f89aaccae..182c396bc 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -41,6 +41,15 @@
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin">
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.MaterialComponents.FloatingActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:backgroundTint="?attr/widgetColorThemeAccent"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/v_heart_box_dark_x24"
+            app:tint="#fff" />
+
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index 0349837a3..e4170c09b 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -46,6 +46,15 @@
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin">
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.MaterialComponents.FloatingActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:backgroundTint="?attr/widgetColorThemeAccent"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/v_magnify_dark_x24"
+            app:tint="#fff" />
+
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/menu/scene_download.xml b/app/src/main/res/menu/scene_download.xml
index 3e33260f8..07f282722 100644
--- a/app/src/main/res/menu/scene_download.xml
+++ b/app/src/main/res/menu/scene_download.xml
@@ -35,6 +35,12 @@
         android:title="@string/download_stop_all"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/action_open_download_labels"
+        android:icon="@drawable/ic_baseline_label_24"
+        android:title="@string/download_labels"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_reset_reading_progress"
         android:title="@string/download_reset_reading_progress"