From 92e8e5963f216f20b4d988ccfe4b52b74af10f8e Mon Sep 17 00:00:00 2001
From: Tihomir Videnov <tihomirvidenov@gmail.com>
Date: Fri, 16 Feb 2024 10:28:57 +0200
Subject: [PATCH 1/3] Fixed duplicated choice view

---
 Sources/Views/SettingPicker.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Sources/Views/SettingPicker.swift b/Sources/Views/SettingPicker.swift
index 72db500..f255d41 100644
--- a/Sources/Views/SettingPicker.swift
+++ b/Sources/Views/SettingPicker.swift
@@ -268,8 +268,9 @@ struct SettingPickerChoicesView: View {
                 } else {
                     settingGroupView
                 }
-            #endif
+            #else
                 settingGroupView
+            #endif
         }
     }
 }

From 776af59b90b24568cc65577e0c9dc0574fd03c69 Mon Sep 17 00:00:00 2001
From: Tihomir Videnov <tihomirvidenov@gmail.com>
Date: Fri, 16 Feb 2024 11:12:04 +0200
Subject: [PATCH 2/3] Adds icon to SettingToggle

---
 Sources/Views/SettingToggle.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Sources/Views/SettingToggle.swift b/Sources/Views/SettingToggle.swift
index 39fc909..b36509c 100644
--- a/Sources/Views/SettingToggle.swift
+++ b/Sources/Views/SettingToggle.swift
@@ -15,12 +15,14 @@ public struct SettingToggle: View, Setting {
     public var id: AnyHashable?
     public var title: String
     @Binding public var isOn: Bool
+    public var icon: SettingIcon?
     public var horizontalSpacing = CGFloat(12)
     public var verticalPadding = CGFloat(14)
     public var horizontalPadding: CGFloat? = nil
 
     public init(
         id: AnyHashable? = nil,
+        icon: SettingIcon? = nil,
         title: String,
         isOn: Binding<Bool>,
         horizontalSpacing: CGFloat = CGFloat(12),
@@ -28,6 +30,7 @@ public struct SettingToggle: View, Setting {
         horizontalPadding: CGFloat? = nil
     ) {
         self.id = id
+        self.icon = icon
         self.title = title
         self._isOn = isOn
         self.horizontalSpacing = horizontalSpacing
@@ -37,6 +40,7 @@ public struct SettingToggle: View, Setting {
 
     public var body: some View {
         SettingToggleView(
+            icon: icon,
             title: title,
             isOn: $isOn,
             horizontalSpacing: horizontalSpacing,
@@ -49,6 +53,7 @@ public struct SettingToggle: View, Setting {
 struct SettingToggleView: View {
     @Environment(\.edgePadding) var edgePadding
     
+    let icon: SettingIcon?
     let title: String
     @Binding var isOn: Bool
 
@@ -58,6 +63,9 @@ struct SettingToggleView: View {
 
     var body: some View {
         HStack(spacing: horizontalSpacing) {
+            if let icon {
+              SettingIconView(icon: icon)
+            }
             Text(title)
                 .fixedSize(horizontal: false, vertical: true)
                 .frame(maxWidth: .infinity, alignment: .leading)

From 0f2de308c86c3eaa16e938b8be2be58c29e27a0e Mon Sep 17 00:00:00 2001
From: Tihomir Videnov <tihomirvidenov@gmail.com>
Date: Wed, 21 Feb 2024 10:14:08 +0200
Subject: [PATCH 3/3] Revert "Adds icon to SettingToggle"

This reverts commit 776af59b90b24568cc65577e0c9dc0574fd03c69.
---
 Sources/Views/SettingToggle.swift | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Sources/Views/SettingToggle.swift b/Sources/Views/SettingToggle.swift
index b36509c..39fc909 100644
--- a/Sources/Views/SettingToggle.swift
+++ b/Sources/Views/SettingToggle.swift
@@ -15,14 +15,12 @@ public struct SettingToggle: View, Setting {
     public var id: AnyHashable?
     public var title: String
     @Binding public var isOn: Bool
-    public var icon: SettingIcon?
     public var horizontalSpacing = CGFloat(12)
     public var verticalPadding = CGFloat(14)
     public var horizontalPadding: CGFloat? = nil
 
     public init(
         id: AnyHashable? = nil,
-        icon: SettingIcon? = nil,
         title: String,
         isOn: Binding<Bool>,
         horizontalSpacing: CGFloat = CGFloat(12),
@@ -30,7 +28,6 @@ public struct SettingToggle: View, Setting {
         horizontalPadding: CGFloat? = nil
     ) {
         self.id = id
-        self.icon = icon
         self.title = title
         self._isOn = isOn
         self.horizontalSpacing = horizontalSpacing
@@ -40,7 +37,6 @@ public struct SettingToggle: View, Setting {
 
     public var body: some View {
         SettingToggleView(
-            icon: icon,
             title: title,
             isOn: $isOn,
             horizontalSpacing: horizontalSpacing,
@@ -53,7 +49,6 @@ public struct SettingToggle: View, Setting {
 struct SettingToggleView: View {
     @Environment(\.edgePadding) var edgePadding
     
-    let icon: SettingIcon?
     let title: String
     @Binding var isOn: Bool
 
@@ -63,9 +58,6 @@ struct SettingToggleView: View {
 
     var body: some View {
         HStack(spacing: horizontalSpacing) {
-            if let icon {
-              SettingIconView(icon: icon)
-            }
             Text(title)
                 .fixedSize(horizontal: false, vertical: true)
                 .frame(maxWidth: .infinity, alignment: .leading)