Add text identifier

aheze · aheze · commit 833c87b301cd · 2023-02-24T11:04:07.000-08:00
diff --git a/Example/SettingExample/PreferencesView.swift b/Example/SettingExample/PreferencesView.swift
@@ -20,6 +20,7 @@ class PreferencesViewModel: ObservableObject {
     @AppStorage("notificationPromo") var notificationPromo = true
     @AppStorage("notificationUpdates") var notificationUpdates = true
     @AppStorage("color") var color = 0xFF3100
+    @AppStorage("text") var text = ""
     @Published var showingAlert = false
 }
 
@@ -229,6 +230,10 @@ struct PreferencesView: View {
                         selectedIndex: $model.modeIndex
                     )
                 }
+                
+                SettingGroup {
+                    SettingTextField(placeholder: "Enter text here", text: $model.text)
+                }
 
                 SettingCustomView(id: "Custom Footer", titleForSearch: "Welcome to Setting!") {
                     Text("Welcome to Setting!")
diff --git a/Sources/Setting.swift b/Sources/Setting.swift
@@ -42,6 +42,8 @@ public extension Setting {
             return nil
         case let picker as SettingPicker:
             return picker.title
+        case let textField as SettingTextField:
+            return textField.placeholder
         case let page as SettingPage:
             return page.title
         case let group as SettingGroup:
@@ -51,7 +53,7 @@ public extension Setting {
         case let customView as SettingCustomView:
             return customView.titleForSearch ?? "Custom"
         default:
-            print("Nil! \(type(of: self))")
+            print("Text identifier was nil for: \(type(of: self))")
             return nil
         }
     }
@@ -71,6 +73,8 @@ public extension Setting {
             return nil
         case let picker as SettingPicker:
             return picker.title
+        case let textField as SettingTextField:
+            return textField.placeholder
         case let page as SettingPage:
             return page.title
         case let group as SettingGroup:
diff --git a/Sources/Utilities/SettingIcon.swift b/Sources/Utilities/SettingIcon.swift
@@ -13,6 +13,8 @@ import SwiftUI
  */
 public enum SettingIcon {
     case system(icon: String, foregroundColor: Color = .white, backgroundColor: Color)
+
+    /// Pass in a `foregroundColor` to render and recolor the image as a template.
     case image(name: String, inset: CGFloat, foregroundColor: Color?, backgroundColor: Color)
     case custom(view: AnyView)
 }
diff --git a/Sources/Views/SettingTextField.swift b/Sources/Views/SettingTextField.swift
@@ -0,0 +1,59 @@
+//
+//  SettingTextField.swift
+//  Setting
+//
+//  Created by A. Zheng (github.com/aheze) on 2/24/23.
+//  Copyright © 2023 A. Zheng. All rights reserved.
+//
+
+import SwiftUI
+
+/**
+ A text field.
+ */
+public struct SettingTextField: View, Setting {
+    public var id: AnyHashable?
+    public var placeholder: String
+    @Binding public var text: String
+    public var verticalPadding = CGFloat(14)
+    public var horizontalPadding = CGFloat(16)
+
+    public init(
+        id: AnyHashable? = nil,
+        placeholder: String,
+        text: Binding<String>,
+        verticalPadding: CGFloat = CGFloat(14),
+        horizontalPadding: CGFloat = CGFloat(16)
+    ) {
+        self.id = id
+        self.placeholder = placeholder
+        self._text = text
+        self.verticalPadding = verticalPadding
+        self.horizontalPadding = horizontalPadding
+    }
+
+    public var body: some View {
+        SettingTextFieldView(
+            placeholder: placeholder,
+            text: $text,
+            verticalPadding: verticalPadding,
+            horizontalPadding: horizontalPadding
+        )
+    }
+}
+
+struct SettingTextFieldView: View {
+    let placeholder: String
+    @Binding var text: String
+
+    var verticalPadding = CGFloat(14)
+    var horizontalPadding = CGFloat(16)
+
+    var body: some View {
+        TextField(placeholder, text: $text)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.vertical, verticalPadding)
+            .padding(.horizontal, horizontalPadding)
+            .accessibilityElement(children: .combine)
+    }
+}
diff --git a/Sources/Views/SettingView.swift b/Sources/Views/SettingView.swift
@@ -27,6 +27,8 @@ struct SettingView: View {
             slider
         case let picker as SettingPicker:
             picker
+        case let textField as SettingTextField:
+            textField
         case let page as SettingPage:
 
             if isPagePreview {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ class PreferencesViewModel: ObservableObject {`
`20`	`20`	`@AppStorage("notificationPromo") var notificationPromo = true`
`21`	`21`	`@AppStorage("notificationUpdates") var notificationUpdates = true`
`22`	`22`	`@AppStorage("color") var color = 0xFF3100`
	`23`	`+ @AppStorage("text") var text = ""`
`23`	`24`	`@Published var showingAlert = false`
`24`	`25`	`}`
`25`	`26`
`@@ -229,6 +230,10 @@ struct PreferencesView: View {`
`229`	`230`	`selectedIndex: $model.modeIndex`
`230`	`231`	`)`
`231`	`232`	`}`
	`233`	`+`
	`234`	`+ SettingGroup {`
	`235`	`+ SettingTextField(placeholder: "Enter text here", text: $model.text)`
	`236`	`+ }`
`232`	`237`
`233`	`238`	`SettingCustomView(id: "Custom Footer", titleForSearch: "Welcome to Setting!") {`
`234`	`239`	`Text("Welcome to Setting!")`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import SwiftUI`
`13`	`13`	`*/`
`14`	`14`	`public enum SettingIcon {`
`15`	`15`	`case system(icon: String, foregroundColor: Color = .white, backgroundColor: Color)`
	`16`	`+`
	`17`	+ /// Pass in a `foregroundColor` to render and recolor the image as a template.
`16`	`18`	`case image(name: String, inset: CGFloat, foregroundColor: Color?, backgroundColor: Color)`
`17`	`19`	`case custom(view: AnyView)`
`18`	`20`	`}`