From ac6ae8efd2352c1be8abe1a17ab0e3dfd7754bfb Mon Sep 17 00:00:00 2001 From: zt64 Date: Wed, 24 Aug 2022 20:57:58 -0400 Subject: [PATCH] Update compose --- app/build.gradle.kts | 4 ++-- .../kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ce544e7..ab58c94 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -59,12 +59,12 @@ dependencies { implementation("androidx.activity:activity-compose:1.6.0-beta01") // compose dependencies - val composeVersion = "1.3.0-alpha03" + val composeVersion = "1.3.0-beta01" implementation("androidx.compose.ui:ui:${composeVersion}") implementation("androidx.compose.ui:ui-tooling:${composeVersion}") implementation("androidx.compose.material:material-icons-extended:${composeVersion}") - implementation("androidx.compose.material3:material3:1.0.0-alpha16") + implementation("androidx.compose.material3:material3:1.0.0-beta01") implementation("androidx.paging:paging-compose:1.0.0-alpha16") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha01") diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt index 84887c0..5e489ba 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt @@ -31,10 +31,8 @@ fun SettingsScreen( viewModel: SettingsViewModel = getViewModel(), onClickBack: () -> Unit ) { - val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior( - decayAnimationSpec = rememberSplineBasedDecay(), - state = rememberTopAppBarState() - ) + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + Scaffold( modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {