♻️ (GEK): Rename SelectionViewViewModel to TouchToSelectViewViewModel

leka · Nov 14, 2023 · 349cf3c · 349cf3c
1 parent 941a6d6
commit 349cf3c
Show file tree

Hide file tree

Showing 29 changed files with 37 additions and 37 deletions.
diff --git a/...es/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+1_OneChoice.swift b/...es/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+1_OneChoice.swift
@@ -9,7 +9,7 @@ extension ListenThenTouchToSelectView {
 
     struct OneChoiceView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kAnswerSize: CGFloat = 300

diff --git a/...es/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+2_TwoChoice.swift b/...es/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+2_TwoChoice.swift
@@ -9,7 +9,7 @@ extension ListenThenTouchToSelectView {
 
     struct TwoChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 100

diff --git a/.../_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+3_ThreeChoice.swift b/.../_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+3_ThreeChoice.swift
@@ -9,7 +9,7 @@ extension ListenThenTouchToSelectView {
 
     struct ThreeChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 200

diff --git a/...s/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+4_FourChoice.swift b/...s/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+4_FourChoice.swift
@@ -9,7 +9,7 @@ extension ListenThenTouchToSelectView {
 
     struct FourChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 200

diff --git a/...s/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+5_FiveChoice.swift b/...s/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+5_FiveChoice.swift
@@ -9,7 +9,7 @@ extension ListenThenTouchToSelectView {
 
     struct FiveChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/...es/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+6_SixChoice.swift b/...es/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView+6_SixChoice.swift
@@ -9,7 +9,7 @@ extension ListenThenTouchToSelectView {
 
     struct SixChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/...ineKit/Sources/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView.swift b/...ineKit/Sources/_NewSystem/Views/ListenThenTouchToSelect/ListenThenTouchToSelectView.swift
@@ -17,11 +17,11 @@ public struct ListenThenTouchToSelectView: View {
         case sixChoices
     }
 
-    @StateObject private var viewModel: SelectionViewViewModel
+    @StateObject private var viewModel: TouchToSelectViewViewModel
     @StateObject private var audioPlayer: AudioPlayer
 
     public init(choices: [TouchToSelect.Choice], audioRecording: AudioRecordingModel) {
-        self._viewModel = StateObject(wrappedValue: SelectionViewViewModel(choices: choices))
+        self._viewModel = StateObject(wrappedValue: TouchToSelectViewViewModel(choices: choices))
         self._audioPlayer = StateObject(wrappedValue: AudioPlayer(audioRecording: audioRecording))
     }
 
@@ -35,7 +35,7 @@ public struct ListenThenTouchToSelectView: View {
         }
 
         self._viewModel = StateObject(
-            wrappedValue: SelectionViewViewModel(choices: payload.choices, shared: data))
+            wrappedValue: TouchToSelectViewViewModel(choices: payload.choices, shared: data))
 
         let audioRecording = AudioRecordingModel(name: name, file: name)
         self._audioPlayer = StateObject(wrappedValue: AudioPlayer(audioRecording: audioRecording))

diff --git a/...ngineKit/Sources/_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelect.swift b/...ngineKit/Sources/_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelect.swift
@@ -17,14 +17,14 @@ public struct ObserveThenTouchToSelectView: View {
         case sixChoices
     }
 
-    @StateObject private var viewModel: SelectionViewViewModel
+    @StateObject private var viewModel: TouchToSelectViewViewModel
 
     @State private var imageWasTapped = false
 
     private let image: String
 
     public init(choices: [TouchToSelect.Choice], image: String) {
-        self._viewModel = StateObject(wrappedValue: SelectionViewViewModel(choices: choices))
+        self._viewModel = StateObject(wrappedValue: TouchToSelectViewViewModel(choices: choices))
         self.image = image
     }
 
@@ -38,7 +38,7 @@ public struct ObserveThenTouchToSelectView: View {
         }
 
         self._viewModel = StateObject(
-            wrappedValue: SelectionViewViewModel(choices: payload.choices, shared: data))
+            wrappedValue: TouchToSelectViewViewModel(choices: payload.choices, shared: data))
 
         self.image = name
     }

diff --git a/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+1_OneChoice.swift b/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+1_OneChoice.swift
@@ -9,7 +9,7 @@ extension ObserveThenTouchToSelectView {
 
     struct OneChoiceView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kAnswerSize: CGFloat = 180

diff --git a/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+2_TwoChoice.swift b/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+2_TwoChoice.swift
@@ -9,7 +9,7 @@ extension ObserveThenTouchToSelectView {
 
     struct TwoChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/...NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+3_ThreeChoice.swift b/...NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+3_ThreeChoice.swift
@@ -9,7 +9,7 @@ extension ObserveThenTouchToSelectView {
 
     struct ThreeChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+4_FourChoice.swift b/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+4_FourChoice.swift
@@ -9,7 +9,7 @@ extension ObserveThenTouchToSelectView {
 
     struct FourChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+5_FiveChoice.swift b/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+5_FiveChoice.swift
@@ -9,7 +9,7 @@ extension ObserveThenTouchToSelectView {
 
     struct FiveChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 40

diff --git a/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+6_SixChoice.swift b/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+6_SixChoice.swift
@@ -9,7 +9,7 @@ extension ObserveThenTouchToSelectView {
 
     struct SixChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 40

diff --git a/...rces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+1_OneChoice.swift b/...rces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+1_OneChoice.swift
@@ -9,7 +9,7 @@ extension RobotThenTouchToSelectView {
 
     struct OneChoiceView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kAnswerSize: CGFloat = 300

diff --git a/...rces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+2_TwoChoice.swift b/...rces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+2_TwoChoice.swift
@@ -9,7 +9,7 @@ extension RobotThenTouchToSelectView {
 
     struct TwoChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 100

diff --git a/...es/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+3_ThreeChoice.swift b/...es/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+3_ThreeChoice.swift
@@ -9,7 +9,7 @@ extension RobotThenTouchToSelectView {
 
     struct ThreeChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 200

diff --git a/...ces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+4_FourChoice.swift b/...ces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+4_FourChoice.swift
@@ -9,7 +9,7 @@ extension RobotThenTouchToSelectView {
 
     struct FourChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 200

diff --git a/...ces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+5_FiveChoice.swift b/...ces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+5_FiveChoice.swift
@@ -9,7 +9,7 @@ extension RobotThenTouchToSelectView {
 
     struct FiveChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/...rces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+6_SixChoice.swift b/...rces/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView+6_SixChoice.swift
@@ -9,7 +9,7 @@ extension RobotThenTouchToSelectView {
 
     struct SixChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
         let isTappable: Bool
 
         private let kHorizontalSpacing: CGFloat = 60

diff --git a/...ngineKit/Sources/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView.swift b/...ngineKit/Sources/_NewSystem/Views/RobotThenTouchToSelect/RobotThenTouchToSelectView.swift
@@ -19,15 +19,15 @@ public struct RobotThenTouchToSelectView: View {
         case sixChoices
     }
 
-    @StateObject private var viewModel: SelectionViewViewModel
+    @StateObject private var viewModel: TouchToSelectViewViewModel
     @State private var didSendCommandToRobot = false
 
     private let actionType: Exercise.Action.ActionType
 
     let robot = Robot.shared
 
     public init(choices: [TouchToSelect.Choice]) {
-        self._viewModel = StateObject(wrappedValue: SelectionViewViewModel(choices: choices))
+        self._viewModel = StateObject(wrappedValue: TouchToSelectViewViewModel(choices: choices))
 
         self.actionType = .color("red")
     }
@@ -42,7 +42,7 @@ public struct RobotThenTouchToSelectView: View {
         }
 
         self._viewModel = StateObject(
-            wrappedValue: SelectionViewViewModel(choices: payload.choices, shared: data))
+            wrappedValue: TouchToSelectViewViewModel(choices: payload.choices, shared: data))
 
         self.actionType = actionType
 

diff --git a/.../GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+1_OneChoice.swift b/.../GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+1_OneChoice.swift
@@ -9,7 +9,7 @@ extension TouchToSelectView {
 
     struct OneChoiceView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
 
         private let kAnswerSize: CGFloat = 300
 

diff --git a/...GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+2_TwoChoices.swift b/...GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+2_TwoChoices.swift
@@ -9,7 +9,7 @@ extension TouchToSelectView {
 
     struct TwoChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
 
         private let kHorizontalSpacing: CGFloat = 150
         private let kAnswerSize: CGFloat = 300

diff --git a/...meEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+3_ThreeChoices.swift b/...meEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+3_ThreeChoices.swift
@@ -9,7 +9,7 @@ extension TouchToSelectView {
 
     struct ThreeChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
 
         private let kHorizontalSpacing: CGFloat = 80
         private let kAnswerSize: CGFloat = 280

diff --git a/...ameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+4_FourChoices.swift b/...ameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+4_FourChoices.swift
@@ -9,7 +9,7 @@ extension TouchToSelectView {
 
     struct FourChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
 
         private let kHorizontalSpacing: CGFloat = 200
         private let kVerticalSpacing: CGFloat = 40

diff --git a/...ameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+5_FiveChoices.swift b/...ameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+5_FiveChoices.swift
@@ -9,7 +9,7 @@ extension TouchToSelectView {
 
     struct FiveChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
 
         private let kHorizontalSpacing: CGFloat = 60
         private let kVerticalSpacing: CGFloat = 40

diff --git a/...GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+6_SixChoices.swift b/...GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView+6_SixChoices.swift
@@ -9,7 +9,7 @@ extension TouchToSelectView {
 
     struct SixChoicesView: View {
 
-        @ObservedObject var viewModel: SelectionViewViewModel
+        @ObservedObject var viewModel: TouchToSelectViewViewModel
 
         private let kHorizontalSpacing: CGFloat = 60
         private let kVerticalSpacing: CGFloat = 40

diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Views/TouchToSelect/TouchToSelectView.swift
@@ -17,10 +17,10 @@ public struct TouchToSelectView: View {
         case sixChoices
     }
 
-    @StateObject private var viewModel: SelectionViewViewModel
+    @StateObject private var viewModel: TouchToSelectViewViewModel
 
     public init(choices: [TouchToSelect.Choice], shuffle: Bool = false) {
-        self._viewModel = StateObject(wrappedValue: SelectionViewViewModel(choices: choices, shuffle: shuffle))
+        self._viewModel = StateObject(wrappedValue: TouchToSelectViewViewModel(choices: choices, shuffle: shuffle))
     }
 
     public init(exercise: Exercise, data: ExerciseSharedData? = nil) {
@@ -29,7 +29,7 @@ public struct TouchToSelectView: View {
         }
 
         self._viewModel = StateObject(
-            wrappedValue: SelectionViewViewModel(
+            wrappedValue: TouchToSelectViewViewModel(
                 choices: payload.choices, shuffle: payload.shuffleChoices, shared: data))
     }
 

diff --git a/...System/Views/SelectionViewViewModel.swift → ...em/Views/TouchToSelectViewViewModel.swift b/...System/Views/SelectionViewViewModel.swift → ...em/Views/TouchToSelectViewViewModel.swift
@@ -6,7 +6,7 @@ import Combine
 import ContentKit
 import SwiftUI
 
-class SelectionViewViewModel: ObservableObject {
+class TouchToSelectViewViewModel: ObservableObject {
 
     @Published var choices: [GameplaySelectionChoiceModel] = []
     @ObservedObject var exercicesSharedData: ExerciseSharedData