From d42564240da3db1eba98ad38043d1d324670acbc Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 14 May 2022 12:30:17 +0200 Subject: [PATCH] Use M3 switches --- .../ui/component/preferences/PreferenceWithSwitch.kt | 9 +-------- .../ui/component/preferences/SwitchPreference.kt | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt index 1cc0e10c..ff6a3dee 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt @@ -4,8 +4,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme -import androidx.compose.material.Switch -import androidx.compose.material.SwitchDefaults +import androidx.compose.material3.Switch import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -49,12 +48,6 @@ fun PreferenceWithSwitch( checked = switchValue, enabled = enabled, onCheckedChange = onSwitchChanged, - colors = SwitchDefaults.colors( - checkedThumbColor = MaterialTheme.colorScheme.primary, - uncheckedThumbColor = MaterialTheme.colorScheme.onSurface, - checkedTrackColor = MaterialTheme.colorScheme.primary, - uncheckedTrackColor = MaterialTheme.colorScheme.onSurface, - ) ) } } \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt index d2576b0d..8a725c44 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt @@ -1,7 +1,6 @@ package de.mm20.launcher2.ui.component.preferences -import androidx.compose.material.Switch -import androidx.compose.material.SwitchDefaults +import androidx.compose.material3.Switch import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector @@ -26,12 +25,6 @@ fun SwitchPreference( controls = { Switch( 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, - ) ) } )