library: SuperBottomSheet: Optimize the WindowInsets area

Author: YuKongA

example/src/commonMain/kotlin/component/TextComponent.kt

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
@@ -507,48 +508,52 @@ fun BottomSheet(
             }
         }
     ) {
-        var progress by remember { mutableStateOf(0.5f) }
-        Slider(
-            progress = progress,
-            onProgressChange = { newProgress -> progress = newProgress },
-            decimalPlaces = 3,
-            modifier = Modifier.padding(bottom = 12.dp)
-        )
-        Card(
-            modifier = Modifier.padding(bottom = 12.dp),
-            colors = CardDefaults.defaultColors(
-                color = MiuixTheme.colorScheme.secondaryContainer,
-            )
-        ) {
-            SuperDropdown(
-                title = "Dropdown",
-                items = dropdownOptions,
-                selectedIndex = bottomSheetDropdownSelectedOption.value,
-                onSelectedIndexChange = { newOption -> bottomSheetDropdownSelectedOption.value = newOption }
-            )
-            SuperSwitch(
-                title = "Switch",
-                checked = bottomSheetSuperSwitchState.value,
-                onCheckedChange = {
-                    bottomSheetSuperSwitchState.value = it
+        LazyColumn {
+            item {
+                var progress by remember { mutableStateOf(0.5f) }
+                Slider(
+                    progress = progress,
+                    onProgressChange = { newProgress -> progress = newProgress },
+                    decimalPlaces = 3,
+                    modifier = Modifier.padding(bottom = 12.dp)
+                )
+                Card(
+                    modifier = Modifier.padding(bottom = 12.dp),
+                    colors = CardDefaults.defaultColors(
+                        color = MiuixTheme.colorScheme.secondaryContainer,
+                    )
+                ) {
+                    SuperDropdown(
+                        title = "Dropdown",
+                        items = dropdownOptions,
+                        selectedIndex = bottomSheetDropdownSelectedOption.value,
+                        onSelectedIndexChange = { newOption -> bottomSheetDropdownSelectedOption.value = newOption }
+                    )
+                    SuperSwitch(
+                        title = "Switch",
+                        checked = bottomSheetSuperSwitchState.value,
+                        onCheckedChange = {
+                            bottomSheetSuperSwitchState.value = it
+                        }
+                    )
                 }
-            )
-        }
-        AnimatedVisibility(
-            visible = bottomSheetSuperSwitchState.value,
-            enter = fadeIn() + expandVertically(),
-            exit = fadeOut() + shrinkVertically()
-        ) {
-            val miuixColor = MiuixTheme.colorScheme.primary
-            var selectedColor by remember { mutableStateOf(miuixColor) }
-            ColorPalette(
-                modifier = Modifier.padding(bottom = 12.dp),
-                initialColor = selectedColor,
-                onColorChanged = { selectedColor = it },
-                showPreview = false
-            )
+                AnimatedVisibility(
+                    visible = bottomSheetSuperSwitchState.value,
+                    enter = fadeIn() + expandVertically(),
+                    exit = fadeOut() + shrinkVertically()
+                ) {
+                    val miuixColor = MiuixTheme.colorScheme.primary
+                    var selectedColor by remember { mutableStateOf(miuixColor) }
+                    ColorPalette(
+                        modifier = Modifier.padding(bottom = 12.dp),
+                        initialColor = selectedColor,
+                        onColorChanged = { selectedColor = it },
+                        showPreview = false
+                    )
+                }
+                Spacer(Modifier.padding(bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()))
+            }
         }
-        Spacer(Modifier.padding(bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()))
     }
 }
 

iosApp/iosApp/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>567</string>
+	<string>568</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperBottomSheet.kt

@@ -11,6 +11,9 @@ import androidx.compose.foundation.gestures.detectVerticalDragGestures
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.captionBar
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -179,9 +182,10 @@ private fun SuperBottomSheetContent(
         derivedStateOf { windowSize.height.dp / density.density }
     }
 
-    val statusBarHeight = with(density) {
-        WindowInsets.statusBars.getTop(density).toDp()
-    }
+    val statusBars = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
+    val captionBar = WindowInsets.captionBar.asPaddingValues().calculateTopPadding()
+    val displayCutout = WindowInsets.displayCutout.asPaddingValues().calculateTopPadding()
+    val statusBarHeight = remember { maxOf(statusBars, captionBar, displayCutout) }
 
     val rootBoxModifier = Modifier
         .pointerInput(onDismissRequest) {
@@ -261,7 +265,7 @@ private fun SuperBottomSheetColumn(
                     .align(Alignment.BottomCenter)
                     .widthIn(max = sheetMaxWidth)
                     .fillMaxWidth()
-                    .height(with(density) { overscrollOffsetPx.toDp() })
+                    .height(with(density) { overscrollOffsetPx.toDp() } + 1.dp)
                     .padding(horizontal = outsideMargin.width)
                     .background(backgroundColor)
             )

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt

@@ -174,7 +174,9 @@ private fun SuperDialogContent(
     val rootBoxModifier = Modifier
         .then(
             if (defaultWindowInsetsPadding)
-                Modifier.imePadding().navigationBarsPadding()
+                Modifier
+                    .imePadding()
+                    .navigationBarsPadding()
             else
                 Modifier
         )