Merge pull request #2 from maverick-2013/fix/navbar_clickability

Fixed navbar clickability
KhubaibKhan4 · Jun 14, 2024 · 2a3bed7 · 2a3bed7
2 parents 1774106 + 45db6c6
commit 2a3bed7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -78,12 +78,12 @@ kotlin {
             implementation(libs.kotlinx.datetime)
             implementation(libs.screen.size)
             implementation(project.dependencies.platform("io.insert-koin:koin-bom:3.6.0-wasm-alpha2"))
-            implementation("io.insert-koin:koin-core")
-            implementation("io.insert-koin:koin-compose")
-            implementation("io.insert-koin:koin-annotations:1.3.1")
+            implementation(libs.insert.koin.koin.core)
+            implementation(libs.koin.compose)
+            implementation(libs.koin.annotations)
             implementation(libs.kamel.image)
-            implementation("io.github.thechance101:chart:Beta-0.0.5")
-            implementation("com.ionspin.kotlin:bignum:0.3.9")
+            implementation(libs.chart)
+            implementation(libs.bignum)
             implementation(libs.ktor.core)
             implementation(libs.coil.compose.core)
             implementation(libs.coil.compose)
@@ -105,9 +105,9 @@ kotlin {
             implementation(libs.ktor.client.okhttp)
             implementation(libs.sqlDelight.driver.android)
             implementation(project.dependencies.platform("io.insert-koin:koin-bom:3.6.0-wasm-alpha2"))
-            implementation("io.insert-koin:koin-core")
-            implementation("io.insert-koin:koin-android")
-            implementation("io.insert-koin:koin-annotations:1.3.1")
+            implementation(libs.io.insert.koin.koin.core)
+            implementation(libs.koin.android)
+            implementation(libs.koin.annotations)
         }
 
         jvmMain.dependencies {

diff --git a/composeApp/src/commonMain/kotlin/org/company/app/App.kt b/composeApp/src/commonMain/kotlin/org/company/app/App.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -123,7 +124,7 @@ fun AppContent() {
         Scaffold(bottomBar = {
             if (!showNavigationRail) {
                 BottomNavigation(
-                    modifier = Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets.ime),
+                    modifier = Modifier.fillMaxWidth().navigationBarsPadding(),
                     backgroundColor = MaterialTheme.colorScheme.background,
                     contentColor = contentColorFor(Color.Red),
                     elevation = 8.dp

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,9 @@
 [versions]
 
+bignum = "0.3.9"
+chart = "Beta-0.0.5"
 kamelImage = "0.9.5"
+koinAnnotations = "1.3.1"
 kotlin = "2.0.0"
 compose = "1.6.11"
 agp = "8.2.2"
@@ -25,7 +28,14 @@ coil3 = "3.0.0-alpha06"
 androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 androidx-testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-uiTest" }
 androidx-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-uiTest" }
+bignum = { module = "com.ionspin.kotlin:bignum", version.ref = "bignum" }
+chart = { module = "io.github.thechance101:chart", version.ref = "chart" }
+insert-koin-koin-core = { module = "io.insert-koin:koin-core" }
+io-insert-koin-koin-core = { module = "io.insert-koin:koin-core" }
 kamel-image = { module = "media.kamel:kamel-image", version.ref = "kamelImage" }
+koin-android = { module = "io.insert-koin:koin-android" }
+koin-annotations = { module = "io.insert-koin:koin-annotations", version.ref = "koinAnnotations" }
+koin-compose = { module = "io.insert-koin:koin-compose" }
 lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
 tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" }