From 19378fc7fc8f81c82bad3b5ac31ba1b68d8b156a Mon Sep 17 00:00:00 2001
From: Sad Ellie <openthiswhitedoor@gmail.com>
Date: Wed, 20 Jul 2022 22:28:28 +0300
Subject: [PATCH] Fixed switch settings item. Now it gives you new value on
 change instead of current value.

---
 .../sadellie/unitto/screens/setttings/SettingsScreen.kt   | 2 +-
 .../screens/setttings/components/SettingsListItem.kt      | 7 ++++---
 .../com/sadellie/unitto/screens/theming/ThemesScreen.kt   | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
index 3575bb06..616a40a8 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
@@ -122,7 +122,7 @@ fun SettingsScreen(
                     stringResource(R.string.send_usage_statistics),
                     stringResource(R.string.send_usage_statistics_support),
                     mainViewModel.enableAnalytics
-                ) { mainViewModel.updateEnableAnalytics(!it) }
+                ) { mainViewModel.updateEnableAnalytics(it) }
             }
 
             // THIRD PARTY
diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsListItem.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsListItem.kt
index cfbf9421..5fb4d5c1 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsListItem.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsListItem.kt
@@ -119,7 +119,8 @@ fun SettingsListItem(
  * @param label Main text.
  * @param supportText Text that is located below label.
  * @param switchState Current switch state.
- * @param onSwitchChange Action to perform when user clicks on this component or just switch.
+ * @param onSwitchChange Action to perform when user clicks on this component or just switch. Gives
+ * you new value.
  */
 @Composable
 fun SettingsListItem(
@@ -127,8 +128,8 @@ fun SettingsListItem(
     supportText: String? = null,
     switchState: Boolean,
     onSwitchChange: (Boolean) -> Unit
-) = BasicSettingsListItem(label, supportText, { onSwitchChange(switchState) }) {
-    Switch(checked = switchState, onCheckedChange = { onSwitchChange(!it) })
+) = BasicSettingsListItem(label, supportText, { onSwitchChange(!switchState) }) {
+    Switch(checked = switchState, onCheckedChange = { onSwitchChange(it) })
 }
 
 /**
diff --git a/app/src/main/java/com/sadellie/unitto/screens/theming/ThemesScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/theming/ThemesScreen.kt
index e12c7eb4..c519f6cb 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/theming/ThemesScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/theming/ThemesScreen.kt
@@ -61,8 +61,8 @@ fun ThemesScreen(
                     supportText = stringResource(R.string.enable_dynamic_colors_support),
                     switchState = themmoController.isDynamicThemeEnabled,
                     onSwitchChange = {
-                        themmoController.enableDynamicTheme(!it)
-                        viewModel.updateDynamicTheme(!it)
+                        themmoController.enableDynamicTheme(it)
+                        viewModel.updateDynamicTheme(it)
                     }
                 )
             }
@@ -78,8 +78,8 @@ fun ThemesScreen(
                         supportText = stringResource(R.string.force_amoled_mode_support),
                         switchState = themmoController.isAmoledThemeEnabled,
                         onSwitchChange = {
-                            themmoController.enableAmoledTheme(!it)
-                            viewModel.updateAmoledTheme(!it)
+                            themmoController.enableAmoledTheme(it)
+                            viewModel.updateAmoledTheme(it)
                         }
                     )
                 }