lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
MM20 2023-10-06 12:46:16 +02:00
parent 2d5a0bf5a7
commit dcdedcffc1
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/ui/build.gradle.kts
View File

@ -85,7 +85,6 @@ dependencies {
// Legacy dependencies // Legacy dependencies
implementation(libs.androidx.transition) implementation(libs.androidx.transition)
implementation(libs.accompanist.insets)
implementation(libs.accompanist.systemuicontroller) implementation(libs.accompanist.systemuicontroller)
implementation(libs.accompanist.pager) implementation(libs.accompanist.pager)
implementation(libs.accompanist.pagerindicators) implementation(libs.accompanist.pagerindicators)

4
app/ui/src/main/java/de/mm20/launcher2/ui/common/ImportThemeSheet.kt
View File

@ -160,14 +160,14 @@ fun ThemePreview(
) )
SingleChoiceSegmentedButtonRow { SingleChoiceSegmentedButtonRow {
SegmentedButton( SegmentedButton(
shape = SegmentedButtonDefaults.shape(position = 0, count = 2), shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),
selected = !darkTheme, selected = !darkTheme,
onClick = { darkTheme = false } onClick = { darkTheme = false }
) { ) {
Icon(Icons.Rounded.LightMode, null) Icon(Icons.Rounded.LightMode, null)
} }
SegmentedButton( SegmentedButton(
shape = SegmentedButtonDefaults.shape(position = 1, count = 2), shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),
selected = darkTheme, selected = darkTheme,
onClick = { darkTheme = true } onClick = { darkTheme = true }
) { ) {

8
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt
View File

@ -107,7 +107,7 @@ fun ThemeColorPreference(
currentValue = defaultValue currentValue = defaultValue
}, },
icon = { icon = {
SegmentedButtonDefaults.SegmentedButtonIcon( SegmentedButtonDefaults.Icon(
active = actualValue is ColorRef, active = actualValue is ColorRef,
) { ) {
Icon( 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)) Text(stringResource(R.string.theme_color_scheme_palette_color))
} }
@ -128,7 +128,7 @@ fun ThemeColorPreference(
currentValue = StaticColor(actualValue.get(corePalette)) currentValue = StaticColor(actualValue.get(corePalette))
}, },
icon = { icon = {
SegmentedButtonDefaults.SegmentedButtonIcon( SegmentedButtonDefaults.Icon(
active = actualValue is StaticColor, active = actualValue is StaticColor,
) { ) {
Icon( 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)) Text(stringResource(R.string.theme_color_scheme_custom_color))
} }

4
app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemePreferenceCategory.kt
View File

@ -56,14 +56,14 @@ fun ThemePreferenceCategory(
) )
SingleChoiceSegmentedButtonRow { SingleChoiceSegmentedButtonRow {
SegmentedButton( SegmentedButton(
shape = SegmentedButtonDefaults.shape(position = 0, count = 2), shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),
selected = !darkMode, selected = !darkMode,
onClick = { onDarkModeChanged(false) } onClick = { onDarkModeChanged(false) }
) { ) {
Icon(Icons.Rounded.LightMode, null) Icon(Icons.Rounded.LightMode, null)
} }
SegmentedButton( SegmentedButton(
shape = SegmentedButtonDefaults.shape(position = 1, count = 2), shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),
selected = darkMode, selected = darkMode,
onClick = { onDarkModeChanged(true) } onClick = { onDarkModeChanged(true) }
) { ) {

19
gradle/libs.versions.toml
View File

@ -15,20 +15,20 @@ kotlinx-serialization = "1.5.1"
jetbrains-markdown = "0.4.1" jetbrains-markdown = "0.4.1"
androidx-compose = "1.6.0-alpha04" androidx-compose = "1.6.0-alpha07"
androidx-compose-material3 = "1.2.0-alpha06" androidx-compose-material3 = "1.2.0-alpha09"
androidx-compose-compiler = "1.5.2" androidx-compose-compiler = "1.5.2"
androidx-lifecycle = "2.6.1" androidx-lifecycle = "2.6.2"
androidx-core = "1.9.0" androidx-core = "1.12.0"
androidx-appcompat = "1.7.0-alpha03" androidx-appcompat = "1.7.0-alpha03"
androidx-activity = "1.8.0-alpha06" androidx-activity = "1.8.0"
androidx-work = "2.8.0-alpha04" androidx-work = "2.8.1"
androidx-browser = "1.4.0" androidx-browser = "1.6.0"
androidx-palette = "1.0.0" androidx-palette = "1.0.0"
androidx-media2 = "1.2.1" 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" coil = "2.3.0"
koin = "3.2.0" koin = "3.2.0"
protobuf = "3.14.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-palette = { group = "androidx.palette", name = "palette", version.ref = "androidx-palette" }
androidx-media2 = { group = "androidx.media2", name = "media2-session", version.ref = "androidx-media2" } 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-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", 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" } accompanist-pagerindicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }