From dcdedcffc1f2ca6c7f173b8d1c5af513e35c5395 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:46:16 +0200 Subject: [PATCH] Update dependencies --- app/ui/build.gradle.kts | 1 - .../launcher2/ui/common/ImportThemeSheet.kt | 4 ++-- .../colorscheme/ThemeColorPreference.kt | 8 ++++---- .../colorscheme/ThemePreferenceCategory.kt | 4 ++-- gradle/libs.versions.toml | 19 +++++++++---------- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts index 9f8f43d9..6a95b8bd 100644 --- a/app/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -85,7 +85,6 @@ dependencies { // Legacy dependencies implementation(libs.androidx.transition) - implementation(libs.accompanist.insets) implementation(libs.accompanist.systemuicontroller) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicators) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/ImportThemeSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/ImportThemeSheet.kt index 43afda29..dc78584e 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/ImportThemeSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/ImportThemeSheet.kt @@ -160,14 +160,14 @@ fun ThemePreview( ) SingleChoiceSegmentedButtonRow { SegmentedButton( - shape = SegmentedButtonDefaults.shape(position = 0, count = 2), + shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2), selected = !darkTheme, onClick = { darkTheme = false } ) { Icon(Icons.Rounded.LightMode, null) } SegmentedButton( - shape = SegmentedButtonDefaults.shape(position = 1, count = 2), + shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2), selected = darkTheme, onClick = { darkTheme = true } ) { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt index 549faf6e..80badb06 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt @@ -107,7 +107,7 @@ fun ThemeColorPreference( currentValue = defaultValue }, icon = { - SegmentedButtonDefaults.SegmentedButtonIcon( + SegmentedButtonDefaults.Icon( active = actualValue is ColorRef, ) { Icon( @@ -118,7 +118,7 @@ fun ThemeColorPreference( ) } }, - shape = SegmentedButtonDefaults.shape(position = 0, count = 2) + shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2) ) { Text(stringResource(R.string.theme_color_scheme_palette_color)) } @@ -128,7 +128,7 @@ fun ThemeColorPreference( currentValue = StaticColor(actualValue.get(corePalette)) }, icon = { - SegmentedButtonDefaults.SegmentedButtonIcon( + SegmentedButtonDefaults.Icon( active = actualValue is StaticColor, ) { Icon( @@ -139,7 +139,7 @@ fun ThemeColorPreference( ) } }, - shape = SegmentedButtonDefaults.shape(position = 1, count = 2) + shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2) ) { Text(stringResource(R.string.theme_color_scheme_custom_color)) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemePreferenceCategory.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemePreferenceCategory.kt index 3a5586a9..97ad7496 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemePreferenceCategory.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemePreferenceCategory.kt @@ -56,14 +56,14 @@ fun ThemePreferenceCategory( ) SingleChoiceSegmentedButtonRow { SegmentedButton( - shape = SegmentedButtonDefaults.shape(position = 0, count = 2), + shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2), selected = !darkMode, onClick = { onDarkModeChanged(false) } ) { Icon(Icons.Rounded.LightMode, null) } SegmentedButton( - shape = SegmentedButtonDefaults.shape(position = 1, count = 2), + shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2), selected = darkMode, onClick = { onDarkModeChanged(true) } ) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1092bae..f0176a9a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,20 +15,20 @@ kotlinx-serialization = "1.5.1" jetbrains-markdown = "0.4.1" -androidx-compose = "1.6.0-alpha04" -androidx-compose-material3 = "1.2.0-alpha06" +androidx-compose = "1.6.0-alpha07" +androidx-compose-material3 = "1.2.0-alpha09" androidx-compose-compiler = "1.5.2" -androidx-lifecycle = "2.6.1" -androidx-core = "1.9.0" +androidx-lifecycle = "2.6.2" +androidx-core = "1.12.0" androidx-appcompat = "1.7.0-alpha03" -androidx-activity = "1.8.0-alpha06" -androidx-work = "2.8.0-alpha04" -androidx-browser = "1.4.0" +androidx-activity = "1.8.0" +androidx-work = "2.8.1" +androidx-browser = "1.6.0" androidx-palette = "1.0.0" androidx-media2 = "1.2.1" -androidx-room = "2.5.0" +androidx-room = "2.5.2" -accompanist = "0.31.2-alpha" +accompanist = "0.33.2-alpha" coil = "2.3.0" koin = "3.2.0" protobuf = "3.14.0" @@ -79,7 +79,6 @@ androidx-browser = { group = "androidx.browser", name = "browser", version.ref = androidx-palette = { group = "androidx.palette", name = "palette", version.ref = "androidx-palette" } androidx-media2 = { group = "androidx.media2", name = "media2-session", version.ref = "androidx-media2" } -accompanist-insets = { group = "com.google.accompanist", name = "accompanist-insets", version.ref = "accompanist" } accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" } accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" } accompanist-pagerindicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }