wip

pointfreeco · Dec 21, 2023 · b2c2d1a · b2c2d1a
1 parent 6ea9ea8
commit b2c2d1a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git a/Sources/AppFeature/AppView.swift b/Sources/AppFeature/AppView.swift
@@ -356,9 +356,7 @@ public struct AppView: View {
           self.store.scope(state: \.destination?.game, action: \.destination.game)
         ) { store in
           GameView(
-            content: CubeView(
-              viewStore: ViewStore(store.scope(state: \.cubeScene, action: \.cubeScene), observe: { $0 })
-            ),
+            content: CubeView(store: store.scope(state: \.cubeScene, action: \.cubeScene)),
             store: store
           )
         }

diff --git a/Sources/CubeCore/CubeView.swift b/Sources/CubeCore/CubeView.swift
@@ -4,8 +4,8 @@ import SwiftUI
 public struct CubeView: View {
   public let viewStore: ViewStore<CubeSceneView.ViewState, CubeSceneView.ViewAction>
 
-  public init(viewStore: ViewStore<CubeSceneView.ViewState, CubeSceneView.ViewAction>) {
-    self.viewStore = viewStore
+  public init(store: Store<CubeSceneView.ViewState, CubeSceneView.ViewAction>) {
+    self.viewStore = ViewStore(store, observe: { $0 })
   }
 
   public var body: some View {

diff --git a/Sources/CubePreview/CubePreviewView.swift b/Sources/CubePreview/CubePreviewView.swift
@@ -271,12 +271,7 @@ public struct CubePreviewView: View {
             .adaptivePadding(.top, .grid(16))
         }
 
-        CubeView(
-          viewStore: ViewStore(
-            self.store.scope(state: \.cubeScenePreview, action: \.cubeScene),
-            observe: { $0 }
-          )
-        )
+        CubeView(store: self.store.scope(state: \.cubeScenePreview, action: \.cubeScene))
           .task { await self.viewStore.send(.task).finish() }
       }
       .background(

diff --git a/Sources/DemoFeature/Demo.swift b/Sources/DemoFeature/Demo.swift
@@ -159,12 +159,7 @@ public struct DemoView: View {
         CaseLet(\Demo.State.Step.game, action: Demo.Action.game) { store in
           GameWrapper(
             content: GameView(
-              content: CubeView(
-                viewStore: ViewStore(
-                  store.scope(state: \.cubeScene, action: \.cubeScene),
-                  observe: { $0 }
-                )
-              ),
+              content: CubeView(store: store.scope(state: \.cubeScene, action: \.cubeScene)),
               store: store
             ),
             isGameOver: self.viewStore.isGameOver,

diff --git a/Sources/OnboardingFeature/OnboardingView.swift b/Sources/OnboardingFeature/OnboardingView.swift
@@ -409,13 +409,8 @@ public struct OnboardingView: View {
 
   public var body: some View {
     ZStack(alignment: .topTrailing) {
-      CubeView(
-        viewStore: ViewStore(
-          self.store.scope(state: \.cubeScene, action: \.game.cubeScene),
-          observe: { $0 }
-        )
-      )
-      .opacity(viewStore.step.isFullscreen ? 0 : 1)
+      CubeView(store: self.store.scope(state: \.cubeScene, action: \.game.cubeScene))
+        .opacity(viewStore.step.isFullscreen ? 0 : 1)
 
       OnboardingStepView(store: self.store)
 

diff --git a/Sources/TrailerFeature/Trailer.swift b/Sources/TrailerFeature/Trailer.swift
@@ -265,12 +265,7 @@ public struct TrailerView: View {
         .adaptivePadding(.top, .grid(18))
         .adaptivePadding(.bottom, .grid(2))
 
-        CubeView(
-          viewStore: ViewStore(
-            self.store.scope(state: \.cubeScene, action: \.game.cubeScene),
-            observe: { $0 }
-          )
-        )
+        CubeView(store: self.store.scope(state: \.cubeScene, action: \.game.cubeScene))
           .adaptivePadding(
             self.deviceState.idiom == .pad ? .horizontal : [],
             .grid(30)