wip

stephtelolahy · Jan 18, 2025 · 979114c · 979114c
1 parent 9f3fdc1
commit 979114c
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 8 deletions.
diff --git a/Docs/modular.png b/Docs/modular.png
diff --git a/WildWestOnline/.swiftpm/xcode/xcshareddata/xcschemes/MainUITests.xcscheme b/WildWestOnline/.swiftpm/xcode/xcshareddata/xcschemes/MainUITests.xcscheme
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "MainUITests"
+               BuildableName = "MainUITests"
+               BlueprintName = "MainUITests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...ine/UI/Game/Sources/GameViewBuilder.swift → ...e/UI/Game/Sources/GameContainerView.swift b/...ine/UI/Game/Sources/GameViewBuilder.swift → ...e/UI/Game/Sources/GameContainerView.swift
@@ -1,5 +1,5 @@
 //
-//  GameViewBuilder.swift
+//  GameContainerView.swift
 //  WildWestOnline
 //
 //  Created by Hugues Stephano TELOLAHY on 19/09/2024.
@@ -10,7 +10,7 @@ import Redux
 import AppCore
 import GameCore
 
-public struct GameViewBuilder: View {
+public struct GameContainerView: View {
     @EnvironmentObject private var store: Store<AppState, AppDependencies>
 
     public init() {}

diff --git a/WildWestOnline/UI/Main/Sources/MainCoordinator.swift b/WildWestOnline/UI/Main/Sources/MainCoordinator.swift
@@ -15,7 +15,7 @@ import HomeUI
 import GameUI
 
 public struct MainCoordinator: View {
-    @EnvironmentObject private var store: Store<AppState>
+    @EnvironmentObject private var store: Store<AppState, AppDependencies>
 
     public init() {}
 
@@ -24,13 +24,13 @@ public struct MainCoordinator: View {
             store: {
                 store.projection(MainCoordinator.presenter)
             },
-            root: {
+            rootView: {
                 SplashContainerView()
             },
-            destination: { destination in
+            destinationView: { destination in
                 switch destination {
-                case .home: HomeViewBuilder().eraseToAnyView()
-                case .game: GameViewBuilder().eraseToAnyView()
+                case .home: HomeContainerView().eraseToAnyView()
+                case .game: GameContainerView().eraseToAnyView()
                 case .settings: SettingsCoordinator().eraseToAnyView()
                 }
             }
@@ -40,7 +40,12 @@ public struct MainCoordinator: View {
 
 #Preview {
     MainCoordinator()
-        .environmentObject(Store<AppState>.init(initial: .mockedData))
+        .environmentObject(
+            Store<AppState, AppDependencies>.init(
+                initialState: .mockedData,
+                dependencies: .mockedData
+            )
+        )
 }
 
 private extension AppState {
@@ -53,6 +58,19 @@ private extension AppState {
     }
 }
 
+private extension AppDependencies {
+    static var mockedData: Self {
+        .init(
+            settings: .init(
+                savePlayersCount: { _ in },
+                saveActionDelayMilliSeconds: { _ in },
+                saveSimulationEnabled: { _ in },
+                savePreferredFigure: { _ in }
+            )
+        )
+    }
+}
+
 extension MainCoordinator {
     static let presenter: Presenter<AppState, NavigationStackState<MainDestination>> = { state in
         state.navigation.main