TCA Navigation (#185)

* Use built-in Reducer.onChange * wip * wip * update stats * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * fix * wip * Settings Dependency + Navigation Finesse (#186) * Beginnings of the UserSettingsClient. * extracted UserSettingsClient to its own library * Decoupled haptics settings from some features. * Stopped threading isAnimationReduced state through multple features and fixed tests. * Stopped threading isAnimationReduced to leaderboard. * Moved daily challenge settings into UserSettings. * Moved enableNotifications to UserSettings. * Moved developer settings to app storage. * Game feature has its own settings, haven't deleted home settings yet. * Removed GameFeature * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Fixed some runtime warnings. * wip * Flatten nag banner domains, remove old settings from home * wip * wip --------- Co-authored-by: Brandon Williams <mbrandonw@hey.com> --------- Co-authored-by: Brandon Williams <mbrandonw@hey.com>
pointfreeco · Aug 23, 2023 · 34e28fa · 34e28fa
1 parent d683f23
commit 34e28fa
Show file tree

Hide file tree

Showing 131 changed files with 4,233 additions and 4,964 deletions.
diff --git a/App/AppClip/AppClipApp.swift b/App/AppClip/AppClipApp.swift
@@ -16,13 +16,12 @@ struct AppClipApp: App {
   var body: some Scene {
     WindowGroup {
       DemoView(
-        store: Store(
-          initialState: Demo.State()
-        ) {
+        store: Store(initialState: Demo.State()) {
           Demo()
-            .dependency(\.apiClient, .appClip)
-            .dependency(\.audioPlayer, .live(bundles: [AppClipAudioLibrary.bundle]))
-            .dependency(\.dictionary, .file())
+        } withDependencies: {
+          $0.apiClient = .appClip
+          $0.audioPlayer = .live(bundles: [AppClipAudioLibrary.bundle])
+          $0.dictionary = .file()
         }
       )
     }

diff --git a/App/Previews/CubeCorePreview/CubeCorePreviewApp.swift b/App/Previews/CubeCorePreview/CubeCorePreviewApp.swift
@@ -11,16 +11,15 @@ struct CubeCorePreviewApp: App {
         store: Store(
           initialState: CubeSceneView.ViewState(
             cubes: .mock,
+            enableGyroMotion: false,
             isOnLowPowerMode: false,
             nub: nil,
             playedWords: [],
             selectedFaceCount: 0,
             selectedWordIsValid: false,
-            selectedWordString: "",
-            settings: .init(showSceneStatistics: true)
+            selectedWordString: ""
           )
         ) {
-
         }
       )
     }

diff --git a/App/Previews/CubePreviewPreview/CubePreviewPreviewApp.swift b/App/Previews/CubePreviewPreview/CubePreviewPreviewApp.swift
@@ -19,8 +19,6 @@ struct CubePreviewPreviewApp: App {
         store: Store(
           initialState: CubePreview.State(
             cubes: .mock,
-            isAnimationReduced: false,
-            isHapticsEnabled: true,
             isOnLowPowerMode: false,
             moveIndex: 0,
             moves: [
@@ -56,12 +54,12 @@ struct CubePreviewPreviewApp: App {
                   ),
                 ])
               )
-            ],
-            settings: .init()
+            ]
           )
         ) {
           CubePreview()
-            .dependency(\.audioPlayer, .noop)
+        } withDependencies: {
+          $0.audioPlayer = .noop
         }
       )
     }

diff --git a/App/Previews/GameOverPreview/GameOverPreviewApp.swift b/App/Previews/GameOverPreview/GameOverPreviewApp.swift
@@ -39,44 +39,39 @@ extension StoreOf<GameOver> {
       )
     ) {
       GameOver()
-        .dependency(
-          \.apiClient,
-          update(.noop) {
-            $0.override(
-              routeCase: (/ServerRoute.Api.Route.games)
-                .appending(path: /ServerRoute.Api.Route.Games.submit),
-              withResponse: { _ in
-                try await OK(
-                  SubmitGameResponse.solo(
-                    .init(
-                      ranks: [
-                        .allTime: .init(outOf: 152122, rank: 3828),
-                        .lastDay: .init(outOf: 512, rank: 79),
-                        .lastWeek: .init(outOf: 1603, rank: 605),
-                      ]
-                    )
-                  )
+    } withDependencies: {
+      $0.apiClient = update(.noop) {
+        $0.override(
+          routeCase: (/ServerRoute.Api.Route.games)
+            .appending(path: /ServerRoute.Api.Route.Games.submit),
+          withResponse: { _ in
+            try await OK(
+              SubmitGameResponse.solo(
+                .init(
+                  ranks: [
+                    .allTime: .init(outOf: 152122, rank: 3828),
+                    .lastDay: .init(outOf: 512, rank: 79),
+                    .lastWeek: .init(outOf: 1603, rank: 605),
+                  ]
                 )
-              }
+              )
             )
           }
         )
-        .dependency(\.audioPlayer, .noop)
-        .dependency(
-          \.database,
-          .autoMigratingLive(
-            path: FileManager.default
-              .urls(for: .documentDirectory, in: .userDomainMask)
-              .first!
-              .appendingPathComponent("co.pointfree.Isowords")
-              .appendingPathComponent("Isowords.sqlite3")
-          )
-        )
-        .dependency(\.fileClient, .noop)
-        .dependency(\.remoteNotifications, .noop)
-        .dependency(\.serverConfig, .noop)
-        .dependency(\.userDefaults.boolForKey) { _ in false }
-        .dependency(\.userNotifications, .noop)
+      }
+      $0.audioPlayer = .noop
+      $0.database = .autoMigratingLive(
+        path: FileManager.default
+          .urls(for: .documentDirectory, in: .userDomainMask)
+          .first!
+          .appendingPathComponent("co.pointfree.Isowords")
+          .appendingPathComponent("Isowords.sqlite3")
+      )
+      $0.fileClient = .noop
+      $0.remoteNotifications = .noop
+      $0.serverConfig = .noop
+      $0.userDefaults.boolForKey = { _ in false }
+      $0.userNotifications = .noop
     }
   }
 
@@ -99,7 +94,8 @@ extension StoreOf<GameOver> {
       )
     ) {
       GameOver()
-        .dependency(\.context, .preview)
+    } withDependencies: {
+      $0.context = .preview
     }
   }
 }
diff --git a/App/Previews/HomeFeaturePreview/HomeFeaturePreviewApp.swift b/App/Previews/HomeFeaturePreview/HomeFeaturePreviewApp.swift
@@ -17,47 +17,43 @@ struct HomeFeaturePreviewApp: App {
     WindowGroup {
       NavigationView {
         HomeView(
-          store: Store(
-            initialState: Home.State()
-          ) {
+          store: Store(initialState: Home.State()) {
             Home()
-              .dependency(
-                \.apiClient,
-                update(.noop) {
-                  $0.authenticate = { _ in .init(appleReceipt: nil, player: .blob) }
-                  $0.override(
-                    route: .dailyChallenge(.today(language: .en)),
-                    withResponse: {
-                      try await OK([
-                        FetchTodaysDailyChallengeResponse(
-                          dailyChallenge: .init(
-                            endsAt: .init(),
-                            gameMode: .timed,
-                            id: .init(rawValue: UUID()),
-                            language: .en
-                          ),
-                          yourResult: .init(
-                            outOf: .random(in: 2000...4000),
-                            rank: 10,
-                            score: 3_000
-                          )
-                        )
-                      ])
-                    }
-                  )
+          } withDependencies: {
+            $0.apiClient = update(.noop) {
+              $0.authenticate = { _ in .init(appleReceipt: nil, player: .blob) }
+              $0.override(
+                route: .dailyChallenge(.today(language: .en)),
+                withResponse: {
+                  try await OK([
+                    FetchTodaysDailyChallengeResponse(
+                      dailyChallenge: .init(
+                        endsAt: .init(),
+                        gameMode: .timed,
+                        id: .init(rawValue: UUID()),
+                        language: .en
+                      ),
+                      yourResult: .init(
+                        outOf: .random(in: 2000...4000),
+                        rank: 10,
+                        score: 3_000
+                      )
+                    )
+                  ])
                 }
               )
-              .dependency(\.applicationClient, .noop)
-              .dependency(\.audioPlayer, .noop)
-              .dependency(\.build, .noop)
-              .dependency(\.database, .inMemory)
-              .dependency(\.deviceId, .noop)
-              .dependency(\.gameCenter, .noop)
-              .dependency(\.remoteNotifications, .noop)
-              .dependency(\.serverConfig, .noop)
-              .dependency(\.storeKit, .noop)
-              .dependency(\.userDefaults, .noop)
-              .dependency(\.userNotifications, .noop)
+            }
+            $0.applicationClient = .noop
+            $0.audioPlayer = .noop
+            $0.build = .noop
+            $0.database = .inMemory
+            $0.deviceId = .noop
+            $0.gameCenter = .noop
+            $0.remoteNotifications = .noop
+            $0.serverConfig = .noop
+            $0.storeKit = .noop
+            $0.userDefaults = .noop
+            $0.userNotifications = .noop
           }
         )
       }

diff --git a/App/Previews/LeaderboardsPreview/LeaderboardsPreviewApp.swift b/App/Previews/LeaderboardsPreview/LeaderboardsPreviewApp.swift
@@ -55,14 +55,13 @@ struct LeaderboardsPreviewApp: App {
 
     return WindowGroup {
       LeaderboardView(
-        store: .init(
-          initialState: Leaderboard.State(isHapticsEnabled: false, settings: .init())
-        ) {
+        store: Store(initialState: Leaderboard.State()) {
           Leaderboard()
-            .dependency(\.apiClient, apiClient)
-            .dependency(\.audioPlayer, .noop)
-            .dependency(\.feedbackGenerator, .noop)
-            .dependency(\.lowPowerMode, .false)
+        } withDependencies: {
+          $0.apiClient = apiClient
+          $0.audioPlayer = .noop
+          $0.feedbackGenerator = .noop
+          $0.lowPowerMode = .false
         }
       )
     }

diff --git a/App/Previews/OnboardingPreview/OnboardingPreviewApp.swift b/App/Previews/OnboardingPreview/OnboardingPreviewApp.swift
@@ -15,14 +15,11 @@ struct OnboardingPreviewApp: App {
   var body: some Scene {
     WindowGroup {
       OnboardingView(
-        store: Store(
-          initialState: Onboarding.State(presentationStyle: .firstLaunch)
-        ) {
+        store: Store(initialState: Onboarding.State(presentationStyle: .firstLaunch)) {
           Onboarding()
-            .dependency(
-              \.audioPlayer, .live(bundles: [AppClipAudioLibrary.bundle, AppAudioLibrary.bundle])
-            )
-            .dependency(\.userDefaults, .noop)
+        } withDependencies: {
+          $0.audioPlayer = .live(bundles: [AppClipAudioLibrary.bundle, AppAudioLibrary.bundle])
+          $0.userDefaults = .noop
         }
       )
     }

diff --git a/App/Previews/SettingsPreview/SettingsPreviewApp.swift b/App/Previews/SettingsPreview/SettingsPreviewApp.swift
@@ -20,15 +20,14 @@ struct SettingsPreviewApp: App {
     WindowGroup {
       NavigationView {
         SettingsView(
-          store: .init(
-            initialState: Settings.State()
-          ) {
+          store: .init(initialState: Settings.State()) {
             Settings()
-              .dependency(\.apiClient, .noop)
-              .dependency(\.audioPlayer, .noop)
-              .dependency(\.build, .noop)
-              .dependency(\.database, .noop)
-              .dependency(\.serverConfig, .live(fetch: { .init() }))
+          } withDependencies: {
+            $0.apiClient = .noop
+            $0.audioPlayer = .noop
+            $0.build = .noop
+            $0.database = .noop
+            $0.serverConfig = .live(fetch: { .init() })
           },
           navPresentationStyle: .modal
         )

diff --git a/App/Previews/TrailerPreview/TrailerPreviewApp.swift b/App/Previews/TrailerPreview/TrailerPreviewApp.swift
@@ -15,35 +15,28 @@ struct TrailerPreviewApp: App {
   var body: some Scene {
     WindowGroup {
       TrailerView(
-        store: .init(
-          initialState: Trailer.State()
-        ) {
+        store: .init(initialState: Trailer.State()) {
           Trailer()
-            .dependency(
-              \.audioPlayer,
-              .live(bundles: [
-                AppAudioLibrary.bundle,
-                AppClipAudioLibrary.bundle,
-              ])
-            )
-            .dependency(
-              \.dictionary,
-              .init(
-                contains: { string, _ in
-                  [
-                    "SAY", "HELLO", "TO", "ISOWORDS",
-                    "A", "NEW", "WORD", "SEARCH", "GAME",
-                    "FOR", "YOUR", "PHONE",
-                    "COMING", "NEXT", "YEAR",
-                  ]
-                  .contains(string.uppercased())
-                },
-                load: { _ in true },
-                lookup: { _, _ in nil },
-                randomCubes: { _ in .mock },
-                unload: { _ in }
-              )
-            )
+        } withDependencies: {
+          $0.audioPlayer = .live(bundles: [
+            AppAudioLibrary.bundle,
+            AppClipAudioLibrary.bundle,
+          ])
+          $0.dictionary = .init(
+            contains: { string, _ in
+              [
+                "SAY", "HELLO", "TO", "ISOWORDS",
+                "A", "NEW", "WORD", "SEARCH", "GAME",
+                "FOR", "YOUR", "PHONE",
+                "COMING", "NEXT", "YEAR",
+              ]
+                .contains(string.uppercased())
+            },
+            load: { _ in true },
+            lookup: { _, _ in nil },
+            randomCubes: { _ in .mock },
+            unload: { _ in }
+          )
         }
       )
       .statusBar(hidden: true)

diff --git a/App/Previews/UpgradeInterstitialPreview/UpgradeInterstitialPreviewApp.swift b/App/Previews/UpgradeInterstitialPreview/UpgradeInterstitialPreviewApp.swift
@@ -13,11 +13,10 @@ struct UpgradeInterstitialPreviewApp: App {
   var body: some Scene {
     WindowGroup {
       UpgradeInterstitialView(
-        store: Store(
-          initialState: UpgradeInterstitial.State()
-        ) {
+        store: Store(initialState: UpgradeInterstitial.State()) {
           UpgradeInterstitial()
-            .dependency(\.serverConfig, .noop)
+        } withDependencies: {
+          $0.serverConfig = .noop
         }
       )
     }