From 8e08b5003ebfc7510e5cf7641f80b45f7bc2c09e Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sat, 6 Aug 2022 23:57:44 +0300
Subject: [PATCH] Fix snackbar in feed screen for tablets

---
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |  3 +-
 .../kotatsu/tracker/ui/FeedFragment.kt        |  2 +-
 .../kotatsu/tracker/ui/FeedMenuProvider.kt    |  2 +-
 .../koitharu/kotatsu/utils/ext/AndroidExt.kt  |  8 ---
 .../main/res/drawable/toolbar_background.xml  |  2 +-
 .../res/layout-w600dp/activity_categories.xml | 69 +++++++++++++++++++
 .../main/res/layout-w600dp/activity_main.xml  |  2 +-
 7 files changed, 74 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/layout-w600dp/activity_categories.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 2b309304f..9b1111826 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -245,8 +245,7 @@ class MainActivity :
 	}
 
 	private fun onError(e: Throwable) {
-		Snackbar.make(binding.container, e.getDisplayMessage(resources), Snackbar.LENGTH_SHORT).setAnchorView(bottomNav)
-			.show()
+		Snackbar.make(binding.container, e.getDisplayMessage(resources), Snackbar.LENGTH_SHORT).show()
 	}
 
 	private fun onCountersChanged(counters: SparseIntArray) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
index f4bb69b33..769a0caf2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
@@ -73,7 +73,7 @@ class FeedFragment :
 		addMenuProvider(
 			FeedMenuProvider(
 				binding.recyclerView,
-				(activity as? BottomNavOwner)?.bottomNav ?: binding.recyclerView,
+				(activity as? BottomNavOwner)?.bottomNav,
 				viewModel,
 			),
 		)
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedMenuProvider.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedMenuProvider.kt
index 6a201b1c1..0b83034f3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedMenuProvider.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedMenuProvider.kt
@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.tracker.work.TrackWorker
 
 class FeedMenuProvider(
 	private val snackbarHost: View,
-	private val anchorView: View,
+	private val anchorView: View?,
 	private val viewModel: FeedViewModel,
 ) : MenuProvider {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index 864061300..9f4c34953 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -129,14 +129,6 @@ fun Context.getAnimationDuration(@IntegerRes resId: Int): Long {
 	return (resources.getInteger(resId) * animatorDurationScale).roundToLong()
 }
 
-inline fun <reified T> ViewGroup.findChild(): T? {
-	return children.find { it is T } as? T
-}
-
-inline fun <reified T> ViewGroup.findDescendant(): T? {
-	return descendants.find { it is T } as? T
-}
-
 fun isLowRamDevice(context: Context): Boolean {
 	return context.activityManager?.isLowRamDevice ?: false
 }
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/app/src/main/res/drawable/toolbar_background.xml
index c25f09130..9869007c6 100644
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ b/app/src/main/res/drawable/toolbar_background.xml
@@ -4,4 +4,4 @@
 	android:shape="rectangle">
 	<solid android:color="@color/toolbar_background_scrim" />
 	<corners android:radius="100dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout-w600dp/activity_categories.xml b/app/src/main/res/layout-w600dp/activity_categories.xml
new file mode 100644
index 000000000..5fa1dac25
--- /dev/null
+++ b/app/src/main/res/layout-w600dp/activity_categories.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fitsSystemWindows="true">
+
+		<com.google.android.material.appbar.CollapsingToolbarLayout
+			android:id="@+id/collapsingToolbarLayout"
+			style="?attr/collapsingToolbarLayoutLargeStyle"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+			app:toolbarId="@id/toolbar">
+
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				app:layout_collapseMode="pin">
+
+				<Button
+					android:id="@+id/button_done"
+					style="@style/Widget.Material3.Button.UnelevatedButton"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="end"
+					android:layout_marginHorizontal="@dimen/toolbar_button_margin"
+					android:text="@string/done"
+					android:visibility="gone" />
+
+			</com.google.android.material.appbar.MaterialToolbar>
+
+		</com.google.android.material.appbar.CollapsingToolbarLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:clipToPadding="false"
+		android:orientation="vertical"
+		android:scrollbars="vertical"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+		android:id="@+id/fab_add"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:contentDescription="@string/add_new_category"
+		android:src="@drawable/ic_add"
+		android:text="@string/create_category"
+		app:fabSize="normal"
+		app:icon="@drawable/ic_add"
+		app:layout_anchor="@id/recyclerView"
+		app:layout_anchorGravity="bottom|end"
+		app:layout_behavior="org.koitharu.kotatsu.base.ui.util.ShrinkOnScrollBehavior"
+		app:layout_dodgeInsetEdges="bottom" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-w600dp/activity_main.xml b/app/src/main/res/layout-w600dp/activity_main.xml
index ac119b5ea..6e09a349a 100644
--- a/app/src/main/res/layout-w600dp/activity_main.xml
+++ b/app/src/main/res/layout-w600dp/activity_main.xml
@@ -50,7 +50,7 @@
 			<FrameLayout
 				android:id="@+id/toolbar_card"
 				android:layout_width="match_parent"
-				android:layout_height="48dp"
+				android:layout_height="56dp"
 				android:layout_marginVertical="8dp"
 				android:background="@drawable/toolbar_background"
 				android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"