diff --git a/settings.gradle.kts b/settings.gradle.kts index 35fb4d5a..57066d1b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -41,8 +41,8 @@ dependencyResolutionManagement { version("targetSdk", "32") } create("libs") { - version("kotlin", "1.7.0") - version("kotlinx.coroutines", "1.6.3") + version("kotlin", "1.7.10") + version("kotlinx.coroutines", "1.6.4") alias("kotlin.stdlib") .to("org.jetbrains.kotlin", "kotlin-stdlib") .versionRef("kotlin") @@ -60,40 +60,40 @@ dependencyResolutionManagement { listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") ) - version("androidx.compose.compiler", "1.3.0-beta01") + version("androidx.compose.compiler", "1.3.0-rc01") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.livedata") .to("androidx.compose.runtime", "runtime-livedata") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.foundation") .to("androidx.compose.foundation", "foundation") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.foundationlayout") .to("androidx.compose.foundation", "foundation-layout") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.ui") .to("androidx.compose.ui", "ui") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.uitooling") .to("androidx.compose.ui", "ui-tooling") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.material") .to("androidx.compose.material", "material") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.materialicons") .to("androidx.compose.material", "material-icons-extended") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.animation") .to("androidx.compose.animation", "animation") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.animationgraphics") .to("androidx.compose.animation", "animation-graphics") - .version("1.2.0-rc03") + .version("1.3.0-alpha02") alias("androidx.compose.material3") .to("androidx.compose.material3", "material3") - .version("1.0.0-alpha14") + .version("1.0.0-alpha15") version("androidx.lifecycle", "2.4.1") alias("androidx.lifecycle.viewmodel") diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt index 54186518..1ec6b396 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt @@ -23,6 +23,7 @@ import de.mm20.launcher2.ui.component.BottomSheetDialog import de.mm20.launcher2.ui.component.SmallMessage import kotlinx.coroutines.launch +@OptIn(ExperimentalMaterial3Api::class) @Composable fun WeatherLocationSearchDialog( onDismissRequest: () -> Unit diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt index 50035aeb..61397c3b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CornerSize import androidx.compose.material.* import androidx.compose.material3.CenterAlignedTopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.runtime.* @@ -28,7 +29,9 @@ import de.mm20.launcher2.ui.ktx.toDp import de.mm20.launcher2.ui.ktx.toPixels import kotlin.math.roundToInt -@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterialApi::class) +@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterialApi::class, + ExperimentalMaterial3Api::class +) @Composable fun BottomSheetDialog( onDismissRequest: () -> Unit, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt index d20db0de..e33fa2b8 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.unit.dp import com.godaddy.android.colorpicker.ClassicColorPicker import de.mm20.launcher2.ui.ktx.toHexString +@OptIn(ExperimentalMaterial3Api::class) @Composable fun ColorPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt index 8b6e0868..4dd2db06 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt @@ -1,13 +1,10 @@ package de.mm20.launcher2.ui.component.preferences -import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.TextButton -import androidx.compose.material3.AlertDialog -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text +import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.res.stringResource +@OptIn(ExperimentalMaterial3Api::class) @Composable fun TextPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt index adf54c9a..b948b26d 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt @@ -48,7 +48,8 @@ import de.mm20.launcher2.ui.utils.rememberNotificationShadeController import kotlin.math.roundToInt @OptIn( - ExperimentalMaterialApi::class, ExperimentalFoundationApi::class + ExperimentalMaterialApi::class, ExperimentalFoundationApi::class, + ExperimentalMaterial3Api::class ) @Composable fun PagerScaffold( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt index b9eb1148..31a58aba 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt @@ -45,7 +45,7 @@ import de.mm20.launcher2.ui.modifier.verticalFadingEdges import kotlinx.coroutines.launch import kotlin.math.roundToInt -@OptIn(ExperimentalFoundationApi::class) +@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable fun PullDownScaffold( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt index f362e6e1..64e1fe26 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt @@ -35,6 +35,7 @@ import de.mm20.launcher2.ui.ktx.toPixels import de.mm20.launcher2.ui.locals.LocalGridColumns import kotlinx.coroutines.launch +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomizeSearchableSheet( searchable: Searchable, 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 efd15ae3..c71eb6a5 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 @@ -36,7 +36,7 @@ fun LicenseScreen(library: OpenSourceLibrary) { val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior( rememberSplineBasedDecay(), - rememberTopAppBarScrollState() + rememberTopAppBarState() ) Scaffold( topBar = { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt index cd780e5d..a8539f07 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt @@ -431,6 +431,7 @@ fun EditWebsearchDialog( } } +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun ColorPicker( value: Int,