From 254cb913911a076719b05af3f15f3787f074df8b Mon Sep 17 00:00:00 2001 From: "johan.lachenal" Date: Tue, 28 May 2024 16:01:18 +0200 Subject: [PATCH] Update(dev): correct some problems --- .../Components/Controls/PickerComponent.swift | 2 +- .../Components/Controls/ToggleComponent.swift | 15 ++++++++++++--- .../GeneralParametersMenuView.swift | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/PickerComponent.swift b/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/PickerComponent.swift index 72a816d..489fd48 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/PickerComponent.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/PickerComponent.swift @@ -62,7 +62,7 @@ struct PickerComponent_Previews: PreviewProvider { title: "Selectionne une IA :", selectedOption: $selectedItem, options: AI.allCases - ) + ) } } diff --git a/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/ToggleComponent.swift b/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/ToggleComponent.swift index 798b1a0..5591a6a 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/ToggleComponent.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/ToggleComponent.swift @@ -8,10 +8,19 @@ import SwiftUI struct ToggleComponent: View { - @AppStorage("isDarkMode") private var isDarkMode = false + let description: String + let booleanName : String + @AppStorage private var boolean : Bool + + init(description: String, booleanName: String, booleanDefaultValue: Bool) { + self.description = description + self.booleanName = booleanName + _boolean = AppStorage(wrappedValue: booleanDefaultValue, booleanName) + } + var body: some View { Divider().background(Color.gray).padding(.vertical, 1) - Toggle("Dark Mode", isOn: $isDarkMode) + Toggle(description, isOn: $boolean) .toggleStyle(SwitchToggleStyle(tint: .blue)) .padding(EdgeInsets(top: 0, leading: 48, bottom: 0, trailing: 48)) Divider().background(Color.gray).padding(.vertical, 1) @@ -21,7 +30,7 @@ struct ToggleComponent: View { struct ToggleComponent_Previews: PreviewProvider { static var previews: some View { VStack{ - ToggleComponent() + ToggleComponent(description: "Dark mode", booleanName: "darkModeEnabled", booleanDefaultValue: false) } } } diff --git a/ArkitDoushiQi/ArkitDoushiQi/Views/GeneralParametersMenu/GeneralParametersMenuView.swift b/ArkitDoushiQi/ArkitDoushiQi/Views/GeneralParametersMenu/GeneralParametersMenuView.swift index 6a6de1b..763506b 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Views/GeneralParametersMenu/GeneralParametersMenuView.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Views/GeneralParametersMenu/GeneralParametersMenuView.swift @@ -23,7 +23,7 @@ struct GeneralParametersMenuView: View { Text("Paramètres").bold().font(.title) }.frame(maxWidth: .infinity) Spacer().frame(maxHeight: 30) - ToggleComponent() + ToggleComponent(description: "Dark mode", booleanName: "darkModeEnabled", booleanDefaultValue: false) PickerComponent(title: "Sélectionne un langage :", selectedOption: $selectedLanguageOption, options: Language.allCases)