Merge pull request #13508 from woocommerce/fix/13495-toolbar-scrim-co…

…lor-bug Remove custom modal bottom sheet implementation
woocommerce · Feb 10, 2025 · 9ea5a02 · 9ea5a02
2 parents 4328adc + e9f8fd3
commit 9ea5a02
Showing 1 changed file with 8 additions and 139 deletions.
diff --git a/.../src/main/kotlin/com/woocommerce/android/ui/compose/component/WCModalBottomSheetLayout.kt b/.../src/main/kotlin/com/woocommerce/android/ui/compose/component/WCModalBottomSheetLayout.kt
@@ -1,41 +1,17 @@
 package com.woocommerce.android.ui.compose.component
 
-import android.util.TypedValue
-import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ModalBottomSheetDefaults
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.contentColorFor
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.unit.Dp
-import androidx.core.view.WindowCompat
 import com.woocommerce.android.R
-import com.woocommerce.android.extensions.findActivity
-import com.woocommerce.android.util.SystemVersionUtils
 
 /**
  * A wrapper around [ModalBottomSheetLayout] that provides default values for the sheet shape and scrim color.
@@ -51,121 +27,14 @@ fun WCModalBottomSheetLayout(
     ),
     content: @Composable () -> Unit
 ) {
-    if (SystemVersionUtils.isAtMostU()) {
-        ModalBottomSheetLayoutWithStatusBarWorkaround(
-            sheetContent = sheetContent,
-            sheetShape = sheetShape,
-            sheetState = sheetState,
-            modifier = modifier,
-            content = content,
-        )
-    } else {
-        ModalBottomSheetLayout(
-            sheetContent = sheetContent,
-            sheetShape = sheetShape,
-            sheetState = sheetState,
-            scrimColor = scrimColor(),
-            modifier = modifier,
-            content = content
-        )
-    }
-}
-
-/*
- * This is a custom implementation of the ModalBottomSheetLayout that fixes the scrim color of the status bar
- * and the show animation.
- *
- * Source: https://stackoverflow.com/a/76998328
- *
- */
-@Suppress("DEPRECATION")
-@Composable
-private fun ModalBottomSheetLayoutWithStatusBarWorkaround(
-    sheetContent: @Composable ColumnScope.() -> Unit,
-    modifier: Modifier = Modifier,
-    sheetState: ModalBottomSheetState,
-    sheetShape: Shape = MaterialTheme.shapes.large,
-    sheetElevation: Dp = ModalBottomSheetDefaults.Elevation,
-    sheetBackgroundColor: Color = colorResource(id = R.color.bottom_sheet_background),
-    sheetContentColor: Color = contentColorFor(sheetBackgroundColor),
-    content: @Composable () -> Unit
-): Unit = ModalBottomSheetLayout(
-    sheetContent = {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            sheetContent.invoke(this@ModalBottomSheetLayout)
-        }
-    },
-    sheetState = sheetState,
-    sheetShape = sheetShape,
-    sheetElevation = sheetElevation,
-    sheetBackgroundColor = sheetBackgroundColor,
-    sheetContentColor = sheetContentColor,
-    scrimColor = scrimColor(),
-    modifier = modifier
-        .imePadding()
-        .navigationBarsPadding()
-) {
-    val context = LocalContext.current
-    var statusBarColor by remember { mutableStateOf(Color.Transparent) }
-    val backgroundColor = remember {
-        val typedValue = TypedValue()
-        if (context.findActivity()?.theme?.resolveAttribute(
-                android.R.attr.windowBackground,
-                typedValue,
-                true
-            ) == true
-        ) {
-            Color(typedValue.data)
-        } else {
-            sheetBackgroundColor
-        }
-    }
-
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .background(statusBarColor)
-            .statusBarsPadding()
-    ) {
-        Box(
-            modifier = Modifier
-                .background(backgroundColor)
-                .fillMaxSize()
-                .navigationBarsPadding()
-        ) {
-            content()
-        }
-    }
-
-    val window = remember { context.findActivity()?.window }
-    if (window == null) return@ModalBottomSheetLayout
-
-    val originalNavigationBarColor = remember { window.navigationBarColor }
-
-    LaunchedEffect(sheetState.currentValue) {
-        if (sheetState.currentValue != ModalBottomSheetValue.Hidden) {
-            window.navigationBarColor = sheetBackgroundColor.toArgb()
-        } else {
-            window.navigationBarColor = originalNavigationBarColor
-        }
-    }
-
-    DisposableEffect(Unit) {
-        val originalStatusBarColor = window.statusBarColor
-        statusBarColor = Color(originalStatusBarColor)
-
-        window.statusBarColor = android.graphics.Color.TRANSPARENT
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
-        onDispose {
-            window.statusBarColor = originalStatusBarColor
-            window.navigationBarColor = originalNavigationBarColor
-            WindowCompat.setDecorFitsSystemWindows(window, true)
-        }
-    }
+    ModalBottomSheetLayout(
+        sheetContent = sheetContent,
+        sheetShape = sheetShape,
+        sheetState = sheetState,
+        scrimColor = scrimColor(),
+        modifier = modifier,
+        content = content
+    )
 }
 
 // Overriding scrim color for dark theme because of the following bug affecting ModalBottomSheetLayout: