chore: remove dark theme toggle

Instead prefer to follow the device-wide theme setting.
meese-enterprises · Sep 17, 2024 · d3cfa7f · d3cfa7f
1 parent aa2cd11
commit d3cfa7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/android/app/src/main/java/enterprises/meese/whiterose/MainActivity.kt b/android/app/src/main/java/enterprises/meese/whiterose/MainActivity.kt
@@ -36,12 +36,11 @@ class MainActivity : ComponentActivity() {
 
 @Composable
 fun WhiteroseApp(viewModel: ViewModel = viewModel()) {
-    val isDarkTheme by viewModel.isDarkTheme.collectAsState()
     val ticksEnabled by viewModel.ticksEnabled.collectAsState()
     val speechEnabled by viewModel.speechEnabled.collectAsState()
     var showSettings by remember { mutableStateOf(false) }
 
-    WhiteroseTheme(darkTheme = isDarkTheme) {
+    WhiteroseTheme() {
         Box(modifier = Modifier.fillMaxSize()) {
             Column(
                 modifier = Modifier.fillMaxSize(),
@@ -62,11 +61,9 @@ fun WhiteroseApp(viewModel: ViewModel = viewModel()) {
 
             if (showSettings) {
                 SettingsDialog(
-                    isDarkTheme = isDarkTheme,
                     ticksEnabled = ticksEnabled,
                     speechEnabled = speechEnabled,
                     onDismiss = { showSettings = false },
-                    onThemeChanged = viewModel::setDarkTheme,
                     onTicksChanged = viewModel::setTicksEnabled,
                     onSpeechChanged = viewModel::setSpeechEnabled
                 )
@@ -95,11 +92,9 @@ fun Clock() {
 
 @Composable
 fun SettingsDialog(
-    isDarkTheme: Boolean,
     ticksEnabled: Boolean,
     speechEnabled: Boolean,
     onDismiss: () -> Unit,
-    onThemeChanged: (Boolean) -> Unit,
     onTicksChanged: (Boolean) -> Unit,
     onSpeechChanged: (Boolean) -> Unit
 ) {
@@ -108,17 +103,6 @@ fun SettingsDialog(
         title = { Text("Settings") },
         text = {
             Column {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text("Dark Theme", modifier = Modifier.weight(1f))
-                    Switch(
-                        checked = isDarkTheme,
-                        onCheckedChange = onThemeChanged
-                    )
-                }
-                Spacer(modifier = Modifier.height(8.dp))
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically

diff --git a/android/app/src/main/java/enterprises/meese/whiterose/ViewModel.kt b/android/app/src/main/java/enterprises/meese/whiterose/ViewModel.kt
@@ -12,9 +12,6 @@ import java.util.concurrent.TimeUnit
 class ViewModel(application: Application) : AndroidViewModel(application) {
     private val prefs = application.getSharedPreferences("whiterose_prefs", Application.MODE_PRIVATE)
 
-    private val _isDarkTheme = MutableStateFlow(prefs.getBoolean("dark_theme", false))
-    val isDarkTheme = _isDarkTheme.asStateFlow()
-
     private val _ticksEnabled = MutableStateFlow(prefs.getBoolean("ticks_enabled", true))
     val ticksEnabled = _ticksEnabled.asStateFlow()
 
@@ -25,13 +22,6 @@ class ViewModel(application: Application) : AndroidViewModel(application) {
         updateWorkManager()
     }
 
-    fun setDarkTheme(isDark: Boolean) {
-        viewModelScope.launch {
-            _isDarkTheme.emit(isDark)
-            prefs.edit().putBoolean("dark_theme", isDark).apply()
-        }
-    }
-
     fun setTicksEnabled(enabled: Boolean) {
         viewModelScope.launch {
             _ticksEnabled.emit(enabled)
@@ -67,7 +57,7 @@ class ViewModel(application: Application) : AndroidViewModel(application) {
 
         workManager.enqueueUniquePeriodicWork(
             "timeUpdate",
-            ExistingPeriodicWorkPolicy.REPLACE,
+            ExistingPeriodicWorkPolicy.UPDATE,
             timeUpdateWork
         )
     }

diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="Theme.Whiterose" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
+</resources>