Remove protectNavBars property (#38)

composablehorizons · Oct 29, 2024 · 42685f3 · 42685f3
1 parent 6ba0313
commit 42685f3
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 16 deletions.
diff --git a/core/src/androidMain/kotlin/Modal.android.kt b/core/src/androidMain/kotlin/Modal.android.kt
@@ -9,16 +9,13 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.NativeKeyEvent
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import androidx.lifecycle.setViewTreeLifecycleOwner
@@ -29,7 +26,6 @@ import java.util.*
 
 @Composable
 internal actual fun Modal(
-    protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
 ) {
@@ -86,11 +82,6 @@ internal actual fun Modal(
             window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
         }
 
-        if (protectNavBars) {
-            window.navigationBarColor = Color.Black.copy(alpha = 0.33f).toArgb()
-            WindowInsetsControllerCompat(window, contentView).isAppearanceLightNavigationBars = false
-        }
-
         window.setDimAmount(0f)
         window.setWindowAnimations(-1)
 

diff --git a/core/src/appleMain/kotlin/Modal.apple.kt b/core/src/appleMain/kotlin/Modal.apple.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.window.DialogProperties
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal actual fun Modal(
-    protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
 ) = androidx.compose.ui.window.Dialog(

diff --git a/core/src/commonMain/kotlin/Modal.kt b/core/src/commonMain/kotlin/Modal.kt
@@ -5,7 +5,6 @@ import androidx.compose.ui.input.key.KeyEvent
 
 @Composable
 internal expect fun Modal(
-    protectNavBars: Boolean = false,
     onKeyEvent: (KeyEvent) -> Boolean = { false },
     content: @Composable () -> Unit
 )
diff --git a/core/src/commonMain/kotlin/ModalBottomSheet.kt b/core/src/commonMain/kotlin/ModalBottomSheet.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.delay
 
 public data class ModalSheetProperties(
     val dismissOnBackPress: Boolean = true,
-    val dismissOnClickOutside: Boolean = true
+    val dismissOnClickOutside: Boolean = true,
 )
 
 @Composable
@@ -163,7 +163,7 @@ public fun ModalBottomSheet(
                 { false }
             }
 
-            Modal(protectNavBars = true, onKeyEvent = onKeyEvent) {
+            Modal(onKeyEvent = onKeyEvent) {
                 Box(Modifier
                     .fillMaxSize()
                     .let {

diff --git a/core/src/jsMain/kotlin/Modal.js.kt b/core/src/jsMain/kotlin/Modal.js.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.window.DialogProperties
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal actual fun Modal(
-    protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
 ) = androidx.compose.ui.window.Dialog(

diff --git a/core/src/jvmMain/kotlin/Modal.jvm.kt b/core/src/jvmMain/kotlin/Modal.jvm.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.window.DialogProperties
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal actual fun Modal(
-    protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
 ) = androidx.compose.ui.window.Dialog(

diff --git a/core/src/wasmJsMain/kotlin/Modal.wasmJs.kt b/core/src/wasmJsMain/kotlin/Modal.wasmJs.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.window.DialogProperties
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal actual fun Modal(
-    protectNavBars: Boolean,
     onKeyEvent: (KeyEvent) -> Boolean,
     content: @Composable () -> Unit
 ) = androidx.compose.ui.window.Dialog(