From c9e093bb9b608c4f7d9ba547f978b10328df340d Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Mon, 11 Apr 2022 22:01:27 +0200
Subject: [PATCH] Update Jetpack Compose and Accompanist

---
 settings.gradle.kts                                   |  6 +++---
 .../ui/component/preferences/PreferenceWithSwitch.kt  | 11 +++--------
 .../ui/component/preferences/SwitchPreference.kt      |  9 ++-------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a7bca82e..84b9db84 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -61,7 +61,7 @@ dependencyResolutionManagement {
                 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")
                 .to("androidx.compose.runtime", "runtime")
                 .versionRef("androidx.compose")
@@ -94,7 +94,7 @@ dependencyResolutionManagement {
                 .versionRef("androidx.compose")
             alias("androidx.compose.material3")
                 .to("androidx.compose.material3", "material3")
-                .version("1.0.0-alpha08")
+                .version("1.0.0-alpha09")
 
             version("androidx.lifecycle", "2.4.1")
             alias("androidx.lifecycle.viewmodel")
@@ -122,7 +122,7 @@ dependencyResolutionManagement {
                 )
             )
 
-            version("accompanist", "0.24.4-alpha")
+            version("accompanist", "0.24.6-alpha")
             alias("accompanist.insets")
                 .to("com.google.accompanist", "accompanist-insets")
                 .versionRef("accompanist")
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 0c45b239..041465d0 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
@@ -2,8 +2,8 @@ package de.mm20.launcher2.ui.component.preferences
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -48,12 +48,7 @@ fun PreferenceWithSwitch(
             modifier = Modifier.padding(horizontal = 16.dp),
             checked = switchValue,
             enabled = enabled,
-            onCheckedChange = onSwitchChanged,
-            colors = SwitchDefaults.colors(
-                uncheckedThumbColor = MaterialTheme.colorScheme.onSurface,
-                checkedThumbColor = MaterialTheme.colorScheme.primary,
-                checkedTrackColor = MaterialTheme.colorScheme.primary
-            )
+            onCheckedChange = onSwitchChanged
         )
     }
 }
\ 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 e69f3977..532272bb 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,7 @@
 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.SwitchDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -26,11 +26,6 @@ fun SwitchPreference(
         controls = {
             Switch(
                 enabled = enabled, checked = value, onCheckedChange = onValueChanged,
-                colors = SwitchDefaults.colors(
-                    uncheckedThumbColor = MaterialTheme.colorScheme.onSurface,
-                    checkedThumbColor = MaterialTheme.colorScheme.primary,
-                    checkedTrackColor = MaterialTheme.colorScheme.primary
-                )
             )
         }
     )