Move changeBehaviorBasedOnModal function to AppDelegate

DamascenoRafael · Jun 28, 2022 · 528f71a · 528f71a
1 parent 17aaf55
commit 528f71a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/reminders-menu-bar/AppDelegate.swift b/reminders-menu-bar/AppDelegate.swift
@@ -96,9 +96,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         popover.behavior = .transient
     }
 
-    func changeBehaviorToKeepVisible() {
+    private func changeBehaviorToKeepVisible() {
         popover.behavior = .applicationDefined
     }
+
+    func changeBehaviorBasedOnModal(isShowing: Bool) {
+        if isShowing {
+            changeBehaviorToKeepVisible()
+        } else {
+            changeBehaviorToDismissIfNeeded()
+        }
+    }
 
     private func requestAuthorization() {
         let authorization = RemindersService.instance.authorizationStatus()

diff --git a/reminders-menu-bar/Views/ReminderItemView.swift b/reminders-menu-bar/Views/ReminderItemView.swift
@@ -79,13 +79,13 @@ struct ReminderItemView: View {
                     removeReminderAlert()
                 }
                 .onChange(of: showingRemoveAlert) { isShowing in
-                    changeBehaviorBasedOnModal(isShowing: isShowing)
+                    AppDelegate.instance.changeBehaviorBasedOnModal(isShowing: isShowing)
                 }
                 .sheet(isPresented: $showingRenameSheet) {
                     renameReminderSheet()
                 }
                 .onChange(of: showingRenameSheet) { isShowing in
-                    changeBehaviorBasedOnModal(isShowing: isShowing)
+                    AppDelegate.instance.changeBehaviorBasedOnModal(isShowing: isShowing)
                 }
 
                 if let dateDescription = reminder.relativeDateDescription {
@@ -131,14 +131,6 @@ struct ReminderItemView: View {
         RemindersService.instance.save(reminder: reminder)
     }
 
-    func changeBehaviorBasedOnModal(isShowing: Bool) {
-        if isShowing {
-            AppDelegate.instance.changeBehaviorToKeepVisible()
-        } else {
-            AppDelegate.instance.changeBehaviorToDismissIfNeeded()
-        }
-    }
-
     func removeReminderAlert() -> Alert {
         Alert(title: Text(rmbLocalized(.removeReminderAlertTitle)),
               message: Text(rmbLocalized(.removeReminderAlertMessage, arguments: reminder.title)),