From 1370901f46bdb2cfcc9108312cb28a62050b5021 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Thu, 27 Jan 2022 20:49:22 +0100 Subject: [PATCH] Update Jetpack Compose and Accompanist --- settings.gradle.kts | 6 +++--- .../launcher2/ui/component/preferences/ListPreference.kt | 6 ++---- .../settings/calendarwidget/CalendarWidgetSettingsScreen.kt | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index b1e8397f..d2313315 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -62,7 +62,7 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose", "1.2.0-alpha01") + version("androidx.compose", "1.2.0-alpha02") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") .versionRef("androidx.compose") @@ -95,7 +95,7 @@ dependencyResolutionManagement { .versionRef("androidx.compose") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha03") + .version("1.0.0-alpha04") version("androidx.lifecycle", "2.4.0-rc01") alias("androidx.lifecycle.viewmodel") @@ -123,7 +123,7 @@ dependencyResolutionManagement { ) ) - version("accompanist", "0.24.0-alpha") + version("accompanist", "0.24.1-alpha") alias("accompanist.insets") .to("com.google.accompanist", "accompanist-insets") .versionRef("accompanist") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt index 0e57c806..724cfdc7 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt @@ -8,10 +8,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.RadioButton -import androidx.compose.material3.Surface -import androidx.compose.material3.Text +import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -19,6 +16,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog +@OptIn(ExperimentalMaterial3Api::class) @Composable fun ListPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt index 4e383e46..07c2521f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt @@ -66,6 +66,7 @@ fun CalendarWidgetSettingsScreen() { } } +@OptIn(ExperimentalMaterial3Api::class) @Composable fun ExcludedCalendarsPreference( calendars: List,