diff --git a/settings.gradle.kts b/settings.gradle.kts index 531a00a9..eba1fd8d 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-alpha04") + version("androidx.compose", "1.2.0-alpha05") 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-alpha06") + .version("1.0.0-alpha07") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") @@ -122,7 +122,7 @@ dependencyResolutionManagement { ) ) - version("accompanist", "0.24.3-alpha") + version("accompanist", "0.24.4-alpha") alias("accompanist.insets") .to("com.google.accompanist", "accompanist-insets") .versionRef("accompanist") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt index ca1ea7a2..1f7e4f9e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt @@ -7,9 +7,9 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.layout.* -import androidx.compose.foundation.lazy.GridCells -import androidx.compose.foundation.lazy.LazyVerticalGrid -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.* import androidx.compose.runtime.* @@ -20,7 +20,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.window.Dialog import androidx.lifecycle.viewmodel.compose.viewModel import com.google.accompanist.pager.ExperimentalPagerApi @@ -337,7 +336,7 @@ fun IconShapePreference( ) ) LazyVerticalGrid( - cells = GridCells.Adaptive(96.dp), + columns = GridCells.Adaptive(96.dp), modifier = Modifier .fillMaxWidth() .padding(bottom = 16.dp, start = 16.dp, end = 16.dp) @@ -415,7 +414,7 @@ fun LegacyIconBackgroundPreference( ) ) LazyVerticalGrid( - cells = GridCells.Adaptive(96.dp), + columns = GridCells.Adaptive(96.dp), modifier = Modifier .fillMaxWidth() .padding(bottom = 16.dp, start = 16.dp, end = 16.dp)