From 7530a7bd4ee1047176be3f2b282f7110e9522fd2 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 16 Jul 2020 22:22:06 -0400
Subject: [PATCH] Move edit categories to overflow

(cherry picked from commit 88ee86b7ef9c4bf8170d111f1ae2ab56871d7688)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/res/menu/chapters.xml
---
 .../eu/kanade/tachiyomi/ui/manga/MangaController.kt  |  6 ++++--
 .../ui/manga/info/MangaInfoHeaderAdapter.kt          | 12 ------------
 app/src/main/res/layout/manga_info_header.xml        | 11 -----------
 app/src/main/res/menu/chapters.xml                   |  5 +++++
 app/src/main/res/values/styles.xml                   |  2 ++
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
index 295be9c97..285fc8b6c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@@ -337,7 +337,8 @@ class MangaController :
         // Hide download options for local manga
         menu.findItem(R.id.download_group).isVisible = !isLocalSource
 
-        // Hide edit cover and migrate options for non-library manga
+        // Hide options for non-library manga
+        menu.findItem(R.id.action_edit_categories).isVisible = presenter.manga.favorite && presenter.getCategories().isNotEmpty()
         /* SY --> menu.findItem(R.id.action_edit_cover).isVisible = presenter.manga.favorite SY <-- */
         /* SY --> menu.findItem(R.id.action_migrate).isVisible = presenter.manga.favorite SY <-- */
 
@@ -411,6 +412,7 @@ class MangaController :
             }
             // SY <--
 
+            R.id.action_edit_categories -> onCategoriesClick()
             // SY --> R.id.action_edit_cover -> handleChangeCover() // SY <--
             // SY --> R.id.action_migrate -> migrateManga() // SY <--
         }
@@ -643,7 +645,7 @@ class MangaController :
         mangaInfoAdapter?.notifyDataSetChanged()
     }
 
-    fun onCategoriesClick() {
+    private fun onCategoriesClick() {
         val manga = presenter.manga
         val categories = presenter.getCategories()
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
index 5be97676e..6b6399c8e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
@@ -107,16 +107,6 @@ class MangaInfoHeaderAdapter(
                 binding.btnTracking.gone()
             }
 
-            if (controller.presenter.manga.favorite && controller.presenter.getCategories().isNotEmpty()) {
-                binding.btnCategories.visible()
-                binding.btnCategories.clicks()
-                    .onEach { controller.onCategoriesClick() }
-                    .launchIn(scope)
-                binding.btnCategories.setTooltip(R.string.action_move_category)
-            } else {
-                binding.btnCategories.gone()
-            }
-
             if (controller.presenter.source is HttpSource) {
                 binding.btnWebview.visible()
                 binding.btnWebview.clicks()
@@ -366,8 +356,6 @@ class MangaInfoHeaderAdapter(
                     initialLoad = false
                 }
             }
-
-            binding.btnCategories.visibleIf { manga.favorite && controller.presenter.getCategories().isNotEmpty() }
         }
 
         private fun showMangaInfo(visible: Boolean) {
diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index 0c6899cf5..109424324 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -142,17 +142,6 @@
                     app:icon="@drawable/ic_sync_24dp"
                     tools:visibility="visible" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btn_categories"
-                    style="@style/Theme.Widget.Button.Icon.Textless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:contentDescription="@string/action_edit_categories"
-                    android:visibility="gone"
-                    app:icon="@drawable/ic_label_24dp"
-                    tools:visibility="visible" />
-
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_share"
                     style="@style/Theme.Widget.Button.Icon.Textless"
diff --git a/app/src/main/res/menu/chapters.xml b/app/src/main/res/menu/chapters.xml
index 86902f7a4..6a6d6f757 100755
--- a/app/src/main/res/menu/chapters.xml
+++ b/app/src/main/res/menu/chapters.xml
@@ -97,6 +97,11 @@
         </menu>
     </item>
 
+    <item
+        android:id="@+id/action_edit_categories"
+        android:title="@string/action_edit_categories"
+        app:showAsAction="never" />
+
     <!--<item
         android:id="@+id/action_edit_cover"
         android:title="@string/action_edit_cover"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3360115bd..ac03b949a 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -255,6 +255,8 @@
     <style name="Theme.Widget.Button.Icon" parent="Widget.MaterialComponents.Button.OutlinedButton.Icon">
         <item name="android:minHeight">0dp</item>
         <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">16dp</item>
 
         <item name="elevation">0dp</item>