Migrate to ExtendedFloatingActionButton

app/build.gradle

@@ -100,7 +100,7 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'io.insert-koin:koin-android:3.1.5'
+	implementation 'io.insert-koin:koin-android:3.1.6'
 	implementation 'io.coil-kt:coil-base:1.4.0'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'

app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt

@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
+import androidx.core.view.ViewCompat
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+
+class ShrinkOnScrollBehavior : Behavior<ExtendedFloatingActionButton> {
+
+	@Suppress("unused") constructor() : super()
+	@Suppress("unused") constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+
+	override fun onStartNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: ExtendedFloatingActionButton,
+		directTargetChild: View,
+		target: View,
+		axes: Int,
+		type: Int
+	): Boolean {
+		return axes == ViewCompat.SCROLL_AXIS_VERTICAL
+	}
+
+	override fun onNestedScroll(
+		coordinatorLayout: CoordinatorLayout,
+		child: ExtendedFloatingActionButton,
+		target: View,
+		dxConsumed: Int,
+		dyConsumed: Int,
+		dxUnconsumed: Int,
+		dyUnconsumed: Int,
+		type: Int,
+		consumed: IntArray
+	) {
+		if (dyConsumed > 0) {
+			if (child.isExtended) {
+				child.shrink()
+			}
+		} else if (dyConsumed < 0) {
+			if (!child.isExtended) {
+				child.extend()
+			}
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -308,17 +308,6 @@ class MainActivity :
 
 	private fun onLoadingStateChanged(isLoading: Boolean) {
 		binding.fab.isEnabled = !isLoading
-		if (isLoading) {
-			binding.fab.setImageDrawable(
-				CircularProgressDrawable(this).also {
-					it.setColorSchemeColors(R.color.kotatsu_onPrimaryContainer)
-					it.strokeWidth = resources.resolveDp(3.5f)
-					it.start()
-				}
-			)
-		} else {
-			binding.fab.setImageResource(R.drawable.ic_read_fill)
-		}
 	}
 
 	private fun updateSideMenu(remoteSources: List<MangaSource>) {

app/src/main/res/drawable/ic_read_fill.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54z" />
-</vector>

app/src/main/res/layout-w720dp-land/activity_main.xml

@@ -73,19 +73,20 @@
 
 		</com.google.android.material.appbar.AppBarLayout>
 
-		<com.google.android.material.floatingactionbutton.FloatingActionButton
+		<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 			android:id="@+id/fab"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_margin="16dp"
-			android:contentDescription="@string/_continue"
+			android:text="@string/_continue"
-			android:src="@drawable/ic_read_fill"
 			android:visibility="gone"
 			app:backgroundTint="?attr/colorContainer"
-			app:fabSize="normal"
+			app:behavior_autoHide="true"
+			app:behavior_autoShrink="true"
+			app:icon="@drawable/ic_read"
 			app:layout_anchor="@id/container"
 			app:layout_anchorGravity="bottom|end"
-			app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
+			app:layout_behavior="org.koitharu.kotatsu.base.ui.util.ShrinkOnScrollBehavior"
 			app:layout_dodgeInsetEdges="bottom"
 			tools:visibility="visible" />
 

app/src/main/res/layout/activity_categories.xml

@@ -63,6 +63,7 @@
 		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>

app/src/main/res/layout/activity_main.xml

@@ -67,19 +67,20 @@
 
 		</com.google.android.material.appbar.AppBarLayout>
 
-		<com.google.android.material.floatingactionbutton.FloatingActionButton
+		<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 			android:id="@+id/fab"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_margin="16dp"
-			android:contentDescription="@string/_continue"
+			android:text="@string/_continue"
-			android:src="@drawable/ic_read_fill"
 			android:visibility="gone"
 			app:backgroundTint="?attr/colorContainer"
-			app:fabSize="normal"
+			app:behavior_autoHide="true"
+			app:behavior_autoShrink="true"
+			app:icon="@drawable/ic_read"
 			app:layout_anchor="@id/container"
 			app:layout_anchorGravity="bottom|end"
-			app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
+			app:layout_behavior="org.koitharu.kotatsu.base.ui.util.ShrinkOnScrollBehavior"
 			app:layout_dodgeInsetEdges="bottom"
 			tools:visibility="visible" />