🔀 Merge branch 'ladislas/feature/gek-refactor-activity-view'

leka · Feb 22, 2024 · f6506ce · f6506ce
2 parents bd15514 + 8af7515
commit f6506ce
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 78 deletions.
diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift
@@ -137,9 +137,7 @@ struct MainView: View {
         .fullScreenCover(item: self.$navigation.currentActivity) {
             self.navigation.currentActivity = nil
         } content: { activity in
-            Text("Activity: \(activity.details.title)")
-            // TODO: (@ladislas) switch back to activity view
-            // ActivityView(activity: activity)
+            ActivityView(activity: activity)
         }
         .sheet(isPresented: self.$rootOwnerViewModel.isSettingsViewPresented) {
             SettingsView()

diff --git a/...ources/Content/activities/examples/sample_1-5A670B59EB214A6AA11AB39D64D63990.activity.yml b/...ources/Content/activities/examples/sample_1-5A670B59EB214A6AA11AB39D64D63990.activity.yml
@@ -238,10 +238,10 @@ exercises_payload:
                 type: sfsymbol
               - value: cloud.sun
                 type: sfsymbol
-              - value: cloud.bolt.rain.fill
+              - value: cloud.bolt.rain
                 type: sfsymbol
                 isRightAnswer: true
-              - value: cloud.rain
+              - value: cloud.snow
                 type: sfsymbol
 
         - instructions:
@@ -260,5 +260,5 @@ exercises_payload:
                 type: sfsymbol
               - value: airplane
                 type: sfsymbol
-              - value: boat
+              - value: sailboat
                 type: sfsymbol
diff --git a/...ources/Content/activities/examples/sample_2-6102794F02D3423482E243BCBC7F8CA8.activity.yml b/...ources/Content/activities/examples/sample_2-6102794F02D3423482E243BCBC7F8CA8.activity.yml
@@ -238,7 +238,7 @@ exercises_payload:
                 type: sfsymbol
               - value: cloud.sun
                 type: sfsymbol
-              - value: cloud.bolt.rain.fill
+              - value: cloud.bolt.rain
                 type: sfsymbol
                 isRightAnswer: true
               - value: cloud.rain
@@ -260,5 +260,5 @@ exercises_payload:
                 type: sfsymbol
               - value: airplane
                 type: sfsymbol
-              - value: boat
+              - value: sailboat
                 type: sfsymbol
diff --git a/...ources/Content/activities/examples/sample_3-E7EE9CA4B13B49AF96CD77A9DF90833B.activity.yml b/...ources/Content/activities/examples/sample_3-E7EE9CA4B13B49AF96CD77A9DF90833B.activity.yml
@@ -238,7 +238,7 @@ exercises_payload:
                 type: sfsymbol
               - value: cloud.sun
                 type: sfsymbol
-              - value: cloud.bolt.rain.fill
+              - value: cloud.bolt.rain
                 type: sfsymbol
                 isRightAnswer: true
               - value: cloud.rain
@@ -260,5 +260,5 @@ exercises_payload:
                 type: sfsymbol
               - value: airplane
                 type: sfsymbol
-              - value: boat
+              - value: sailboat
                 type: sfsymbol
diff --git a/...ources/Content/activities/examples/sample_4-81F6617499FE42ADB5B03B409462923E.activity.yml b/...ources/Content/activities/examples/sample_4-81F6617499FE42ADB5B03B409462923E.activity.yml
@@ -238,7 +238,7 @@ exercises_payload:
                 type: sfsymbol
               - value: cloud.sun
                 type: sfsymbol
-              - value: cloud.bolt.rain.fill
+              - value: cloud.bolt.rain
                 type: sfsymbol
                 isRightAnswer: true
               - value: cloud.rain
@@ -260,5 +260,5 @@ exercises_payload:
                 type: sfsymbol
               - value: airplane
                 type: sfsymbol
-              - value: boat
+              - value: sailboat
                 type: sfsymbol
diff --git a/...ources/Content/activities/examples/sample_5-725853C4DC7B4D84A45AA20385F389F1.activity.yml b/...ources/Content/activities/examples/sample_5-725853C4DC7B4D84A45AA20385F389F1.activity.yml
@@ -238,7 +238,7 @@ exercises_payload:
                 type: sfsymbol
               - value: cloud.sun
                 type: sfsymbol
-              - value: cloud.bolt.rain.fill
+              - value: cloud.bolt.rain
                 type: sfsymbol
                 isRightAnswer: true
               - value: cloud.rain
@@ -260,5 +260,5 @@ exercises_payload:
                 type: sfsymbol
               - value: airplane
                 type: sfsymbol
-              - value: boat
+              - value: sailboat
                 type: sfsymbol
diff --git a/...ources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml b/...ources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml
@@ -238,7 +238,7 @@ exercises_payload:
                 type: sfsymbol
               - value: cloud.sun
                 type: sfsymbol
-              - value: cloud.bolt.rain.fill
+              - value: cloud.bolt.rain
                 type: sfsymbol
                 isRightAnswer: true
               - value: cloud.rain
@@ -260,5 +260,5 @@ exercises_payload:
                 type: sfsymbol
               - value: airplane
                 type: sfsymbol
-              - value: boat
+              - value: sailboat
                 type: sfsymbol
diff --git a/Modules/ContentKit/Sources/Activity/Activity.swift b/Modules/ContentKit/Sources/Activity/Activity.swift
@@ -142,10 +142,10 @@ public extension Activity {
 
 public extension Activity {
     struct ExercisesPayload: Decodable {
-        // MARK: Internal
+        // MARK: Public
 
-        let options: Options
-        var exerciseGroups: [ExerciseGroup]
+        public let options: Options
+        public var exerciseGroups: [ExerciseGroup]
 
         // MARK: Private
 

diff --git a/...es/Activity/ActivityExerciseManager.swift → ...ces/Activity/CurrentActivityManager.swift b/...es/Activity/ActivityExerciseManager.swift → ...ces/Activity/CurrentActivityManager.swift
@@ -2,7 +2,7 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
-public class ActivityExerciseManager {
+public class CurrentActivityManager {
     // MARK: Lifecycle
 
     public init(activity: Activity) {
@@ -26,6 +26,8 @@ public class ActivityExerciseManager {
     public var currentGroupIndex: Int = 0
     public var currentExerciseIndexInCurrentGroup: Int = 0
 
+    public let activity: Activity
+
     public var totalGroups: Int {
         self.activity.exercisePayload.exerciseGroups.count
     }
@@ -64,8 +66,4 @@ public class ActivityExerciseManager {
             self.currentExerciseIndexInCurrentGroup = self.activity.exercisePayload.exerciseGroups[self.currentGroupIndex].exercises.count - 1
         }
     }
-
-    // MARK: Private
-
-    private let activity: Activity
 }
diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/ExerciseSharedData.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/ExerciseSharedData.swift
@@ -7,22 +7,22 @@ import SwiftUI
 public class ExerciseSharedData: ObservableObject {
     // MARK: Lifecycle
 
-    public init(sequenceIndex: Int, exerciseIndex: Int) {
-        self.sequenceIndex = sequenceIndex
+    public init(groupIndex: Int, exerciseIndex: Int) {
+        self.groupIndex = groupIndex
         self.exerciseIndex = exerciseIndex
     }
 
     public init() {
         self.exerciseIndex = 0
-        self.sequenceIndex = 0
+        self.groupIndex = 0
     }
 
     // MARK: Internal
 
     // TODO: (@HPezz): Add state setter function, and makes it private
     @Published var state: ExerciseState = .idle
 
-    let sequenceIndex: Int
+    let groupIndex: Int
     let exerciseIndex: Int
 
     var completionLevel: ExerciseState.CompletionLevel? {

diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityProgressBar.swift b/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityProgressBar.swift
@@ -9,24 +9,23 @@ struct ActivityProgressBar: View {
     // MARK: Internal
 
     @ObservedObject var viewModel: ActivityViewViewModel
-    let height: CGFloat = 30
 
     var body: some View {
         HStack(spacing: 0) {
             Spacer()
-            ForEach(0..<self.viewModel.totalSequences, id: \.self) { sequenceIndex in
+            ForEach(0..<self.viewModel.totalGroups, id: \.self) { groupIndex in
                 HStack(spacing: 0) {
-                    ForEach(0..<self.viewModel.totalExercisesInCurrentSequence, id: \.self) { exerciseIndex in
-                        let markerColor = self.progressBarMarkerColor(sequence: sequenceIndex, exercise: exerciseIndex)
+                    ForEach(0..<self.viewModel.groupSizeEnumeration[groupIndex], id: \.self) { exerciseIndex in
+                        let markerColor = self.progressBarMarkerColor(group: groupIndex, exercise: exerciseIndex)
 
-                        let isCurrentSequence = sequenceIndex == self.viewModel.currentSequenceIndex
-                        let isCurrentExercise = isCurrentSequence && exerciseIndex == self.viewModel.currentExerciseIndexInSequence
+                        let isCurrentGroup = groupIndex == self.viewModel.currentGroupIndex
+                        let isCurrentExercise = isCurrentGroup && exerciseIndex == self.viewModel.currentExerciseIndexInCurrentGroup
                         let isNotYetCompleted = self.viewModel.currentExerciseSharedData.isExerciseNotYetCompleted
 
                         let isCurrentlyPlaying = isCurrentExercise && isNotYetCompleted
 
                         ActivityProgressBarMarker(
-                            color: (isCurrentSequence && isCurrentExercise)
+                            color: (isCurrentGroup && isCurrentExercise)
                                 ? self.$currentColor : .constant(markerColor),
                             isCurrentlyPlaying: .constant(isCurrentlyPlaying)
                         )
@@ -39,15 +38,15 @@ struct ActivityProgressBar: View {
                             }
                         }
 
-                        if exerciseIndex < self.viewModel.totalExercisesInCurrentSequence - 1 {
+                        if exerciseIndex < self.viewModel.groupSizeEnumeration[groupIndex] - 1 {
                             Spacer().frame(maxWidth: 100)
                         }
                     }
                 }
                 .frame(height: self.height)
                 .background(DesignKitAsset.Colors.progressBar.swiftUIColor, in: Capsule())
 
-                if sequenceIndex < self.viewModel.totalSequences - 1 {
+                if groupIndex < self.viewModel.totalGroups - 1 {
                     Spacer().frame(minWidth: 20, maxWidth: 60)
                 }
             }
@@ -57,6 +56,8 @@ struct ActivityProgressBar: View {
 
     // MARK: Private
 
+    private let height: CGFloat = 30
+
     @State private var currentColor: Color = .white
 
     private func completionLevelToColor(level: ExerciseState.CompletionLevel?) -> Color {
@@ -75,9 +76,9 @@ struct ActivityProgressBar: View {
         }
     }
 
-    private func progressBarMarkerColor(sequence: Int, exercise: Int) -> Color {
+    private func progressBarMarkerColor(group: Int, exercise: Int) -> Color {
         if let completedExerciseSharedData = self.viewModel.completedExercisesSharedData.first(where: {
-            $0.sequenceIndex == sequence
+            $0.groupIndex == group
                 && $0.exerciseIndex == exercise
         }) {
             self.completionLevelToColor(level: completedExerciseSharedData.completionLevel)

diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityView.swift
@@ -16,8 +16,8 @@ import SwiftUI
 public struct ActivityView: View {
     // MARK: Lifecycle
 
-    public init(viewModel: ActivityViewViewModel) {
-        self.viewModel = viewModel
+    public init(activity: Activity) {
+        self._viewModel = StateObject(wrappedValue: ActivityViewViewModel(activity: activity))
     }
 
     // MARK: Public
@@ -32,7 +32,7 @@ public struct ActivityView: View {
                         }
 
                         if self.viewModel.isExerciseInstructionsButtonVisible {
-                            ExerciseInstructionsButton(instructions: self.viewModel.currentExercise.instructions)
+                            ExerciseInstructionsButton(instructions: self.viewModel.currentExercise.instructions!)
                         }
                     }
 
@@ -42,7 +42,7 @@ public struct ActivityView: View {
                         Spacer()
                     }
                 }
-                .id(self.viewModel.currentExerciseIndexInSequence)
+                .id(self.viewModel.currentExerciseIndexInCurrentGroup)
                 .blur(radius: self.blurRadius)
                 .opacity(self.opacity)
                 .onChange(of: self.viewModel.isReinforcerAnimationVisible) {
@@ -146,7 +146,8 @@ public struct ActivityView: View {
 
     @Environment(\.dismiss) var dismiss
 
-    @ObservedObject var viewModel: ActivityViewViewModel
+    // TODO: (@ladislas) was @ObservedObject, check why
+    @StateObject var viewModel: ActivityViewViewModel
 
     // MARK: Private
 
@@ -301,6 +302,7 @@ public struct ActivityView: View {
 // swiftlint:enable cyclomatic_complexity void_function_in_ternary function_body_length
 
 #Preview {
-    let activity = ContentKit.decodeActivityDeprecated("activity-sample")
-    return ActivityView(viewModel: ActivityViewViewModel(activity: activity))
+    NavigationStack {
+        ActivityView(activity: Activity.mock)
+    }
 }