Update project

michaelbel · Nov 25, 2024 · 3f62bbe · 3f62bbe
1 parent 1efece0
commit 3f62bbe
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/...ings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/model/Features.android.kt b/...ings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/model/Features.android.kt
@@ -3,6 +3,7 @@ package org.michaelbel.movies.settings.model
 import android.os.Build
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.google.android.material.color.DynamicColors
 import org.michaelbel.movies.ui.ktx.displayCutoutWindowInsets
 
@@ -61,4 +62,7 @@ internal actual val isAboutFeatureEnabled: Boolean
     get() = true
 
 internal actual val settingsWindowInsets: WindowInsets
-    @Composable get() = displayCutoutWindowInsets
+    @Composable get() = displayCutoutWindowInsets
+
+internal actual val bottomBarModifier: Modifier
+    get() = Modifier
diff --git a/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/model/Features.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
@@ -1,6 +1,7 @@
 package org.michaelbel.movies.settings.model
 
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.ui.Modifier
 
 internal expect val isNavigationIconVisible: Boolean
 internal expect val isLanguageFeatureEnabled: Boolean
@@ -20,4 +21,5 @@ internal expect val isGithubFeatureEnabled: Boolean
 internal expect val isReviewAppFeatureEnabled: Boolean
 internal expect val isUpdateAppFeatureEnabled: Boolean
 internal expect val isAboutFeatureEnabled: Boolean
-internal expect val settingsWindowInsets: WindowInsets
+internal expect val settingsWindowInsets: WindowInsets
+internal expect val bottomBarModifier: Modifier
diff --git a/...re/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt b/...re/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
@@ -24,6 +24,7 @@ import org.michaelbel.movies.settings.ktx.rememberAndPinAppWidgetProvider
 import org.michaelbel.movies.settings.ktx.rememberPostNotificationsPermissionHandler
 import org.michaelbel.movies.settings.ktx.requestTileService
 import org.michaelbel.movies.settings.model.SettingsData
+import org.michaelbel.movies.settings.model.bottomBarModifier
 import org.michaelbel.movies.settings.model.isAboutFeatureEnabled
 import org.michaelbel.movies.settings.model.isAppIconFeatureEnabled
 import org.michaelbel.movies.settings.model.isBiometricFeatureEnabled
@@ -209,6 +210,7 @@ fun SettingsRoute(
         windowInsets = settingsWindowInsets,
         snackbarHostState = snackbarHostState,
         isNavigationIconVisible = isNavigationIconVisible,
+        bottomBarModifier = bottomBarModifier,
         modifier = modifier
     )
 

diff --git a/...ngs-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt b/...ngs-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
@@ -53,6 +53,7 @@ internal fun SettingsScreenContent(
     windowInsets: WindowInsets,
     snackbarHostState: SnackbarHostState,
     isNavigationIconVisible: Boolean,
+    bottomBarModifier: Modifier,
     modifier: Modifier = Modifier
 ) {
     val scope = rememberCoroutineScope()
@@ -81,7 +82,9 @@ internal fun SettingsScreenContent(
             if (settingsData.aboutData.isFeatureEnabled) {
                 SettingsVersionBox(
                     aboutData = settingsData.aboutData,
-                    modifier = Modifier.windowInsetsPadding(windowInsets)
+                    modifier = Modifier
+                        .then(bottomBarModifier)
+                        .windowInsetsPadding(windowInsets)
                 )
             }
         },

diff --git a/...ure/settings-impl/src/iosMain/kotlin/org/michaelbel/movies/settings/model/Features.ios.kt b/...ure/settings-impl/src/iosMain/kotlin/org/michaelbel/movies/settings/model/Features.ios.kt
@@ -1,6 +1,8 @@
 package org.michaelbel.movies.settings.model
 
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
 internal actual val isNavigationIconVisible: Boolean
@@ -58,4 +60,7 @@ internal actual val isAboutFeatureEnabled: Boolean
     get() = true
 
 internal actual val settingsWindowInsets: WindowInsets
-    get() = WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)
+    get() = WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)
+
+internal actual val bottomBarModifier: Modifier
+    get() = Modifier.navigationBarsPadding()
diff --git a/...settings-impl/src/jvmMain/kotlin/org/michaelbel/movies/settings/model/Features.desktop.kt b/...settings-impl/src/jvmMain/kotlin/org/michaelbel/movies/settings/model/Features.desktop.kt
@@ -1,6 +1,7 @@
 package org.michaelbel.movies.settings.model
 
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
 internal actual val isNavigationIconVisible: Boolean
@@ -58,4 +59,7 @@ internal actual val isAboutFeatureEnabled: Boolean
     get() = true
 
 internal actual val settingsWindowInsets: WindowInsets
-    get() = WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)
+    get() = WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)
+
+internal actual val bottomBarModifier: Modifier
+    get() = Modifier