Refactor/shared appstorage (#533)

* remove Logger package

* add SharedKeys packge

* remove userDefaultsClient package

* update dependencies

* update AppFeature

* update ChatFeature

* update IDProvider package

* update NextRideFeature

* update SettingsFeature

* update SocialFeature

* update keys

* gardening

* use StoreMigration namespace

Author: mltbnz

CriticalMapsKit/Package.swift

@@ -63,9 +63,9 @@ let package = Package(
         "NextRideFeature",
         .pathMonitorClient,
         "SettingsFeature",
+        .sharedKeys,
         "SocialFeature",
         .styleguide,
-        .userDefaultsClient,
         .uiApplicationClient,
         .tca
       ]
@@ -84,10 +84,10 @@ let package = Package(
         .helpers,
         .idProvider,
         .l10n,
+        .sharedKeys,
         .sharedModels,
         .styleguide,
-        .swiftUIHelpers,
-        .userDefaultsClient
+        .swiftUIHelpers
       ]
     ),
     .target(
@@ -114,8 +114,8 @@ let package = Package(
       name: "IDProvider",
       dependencies: [
         .helpers,
-        .tca,
-        .userDefaultsClient
+        .sharedKeys,
+        .tca
       ]
     ),
     .target(
@@ -154,9 +154,9 @@ let package = Package(
         .apiClient,
         .helpers,
         .l10n,
+        .sharedKeys,
         .sharedModels,
         .styleguide,
-        .userDefaultsClient,
         .composableCoreLocation,
         .tca
       ]
@@ -175,6 +175,7 @@ let package = Package(
         .l10n,
         .helpers,
         "MapFeature",
+        .sharedKeys,
         .sharedModels,
         .styleguide,
         .swiftUIHelpers,
@@ -184,6 +185,13 @@ let package = Package(
       ],
       resources: [.process("_Resources/")]
     ),
+    .target(
+      name: "SharedKeys",
+      dependencies: [
+        .sharedModels,
+        .tca
+      ]
+    ),
     .target(
       name: "SharedModels",
       dependencies: [
@@ -197,7 +205,6 @@ let package = Package(
         "ChatFeature",
         .l10n,
         "MastodonFeedFeature",
-        .userDefaultsClient,
         .tca
       ]
     ),
@@ -227,14 +234,6 @@ let package = Package(
       dependencies: [
         .tca
       ]
-    ),
-    .target(
-      name: "UserDefaultsClient",
-      dependencies: [
-        .helpers,
-        .sharedModels,
-        .tca
-      ]
     )
   ]
 )
@@ -260,7 +259,6 @@ package.targets.append(contentsOf: [
       "ChatFeature",
       .testHelper,
       .sharedModels,
-      .userDefaultsClient,
       .tca
     ],
     exclude: [
@@ -271,7 +269,7 @@ package.targets.append(contentsOf: [
     name: "HelperTests",
     dependencies: [
       .helpers,
-      .userDefaultsClient
+      .sharedModels
     ]
   ),
   .testTarget(
@@ -293,7 +291,6 @@ package.targets.append(contentsOf: [
     name: "NextRideFeatureTests",
     dependencies: [
       .helpers,
-      .userDefaultsClient,
       "NextRideFeature",
       .tca
     ]
@@ -322,7 +319,6 @@ package.targets.append(contentsOf: [
       .l10n,
       "SettingsFeature",
       .testHelper,
-      .userDefaultsClient,
       .tca
     ],
     exclude: ["__Snapshots__"]
@@ -348,12 +344,12 @@ extension Target.Dependency {
   static let idProvider = byName(name: "IDProvider")
   static let l10n = byName(name: "L10n")
   static let pathMonitorClient = byName(name: "PathMonitorClient")
+  static let sharedKeys = byName(name: "SharedKeys")
   static let sharedModels = byName(name: "SharedModels")
   static let styleguide = byName(name: "Styleguide")
   static let swiftUIHelpers = byName(name: "SwiftUIHelpers")
   static let testHelper = byName(name: "TestHelper")
   static let uiApplicationClient = byName(name: "UIApplicationClient")
-  static let userDefaultsClient = byName(name: "UserDefaultsClient")
 
   // MARK: - External
 

CriticalMapsKit/Sources/AppFeature/AppFeature.swift

@@ -11,11 +11,11 @@ import MastodonFeedFeature
 import NextRideFeature
 import os
 import SettingsFeature
+import SharedKeys
 import SharedModels
 import SocialFeature
 import struct SwiftUI.PresentationDetent
 import UIApplicationClient
-import UserDefaultsClient
 
 @Reducer
 public struct AppFeature: Sendable { // swiftlint:disable:this type_body_length
@@ -126,7 +126,6 @@ public struct AppFeature: Sendable { // swiftlint:disable:this type_body_length
   @Dependency(\.apiService) var apiService
   @Dependency(\.uuid) var uuid
   @Dependency(\.date) var date
-  @Dependency(\.userDefaultsClient) var userDefaultsClient
   @Dependency(\.nextRideService) var nextRideService
   @Dependency(\.idProvider) var idProvider
   @Dependency(\.mainQueue) var mainQueue
@@ -160,39 +159,40 @@ public struct AppFeature: Sendable { // swiftlint:disable:this type_body_length
         )
 
       case .onAppear:
-        var effects: [Effect<Action>] = [
-          .send(.map(.onAppear)),
-          .send(.requestTimer(.startTimer)),
-          .run { _ in
-            await userDefaultsClient.setSessionID(uuid().uuidString)
-          },
-          .run { [style = state.appearanceSettings.colorScheme.userInterfaceStyle] _ in
-            await uiApplicationClient.setUserInterfaceStyle(style)
-          },
-          .run { send in
-            await withThrowingTaskGroup(of: Void.self) { group in
-              group.addTask {
-                await send(.fetchChatMessages)
-              }
-              group.addTask {
-                await send(.fetchLocations)
+        @Shared(.sessionID) var sessionID
+        $sessionID.withLock { $0 = uuid().uuidString }
+
+        StorageMigration.migratePrivacyZones()
+        
+        return .merge(
+          [
+            .send(.map(.onAppear)),
+            .send(.requestTimer(.startTimer)),
+            .run { [style = state.appearanceSettings.colorScheme.userInterfaceStyle] _ in
+              await uiApplicationClient.setUserInterfaceStyle(style)
+            },
+            .run { send in
+              await withThrowingTaskGroup(of: Void.self) { group in
+                group.addTask {
+                  await send(.fetchChatMessages)
+                }
+                group.addTask {
+                  await send(.fetchLocations)
+                }
               }
-            }
-          },
-          .run { _ in
-            await feedbackGenerator.prepare()
-          }
-        ]
-        if !userDefaultsClient.didShowObservationModePrompt {
-          effects.append(
+            },
+            .run { _ in
+              await feedbackGenerator.prepare()
+            },
             .run { send in
-              try? await clock.sleep(for: .seconds(3))
-              await send(.presentObservationModeAlert)
+              @Shared(.didShowObservationModePrompt) var didShowObservationModePrompt
+              if !didShowObservationModePrompt {
+                try? await clock.sleep(for: .seconds(3))
+                await send(.presentObservationModeAlert)
+              }
             }
-          )
-        }
-        
-        return .merge(effects)
+          ]
+        )
 
       case .onDisappear:
         return .none
@@ -225,9 +225,10 @@ public struct AppFeature: Sendable { // swiftlint:disable:this type_body_length
         if case .social = state.destination {
           let cachedMessages = messages.sorted(by: \.timestamp)
 
+          @Shared(.chatReadTimeInterval) var chatReadTimeInterval
           let unreadMessagesCount = UInt(
             cachedMessages
-              .count(where: { $0.timestamp > userDefaultsClient.chatReadTimeInterval })
+              .count(where: { $0.timestamp > chatReadTimeInterval })
           )
           state.chatMessageBadgeCount = unreadMessagesCount
         }
@@ -387,9 +388,9 @@ public struct AppFeature: Sendable { // swiftlint:disable:this type_body_length
             message: { TextState(L10n.AppCore.ViewingModeAlert.message) }
           )
         )
-        return .run { _ in
-          await userDefaultsClient.setDidShowObservationModePrompt(true)
-        }
+        @Shared(.didShowObservationModePrompt) var didShowObservationModePrompt
+        $didShowObservationModePrompt.withLock { $0 = true }
+        return .none
 
       case let .destination(.presented(.alert(alertAction))):
         switch alertAction {

CriticalMapsKit/Sources/ChatFeature/ChatFeature.swift

@@ -6,8 +6,8 @@ import Helpers
 import IDProvider
 import L10n
 import os
+import SharedKeys
 import SharedModels
-import UserDefaultsClient
 
 @Reducer
 public struct ChatFeature: Sendable {
@@ -65,7 +65,6 @@ public struct ChatFeature: Sendable {
   @Dependency(\.idProvider) var idProvider
   @Dependency(\.mainQueue) var mainQueue
   @Dependency(\.uuid) var uuid
-  @Dependency(\.userDefaultsClient) var userDefaultsClient
 
   public var body: some Reducer<State, Action> {
     Scope(state: \.chatInputState, action: \.chatInput) {
@@ -95,9 +94,11 @@ public struct ChatFeature: Sendable {
 
       case let .fetchChatMessagesResponse(.success(messages)):
         state.chatMessages = .results(messages)
-        return .run { _ in
-          await userDefaultsClient.setChatReadTimeInterval(date().timeIntervalSince1970)
-        }
+        
+        @Shared(.chatReadTimeInterval) var chatReadTimeInterval
+        $chatReadTimeInterval.withLock { $0 = date().timeIntervalSince1970 }
+        
+        return .none
 
       case let .fetchChatMessagesResponse(.failure(error)):
         state.chatMessages = .error(

CriticalMapsKit/Sources/IDProvider/IDProvider+LiveKey.swift

@@ -1,15 +1,15 @@
 import ComposableArchitecture
 import Foundation
+import SharedKeys
 import UIKit.UIDevice
-import UserDefaultsClient
 
 extension IDProvider: DependencyKey {
   public static var liveValue: IDProvider {
-    @Dependency(\.userDefaultsClient) var defaultsClient
     @Dependency(\.date) var date
     @Dependency(\.uuid) var uuid
+    @Shared(.sessionID) var sessionID
 
-    let id = defaultsClient.getSessionID ?? uuid().uuidString
+    let id = sessionID ?? uuid().uuidString
 
     return Self(
       id: {

CriticalMapsKit/Sources/Logger/Logger.swift

@@ -3,6 +3,7 @@ import ComposableArchitecture
 import ComposableCoreLocation
 import Foundation
 import os
+import SharedKeys
 import SharedModels
 
 // MARK: State
@@ -45,7 +46,7 @@ public struct NextRideFeature: Sendable {
     switch action {
     case let .getNextRide(coordinate):
       guard state.rideEventSettings.isEnabled else {
-        Logger.reducer.debug("NextRide featue is disabled")
+        Logger.reducer.debug("NextRide feature is disabled")
         return .none
       }
 

CriticalMapsKit/Sources/NextRideFeature/NextRideFeature.swift

@@ -1,6 +1,7 @@
 import ComposableArchitecture
 import FeedbackGeneratorClient
 import Helpers
+import SharedKeys
 import SharedModels
 import UIApplicationClient
 import UIKit

CriticalMapsKit/Sources/SettingsFeature/AppearanceSettings/AppearanceSettingsFeature.swift

@@ -1,5 +1,6 @@
 import ComposableArchitecture
 import L10n
+import SharedKeys
 import SharedModels
 import Styleguide
 import SwiftUI

CriticalMapsKit/Sources/SettingsFeature/PrivacyZoneFeature/CreateZoneFeature.swift

@@ -1,5 +1,6 @@
 import ComposableArchitecture
 import L10n
+import SharedKeys
 import SharedModels
 import Styleguide
 import SwiftUI

CriticalMapsKit/Sources/SettingsFeature/PrivacyZoneFeature/PrivacyStatusTile.swift

@@ -2,6 +2,7 @@ import ComposableArchitecture
 import CoreLocation
 import L10n
 import MapKit
+import SharedKeys
 import SharedModels
 import Styleguide
 import SwiftUI