♻️ (UIExplorer): Instantiate gameplays with @StateObject

Using @StateObject instead of @ObservedObject initiate gameplay when we start the activity instead of before
leka · Sep 22, 2023 · 889f2a1 · 889f2a1
1 parent 5da7045
commit 889f2a1
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 18 deletions.
diff --git a/Apps/LekaActivityUIExplorer/Sources/NewUI/Activities/DanceFreezeActivity.swift b/Apps/LekaActivityUIExplorer/Sources/NewUI/Activities/DanceFreezeActivity.swift
@@ -6,7 +6,7 @@ import GameEngineKit
 import SwiftUI
 
 struct DanceFreezeActivity: View {
-    let gameplay = DanceFreezeGameplay()
+    @StateObject private var gameplay = DanceFreezeGameplay()
 
     var body: some View {
         DanceFreezeView(gameplay: gameplay)

diff --git a/.../NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelecFourChoicesActivity.swift b/.../NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelecFourChoicesActivity.swift
@@ -59,7 +59,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct ListenThenTouchToSelectFourChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...s/NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectOneChoiceActivity.swift b/...s/NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectOneChoiceActivity.swift
@@ -44,7 +44,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct ListenThenTouchToSelectOneChoiceActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/.../NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectSixChoicesActivity.swift b/.../NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectSixChoicesActivity.swift
@@ -69,7 +69,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct ListenThenTouchToSelectSixChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...ewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectThreeChoicesActivity.swift b/...ewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectThreeChoicesActivity.swift
@@ -54,7 +54,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct ListenThenTouchToSelectThreeChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...ctivities/ListenThenTouchToSelect/ListenThenTouchToSelectThreeChoicesInlineActivity.swift b/...ctivities/ListenThenTouchToSelect/ListenThenTouchToSelectThreeChoicesInlineActivity.swift
@@ -54,7 +54,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct ListenThenTouchToSelectThreeChoicesInlineActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/.../NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectTwoChoicesActivity.swift b/.../NewUI/Activities/ListenThenTouchToSelect/ListenThenTouchToSelectTwoChoicesActivity.swift
@@ -49,7 +49,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct ListenThenTouchToSelectTwoChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/Apps/LekaActivityUIExplorer/Sources/NewUI/Activities/MelodyActivity.swift b/Apps/LekaActivityUIExplorer/Sources/NewUI/Activities/MelodyActivity.swift
@@ -6,7 +6,7 @@ import GameEngineKit
 import SwiftUI
 
 struct MelodyActivity: View {
-    let gameplay = MelodyGameplay(song: kListOfMelodySongsAvailable[0])
+    @StateObject private var gameplay = MelodyGameplay(song: kListOfMelodySongsAvailable[0])
 
     var body: some View {
         MelodyView(gameplay: gameplay)

diff --git a/...yUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectFiveChoicesActivity.swift b/...yUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectFiveChoicesActivity.swift
@@ -55,7 +55,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectFiveChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...yUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectFourChoicesActivity.swift b/...yUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectFourChoicesActivity.swift
@@ -50,7 +50,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectFourChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...lorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectFourChoicesInlineActivity.swift b/...lorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectFourChoicesInlineActivity.swift
@@ -50,7 +50,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectFourChoicesInlineActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...ityUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectOneChoiceActivity.swift b/...ityUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectOneChoiceActivity.swift
@@ -35,7 +35,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectOneChoiceActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...tyUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectSixChoicesActivity.swift b/...tyUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectSixChoicesActivity.swift
@@ -60,7 +60,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectSixChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...UIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectThreeChoicesActivity.swift b/...UIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectThreeChoicesActivity.swift
@@ -44,7 +44,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectThreeChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...orer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectThreeChoicesInlineActivity.swift b/...orer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectThreeChoicesInlineActivity.swift
@@ -44,7 +44,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectThreeChoicesInlineActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/...tyUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectTwoChoicesActivity.swift b/...tyUIExplorer/Sources/NewUI/Activities/TouchToSelect/TouchToSelectTwoChoicesActivity.swift
@@ -39,7 +39,7 @@ private var steps: [StandardStepModel] = [
 ]
 
 struct TouchToSelectTwoChoicesActivity: View {
-    @ObservedObject private var stepManager = StepManager(steps: steps)
+    @StateObject private var stepManager = StepManager(steps: steps)
 
     var body: some View {
         stepManager.interface

diff --git a/Modules/GameEngineKit/Sources/Specific/DanceFreeze/Gameplay/DanceFreezeGameplay.swift b/Modules/GameEngineKit/Sources/Specific/DanceFreeze/Gameplay/DanceFreezeGameplay.swift
@@ -5,7 +5,7 @@
 import Combine
 import SwiftUI
 
-public class DanceFreezeGameplay {
+public class DanceFreezeGameplay : ObservableObject {
     var audioPlayer: AudioPlayer
     @Published public var progress: CGFloat = 0.0
     @Published public var state: GameplayState = .idle

diff --git a/Modules/GameEngineKit/Sources/Specific/Melody/MelodyGameplay.swift b/Modules/GameEngineKit/Sources/Specific/Melody/MelodyGameplay.swift
@@ -6,7 +6,7 @@ import AudioKit
 import Combine
 import SwiftUI
 
-public class MelodyGameplay {
+public class MelodyGameplay : ObservableObject {
     @Published public var progress: CGFloat = 0.0
     @Published public var state: GameplayState = .idle