From 2f7fda252367bd44743aa0db144520d92fff747f Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 22 Jul 2022 22:58:53 -0400
Subject: [PATCH] Remove unused menus and drawables

(cherry picked from commit 0e19c245e9aaeb2da88722e7f5816cfddece8777)

# Conflicts:
#	app/src/main/res/menu/category_selection.xml
#	app/src/main/res/menu/chapter_selection.xml
#	app/src/main/res/menu/library.xml
#	app/src/main/res/menu/library_selection.xml
---
 .../res/drawable/ic_arrow_downward_24dp.xml   |  9 ---
 .../res/drawable/ic_check_circle_24dp.xml     |  9 ---
 .../res/drawable/ic_done_outline_24dp.xml     |  9 ---
 .../res/drawable/ic_error_outline_24dp.xml    |  9 ---
 .../main/res/drawable/ic_favorite_24dp.xml    |  9 ---
 .../res/drawable/ic_favorite_border_24dp.xml  |  9 ---
 .../main/res/layout/chapter_download_view.xml | 36 ----------
 app/src/main/res/layout/main_activity_fab.xml |  2 +-
 .../main/res/layout/section_header_item.xml   | 28 --------
 app/src/main/res/menu/chapter_download.xml    | 16 -----
 app/src/main/res/menu/chapter_selection.xml   | 62 -----------------
 app/src/main/res/menu/library.xml             | 34 ----------
 app/src/main/res/menu/library_selection.xml   | 67 -------------------
 app/src/main/res/menu/updates.xml             | 13 ----
 .../res/menu/updates_chapter_selection.xml    | 54 ---------------
 15 files changed, 1 insertion(+), 365 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_arrow_downward_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_check_circle_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_done_outline_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_error_outline_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_favorite_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_favorite_border_24dp.xml
 delete mode 100644 app/src/main/res/layout/chapter_download_view.xml
 delete mode 100644 app/src/main/res/layout/section_header_item.xml
 delete mode 100644 app/src/main/res/menu/chapter_download.xml
 delete mode 100755 app/src/main/res/menu/chapter_selection.xml
 delete mode 100755 app/src/main/res/menu/library.xml
 delete mode 100755 app/src/main/res/menu/library_selection.xml
 delete mode 100644 app/src/main/res/menu/updates.xml
 delete mode 100644 app/src/main/res/menu/updates_chapter_selection.xml

diff --git a/app/src/main/res/drawable/ic_arrow_downward_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_24dp.xml
deleted file mode 100644
index e6f6c1222..000000000
--- a/app/src/main/res/drawable/ic_arrow_downward_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="@android:color/black"
-        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_circle_24dp.xml b/app/src/main/res/drawable/ic_check_circle_24dp.xml
deleted file mode 100644
index 947f2d697..000000000
--- a/app/src/main/res/drawable/ic_check_circle_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="@android:color/black"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_done_outline_24dp.xml b/app/src/main/res/drawable/ic_done_outline_24dp.xml
deleted file mode 100644
index d24a1b9f4..000000000
--- a/app/src/main/res/drawable/ic_done_outline_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="@android:color/black"
-        android:pathData="M19.77,5.03l1.4,1.4L8.43,19.17l-5.6,-5.6 1.4,-1.4 4.2,4.2L19.77,5.03m0,-2.83L8.43,13.54l-4.2,-4.2L0,13.57 8.43,22 24,6.43 19.77,2.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_error_outline_24dp.xml b/app/src/main/res/drawable/ic_error_outline_24dp.xml
deleted file mode 100644
index 5ea6b9db1..000000000
--- a/app/src/main/res/drawable/ic_error_outline_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="@android:color/black"
-        android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_24dp.xml b/app/src/main/res/drawable/ic_favorite_24dp.xml
deleted file mode 100644
index c79e6d6a0..000000000
--- a/app/src/main/res/drawable/ic_favorite_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="@android:color/black"
-        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_border_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_24dp.xml
deleted file mode 100644
index 5fb8bf629..000000000
--- a/app/src/main/res/drawable/ic_favorite_border_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="@android:color/black"
-        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
-</vector>
diff --git a/app/src/main/res/layout/chapter_download_view.xml b/app/src/main/res/layout/chapter_download_view.xml
deleted file mode 100644
index 5575d562a..000000000
--- a/app/src/main/res/layout/chapter_download_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="42dp"
-    android:layout_height="42dp"
-    android:background="?attr/selectableItemBackgroundBorderless"
-    android:padding="8dp">
-
-    <ImageView
-        android:id="@+id/download_status_icon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        tools:ignore="ContentDescription" />
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/download_progress"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="2dp"
-        android:progress="100"
-        app:indicatorInset="0dp"
-        app:indicatorSize="22dp" />
-
-    <ImageView
-        android:id="@+id/download_icon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="4dp"
-        android:scaleType="fitXY"
-        app:srcCompat="@drawable/ic_arrow_downward_24dp"
-        app:tint="?android:attr/textColorHint"
-        tools:ignore="ContentDescription" />
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/main_activity_fab.xml b/app/src/main/res/layout/main_activity_fab.xml
index e1a270ef6..4c57c9f80 100644
--- a/app/src/main/res/layout/main_activity_fab.xml
+++ b/app/src/main/res/layout/main_activity_fab.xml
@@ -8,6 +8,6 @@
     android:layout_gravity="bottom|end"
     android:minWidth="0dp"
     android:visibility="gone"
-    tools:icon="@drawable/ic_add_24dp"
+    tools:icon="@drawable/ic_help_24dp"
     tools:text="Action"
     tools:visibility="visible" />
diff --git a/app/src/main/res/layout/section_header_item.xml b/app/src/main/res/layout/section_header_item.xml
deleted file mode 100644
index 5b46ea81b..000000000
--- a/app/src/main/res/layout/section_header_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="8dp"
-        android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader"
-        tools:text="Title" />
-
-    <Button
-        android:id="@+id/action_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:visibility="gone"
-        tools:text="Button"
-        tools:visibility="visible" />
-
-</LinearLayout>
diff --git a/app/src/main/res/menu/chapter_download.xml b/app/src/main/res/menu/chapter_download.xml
deleted file mode 100644
index b3a508416..000000000
--- a/app/src/main/res/menu/chapter_download.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/start_download"
-        android:title="@string/action_start_downloading_now" />
-
-    <item
-        android:id="@+id/delete_download"
-        android:title="@string/action_delete" />
-
-    <item
-        android:id="@+id/cancel_download"
-        android:title="@string/action_cancel" />
-
-</menu>
diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml
deleted file mode 100755
index dd6530232..000000000
--- a/app/src/main/res/menu/chapter_selection.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <item
-        android:id="@+id/action_bookmark"
-        android:icon="@drawable/ic_bookmark_border_24dp"
-        android:title="@string/action_bookmark"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_remove_bookmark"
-        android:icon="@drawable/ic_bookmark_24dp"
-        android:title="@string/action_remove_bookmark"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_as_read"
-        android:icon="@drawable/ic_done_24dp"
-        android:title="@string/action_mark_as_read"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_as_unread"
-        android:icon="@drawable/ic_done_outline_24dp"
-        android:title="@string/action_mark_as_unread"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_previous_as_read"
-        android:icon="@drawable/ic_done_prev_24dp"
-        android:title="@string/action_mark_previous_as_read"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_download"
-        android:icon="@drawable/ic_get_app_24dp"
-        android:title="@string/action_download"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_delete"
-        android:icon="@drawable/ic_delete_24dp"
-        android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-</menu>
diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
deleted file mode 100755
index 28aa1922b..000000000
--- a/app/src/main/res/menu/library.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
-
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_24dp"
-        android:title="@string/action_search"
-        app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="collapseActionView|ifRoom" />
-
-    <item
-        android:id="@+id/action_filter"
-        android:icon="@drawable/ic_filter_list_24dp"
-        android:title="@string/action_filter"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_update_library"
-        android:icon="@drawable/ic_refresh_24dp"
-        android:title="@string/pref_category_library_update"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_sync_favorites"
-        android:icon="@drawable/ic_cloud_24dp"
-        android:title="@string/sync_favorites"
-        app:showAsAction="never"/>
-
-</menu>
diff --git a/app/src/main/res/menu/library_selection.xml b/app/src/main/res/menu/library_selection.xml
deleted file mode 100755
index 8f1536310..000000000
--- a/app/src/main/res/menu/library_selection.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <item
-        android:id="@+id/action_move_to_category"
-        android:icon="@drawable/ic_label_24dp"
-        android:title="@string/action_move_category"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_download_unread"
-        android:icon="@drawable/ic_get_app_24dp"
-        android:title="@string/action_download_unread"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_delete"
-        android:icon="@drawable/ic_delete_24dp"
-        android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_as_read"
-        android:icon="@drawable/ic_done_24dp"
-        android:title="@string/action_mark_as_read"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_as_unread"
-        android:icon="@drawable/ic_done_outline_24dp"
-        android:title="@string/action_mark_as_unread"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_clean"
-        android:icon="@drawable/baseline_swap_calls_24"
-        android:title="@string/action_clean_titles"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_migrate"
-        android:icon="@drawable/baseline_swap_calls_24"
-        android:title="@string/migrate"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_push_to_mdlist"
-        android:icon="@drawable/baseline_swap_calls_24"
-        android:title="@string/mangadex_add_to_follows"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom" />
-
-</menu>
diff --git a/app/src/main/res/menu/updates.xml b/app/src/main/res/menu/updates.xml
deleted file mode 100644
index 3f0bdb0cc..000000000
--- a/app/src/main/res/menu/updates.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
-
-    <item
-        android:id="@+id/action_update_library"
-        android:icon="@drawable/ic_refresh_24dp"
-        android:title="@string/action_update_library"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="ifRoom" />
-
-</menu>
diff --git a/app/src/main/res/menu/updates_chapter_selection.xml b/app/src/main/res/menu/updates_chapter_selection.xml
deleted file mode 100644
index d0d7b1a30..000000000
--- a/app/src/main/res/menu/updates_chapter_selection.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_bookmark"
-        android:icon="@drawable/ic_bookmark_border_24dp"
-        android:title="@string/action_bookmark"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_remove_bookmark"
-        android:icon="@drawable/ic_bookmark_24dp"
-        android:title="@string/action_remove_bookmark"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_as_read"
-        android:icon="@drawable/ic_done_24dp"
-        android:title="@string/action_mark_as_read"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_mark_as_unread"
-        android:icon="@drawable/ic_done_outline_24dp"
-        android:title="@string/action_mark_as_unread"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_download"
-        android:icon="@drawable/ic_get_app_24dp"
-        android:title="@string/action_download"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-    <item
-        android:id="@+id/action_delete"
-        android:icon="@drawable/ic_delete_24dp"
-        android:title="@string/action_delete"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
-</menu>