From 3516597d10966db1d281e2bbc0176dfae1331ca5 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Thu, 12 Oct 2023 20:33:09 +0200
Subject: [PATCH] Use new clock widget configuration sheet in settings

---
 .../ui/settings/homescreen/HomescreenSettingsScreen.kt     | 7 ++++++-
 .../ui/settings/homescreen/HomescreenSettingsScreenVM.kt   | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt
index 775b73eb..db8dbdf1 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt
@@ -36,6 +36,7 @@ import de.mm20.launcher2.ui.component.preferences.PreferenceCategory
 import de.mm20.launcher2.ui.component.preferences.PreferenceScreen
 import de.mm20.launcher2.ui.component.preferences.SliderPreference
 import de.mm20.launcher2.ui.component.preferences.SwitchPreference
+import de.mm20.launcher2.ui.launcher.widgets.clock.ConfigureClockWidgetSheet
 import de.mm20.launcher2.ui.locals.LocalNavController
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
@@ -85,7 +86,7 @@ fun HomescreenSettingsScreen() {
                     title = stringResource(R.string.preference_screen_clockwidget),
                     summary = stringResource(R.string.preference_screen_clockwidget_summary),
                     onClick = {
-                        navController?.navigate("settings/homescreen/clock")
+                        viewModel.showClockWidgetSheet = true
                     }
                 )
                 SwitchPreference(
@@ -244,6 +245,10 @@ fun HomescreenSettingsScreen() {
             }
         }
     }
+
+    if (viewModel.showClockWidgetSheet) {
+        ConfigureClockWidgetSheet(onDismiss = { viewModel.showClockWidgetSheet = false })
+    }
 }
 
 @Composable
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt
index e0593647..ea199b21 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt
@@ -4,6 +4,9 @@ import android.content.Context
 import android.content.Intent
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.core.content.getSystemService
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -23,6 +26,8 @@ class HomescreenSettingsScreenVM(
     private val dataStore: LauncherDataStore,
 ) : ViewModel() {
 
+    var showClockWidgetSheet by mutableStateOf(false)
+
 
     val dimWallpaper = dataStore.data.map { it.appearance.dimWallpaper }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false)