app: Optimize Fab bottom

YuKongA · Apr 28, 2024 · 052e327 · 052e327
1 parent 4153779
commit 052e327
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/kotlin/top/yukonga/update/activity/MainActivity.kt b/app/src/main/kotlin/top/yukonga/update/activity/MainActivity.kt
@@ -373,16 +373,16 @@ class MainActivity : AppCompatActivity() {
         if (AppUtils.atLeast(Build.VERSION_CODES.R)) {
             mainContentBinding.downloadInfo.setOnApplyWindowInsetsListener { _, insets ->
                 mainContentBinding.downloadInfo.layoutParams.apply {
-                    // View bottom margin + Fab bottom height + Fab bottom margin + System gestures height.
+                    // Bottom margin + System gestures height.
                     (this as LinearLayout.LayoutParams).bottomMargin =
-                        18.dp + 56.dp + if (isLandscape()) 32.dp else 24.dp + insets.getInsets(WindowInsets.Type.systemGestures()).bottom
+                        if (isLandscape()) 32.dp else 24.dp + insets.getInsets(WindowInsets.Type.systemGestures()).bottom
                 }
                 insets
             }
         } else {
             mainContentBinding.downloadInfo.layoutParams.apply {
-                // View bottom margin + Fab bottom height + Fab bottom margin + Fixed spacing.
-                (this as LinearLayout.LayoutParams).bottomMargin = 18.dp + 56.dp + if (isLandscape()) 32.dp else 24.dp + 46.dp
+                // Bottom margin + Fixed spacing.
+                (this as LinearLayout.LayoutParams).bottomMargin = if (isLandscape()) 32.dp else 24.dp + 46.dp
             }
         }
     }

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -42,6 +42,7 @@
         android:textColor="?attr/colorOnSecondaryContainer"
         app:backgroundTint="?attr/colorSecondaryContainer"
         app:icon="@drawable/ic_check"
-        app:iconTint="?attr/colorOnSecondaryContainer" />
+        app:iconTint="?attr/colorOnSecondaryContainer"
+        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -44,6 +44,7 @@
         android:textColor="?attr/colorOnSecondaryContainer"
         app:backgroundTint="?attr/colorSecondaryContainer"
         app:icon="@drawable/ic_check"
-        app:iconTint="?attr/colorOnSecondaryContainer" />
+        app:iconTint="?attr/colorOnSecondaryContainer"
+        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>