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

Update Jetpack Compose and Accompanist

Browse Source
This commit is contained in:
MM20 2022-04-11 22:01:27 +02:00
parent 19ae7e07e6
commit c9e093bb9b
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings.gradle.kts
View File

@ -61,7 +61,7 @@ dependencyResolutionManagement {
listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android") listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android")
) )
version("androidx.compose", "1.2.0-alpha06") version("androidx.compose", "1.2.0-alpha07")
alias("androidx.compose.runtime") alias("androidx.compose.runtime")
.to("androidx.compose.runtime", "runtime") .to("androidx.compose.runtime", "runtime")
.versionRef("androidx.compose") .versionRef("androidx.compose")
@ -94,7 +94,7 @@ dependencyResolutionManagement {
.versionRef("androidx.compose") .versionRef("androidx.compose")
alias("androidx.compose.material3") alias("androidx.compose.material3")
.to("androidx.compose.material3", "material3") .to("androidx.compose.material3", "material3")
.version("1.0.0-alpha08") .version("1.0.0-alpha09")
version("androidx.lifecycle", "2.4.1") version("androidx.lifecycle", "2.4.1")
alias("androidx.lifecycle.viewmodel") alias("androidx.lifecycle.viewmodel")
@ -122,7 +122,7 @@ dependencyResolutionManagement {
) )
) )
version("accompanist", "0.24.4-alpha") version("accompanist", "0.24.6-alpha")
alias("accompanist.insets") alias("accompanist.insets")
.to("com.google.accompanist", "accompanist-insets") .to("com.google.accompanist", "accompanist-insets")
.versionRef("accompanist") .versionRef("accompanist")

11
ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt
View File

@ -2,8 +2,8 @@ package de.mm20.launcher2.ui.component.preferences
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material.Switch import androidx.compose.material3.Switch
import androidx.compose.material.SwitchDefaults import androidx.compose.material3.SwitchDefaults
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -48,12 +48,7 @@ fun PreferenceWithSwitch(
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(horizontal = 16.dp),
checked = switchValue, checked = switchValue,
enabled = enabled, enabled = enabled,
onCheckedChange = onSwitchChanged, onCheckedChange = onSwitchChanged
colors = SwitchDefaults.colors(
uncheckedThumbColor = MaterialTheme.colorScheme.onSurface,
checkedThumbColor = MaterialTheme.colorScheme.primary,
checkedTrackColor = MaterialTheme.colorScheme.primary
)
) )
} }
} }

9
ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt
View File

@ -1,7 +1,7 @@
package de.mm20.launcher2.ui.component.preferences package de.mm20.launcher2.ui.component.preferences
import androidx.compose.material.Switch import androidx.compose.material3.Switch
import androidx.compose.material.SwitchDefaults import androidx.compose.material3.SwitchDefaults
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
@ -26,11 +26,6 @@ fun SwitchPreference(
controls = { controls = {
Switch( Switch(
enabled = enabled, checked = value, onCheckedChange = onValueChanged, enabled = enabled, checked = value, onCheckedChange = onValueChanged,
colors = SwitchDefaults.colors(
uncheckedThumbColor = MaterialTheme.colorScheme.onSurface,
checkedThumbColor = MaterialTheme.colorScheme.primary,
checkedTrackColor = MaterialTheme.colorScheme.primary
)
) )
} }
) )