Skip to content

Commit fc38dd9

Browse files
committed
library: Opt FloatingNavigationBar on iOS
1 parent 9cf8029 commit fc38dd9

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

iosApp/iosApp/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.3</string>
18+
<string>1.0.4</string>
1919
<key>CFBundleVersion</key>
20-
<string>103</string>
20+
<string>104</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>CADisableMinimumFrameDurationOnPhone</key>

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/NavigationBar.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,15 @@ fun FloatingNavigationBar(
224224

225225
val dividerLineColor = MiuixTheme.colorScheme.dividerLine
226226

227-
val platformValue = platform()
228-
val bottomPaddingValue = if (platformValue != Platform.IOS) 36.dp else 30.dp
227+
val platformValue = remember { platform() }
228+
val bottomPaddingValue = when (platformValue) {
229+
Platform.IOS -> 8.dp
230+
Platform.Android -> {
231+
val navBarBottomPadding = WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues().calculateBottomPadding()
232+
if (navBarBottomPadding != 0.dp) 8.dp + navBarBottomPadding else 36.dp
233+
}
234+
else -> 36.dp
235+
}
229236

230237
val rootColumnModifier = remember(horizontalAlignment, horizontalOutSidePadding) {
231238
Modifier

0 commit comments

Comments
 (0)