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

Revert to Material 2 switches

Browse Source 
Material 3 switches are currently broken, see https://issuetracker.google.com/issues/228336571
This commit is contained in:
MM20 2022-04-16 18:15:48 +02:00
parent ba35e6b786
commit 9e012f1a23
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,10 @@ 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.material3.Switch
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.material.Switch
import androidx.compose.material.SwitchDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@ -48,7 +48,13 @@ 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(
checkedThumbColor = MaterialTheme.colorScheme.primary,
uncheckedThumbColor = MaterialTheme.colorScheme.onSurface,
checkedTrackColor = MaterialTheme.colorScheme.primary,
uncheckedTrackColor = MaterialTheme.colorScheme.onSurface,
)
) )
} }
} }

10
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.material3.Switch import androidx.compose.material.Switch
import androidx.compose.material3.SwitchDefaults import androidx.compose.material.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,6 +26,12 @@ fun SwitchPreference(
controls = { controls = {
Switch( Switch(
enabled = enabled, checked = value, onCheckedChange = onValueChanged, enabled = enabled, checked = value, onCheckedChange = onValueChanged,
colors = SwitchDefaults.colors(
checkedThumbColor = MaterialTheme.colorScheme.primary,
uncheckedThumbColor = MaterialTheme.colorScheme.onSurface,
checkedTrackColor = MaterialTheme.colorScheme.primary,
uncheckedTrackColor = MaterialTheme.colorScheme.onSurface,
)
) )
} }
) )