From b79250485410140b2540066b75e93438fa7e47be Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 23 Mar 2021 13:16:26 -0400
Subject: [PATCH] Various updates to Browse Tab

Changed filter languages button to a globe and now says "filter languages"
Fix source migration not animated between sources and manga
Leaving the migration tab sends you back to source migration list
---
 .../tachiyomi/ui/extension/ExtensionBottomSheet.kt    |  7 +++++--
 app/src/main/res/drawable/ic_bookmark_24dp.xml        | 10 +++++-----
 app/src/main/res/drawable/ic_language_24dp.xml        | 10 ++++++++++
 app/src/main/res/menu/extension_main.xml              | 11 ++++++-----
 app/src/main/res/values/strings.xml                   |  1 +
 5 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_language_24dp.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt
index 8749dafd3e..c01f148485 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt
@@ -128,6 +128,9 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At
                     0 -> extensionFrameLayout
                     else -> migrationFrameLayout
                 }.recycler?.isNestedScrollingEnabled = false
+                if (tab?.position == 1) {
+                    presenter.deselectSource()
+                }
             }
             override fun onTabReselected(tab: TabLayout.Tab?) {
                 this@ExtensionBottomSheet.sheetBehavior?.expand()
@@ -260,7 +263,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At
             migRecyler.adapter = migAdapter
             migAdapter?.fastScroller = migrationFrameLayout.fast_scroller
         }
-        migAdapter?.updateDataSet(sources)
+        migAdapter?.updateDataSet(sources, true)
     }
 
     fun setMigrationManga(manga: List<MangaItem>?) {
@@ -270,7 +273,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At
             migRecyler.adapter = migAdapter
             migAdapter?.fastScroller = migrationFrameLayout.fast_scroller
         }
-        migAdapter?.updateDataSet(manga)
+        migAdapter?.updateDataSet(manga, true)
     }
 
     fun drawExtensions() {
diff --git a/app/src/main/res/drawable/ic_bookmark_24dp.xml b/app/src/main/res/drawable/ic_bookmark_24dp.xml
index 38953e0efa..b70b21beaf 100644
--- a/app/src/main/res/drawable/ic_bookmark_24dp.xml
+++ b/app/src/main/res/drawable/ic_bookmark_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:tint="#FFFFFF"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:tint="?attr/actionBarTintColor"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_language_24dp.xml b/app/src/main/res/drawable/ic_language_24dp.xml
new file mode 100644
index 0000000000..6d7cba52fd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_language_24dp.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/actionBarTintColor">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.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,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
diff --git a/app/src/main/res/menu/extension_main.xml b/app/src/main/res/menu/extension_main.xml
index 5f679a87a2..245c43e221 100644
--- a/app/src/main/res/menu/extension_main.xml
+++ b/app/src/main/res/menu/extension_main.xml
@@ -1,10 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_filter"
-        android:title="@string/filter"
-        android:icon="@drawable/ic_filter_list_24dp"
-        app:showAsAction="always"/>
 
     <item
         android:id="@+id/action_search"
@@ -12,4 +7,10 @@
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom" />
+
+    <item
+        android:id="@+id/action_filter"
+        android:title="@string/filter_languages"
+        android:icon="@drawable/ic_language_24dp"
+        app:showAsAction="always"/>
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2720161d2e..b2cbc28cfd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -248,6 +248,7 @@
     <string name="extensions">Extensions</string>
     <string name="extension_updates">Extension Updates</string>
     <string name="extension_info">Extension info</string>
+    <string name="filter_languages">Filter Languages</string>
     <string name="details">Details</string>
     <string name="obsolete">Obsolete</string>
     <string name="pending">Pending</string>