mirror of
https://github.com/msfjarvis/compose-lobsters
synced 2025-08-14 10:37:05 +05:30
android: migrate away from Accompanist Insets
This commit is contained in:
parent
edd537b351
commit
9f7a5446f8
3 changed files with 102 additions and 109 deletions
|
@ -55,7 +55,6 @@ dependencies {
|
|||
implementation(projects.common)
|
||||
implementation(projects.database)
|
||||
implementation(compose.material3)
|
||||
implementation(libs.accompanist.insets)
|
||||
implementation(libs.accompanist.swiperefresh)
|
||||
implementation(libs.accompanist.sysuicontroller)
|
||||
implementation(libs.androidx.activity.compose)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package dev.msfjarvis.claw.android.ui
|
||||
|
||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||
import androidx.compose.material.icons.Icons
|
||||
|
@ -31,9 +32,6 @@ import androidx.navigation.compose.rememberNavController
|
|||
import androidx.navigation.navArgument
|
||||
import androidx.navigation.navDeepLink
|
||||
import androidx.paging.compose.collectAsLazyPagingItems
|
||||
import com.google.accompanist.insets.ProvideWindowInsets
|
||||
import com.google.accompanist.insets.navigationBarsPadding
|
||||
import com.google.accompanist.insets.statusBarsPadding
|
||||
import com.google.accompanist.systemuicontroller.rememberSystemUiController
|
||||
import dev.msfjarvis.claw.android.R
|
||||
import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar
|
||||
|
@ -76,7 +74,6 @@ fun LobstersApp(
|
|||
LocalHTMLConverter provides htmlConverter,
|
||||
colorScheme = decideColorScheme(LocalContext.current),
|
||||
) {
|
||||
ProvideWindowInsets {
|
||||
val currentUiMode = LocalConfiguration.current.uiMode
|
||||
val systemBarsColor = MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation()
|
||||
val backgroundColor = MaterialTheme.colorScheme.background
|
||||
|
@ -110,7 +107,6 @@ fun LobstersApp(
|
|||
Scaffold(
|
||||
topBar = {
|
||||
ClawAppBar(
|
||||
modifier = Modifier.statusBarsPadding(),
|
||||
backgroundColor = systemBarsColor,
|
||||
navigationIcon = {
|
||||
if (navItems.none { it.route == currentDestination }) {
|
||||
|
@ -188,5 +184,4 @@ fun LobstersApp(
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@ serialization = "1.3.2"
|
|||
sqldelight = "1.5.3"
|
||||
|
||||
[libraries]
|
||||
accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" }
|
||||
accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }
|
||||
accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
|
||||
androidx-activity-compose = "androidx.activity:activity-compose:1.6.0-alpha01"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue