Move remaining UserPersistent- objects to WordPressShared

They had to be moved in bulk because of circular dependencies.

Author: mokagio

Modules/Sources/WordPressShared/UserPersistentRepository/UserPersistentRepository.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+public typealias UserPersistentRepository = UserPersistentRepositoryReader & UserPersistentRepositoryWriter & UserPersistentRepositoryUtility
+
+extension UserDefaults: UserPersistentRepository {}

Modules/Sources/WordPressShared/UserPersistentRepository/UserPersistentRepositoryUtitility.swift

@@ -0,0 +1,45 @@
+public protocol UserPersistentRepositoryUtility: AnyObject {
+    var onboardingNotificationsPromptDisplayed: Bool { get set }
+    var notificationPrimerAlertWasDisplayed: Bool { get set }
+}
+
+public enum UPRUConstants {
+    static let promptKey = "onboarding_notifications_prompt_displayed"
+    static let questionKey = "onboarding_question_selection"
+    static let notificationPrimerAlertWasDisplayed = "NotificationPrimerAlertWasDisplayed"
+    public static let notificationsTabAccessCount = "NotificationsTabAccessCount"
+    public static let notificationPrimerInlineWasAcknowledged = "notificationPrimerInlineWasAcknowledged"
+    public static let secondNotificationsAlertCount = "secondNotificationsAlertCount"
+    public static let hasShownCustomAppIconUpgradeAlert = "custom-app-icon-upgrade-alert-shown"
+    public static let savedPostsPromoWasDisplayed = "SavedPostsV1PromoWasDisplayed"
+    public static let currentAnnouncementsKey = "currentAnnouncements"
+    public static let currentAnnouncementsDateKey = "currentAnnouncementsDate"
+    public static let announcementsVersionDisplayedKey = "announcementsVersionDisplayed"
+    public static let isJPContentImportCompleteKey = "jetpackContentImportComplete"
+    public static let jetpackContentMigrationStateKey = "jetpackContentMigrationState"
+    public static let mediaAspectRatioModeEnabledKey = "mediaAspectRatioModeEnabled"
+    public static let readerSidebarSelectionKey = "readerSidebarSelectionKey"
+    public static let isReaderSelectedKey = "isReaderSelectedKey"
+    public static let readerSearchHistoryKey = "readerSearchHistoryKey"
+    public static let readerDidSelectInterestsKey = "readerDidSelectInterestsKey"
+}
+
+public extension UserPersistentRepositoryUtility {
+    var onboardingNotificationsPromptDisplayed: Bool {
+        get {
+            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.promptKey)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.promptKey)
+        }
+    }
+
+    var notificationPrimerAlertWasDisplayed: Bool {
+        get {
+            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.notificationPrimerAlertWasDisplayed)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.notificationPrimerAlertWasDisplayed)
+        }
+    }
+}

Modules/Sources/WordPressShared/UserPersistentRepository/UserPersistentRepositoryWriter.swift

@@ -1,4 +1,4 @@
-protocol UserPersistentRepositoryWriter: KeyValueDatabase {
+public protocol UserPersistentRepositoryWriter: KeyValueDatabase {
     func set(_ value: Any?, forKey key: String)
     func set(_ value: Int, forKey key: String)
     func set(_ value: Float, forKey key: String)

WordPress/Classes/Stores/UserPersistentStoreFactory.swift renamed to Modules/Sources/WordPressShared/UserPersistentRepository/UserPersistentStoreFactory.swift

@@ -6,13 +6,13 @@ import Foundation
 /// If it is evident that this kind of thing is no longer needed after migration is complete, we can remove this
 /// and update call-sites to call `standard` directly.
 @objc
-final class UserPersistentStoreFactory: NSObject {
-    static func instance() -> UserPersistentRepository {
+public final class UserPersistentStoreFactory: NSObject {
+    public static func instance() -> UserPersistentRepository {
         UserDefaults.standard
     }
 
     @objc
-    static func userDefaultsInstance() -> UserDefaults {
+    public static func userDefaultsInstance() -> UserDefaults {
         return UserDefaults.standard
     }
 }

WordPress/Classes/Models/UserSettings.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 struct UserSettings {
     /// Stores all `UserSettings` keys.

WordPress/Classes/Services/AppUpdate/AppUpdateCoordinator.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 struct AppUpdateType {
     let appStoreInfo: AppStoreLookupResponse.AppStoreInfo

WordPress/Classes/Services/NotificationSettingsService.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressKit
+import WordPressShared
 
 /// This service encapsulates the Restful API related to WordPress Notifications.
 ///

WordPress/Classes/Stores/RemoteConfigStore.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 fileprivate extension DispatchQueue {
     static let remoteConfigStoreQueue = DispatchQueue(label: "remote-config-store-queue")

WordPress/Classes/Stores/UserPersistentRepository.swift

@@ -1,50 +1,6 @@
-import Foundation
-
-private enum UPRUConstants {
-    static let promptKey = "onboarding_notifications_prompt_displayed"
-    static let questionKey = "onboarding_question_selection"
-    static let notificationPrimerAlertWasDisplayed = "NotificationPrimerAlertWasDisplayed"
-    static let notificationsTabAccessCount = "NotificationsTabAccessCount"
-    static let notificationPrimerInlineWasAcknowledged = "notificationPrimerInlineWasAcknowledged"
-    static let secondNotificationsAlertCount = "secondNotificationsAlertCount"
-    static let hasShownCustomAppIconUpgradeAlert = "custom-app-icon-upgrade-alert-shown"
-    static let savedPostsPromoWasDisplayed = "SavedPostsV1PromoWasDisplayed"
-    static let currentAnnouncementsKey = "currentAnnouncements"
-    static let currentAnnouncementsDateKey = "currentAnnouncementsDate"
-    static let announcementsVersionDisplayedKey = "announcementsVersionDisplayed"
-    static let isJPContentImportCompleteKey = "jetpackContentImportComplete"
-    static let jetpackContentMigrationStateKey = "jetpackContentMigrationState"
-    static let mediaAspectRatioModeEnabledKey = "mediaAspectRatioModeEnabled"
-    static let readerSidebarSelectionKey = "readerSidebarSelectionKey"
-    static let isReaderSelectedKey = "isReaderSelectedKey"
-    static let readerSearchHistoryKey = "readerSearchHistoryKey"
-    static let readerDidSelectInterestsKey = "readerDidSelectInterestsKey"
-}
-
-protocol UserPersistentRepositoryUtility: AnyObject {
-    var onboardingNotificationsPromptDisplayed: Bool { get set }
-    var notificationPrimerAlertWasDisplayed: Bool { get set }
-}
+import WordPressShared
 
 extension UserPersistentRepositoryUtility {
-    var onboardingNotificationsPromptDisplayed: Bool {
-        get {
-            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.promptKey)
-        }
-        set {
-            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.promptKey)
-        }
-    }
-
-    var notificationPrimerAlertWasDisplayed: Bool {
-        get {
-            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.notificationPrimerAlertWasDisplayed)
-        }
-        set {
-            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.notificationPrimerAlertWasDisplayed)
-        }
-    }
-
     var notificationsTabAccessCount: Int {
         get {
             UserPersistentStoreFactory.instance().integer(forKey: UPRUConstants.notificationsTabAccessCount)

WordPress/Classes/Stores/UserPersistentRepositoryUtility.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 protocol RootViewPresenter: AnyObject {
     var rootViewController: UIViewController { get }

WordPress/Classes/System/Root View/RootViewPresenter.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressShared
 
 /// Encapsulates UIUserInterfaceStyle getting and setting for the app's
 /// main window. Allows users to override the interface style for the app.

WordPress/Classes/Utility/AppAppearance.swift

@@ -1,6 +1,7 @@
 import CoreData
 import Foundation
 import WordPressData
+import WordPressShared
 
 /// The main data provider for Weekly Roundup information.
 ///

WordPress/Classes/Utility/BackgroundTasks/WeeklyRoundupBackgroundTask.swift

@@ -1,5 +1,6 @@
 import Foundation
 import Security
+import WordPressShared
 
 private let keychainDebugWipeArgument = "WipeKeychainItem"
 

WordPress/Classes/Utility/KeychainTools.swift

@@ -1,3 +1,5 @@
+import WordPressShared
+
 /// Encapsulates logic related to content migration from WordPress to Jetpack.
 ///
 @objc class ContentMigrationCoordinator: NSObject {

WordPress/Classes/Utility/Migration/ContentMigrationCoordinator.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 protocol OverlaySource {
     var key: String { get }

WordPress/Classes/Utility/OverlayFrequencyTracker.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 import AutomatticTracks
+import WordPressShared
 
 class DashboardJetpackSocialCardCell: DashboardCollectionViewCell {
 

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/DashboardJetpackSocialCardCell.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 /// `BlogDashboardPersonalizable` is a protocol that defines the requirements for personalizing blog dashboard items.
 /// It provides properties to access personalization key and settings scope specific to the blog dashboard.

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Service/BlogDashboardPersonalizationService.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressKit
+import WordPressShared
 
 final class BlogDashboardService {
 

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Service/BlogDashboardService.swift

@@ -1,5 +1,6 @@
 import UIKit
 import WordPressFlux
+import WordPressShared
 import WordPressUI
 
 final class BloggingRemindersFlow {

WordPress/Classes/ViewRelated/Blog/BloggingReminders/BloggingRemindersFlow.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressShared
 
 class OnboardingEnableNotificationsViewController: UIViewController {
     @IBOutlet weak var titleLabel: UILabel!

WordPress/Classes/ViewRelated/Blog/Onboarding Questions Prompt/OnboardingEnableNotificationsViewController.swift

@@ -1,5 +1,6 @@
 import BackgroundTasks
 import SwiftUI
+import WordPressShared
 
 struct BlueButton: ButtonStyle {
     func makeBody(configuration: Configuration) -> some View {

WordPress/Classes/ViewRelated/Developer/WeeklyRoundupDebugScreen.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 class JetpackBrandingMenuCardPresenter {
 

WordPress/Classes/ViewRelated/Jetpack/Branding/Menu Card/JetpackBrandingMenuCardPresenter.swift

@@ -1,3 +1,5 @@
+import WordPressShared
+
 @objc
 class JetpackInstallPluginHelper: NSObject {
 

WordPress/Classes/ViewRelated/Jetpack/Install/JetpackInstallPluginHelper.swift

@@ -1,6 +1,7 @@
 import Combine
 import SwiftUI
 import WordPressData
+import WordPressShared
 
 final class BooleanUserDefaultsDebugViewModel: ObservableObject {
 

WordPress/Classes/ViewRelated/Me/App Settings/Boolean User Defaults/BooleanUserDefaultsDebugViewModel.swift

@@ -1,6 +1,7 @@
 import Foundation
 import SFHFKeychainUtils
 import WordPressAuthenticator
+import WordPressShared
 import Gridicons
 import UIKit
 

WordPress/Classes/ViewRelated/NUX/Helpers/WordPressAuthenticationManager.swift

@@ -1,3 +1,5 @@
+import WordPressShared
+
 // MARK: - Push Notification Primer
 //
 extension NotificationsViewController {

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

@@ -1,5 +1,6 @@
 import AutomatticTracks
 import WordPressData
+import WordPressShared
 import Foundation
 
 final class NotificationsViewModel {

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController/NotificationsViewModel.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 import AutomatticTracks
+import WordPressShared
 
 extension PostSettingsViewController {
 

WordPress/Classes/ViewRelated/Post/PostSettingsViewController+JetpackSocial.swift

@@ -2,6 +2,7 @@ import UIKit
 import Combine
 import SwiftUI
 import WordPressData
+import WordPressShared
 import WordPressUI
 
 enum PrepublishingSheetResult {

WordPress/Classes/ViewRelated/Post/Prepublishing/PrepublishingViewController.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 /// Singleton class to contain site related information for Stats.
 ///

WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsInformation.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 // A protocol to constrain Site Stats pinned items together
 protocol SiteStatsPinnable { /* not implemented */ }

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsPinnedItemStore.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressShared
 
 enum StatsTabType: Int, FilterTabBarItem, CaseIterable {
     case insights = 0

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 enum SupportConfiguration {
     case zendesk

WordPress/Classes/ViewRelated/Support/SupportConfiguration.swift

@@ -1,5 +1,6 @@
 import UIKit
 import WordPressAuthenticator
+import WordPressShared
 
 class SupportTableViewController: UITableViewController {
 

WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressShared
 import WordPressUI
 
 extension FancyAlertViewController {

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

@@ -1,5 +1,6 @@
 import UIKit
 import Gridicons
+import WordPressShared
 import WordPressUI
 
 extension FancyAlertViewController {

WordPress/Classes/ViewRelated/System/Fancy Alerts/FancyAlertViewController+SavedPosts.swift

@@ -1,5 +1,6 @@
 import Gridicons
 import WordPressFlux
+import WordPressShared
 import WordPressUI
 
 @objc class CreateButtonCoordinator: NSObject {

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

@@ -1,4 +1,5 @@
 import WordPressKit
+import WordPressShared
 
 /// Generic feature announcement cache
 protocol AnnouncementsCache {

WordPress/Classes/ViewRelated/WhatsNew/Data store/Cache/AnnouncementsCache.swift

@@ -1,5 +1,6 @@
 import Combine
 import Foundation
+import WordPressShared
 
 class JetpackWindowManager: WindowManager {
 

WordPress/Jetpack/Classes/System/JetpackWindowManager.swift

@@ -1,5 +1,6 @@
 import Combine
 import UserNotifications
+import WordPressShared
 
 /// Coordinator for the migration to jetpack flow
 final class MigrationFlowCoordinator: ObservableObject {

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/Navigation/MigrationFlowCoordinator.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressShared
 
 @objc
 class MigrationSuccessCardView: UIView {

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Success card/MigrationSuccessCardView.swift

@@ -1,3 +1,4 @@
+import WordPressShared
 import XCTest
 @testable import WordPress
 
@@ -66,6 +67,7 @@ class DashboardJetpackSocialCardCellTests: CoreDataTestCase {
         // Given
         let blog = createTestBlog()
         let dotComID = try XCTUnwrap(blog.dotComID)
+        // FIXME: Using this production type in the test will mess the global state
         let repository = UserPersistentStoreFactory.instance()
         let key = DashboardJetpackSocialCardCell.Constants.hideNoConnectionViewKey
 

WordPress/WordPressTest/Blog Dashboard/Cards/DashboardJetpackSocialCardCellTests.swift

@@ -1,5 +1,4 @@
-import Foundation
-@testable import WordPress
+import WordPressShared
 
 class InMemoryUserDefaults: UserPersistentRepository {