diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 58a6ce3c..0d991f3d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -86,26 +86,26 @@ dependencies { // Core implementation("androidx.core:core-ktx:1.16.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") implementation("androidx.activity:activity-compose:1.10.1") // Compose BOM libraries // Compose BOM was eliminated - it is recognized as Closed Source in AboutLibraries.. // although it is not. - implementation("androidx.compose.foundation:foundation:1.8.0-beta03") - implementation("androidx.compose.animation:animation:1.7.8") - implementation("androidx.compose.animation:animation-android:1.8.0-beta03") - implementation("androidx.compose.foundation:foundation-layout:1.7.8") - implementation("androidx.compose.ui:ui:1.7.8") - implementation("androidx.compose.ui:ui-graphics:1.7.8") - implementation("androidx.compose.ui:ui-android:1.8.0-beta03") - implementation("androidx.compose.material3:material3:1.4.0-alpha08") - implementation("androidx.compose.material3:material3-window-size-class:1.3.1") + implementation("androidx.compose.foundation:foundation:1.8.3") + implementation("androidx.compose.animation:animation:1.8.3") + implementation("androidx.compose.animation:animation-android:1.8.3") + implementation("androidx.compose.foundation:foundation-layout:1.8.3") + implementation("androidx.compose.ui:ui:1.8.3") + implementation("androidx.compose.ui:ui-graphics:1.8.3") + implementation("androidx.compose.ui:ui-android:1.8.3") + implementation("androidx.compose.material3:material3:1.4.0-alpha17") + implementation("androidx.compose.material3:material3-window-size-class:1.3.2") implementation("androidx.compose.material:material-icons-extended:1.7.8") - implementation("androidx.compose.material:material:1.7.8") + implementation("androidx.compose.material:material:1.8.3") // All dependencies - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1") implementation("com.google.accompanist:accompanist-swiperefresh:0.36.0") // Dagger - Hilt @@ -116,14 +116,14 @@ dependencies { implementation("androidx.hilt:hilt-navigation-compose:1.2.0") // Room - implementation("androidx.room:room-runtime:2.7.1") - ksp("androidx.room:room-compiler:2.7.1") + implementation("androidx.room:room-runtime:2.7.2") + ksp("androidx.room:room-compiler:2.7.2") // Kotlin Extensions and Coroutines support for Room - implementation("androidx.room:room-ktx:2.7.1") + implementation("androidx.room:room-ktx:2.7.2") // Datastore (Settings) - implementation("androidx.datastore:datastore-preferences:1.1.3") + implementation("androidx.datastore:datastore-preferences:1.1.7") // Splash Screen API implementation("androidx.core:core-splashscreen:1.0.1") @@ -138,8 +138,8 @@ dependencies { implementation("org.jsoup:jsoup:1.18.3") // Language Switcher - implementation("androidx.appcompat:appcompat:1.7.0") - implementation("androidx.appcompat:appcompat-resources:1.7.0") + implementation("androidx.appcompat:appcompat:1.7.1") + implementation("androidx.appcompat:appcompat-resources:1.7.1") // Coil for loading images implementation("io.coil-kt:coil-compose:2.7.0") diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt index b0513a10..5c1f5031 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt @@ -8,8 +8,12 @@ package ua.acclorite.book_story.ui.common.components.modal_bottom_sheet import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.safeDrawing import androidx.compose.material3.BottomSheetDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme @@ -59,6 +63,10 @@ fun ModalBottomSheet( ) .fillMaxWidth() .then(modifier), + contentWindowInsets = { + if (hasFixedHeight) WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom) + else BottomSheetDefaults.windowInsets + }, sheetGesturesEnabled = sheetGesturesEnabled, onDismissRequest = { onDismissRequest()