msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-16 05:47:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 2

android: migrate away from Accompanist Insets

Browse source
This commit is contained in:
Harsh Shandilya 2022-03-28 14:26:20 +05:30
parent edd537b351
commit 9f7a5446f8
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
3 changed files with 102 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
android/build.gradle.kts
View file

@ -55,7 +55,6 @@ dependencies {
implementation(projects.common) implementation(projects.common)
implementation(projects.database) implementation(projects.database)
implementation(compose.material3) implementation(compose.material3)
implementation(libs.accompanist.insets)
implementation(libs.accompanist.swiperefresh) implementation(libs.accompanist.swiperefresh)
implementation(libs.accompanist.sysuicontroller) implementation(libs.accompanist.sysuicontroller)
implementation(libs.androidx.activity.compose) implementation(libs.androidx.activity.compose)

7
android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
View file

@ -1,5 +1,6 @@
package dev.msfjarvis.claw.android.ui package dev.msfjarvis.claw.android.ui
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
@ -31,9 +32,6 @@ import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument import androidx.navigation.navArgument
import androidx.navigation.navDeepLink import androidx.navigation.navDeepLink
import androidx.paging.compose.collectAsLazyPagingItems 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 com.google.accompanist.systemuicontroller.rememberSystemUiController
import dev.msfjarvis.claw.android.R import dev.msfjarvis.claw.android.R
import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar
@ -76,7 +74,6 @@ fun LobstersApp(
LocalHTMLConverter provides htmlConverter, LocalHTMLConverter provides htmlConverter,
colorScheme = decideColorScheme(LocalContext.current), colorScheme = decideColorScheme(LocalContext.current),
) { ) {
ProvideWindowInsets {
val currentUiMode = LocalConfiguration.current.uiMode val currentUiMode = LocalConfiguration.current.uiMode
val systemBarsColor = MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation() val systemBarsColor = MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation()
val backgroundColor = MaterialTheme.colorScheme.background val backgroundColor = MaterialTheme.colorScheme.background
@ -110,7 +107,6 @@ fun LobstersApp(
Scaffold( Scaffold(
topBar = { topBar = {
ClawAppBar( ClawAppBar(
modifier = Modifier.statusBarsPadding(),
backgroundColor = systemBarsColor, backgroundColor = systemBarsColor,
navigationIcon = { navigationIcon = {
if (navItems.none { it.route == currentDestination }) { if (navItems.none { it.route == currentDestination }) {
@ -188,5 +184,4 @@ fun LobstersApp(
} }
} }
} }
}
} }

1
gradle/libs.versions.toml
View file

@ -10,7 +10,6 @@ serialization = "1.3.2"
sqldelight = "1.5.3" sqldelight = "1.5.3"
[libraries] [libraries]
accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" }
accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", 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" } accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
androidx-activity-compose = "androidx.activity:activity-compose:1.6.0-alpha01" androidx-activity-compose = "androidx.activity:activity-compose:1.6.0-alpha01"