Skip to content

Commit 7bd021f

Browse files
committed
build(deps): Update compose-multiplatform to 1.7.0-rc01
1 parent fbffbbf commit 7bd021f

File tree

5 files changed

+32
-6
lines changed

5 files changed

+32
-6
lines changed

composeApp/src/commonMain/kotlin/ThirdPage.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import androidx.compose.foundation.layout.PaddingValues
2+
import androidx.compose.foundation.layout.Spacer
23
import androidx.compose.foundation.layout.height
34
import androidx.compose.runtime.Composable
45
import androidx.compose.runtime.MutableState
@@ -67,5 +68,8 @@ fun ThirdPage(
6768
onSelectedIndexChange = { colorMode.value = it }
6869
)
6970
}
71+
item {
72+
Spacer(modifier = Modifier.height(padding.calculateBottomPadding()))
73+
}
7074
}
7175
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android-targetSdk = "35"
66
androidGradlePlugin = "8.7.0"
77
androidx-activity-compose = "1.9.2"
88
androidx-window = "1.3.0"
9-
compose-plugin = "1.7.0-beta02"
9+
compose-plugin = "1.7.0-rc01"
1010
kotlin = "2.0.20"
1111

1212
[libraries]

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@ package top.yukonga.miuix.kmp.extra
33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.gestures.detectTapGestures
55
import androidx.compose.foundation.layout.Column
6+
import androidx.compose.foundation.layout.WindowInsets
7+
import androidx.compose.foundation.layout.WindowInsetsSides
8+
import androidx.compose.foundation.layout.captionBar
9+
import androidx.compose.foundation.layout.displayCutout
610
import androidx.compose.foundation.layout.fillMaxSize
711
import androidx.compose.foundation.layout.fillMaxWidth
812
import androidx.compose.foundation.layout.imePadding
13+
import androidx.compose.foundation.layout.navigationBarsPadding
14+
import androidx.compose.foundation.layout.only
915
import androidx.compose.foundation.layout.padding
1016
import androidx.compose.foundation.layout.widthIn
17+
import androidx.compose.foundation.layout.windowInsetsPadding
1118
import androidx.compose.runtime.Composable
1219
import androidx.compose.runtime.MutableState
1320
import androidx.compose.runtime.derivedStateOf
@@ -77,7 +84,11 @@ fun SuperDialog(
7784

7885
Box(
7986
modifier = if (defaultWindowInsetsPadding) {
80-
modifier.imePadding()
87+
modifier
88+
.imePadding()
89+
.navigationBarsPadding()
90+
.windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
91+
.windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
8192
} else {
8293
modifier
8394
}

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@ import androidx.compose.foundation.interaction.PressInteraction
1010
import androidx.compose.foundation.layout.Arrangement
1111
import androidx.compose.foundation.layout.Row
1212
import androidx.compose.foundation.layout.WindowInsets
13+
import androidx.compose.foundation.layout.WindowInsetsSides
1314
import androidx.compose.foundation.layout.asPaddingValues
1415
import androidx.compose.foundation.layout.captionBar
16+
import androidx.compose.foundation.layout.displayCutout
1517
import androidx.compose.foundation.layout.fillMaxSize
1618
import androidx.compose.foundation.layout.navigationBars
1719
import androidx.compose.foundation.layout.offset
20+
import androidx.compose.foundation.layout.only
1821
import androidx.compose.foundation.layout.padding
1922
import androidx.compose.foundation.layout.size
2023
import androidx.compose.foundation.layout.statusBars
2124
import androidx.compose.foundation.layout.width
25+
import androidx.compose.foundation.layout.windowInsetsPadding
2226
import androidx.compose.foundation.lazy.LazyColumn
2327
import androidx.compose.runtime.Composable
2428
import androidx.compose.runtime.MutableState
@@ -83,6 +87,7 @@ expect fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>
8387
* @param items The options of the [SuperDropdown].
8488
* @param alwaysRight Whether the popup is always show on the right side.
8589
* @param insideMargin The margin inside the [SuperDropdown].
90+
* @param defaultWindowInsetsPadding Whether to apply default window insets padding to the [SuperDropdown].
8691
* @param selectedIndex The index of the selected option.
8792
* @param onSelectedIndexChange The callback when the index is selected.
8893
*/
@@ -96,6 +101,7 @@ fun SuperDropdown(
96101
items: List<String>,
97102
alwaysRight: Boolean = false,
98103
insideMargin: DpSize = DpSize(16.dp, 16.dp),
104+
defaultWindowInsetsPadding: Boolean = true,
99105
selectedIndex: Int,
100106
onSelectedIndexChange: (Int) -> Unit
101107
) {
@@ -138,7 +144,7 @@ fun SuperDropdown(
138144
)
139145

140146
BasicComponent(
141-
modifier = modifierPlatform(modifier = modifier, isHovered = isHovered)
147+
modifier = modifierPlatform(modifier = Modifier, isHovered = isHovered)
142148
.background(if (isHovered.value) MiuixTheme.colorScheme.onBackground.copy(0.08f) else Color.Transparent)
143149
.indication(interactionSource, createRipple())
144150
.pointerInput(Unit) {
@@ -199,7 +205,13 @@ fun SuperDropdown(
199205
showPopup(
200206
content = {
201207
Box(
202-
modifier = Modifier
208+
modifier = if (defaultWindowInsetsPadding) {
209+
modifier
210+
.windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
211+
.windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
212+
} else {
213+
modifier
214+
}
203215
.fillMaxSize()
204216
.pointerInput(Unit) {
205217
detectTapGestures(onTap = {

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixPopupUtil.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.compose.animation.slideInVertically
1111
import androidx.compose.animation.slideOutVertically
1212
import androidx.compose.foundation.background
1313
import androidx.compose.foundation.layout.fillMaxSize
14-
import androidx.compose.foundation.layout.navigationBarsPadding
1514
import androidx.compose.runtime.Composable
1615
import androidx.compose.runtime.mutableStateOf
1716
import androidx.compose.ui.Modifier
@@ -105,7 +104,7 @@ class MiuixPopupUtil {
105104
)
106105
) {
107106
Box(
108-
modifier = Modifier.fillMaxSize().navigationBarsPadding()
107+
modifier = Modifier.fillMaxSize()
109108
) {
110109
dialogContext.value?.invoke()
111110
}

0 commit comments

Comments
 (0)