From ef8adb00f44969959158394dd9746cea920a5ab6 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 24 Nov 2023 20:27:47 +0800
Subject: [PATCH] Fix invisible FAB being clickable

---
 .../main/kotlin/com/hippo/ehviewer/ui/legacy/FabLayout.kt   | 6 ++++--
 app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/FabLayout.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/FabLayout.kt
index c1922a8ed..af00b16b0 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/FabLayout.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/FabLayout.kt
@@ -104,7 +104,10 @@ class FabLayout @JvmOverloads constructor(
                 modifier = Modifier.fillMaxSize().padding(16.dp),
                 contentAlignment = Alignment.BottomEnd,
             ) {
-                Box(contentAlignment = Alignment.Center) {
+                Box(
+                    modifier = Modifier.rotate(lerp(-90f, 0f, appearState)).scale(appearState),
+                    contentAlignment = Alignment.Center,
+                ) {
                     val animatedProgress by animateFloatMergePredictiveBackAsState(
                         enable = expanded,
                         animationSpec = tween(FAB_ANIMATE_TIME, if (mHidden) FAB_ANIMATE_TIME else 0),
@@ -112,7 +115,6 @@ class FabLayout @JvmOverloads constructor(
                     ) { expanded = false }
                     FloatingActionButton(
                         onClick = { expanded = !expanded },
-                        modifier = Modifier.rotate(lerp(-90f, 0f, appearState)).scale(appearState),
                     ) {
                         Icon(
                             imageVector = Icons.Default.Close,
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt
index d15783e89..c74730104 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt
@@ -72,14 +72,16 @@ fun FabLayout(
         modifier = Modifier.fillMaxSize().navigationBarsPadding().padding(16.dp),
         contentAlignment = Alignment.BottomEnd,
     ) {
-        Box(contentAlignment = Alignment.Center) {
+        Box(
+            modifier = Modifier.rotate(lerp(-90f, 0f, appearState)).scale(appearState),
+            contentAlignment = Alignment.Center,
+        ) {
             val animatedProgress by animateFloatMergePredictiveBackAsState(
                 enable = expanded,
                 animationSpec = tween(FAB_ANIMATE_TIME),
             ) { onExpandChanged(false) }
             FloatingActionButton(
                 onClick = { onExpandChanged(!expanded) },
-                modifier = Modifier.rotate(lerp(-90f, 0f, appearState)).scale(appearState),
             ) {
                 Icon(
                     imageVector = Icons.Default.Close,