udpate last destination reducer

pointfreeco · stephencelis · Apr 9, 2024 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
commit b93b94c1a3b104faaa79f99d50ea1547f2725316
diff --git a/Sources/GameCore/GameCore.swift b/Sources/GameCore/GameCore.swift
@@ -5,6 +5,7 @@ import ClientModels
 import ComposableArchitecture
 import ComposableGameCenter
 import CubeCore
+import Dependencies
 import DictionaryClient
 import GameOverFeature
 import HapticsCore
@@ -20,51 +21,26 @@ import UserSettingsClient
 
 @Reducer
 public struct Game {
-  @Reducer
-  public struct Destination {
-    @ObservableState
-    public enum State: Equatable {
-      case alert(AlertState<Action.Alert>)
-      case bottomMenu(BottomMenuState<Action.BottomMenu>)
-      case gameOver(GameOver.State)
-      case settings(Settings.State = Settings.State())
-      case upgradeInterstitial(UpgradeInterstitial.State = .init())
+  @Reducer(state: .equatable)
+  public enum Destination {
+    case alert(AlertState<Alert>)
+    @ReducerCaseEphemeral
+    case bottomMenu(BottomMenuState<BottomMenu>)
+    case gameOver(GameOver)
+    case settings(Settings)
+    case upgradeInterstitial(UpgradeInterstitial)
+
+    @CasePathable
+    public enum Alert {
+      case forfeitButtonTapped
     }
-
-    public enum Action {
-      case alert(Alert)
-      case bottomMenu(BottomMenu)
-      case gameOver(GameOver.Action)
-      case settings(Settings.Action)
-      case upgradeInterstitial(UpgradeInterstitial.Action)
-
-      @CasePathable
-      public enum Alert {
-        case forfeitButtonTapped
-      }
-      @CasePathable
-      public enum BottomMenu: Equatable {
-        case confirmRemoveCube(LatticePoint)
-        case endGameButtonTapped
-        case exitButtonTapped
-        case forfeitGameButtonTapped
-        case settingsButtonTapped
-      }
-    }
-
-    let dismissGame: DismissEffect
-
-    public var body: some ReducerOf<Self> {
-      Scope(state: \.gameOver, action: \.gameOver) {
-        GameOver()
-          .dependency(\.dismiss, self.dismissGame)
-      }
-      Scope(state: \.settings, action: \.settings) {
-        Settings()
-      }
-      Scope(state: \.upgradeInterstitial, action: \.upgradeInterstitial) {
-        UpgradeInterstitial()
-      }
+    @CasePathable
+    public enum BottomMenu: Equatable {
+      case confirmRemoveCube(LatticePoint)
+      case endGameButtonTapped
+      case exitButtonTapped
+      case forfeitGameButtonTapped
+      case settingsButtonTapped
     }
   }
 
@@ -220,7 +196,8 @@ public struct Game {
       }
       .filterActionsForYourTurn()
       .ifLet(\.$destination, action: \.destination) {
-        Destination(dismissGame: self.dismiss)
+        Destination.body
+          .dependency(\.dismissGame, self.dismiss)
       }
       .sounds()
   }
@@ -241,7 +218,7 @@ public struct Game {
         return .none
 
       case .delayedShowUpgradeInterstitial:
-        state.destination = .upgradeInterstitial()
+        state.destination = .upgradeInterstitial(UpgradeInterstitial.State())
         return .none
 
       case .destination(.presented(.alert(.forfeitButtonTapped))):
@@ -301,7 +278,7 @@ public struct Game {
         return .none
 
       case .destination(.presented(.bottomMenu(.settingsButtonTapped))):
-        state.destination = .settings()
+        state.destination = .settings(Settings.State())
         return .none
 
       case let .destination(.presented(.gameOver(.delegate(.startGame(inProgressGame))))):
@@ -572,7 +549,7 @@ extension TurnBasedMatchData {
   }
 }
 
-extension BottomMenuState where Action == Game.Destination.Action.BottomMenu {
+extension BottomMenuState where Action == Game.Destination.BottomMenu {
   public static func removeCube(
     index: LatticePoint,
     state: Game.State,

diff --git a/Sources/GameOverFeature/DismissGame.swift b/Sources/GameOverFeature/DismissGame.swift
@@ -0,0 +1,15 @@
+import ComposableArchitecture
+import Dependencies
+
+private enum DismissGameKey: DependencyKey {
+  static var liveValue: DismissEffect {
+    @Dependency(\.dismiss) var dismiss
+    return dismiss
+  }
+}
+extension DependencyValues {
+  public var dismissGame: DismissEffect {
+    get { self[DismissGameKey.self] }
+    set { self[DismissGameKey.self] = newValue }
+  }
+}
diff --git a/Sources/GameOverFeature/GameOverView.swift b/Sources/GameOverFeature/GameOverView.swift
@@ -127,7 +127,7 @@ public struct GameOver {
   @Dependency(\.apiClient) var apiClient
   @Dependency(\.audioPlayer) var audioPlayer
   @Dependency(\.database) var database
-  @Dependency(\.dismiss) var dismiss
+  @Dependency(\.dismissGame) var dismissGame
   @Dependency(\.fileClient) var fileClient
   @Dependency(\.mainRunLoop) var mainRunLoop
   @Dependency(\.storeKit.requestReview) var requestReview
@@ -148,7 +148,7 @@ public struct GameOver {
         else {
           return .run { send in
             try? await self.requestReviewAsync()
-            await self.dismiss(animation: .default)
+            await self.dismissGame(animation: .default)
           }
         }
 
@@ -208,14 +208,14 @@ public struct GameOver {
       where state.destination.is(\.some.notificationsAuthAlert):
         return .run { _ in
           try? await self.requestReviewAsync()
-          await self.dismiss(animation: .default)
+          await self.dismissGame(animation: .default)
         }
 
       case .destination(
         .presented(.notificationsAuthAlert(.delegate(.didChooseNotificationSettings)))
       ):
         return .run { _ in
-          await self.dismiss(animation: .default)
+          await self.dismissGame(animation: .default)
         }
 
       case .destination:
@@ -276,7 +276,7 @@ public struct GameOver {
         return .run { [completedGame = state.completedGame, isDemo = state.isDemo] send in
           guard isDemo || completedGame.currentScore > 0
           else {
-            await self.dismiss(animation: .default)
+            await self.dismissGame(animation: .default)
             return
           }