diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift index c1f397f7eb..b5990f6761 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift @@ -140,7 +140,7 @@ struct MainView: View { ActivityView(activity: activity) } .sheet(isPresented: self.$rootOwnerViewModel.isSettingsViewPresented) { - SettingsView() + SettingsView(isCaregiverPickerPresented: self.$isCaregiverPickerPresented) } .sheet(isPresented: self.$rootOwnerViewModel.isEditCaregiverViewPresented) { EditCaregiverView(modifiedCaregiver: self.rootOwnerViewModel.currentCaregiver!) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+ProfilesSection.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+ProfilesSection.swift index dbdad14ced..791ca214e4 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+ProfilesSection.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+ProfilesSection.swift @@ -11,12 +11,14 @@ extension SettingsView { struct ProfilesSection: View { // MARK: Internal + @Binding var isCaregiverPickerPresented: Bool + var body: some View { Section(String(l10n.SettingsView.ProfilesSection.header.characters)) { Button { self.rootOwnerViewModel.isSettingsViewPresented = false DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { - self.rootOwnerViewModel.currentCaregiver = nil + self.isCaregiverPickerPresented = true } } label: { Label(String(l10n.SettingsView.ProfilesSection.switchProfileButtonLabel.characters), systemImage: "person.2.gobackward") @@ -32,5 +34,5 @@ extension SettingsView { } #Preview { - SettingsView.ProfilesSection() + SettingsView.ProfilesSection(isCaregiverPickerPresented: .constant(false)) } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView.swift index f34c93c841..2069044b1f 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView.swift @@ -9,14 +9,15 @@ import SwiftUI // MARK: - SettingsView struct SettingsView: View { - @ObservedObject var rootOwnerViewModel: RootOwnerViewModel = .shared - @ObservedObject var styleManager: StyleManager = .shared + @ObservedObject private var rootOwnerViewModel: RootOwnerViewModel = .shared + @ObservedObject private var styleManager: StyleManager = .shared + @Binding var isCaregiverPickerPresented: Bool var body: some View { NavigationStack { Form { CredentialsSection() - ProfilesSection() + ProfilesSection(isCaregiverPickerPresented: self.$isCaregiverPickerPresented) AccountSection() } .navigationTitle(String(l10n.SettingsView.navigationTitle.characters)) @@ -34,5 +35,5 @@ struct SettingsView: View { } #Preview { - SettingsView() + SettingsView(isCaregiverPickerPresented: .constant(false)) } diff --git a/Modules/ContentKit/Resources/Content/activities/examples/sample_1-5A670B59EB214A6AA11AB39D64D63990.activity.yml b/Modules/ContentKit/Resources/Content/activities/examples/sample_1-5A670B59EB214A6AA11AB39D64D63990.activity.yml index 275f53ea66..4ec8b97d4d 100644 --- a/Modules/ContentKit/Resources/Content/activities/examples/sample_1-5A670B59EB214A6AA11AB39D64D63990.activity.yml +++ b/Modules/ContentKit/Resources/Content/activities/examples/sample_1-5A670B59EB214A6AA11AB39D64D63990.activity.yml @@ -95,10 +95,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color - isRightAnswer: true + is_right_answer: true - value: red type: color - value: green @@ -114,6 +115,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color @@ -121,10 +123,10 @@ exercises_payload: type: color - value: green type: color - isRightAnswer: true + is_right_answer: true - value: blue type: color - isRightAnswer: true + is_right_answer: true - group: - instructions: @@ -135,10 +137,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🍉 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🍌 type: emoji - value: 🍒 @@ -154,13 +157,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🐱 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐶 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐷 type: emoji - value: 🐹 @@ -174,13 +178,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🔨 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪚 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪛 type: emoji - value: 🪜 @@ -195,12 +200,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: circle type: sfsymbol - value: square type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: triangle type: sfsymbol - value: rhombus @@ -214,12 +220,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: figure.climbing type: sfsymbol - value: figure.tennis type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: figure.pool.swim type: sfsymbol - value: figure.soccer @@ -233,6 +240,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: sun.max type: sfsymbol @@ -240,7 +248,7 @@ exercises_payload: type: sfsymbol - value: cloud.bolt.rain type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: cloud.snow type: sfsymbol @@ -252,10 +260,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: bicycle type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: car type: sfsymbol - value: airplane diff --git a/Modules/ContentKit/Resources/Content/activities/examples/sample_2-6102794F02D3423482E243BCBC7F8CA8.activity.yml b/Modules/ContentKit/Resources/Content/activities/examples/sample_2-6102794F02D3423482E243BCBC7F8CA8.activity.yml index 4abc077ff4..a86269fc35 100644 --- a/Modules/ContentKit/Resources/Content/activities/examples/sample_2-6102794F02D3423482E243BCBC7F8CA8.activity.yml +++ b/Modules/ContentKit/Resources/Content/activities/examples/sample_2-6102794F02D3423482E243BCBC7F8CA8.activity.yml @@ -95,10 +95,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color - isRightAnswer: true + is_right_answer: true - value: red type: color - value: green @@ -114,6 +115,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color @@ -121,10 +123,10 @@ exercises_payload: type: color - value: green type: color - isRightAnswer: true + is_right_answer: true - value: blue type: color - isRightAnswer: true + is_right_answer: true - group: - instructions: @@ -135,10 +137,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🍉 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🍌 type: emoji - value: 🍒 @@ -154,13 +157,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🐱 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐶 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐷 type: emoji - value: 🐹 @@ -174,13 +178,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🔨 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪚 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪛 type: emoji - value: 🪜 @@ -195,12 +200,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: circle type: sfsymbol - value: square type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: triangle type: sfsymbol - value: rhombus @@ -214,12 +220,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: figure.climbing type: sfsymbol - value: figure.tennis type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: figure.pool.swim type: sfsymbol - value: figure.soccer @@ -233,6 +240,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: sun.max type: sfsymbol @@ -240,7 +248,7 @@ exercises_payload: type: sfsymbol - value: cloud.bolt.rain type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: cloud.rain type: sfsymbol @@ -252,10 +260,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: bicycle type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: car type: sfsymbol - value: airplane diff --git a/Modules/ContentKit/Resources/Content/activities/examples/sample_3-E7EE9CA4B13B49AF96CD77A9DF90833B.activity.yml b/Modules/ContentKit/Resources/Content/activities/examples/sample_3-E7EE9CA4B13B49AF96CD77A9DF90833B.activity.yml index 17ffe19729..5431592e26 100644 --- a/Modules/ContentKit/Resources/Content/activities/examples/sample_3-E7EE9CA4B13B49AF96CD77A9DF90833B.activity.yml +++ b/Modules/ContentKit/Resources/Content/activities/examples/sample_3-E7EE9CA4B13B49AF96CD77A9DF90833B.activity.yml @@ -95,10 +95,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color - isRightAnswer: true + is_right_answer: true - value: red type: color - value: green @@ -114,6 +115,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color @@ -121,10 +123,10 @@ exercises_payload: type: color - value: green type: color - isRightAnswer: true + is_right_answer: true - value: blue type: color - isRightAnswer: true + is_right_answer: true - group: - instructions: @@ -135,10 +137,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🍉 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🍌 type: emoji - value: 🍒 @@ -154,13 +157,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🐱 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐶 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐷 type: emoji - value: 🐹 @@ -174,13 +178,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🔨 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪚 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪛 type: emoji - value: 🪜 @@ -195,12 +200,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: circle type: sfsymbol - value: square type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: triangle type: sfsymbol - value: rhombus @@ -214,12 +220,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: figure.climbing type: sfsymbol - value: figure.tennis type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: figure.pool.swim type: sfsymbol - value: figure.soccer @@ -233,6 +240,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: sun.max type: sfsymbol @@ -240,7 +248,7 @@ exercises_payload: type: sfsymbol - value: cloud.bolt.rain type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: cloud.rain type: sfsymbol @@ -252,10 +260,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: bicycle type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: car type: sfsymbol - value: airplane diff --git a/Modules/ContentKit/Resources/Content/activities/examples/sample_4-81F6617499FE42ADB5B03B409462923E.activity.yml b/Modules/ContentKit/Resources/Content/activities/examples/sample_4-81F6617499FE42ADB5B03B409462923E.activity.yml index 6232e5ff27..32a0edf80a 100644 --- a/Modules/ContentKit/Resources/Content/activities/examples/sample_4-81F6617499FE42ADB5B03B409462923E.activity.yml +++ b/Modules/ContentKit/Resources/Content/activities/examples/sample_4-81F6617499FE42ADB5B03B409462923E.activity.yml @@ -95,10 +95,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color - isRightAnswer: true + is_right_answer: true - value: red type: color - value: green @@ -114,6 +115,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color @@ -121,10 +123,10 @@ exercises_payload: type: color - value: green type: color - isRightAnswer: true + is_right_answer: true - value: blue type: color - isRightAnswer: true + is_right_answer: true - group: - instructions: @@ -135,10 +137,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🍉 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🍌 type: emoji - value: 🍒 @@ -154,13 +157,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🐱 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐶 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐷 type: emoji - value: 🐹 @@ -174,13 +178,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🔨 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪚 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪛 type: emoji - value: 🪜 @@ -195,12 +200,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: circle type: sfsymbol - value: square type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: triangle type: sfsymbol - value: rhombus @@ -214,12 +220,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: figure.climbing type: sfsymbol - value: figure.tennis type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: figure.pool.swim type: sfsymbol - value: figure.soccer @@ -233,6 +240,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: sun.max type: sfsymbol @@ -240,7 +248,7 @@ exercises_payload: type: sfsymbol - value: cloud.bolt.rain type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: cloud.rain type: sfsymbol @@ -252,10 +260,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: bicycle type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: car type: sfsymbol - value: airplane diff --git a/Modules/ContentKit/Resources/Content/activities/examples/sample_5-725853C4DC7B4D84A45AA20385F389F1.activity.yml b/Modules/ContentKit/Resources/Content/activities/examples/sample_5-725853C4DC7B4D84A45AA20385F389F1.activity.yml index b35aa261f1..bd9a5db66d 100644 --- a/Modules/ContentKit/Resources/Content/activities/examples/sample_5-725853C4DC7B4D84A45AA20385F389F1.activity.yml +++ b/Modules/ContentKit/Resources/Content/activities/examples/sample_5-725853C4DC7B4D84A45AA20385F389F1.activity.yml @@ -95,10 +95,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color - isRightAnswer: true + is_right_answer: true - value: red type: color - value: green @@ -114,6 +115,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color @@ -121,10 +123,10 @@ exercises_payload: type: color - value: green type: color - isRightAnswer: true + is_right_answer: true - value: blue type: color - isRightAnswer: true + is_right_answer: true - group: - instructions: @@ -135,10 +137,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🍉 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🍌 type: emoji - value: 🍒 @@ -154,13 +157,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🐱 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐶 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐷 type: emoji - value: 🐹 @@ -174,13 +178,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🔨 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪚 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪛 type: emoji - value: 🪜 @@ -195,12 +200,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: circle type: sfsymbol - value: square type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: triangle type: sfsymbol - value: rhombus @@ -214,12 +220,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: figure.climbing type: sfsymbol - value: figure.tennis type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: figure.pool.swim type: sfsymbol - value: figure.soccer @@ -233,6 +240,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: sun.max type: sfsymbol @@ -240,7 +248,7 @@ exercises_payload: type: sfsymbol - value: cloud.bolt.rain type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: cloud.rain type: sfsymbol @@ -252,10 +260,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: bicycle type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: car type: sfsymbol - value: airplane diff --git a/Modules/ContentKit/Resources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml b/Modules/ContentKit/Resources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml index 5e3ec2605a..205401cb57 100644 --- a/Modules/ContentKit/Resources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml +++ b/Modules/ContentKit/Resources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml @@ -95,10 +95,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color - isRightAnswer: true + is_right_answer: true - value: red type: color - value: green @@ -114,6 +115,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: yellow type: color @@ -121,10 +123,10 @@ exercises_payload: type: color - value: green type: color - isRightAnswer: true + is_right_answer: true - value: blue type: color - isRightAnswer: true + is_right_answer: true - group: - instructions: @@ -135,10 +137,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🍉 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🍌 type: emoji - value: 🍒 @@ -154,13 +157,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🐱 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐶 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🐷 type: emoji - value: 🐹 @@ -174,13 +178,14 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: 🔨 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪚 type: emoji - isRightAnswer: true + is_right_answer: true - value: 🪛 type: emoji - value: 🪜 @@ -195,12 +200,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: circle type: sfsymbol - value: square type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: triangle type: sfsymbol - value: rhombus @@ -214,12 +220,13 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: figure.climbing type: sfsymbol - value: figure.tennis type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: figure.pool.swim type: sfsymbol - value: figure.soccer @@ -233,6 +240,7 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: sun.max type: sfsymbol @@ -240,7 +248,7 @@ exercises_payload: type: sfsymbol - value: cloud.bolt.rain type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: cloud.rain type: sfsymbol @@ -252,10 +260,11 @@ exercises_payload: interface: touchToSelect gameplay: findTheRightAnswers payload: + shuffle_choices: true choices: - value: bicycle type: sfsymbol - isRightAnswer: true + is_right_answer: true - value: car type: sfsymbol - value: airplane diff --git a/Modules/ContentKit/Sources/Exercise/Exercise+TouchToSelect.swift b/Modules/ContentKit/Sources/Exercise/Exercise+TouchToSelect.swift index 223149799c..2430dd16fb 100644 --- a/Modules/ContentKit/Sources/Exercise/Exercise+TouchToSelect.swift +++ b/Modules/ContentKit/Sources/Exercise/Exercise+TouchToSelect.swift @@ -32,7 +32,7 @@ public enum TouchToSelect { private enum CodingKeys: String, CodingKey { case value case type - case isRightAnswer + case isRightAnswer = "is_right_answer" } }