Browse Source

Scaffold: Fix snackbar bottom inset (#9052)

(cherry picked from commit 34a586ce48d6c10ac9eadb697b955ba336044bc2)
Ivan Iskandar 2 years ago
parent
commit
48546c3db4
1 changed files with 5 additions and 2 deletions
  1. 5 2
      app/src/main/java/eu/kanade/presentation/components/Scaffold.kt

+ 5 - 2
app/src/main/java/eu/kanade/presentation/components/Scaffold.kt

@@ -240,13 +240,16 @@ private fun ScaffoldLayout(
                 )
             }.fastMap { it.measure(looseConstraints) }
 
-            val bottomBarHeight = bottomBarPlaceables.fastMaxBy { it.height }?.height
+            val bottomBarHeight = bottomBarPlaceables
+                .fastMaxBy { it.height }
+                ?.height
+                ?.takeIf { it != 0 }
             val fabOffsetFromBottom = fabPlacement?.let {
                 max(bottomBarHeight ?: 0, bottomInset) + it.height + FabSpacing.roundToPx()
             }
 
             val snackbarOffsetFromBottom = if (snackbarHeight != 0) {
-                snackbarHeight + (fabOffsetFromBottom ?: bottomBarHeight ?: bottomInset)
+                snackbarHeight + (fabOffsetFromBottom ?: max(bottomBarHeight ?: 0, bottomInset))
             } else {
                 0
             }