Fix notification settings current value

patzly · Dec 30, 2024 · b879c4b · b879c4b
1 parent 1264d10
commit b879c4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/SettingsCatNotificationsFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/SettingsCatNotificationsFragment.java
@@ -113,10 +113,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       }
     });
 
-    binding.switchStockEnableNotifications.post(() -> {
-      binding.switchStockEnableNotifications.jumpDrawablesToCurrentState();
-      binding.switchChoresEnableNotifications.jumpDrawablesToCurrentState();
-    });
+    binding.switchStockEnableNotifications.setChecked(viewModel.getStockNotificationsEnabled());
+    binding.switchStockEnableNotifications.post(
+        () -> binding.switchStockEnableNotifications.jumpDrawablesToCurrentState()
+    );
     permStockLauncher = registerForActivityResult(new RequestPermission(), isGranted -> {
       if (isGranted) {
         if (binding != null) {
@@ -147,6 +147,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       }
     });
 
+    binding.switchChoresEnableNotifications.setChecked(viewModel.getChoresNotificationsEnabled());
+    binding.switchChoresEnableNotifications.post(
+        () -> binding.switchChoresEnableNotifications.jumpDrawablesToCurrentState()
+    );
     permChoresLauncher = registerForActivityResult(new RequestPermission(), isGranted -> {
       if (isGranted) {
         if (binding != null) {

diff --git a/app/src/main/res/raw/changelog.txt b/app/src/main/res/raw/changelog.txt
@@ -1,6 +1,7 @@
 ## 3.7.1
 
 - Improved: Hide bottom bar if it is empty
+- Fixed: notification settings not displaying current value in certain cases
 - Fixed: Bottom bar not hiding on some pages when scrolled down
 
 ## 3.7.0