Avoid refreshes when config was untouched

inderdhir · Feb 20, 2024 · ae9563c · ae9563c
1 parent a7ce295
commit ae9563c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/DatWeatherDoe/UI/Configure/ConfigureViewModel.swift b/DatWeatherDoe/UI/Configure/ConfigureViewModel.swift
@@ -55,7 +55,9 @@ final class ConfigureViewModel: ObservableObject {
     }
 
     private let configManager: ConfigManagerType
+    private var hasConfigChanged = false
     private weak var popoverManager: PopoverManager?
+    private var cancellables: Set<AnyCancellable> = []
 
     init(configManager: ConfigManagerType, popoverManager: PopoverManager?) {
         self.configManager = configManager
@@ -78,6 +80,8 @@ final class ConfigureViewModel: ObservableObject {
         isUnitLetterOff = configManager.isUnitLetterOff
         isUnitSymbolOff = configManager.isUnitSymbolOff
         isWeatherConditionAsTextEnabled = configManager.isWeatherConditionAsTextEnabled
+
+        listenForConfigChange()
     }
 
     func saveConfig() {
@@ -97,6 +101,15 @@ final class ConfigureViewModel: ObservableObject {
 
     func saveAndCloseConfig() {
         saveConfig()
-        popoverManager?.togglePopover(nil)
+
+        popoverManager?.togglePopover(nil, shouldRefresh: hasConfigChanged)
+        hasConfigChanged = false
+    }
+
+    private func listenForConfigChange() {
+        objectWillChange.sink { [weak self] in
+            self?.hasConfigChanged = true
+        }
+        .store(in: &cancellables)
     }
 }
diff --git a/DatWeatherDoe/UI/Menu Bar/MenuBarManager.swift b/DatWeatherDoe/UI/Menu Bar/MenuBarManager.swift
@@ -51,7 +51,7 @@ final class MenuBarManager {
     }
 
     func configure(_ sender: AnyObject) {
-        popOverManager.togglePopover(sender)
+        popOverManager.togglePopover(sender, shouldRefresh: false)
     }
 
     private func buildMenuWith(options: MenuBarManager.Options) -> NSMenu {

diff --git a/DatWeatherDoe/UI/Menu Bar/Popover/PopoverManager.swift b/DatWeatherDoe/UI/Menu Bar/Popover/PopoverManager.swift
@@ -30,10 +30,13 @@ final class PopoverManager {
         setupConfigurationView(configManager)
     }
 
-    func togglePopover(_ sender: AnyObject?) {
+    func togglePopover(_ sender: AnyObject?, shouldRefresh: Bool) {
         if popover.isShown {
             closePopover(sender)
-            refreshCallback()
+
+            if shouldRefresh {
+                refreshCallback()
+            }
         } else {
             showPopover()
         }