Screen-Based features

.gitignore

@@ -48,28 +48,6 @@ Package.resolved
 *swiftpm/
 .build/
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build/
-
-# Accio dependency management
-Dependencies/
-.accio/
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo.

App/WildWestOnline.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		2699EF0129D93AD00030ACCD /* WildWestOnlineApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2699EF0029D93AD00030ACCD /* WildWestOnlineApp.swift */; };
 		2699EF0529D93AD10030ACCD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2699EF0429D93AD10030ACCD /* Assets.xcassets */; };
-		26F4048D2EB5CE5700F5FCA9 /* AppBootstrap in Frameworks */ = {isa = PBXBuildFile; productRef = 26F4048C2EB5CE5700F5FCA9 /* AppBootstrap */; };
+		98A1A0BA2EE4A1D7003EB768 /* AppBuilder in Frameworks */ = {isa = PBXBuildFile; productRef = 98A1A0B92EE4A1D7003EB768 /* AppBuilder */; };
 		98E868E62D9D19CC00EF4582 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 98E868E52D9D19CC00EF4582 /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
 
@@ -26,7 +26,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				26F4048D2EB5CE5700F5FCA9 /* AppBootstrap in Frameworks */,
+				98A1A0BA2EE4A1D7003EB768 /* AppBuilder in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -77,7 +77,7 @@
 			);
 			name = WildWestOnline;
 			packageProductDependencies = (
-				26F4048C2EB5CE5700F5FCA9 /* AppBootstrap */,
+				98A1A0B92EE4A1D7003EB768 /* AppBuilder */,
 			);
 			productName = ReduxGameDSL;
 			productReference = 2699EEFD29D93AD00030ACCD /* WildWestOnline.app */;
@@ -419,9 +419,10 @@
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		26F4048C2EB5CE5700F5FCA9 /* AppBootstrap */ = {
+		98A1A0B92EE4A1D7003EB768 /* AppBuilder */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = AppBootstrap;
+			package = 26F4048B2EB5CE5700F5FCA9 /* XCLocalSwiftPackageReference "../Modules" */;
+			productName = AppBuilder;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

App/WildWestOnlineApp.swift

@@ -5,7 +5,7 @@
 //  Created by Hugues Telolahy on 02/04/2023.
 //
 import SwiftUI
-import AppBootstrap
+import AppBuilder
 
 @main
 struct WildWestOnlineApp: App {

Modules/.swiftlint.yml

@@ -102,7 +102,7 @@ opt_in_rules:
   - prefixed_toplevel_constant
   - private_action
   - private_outlet
-  - private_subject
+  # - private_subject
   # - private_swiftui_state
   # - prohibited_interface_builder
   - prohibited_super_call

Modules/AppBuilder/Sources/AppBuilder.swift

@@ -0,0 +1,37 @@
+//
+//  AppBuilder.swift
+//  WildWestOnline
+//
+//  Created by Hugues Telolahy on 31/10/2025.
+//
+import SwiftUI
+import Redux
+import AppFeature
+import PreferencesClient
+import PreferencesClientLive
+import AudioClient
+import AudioClientLive
+import CardLibrary
+import CardLibraryLive
+import GameCore
+
+@MainActor
+public enum AppBuilder {
+    public static func build() -> some View {
+        var dependencies = Dependencies()
+        dependencies.preferencesClient = PreferencesClient.live()
+        dependencies.audioClient = AudioClient.live()
+        dependencies.queueModifierClient = QueueModifierClient.live(handlers: QueueModifiers.allHandlers)
+        dependencies.cardLibrary = CardLibrary.live()
+
+        let store = Store<AppFeature.State, AppFeature.Action>(
+            initialState: .init(),
+            reducer: AppFeature.reducer,
+            dependencies: dependencies
+        )
+
+        return AppView {
+            store
+        }
+    }
+}

Modules/AppFeature/Sources/AppFeature.swift

@@ -6,111 +6,134 @@
 //
 
 import Redux
-import NavigationFeature
+import HomeFeature
 import SettingsFeature
-import GameFeature
-import AudioClient
-import PreferencesClient
-
-public typealias AppStore = Store<AppFeature.State, AppFeature.Action>
+import GameSessionFeature
 
 public enum AppFeature {
-    /// Global app state
-    /// Organize State Structure Based on Data Types, Not Components
-    /// https://redux.js.org/style-guide/#organize-state-structure-based-on-data-types-not-components
-    public struct State: Codable, Equatable, Sendable {
-        public let cardLibrary: CardLibrary
-        public var navigation: AppNavigationFeature.State
-        public var settings: SettingsFeature.State
-        public var game: GameFeature.State?
+    public struct State: Equatable {
+        var path: [Destination]
+        var home: HomeFeature.State
+        var gameSession: GameSessionFeature.State
+        var settings: SettingsFeature.State?
+
+        public enum Destination: Hashable {
+            case gameSession
+        }
 
         public init(
-            cardLibrary: CardLibrary,
-            navigation: AppNavigationFeature.State,
-            settings: SettingsFeature.State,
-            game: GameFeature.State? = nil
+            path: [Destination] = [],
+            home: HomeFeature.State = .init(),
+            gameSession: GameSessionFeature.State = .init(),
+            settings: SettingsFeature.State? = nil
         ) {
-            self.cardLibrary = cardLibrary
-            self.navigation = navigation
+            self.path = path
+            self.home = home
             self.settings = settings
-            self.game = game
-        }
-
-        public struct CardLibrary: Codable, Equatable, Sendable {
-            public let cards: [Card]
-            public let deck: [String]
-            public let specialSounds: [Card.ActionName: [String: AudioClient.Sound]]
-
-            public init(
-                cards: [Card] = [],
-                deck: [String] = [],
-                specialSounds: [Card.ActionName: [String: AudioClient.Sound]] = [:]
-            ) {
-                self.cards = cards
-                self.deck = deck
-                self.specialSounds = specialSounds
-            }
+            self.gameSession = gameSession
         }
     }
 
     public enum Action {
-        case start
-        case quit
-        case setGame(GameFeature.State)
-        case unsetGame
-        case navigation(AppNavigationFeature.Action)
+        // View
+        case setPath([State.Destination])
+        case setSettingsPresented(Bool)
+
+        // Internal
+        case home(HomeFeature.Action)
         case settings(SettingsFeature.Action)
-        case game(GameFeature.Action)
+        case gameSession(GameSessionFeature.Action)
     }
 
     public static var reducer: Reducer<State, Action> {
         combine(
             reducerMain,
             pullback(
-                GameFeature.reducer,
-                state: { globalState in
-                    globalState.game != nil ? \.game! : nil
+                HomeFeature.reducer,
+                state: { _ in
+                    \.home
                 },
                 action: { globalAction in
-                    if case let .game(localAction) = globalAction {
+                    if case let .home(localAction) = globalAction {
                         return localAction
                     }
                     return nil
                 },
-                embedAction: Action.game
+                embedAction: {
+                    .home($0)
+                }
             ),
             pullback(
-                SettingsFeature.reducer,
+                GameSessionFeature.reducer,
                 state: { _ in
-                    \.settings
+                    \.gameSession
                 },
                 action: { globalAction in
-                    if case let .settings(localAction) = globalAction {
+                    if case let .gameSession(localAction) = globalAction {
                         return localAction
                     }
                     return nil
                 },
-                embedAction: Action.settings
+                embedAction: {
+                    .gameSession($0)
+                }
             ),
             pullback(
-                AppNavigationFeature.reducer,
-                state: { _ in
-                    \.navigation
+                SettingsFeature.reducer,
+                state: {
+                    $0.settings != nil ? \.settings! : nil
                 },
                 action: { globalAction in
-                    if case let .navigation(localAction) = globalAction {
+                    if case let .settings(localAction) = globalAction {
                         return localAction
                     }
                     return nil
                 },
-                embedAction: Action.navigation
-            ),
-            pullback(
-                reducerSound,
-                state: { _ in \.self },
-                action: { $0 },
-                embedAction: \.self
+                embedAction: {
+                    .settings($0)
+                }
             )
         )
     }
+
+    private static func reducerMain(
+        into state: inout State,
+        action: Action,
+        dependencies: Dependencies
+    ) -> Effect<Action> {
+        switch action {
+        case .setPath(let path):
+            state.path = path
+            return .none
+
+        case .setSettingsPresented(let presented):
+            if presented {
+                state.settings = .init()
+            } else {
+                state.settings = nil
+            }
+            return .none
+
+        case .home(.delegate(.settings)):
+            return .run { .setSettingsPresented(true) }
+
+        case .home(.delegate(.play)):
+            return .run { .setPath([.gameSession]) }
+
+        case .home:
+            return .none
+
+        case .settings:
+            return .none
+
+        case .gameSession(.delegate(.settings)):
+            return .run { .setSettingsPresented(true) }
+
+        case .gameSession(.delegate(.quit)):
+            return .run { .setPath([]) }
+
+        case .gameSession:
+            return .none
+        }
+    }
 }