Update SettingText+SettingTextField to support icons ref _ #1

This feature implements icon support in SettingText and SettingTextField, following the _ ext ref: aheze#42 ref #1
When-original-devs-wont-merge-good-PRs · Jan 26, 2025 · 659be41 · 659be41
1 parent fac1bd9
commit 659be41
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/Sources/Views/SettingText.swift b/Sources/Views/SettingText.swift
@@ -13,6 +13,7 @@ import SwiftUI
  */
 public struct SettingText: View, Setting {
     public var id: AnyHashable?
+    public var icon: SettingIcon?
     public var title: String
     public var foregroundColor: Color?
     public var horizontalSpacing = CGFloat(12)
@@ -21,13 +22,15 @@ public struct SettingText: View, Setting {
 
     public init(
         id: AnyHashable? = nil,
+        icon: SettingIcon? = nil,
         title: String,
         foregroundColor: Color? = nil,
         horizontalSpacing: CGFloat = CGFloat(12),
         verticalPadding: CGFloat = CGFloat(14),
         horizontalPadding: CGFloat? = nil
     ) {
         self.id = id
+        self.icon = icon
         self.title = title
         self.foregroundColor = foregroundColor
         self.horizontalSpacing = horizontalSpacing
@@ -37,6 +40,7 @@ public struct SettingText: View, Setting {
 
     public var body: some View {
         SettingTextView(
+            icon: icon,
             title: title,
             foregroundColor: foregroundColor,
             horizontalSpacing: horizontalSpacing,
@@ -50,18 +54,25 @@ struct SettingTextView: View {
     @Environment(\.edgePadding) var edgePadding
     @Environment(\.settingPrimaryColor) var settingPrimaryColor
 
+    var icon: SettingIcon?
     let title: String
     var foregroundColor: Color?
     var horizontalSpacing = CGFloat(12)
     var verticalPadding = CGFloat(14)
     var horizontalPadding: CGFloat? = nil
 
     var body: some View {
-        Text(title)
-            .foregroundColor(foregroundColor ?? settingPrimaryColor)
-            .fixedSize(horizontal: false, vertical: true)
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.vertical, verticalPadding)
-            .padding(.horizontal, horizontalPadding ?? edgePadding)
+        HStack(spacing: horizontalSpacing) {
+            if let icon {
+                SettingIconView(icon: icon)
+            }
+
+            Text(title)
+                .foregroundColor(foregroundColor ?? settingPrimaryColor)
+                .fixedSize(horizontal: false, vertical: true)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(.vertical, verticalPadding)
+        }
+        .padding(.horizontal, horizontalPadding ?? edgePadding)
     }
 }
diff --git a/Sources/Views/SettingTextField.swift b/Sources/Views/SettingTextField.swift
@@ -13,19 +13,22 @@ import SwiftUI
  */
 public struct SettingTextField: View, Setting {
     public var id: AnyHashable?
+    public var icon: SettingIcon?
     public var placeholder: String
     @Binding public var text: String
     public var verticalPadding = CGFloat(14)
     public var horizontalPadding: CGFloat? = nil
 
     public init(
         id: AnyHashable? = nil,
+        icon: SettingIcon? = nil,
         placeholder: String,
         text: Binding<String>,
         verticalPadding: CGFloat = CGFloat(14),
         horizontalPadding: CGFloat? = nil
     ) {
         self.id = id
+        self.icon = icon
         self.placeholder = placeholder
         self._text = text
         self.verticalPadding = verticalPadding
@@ -34,6 +37,7 @@ public struct SettingTextField: View, Setting {
 
     public var body: some View {
         SettingTextFieldView(
+            icon: icon,
             placeholder: placeholder,
             text: $text,
             verticalPadding: verticalPadding,
@@ -44,18 +48,25 @@ public struct SettingTextField: View, Setting {
 
 struct SettingTextFieldView: View {
     @Environment(\.edgePadding) var edgePadding
-
+
+    var icon: SettingIcon?
     let placeholder: String
     @Binding var text: String
 
     var verticalPadding = CGFloat(14)
     var horizontalPadding: CGFloat? = nil
 
     var body: some View {
-        TextField(placeholder, text: $text)
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.vertical, verticalPadding)
-            .padding(.horizontal, horizontalPadding ?? edgePadding)
-            .accessibilityElement(children: .combine)
+        HStack {
+            if let icon {
+                SettingIconView(icon: icon)
+            }
+
+            TextField(placeholder, text: $text)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(.vertical, verticalPadding)
+                .accessibilityElement(children: .combine)
+        }
+        .padding(.horizontal, horizontalPadding ?? edgePadding)
     }
 }