Refactor AppIcon utility variables

Author: alpavanoglu

WordPress/Classes/Stores/UserPersistentRepositoryUtility.swift

@@ -7,6 +7,9 @@ private enum UPRUConstants {
     static let notificationsTabAccessCount = "NotificationsTabAccessCount"
     static let notificationPrimerInlineWasAcknowledged = "notificationPrimerInlineWasAcknowledged"
     static let secondNotificationsAlertCount = "secondNotificationsAlertCount"
+    static let hasShownCustomAppIconUpgradeAlert = "custom-app-icon-upgrade-alert-shown"
+    static let createButtonTooltipWasDisplayed = "CreateButtonTooltipWasDisplayed"
+    static let createButtonTooltipDisplayCount = "CreateButtonTooltipDisplayCount"
 }
 
 protocol UserPersistentRepositoryUtility: AnyObject {
@@ -63,7 +66,7 @@ extension UserPersistentRepositoryUtility {
 
     var notificationPrimerInlineWasAcknowledged: Bool {
         get {
-            return UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.notificationPrimerInlineWasAcknowledged)
+            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.notificationPrimerInlineWasAcknowledged)
         }
         set {
             UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.notificationPrimerInlineWasAcknowledged)
@@ -78,4 +81,31 @@ extension UserPersistentRepositoryUtility {
             UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.secondNotificationsAlertCount)
         }
     }
+
+    var hasShownCustomAppIconUpgradeAlert: Bool {
+        get {
+            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.hasShownCustomAppIconUpgradeAlert)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.hasShownCustomAppIconUpgradeAlert)
+        }
+    }
+
+    var createButtonTooltipDisplayCount: Int {
+        get {
+            UserPersistentStoreFactory.instance().integer(forKey: UPRUConstants.createButtonTooltipDisplayCount)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.createButtonTooltipDisplayCount)
+        }
+    }
+
+    var createButtonTooltipWasDisplayed: Bool {
+        get {
+            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.createButtonTooltipWasDisplayed)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.createButtonTooltipWasDisplayed)
+        }
+    }
 }

WordPress/Classes/ViewRelated/Me/App Settings/AppIconViewController.swift

@@ -110,7 +110,7 @@ open class AppIconViewController: UITableViewController {
         // Prevent showing the custom icon upgrade alert to a user
         // who's just set an icon for the first time.
         // We'll remove this alert after a couple of releases.
-        UserDefaults.standard.hasShownCustomAppIconUpgradeAlert = true
+        UserPersistentStoreFactory.instance().hasShownCustomAppIconUpgradeAlert = true
 
         UIApplication.shared.setAlternateIconName(iconName, completionHandler: { [weak self] error in
             if error == nil {

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

@@ -406,7 +406,7 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {
                 }
             }
 
-            UserPersistentStoreFactory.instance().set(false, forKey: UserDefaults.standard.welcomeNotificationSeenKey)
+            UserPersistentStoreFactory.instance().set(false, forKey: UserPersistentStoreFactory.instance().welcomeNotificationSeenKey)
         }
 
         navigationController.pushViewController(epilogueViewController, animated: true)

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController+PushPrimer.swift

@@ -8,7 +8,7 @@ extension NotificationsViewController {
 
     var shouldShowPrimeForPush: Bool {
         get {
-            return !UserDefaults.standard.notificationPrimerInlineWasAcknowledged
+            return !UserPersistentStoreFactory.instance().notificationPrimerInlineWasAcknowledged
         }
     }
 
@@ -44,7 +44,7 @@ extension NotificationsViewController {
             InteractiveNotificationsManager.shared.requestAuthorization { _ in
                 DispatchQueue.main.async {
                     self?.hideInlinePrompt(delay: 0.0)
-                    UserDefaults.standard.notificationPrimerInlineWasAcknowledged = true
+                    UserPersistentStoreFactory.instance().notificationPrimerInlineWasAcknowledged = true
                 }
             }
         }
@@ -54,7 +54,7 @@ extension NotificationsViewController {
                 WPAnalytics.track(.pushNotificationPrimerNoTapped, withProperties: [Analytics.locationKey: Analytics.inlineKey])
             }
             self?.hideInlinePrompt(delay: 0.0)
-            UserDefaults.standard.notificationPrimerInlineWasAcknowledged = true
+            UserPersistentStoreFactory.instance().notificationPrimerInlineWasAcknowledged = true
         }
 
         // We _seriously_ need to call the following method at last.
@@ -65,9 +65,9 @@ extension NotificationsViewController {
 
     private func setupWinback() {
         // only show the winback for folks that denied without seeing the post-login primer: aka users of a previous version
-        guard !UserDefaults.standard.notificationPrimerAlertWasDisplayed else {
+        guard !UserPersistentStoreFactory.instance().notificationPrimerAlertWasDisplayed else {
             // they saw the primer, and denied us. they aren't coming back, we aren't bothering them anymore.
-            UserDefaults.standard.notificationPrimerInlineWasAcknowledged = true
+            UserPersistentStoreFactory.instance().notificationPrimerInlineWasAcknowledged = true
             return
         }
 
@@ -91,15 +91,15 @@ extension NotificationsViewController {
             self?.hideInlinePrompt(delay: 0.0)
             let targetURL = URL(string: UIApplication.openSettingsURLString)
             UIApplication.shared.open(targetURL!)
-            UserDefaults.standard.notificationPrimerInlineWasAcknowledged = true
+            UserPersistentStoreFactory.instance().notificationPrimerInlineWasAcknowledged = true
         }
 
         inlinePromptView.setupNoButton(title: noTitle) { [weak self] button in
             defer {
                 WPAnalytics.track(.pushNotificationWinbackNoTapped, withProperties: [Analytics.locationKey: Analytics.inlineKey])
             }
             self?.hideInlinePrompt(delay: 0.0)
-            UserDefaults.standard.notificationPrimerInlineWasAcknowledged = true
+            UserPersistentStoreFactory.instance().notificationPrimerInlineWasAcknowledged = true
         }
     }
 }

WordPress/Classes/ViewRelated/Post/PostListFilterSettings.swift

@@ -104,7 +104,7 @@ class PostListFilterSettings: NSObject {
     /// currentPostListFilter: returns the index of the last active PostListFilter
     @objc func currentFilterIndex() -> Int {
 
-        let userDefaults = UserDefaults.standard
+        let userDefaults = UserPersistentStoreFactory.instance()
 
         if let filter = userDefaults.object(forKey: keyForCurrentListStatusFilter()) as? Int, filter < availablePostListFilters().count {
 

WordPress/Classes/ViewRelated/System/FancyAlertViewController+AppIcons.swift

@@ -54,20 +54,3 @@ extension FancyAlertViewController {
         return controller
     }
 }
-
-// MARK: - User Defaults
-
-extension UserDefaults {
-    private enum Keys: String {
-        case hasShownCustomAppIconUpgradeAlert = "custom-app-icon-upgrade-alert-shown"
-    }
-
-    var hasShownCustomAppIconUpgradeAlert: Bool {
-        get {
-            return bool(forKey: Keys.hasShownCustomAppIconUpgradeAlert.rawValue)
-        }
-        set {
-            set(newValue, forKey: Keys.hasShownCustomAppIconUpgradeAlert.rawValue)
-        }
-    }
-}

WordPress/Classes/ViewRelated/System/Floating Create Button/CreateButtonCoordinator.swift

@@ -273,33 +273,6 @@ extension CreateButtonCoordinator: UIViewControllerTransitioningDelegate {
     }
 }
 
-@objc
-extension UserDefaults {
-    private enum Keys: String {
-        case createButtonTooltipWasDisplayed = "CreateButtonTooltipWasDisplayed"
-        case createButtonTooltipDisplayCount = "CreateButtonTooltipDisplayCount"
-    }
-
-    var createButtonTooltipDisplayCount: Int {
-        get {
-            return integer(forKey: Keys.createButtonTooltipDisplayCount.rawValue)
-        }
-        set {
-            set(newValue, forKey: Keys.createButtonTooltipDisplayCount.rawValue)
-        }
-    }
-
-    var createButtonTooltipWasDisplayed: Bool {
-        get {
-            return bool(forKey: Keys.createButtonTooltipWasDisplayed.rawValue)
-        }
-        set {
-            set(newValue, forKey: Keys.createButtonTooltipWasDisplayed.rawValue)
-        }
-    }
-}
-
-
 // MARK: - Blogging Prompts Methods
 
 private extension CreateButtonCoordinator {