diff --git a/settings.gradle.kts b/settings.gradle.kts index 06b43060..56613cc5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -61,7 +61,7 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.2.0-beta02") + version("androidx.compose", "1.2.0-beta03") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") .versionRef("androidx.compose") @@ -94,7 +94,7 @@ dependencyResolutionManagement { .versionRef("androidx.compose") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha12") + .version("1.0.0-alpha13") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt index ba38ecb7..efd15ae3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt @@ -34,7 +34,10 @@ fun LicenseScreen(library: OpenSourceLibrary) { val navController = LocalNavController.current val scrollBehavior = - TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberSplineBasedDecay()) + TopAppBarDefaults.exitUntilCollapsedScrollBehavior( + rememberSplineBasedDecay(), + rememberTopAppBarScrollState() + ) Scaffold( topBar = { LargeTopAppBar( @@ -71,7 +74,9 @@ fun LicenseScreen(library: OpenSourceLibrary) { }, ) { LazyColumn( - modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection).padding(it) + modifier = Modifier + .nestedScroll(scrollBehavior.nestedScrollConnection) + .padding(it) ) { library.description?.let { item {