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

Use new clock widget configuration sheet in settings

Browse Source
This commit is contained in:
MM20 2023-10-12 20:33:09 +02:00
parent b518e1713c
commit 3516597d10
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt
View File

@ -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.PreferenceScreen
import de.mm20.launcher2.ui.component.preferences.SliderPreference import de.mm20.launcher2.ui.component.preferences.SliderPreference
import de.mm20.launcher2.ui.component.preferences.SwitchPreference 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 de.mm20.launcher2.ui.locals.LocalNavController
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
@ -85,7 +86,7 @@ fun HomescreenSettingsScreen() {
title = stringResource(R.string.preference_screen_clockwidget), title = stringResource(R.string.preference_screen_clockwidget),
summary = stringResource(R.string.preference_screen_clockwidget_summary), summary = stringResource(R.string.preference_screen_clockwidget_summary),
onClick = { onClick = {
navController?.navigate("settings/homescreen/clock") viewModel.showClockWidgetSheet = true
} }
) )
SwitchPreference( SwitchPreference(
@ -244,6 +245,10 @@ fun HomescreenSettingsScreen() {
} }
} }
} }
if (viewModel.showClockWidgetSheet) {
ConfigureClockWidgetSheet(onDismiss = { viewModel.showClockWidgetSheet = false })
}
} }
@Composable @Composable

5
app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt
View File

@ -4,6 +4,9 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.view.WindowManager import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity 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.core.content.getSystemService
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
@ -23,6 +26,8 @@ class HomescreenSettingsScreenVM(
private val dataStore: LauncherDataStore, private val dataStore: LauncherDataStore,
) : ViewModel() { ) : ViewModel() {
var showClockWidgetSheet by mutableStateOf(false)
val dimWallpaper = dataStore.data.map { it.appearance.dimWallpaper } val dimWallpaper = dataStore.data.map { it.appearance.dimWallpaper }
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false) .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false)