PatternTextStyle: added initializer parameters. PatternTextPlaceholders now conform to ExpressibleByDictionaryLiteral. Cleanup.

Author: oscbyspro

Sources/DiffableTextKitXPattern/Placeholders.swift

@@ -11,7 +11,7 @@
 // MARK: * Placeholders
 //*============================================================================*
 
-public struct PatternTextPlaceholders: Equatable {
+public struct PatternTextPlaceholders: Equatable, ExpressibleByDictionaryLiteral {
 
     @usableFromInline typealias Predicate = (Character) -> Bool
 
@@ -41,6 +41,13 @@ public struct PatternTextPlaceholders: Equatable {
         self.option = .many(Many(many))
     }
 
+    @inlinable public init(dictionaryLiteral elements: (Character, (Character) -> Bool)...) {
+        switch elements.count /* O(1) */ {
+        case  0: self.init()
+        case  1: self.init(elements[0])
+        default: self.init(Dictionary(elements, uniquingKeysWith: { $1 })) }
+    }
+    
     //=------------------------------------------------------------------------=
     // MARK: Accessors
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXPattern/Style.swift

@@ -24,14 +24,14 @@ Value: RangeReplaceableCollection, Value.Element == Character {
 
     public var pattern: String
     public var placeholders: Placeholders
-    public var hidden: Bool = false
+    public var hidden: Bool
 
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable public init(_ pattern: String, placeholders: Placeholders = .init()) {
-        self.pattern = pattern; self.placeholders = placeholders
+    @inlinable public init(_ pattern: String, placeholders: Placeholders = .init(), hidden: Bool = false) {
+        self.pattern = pattern; self.placeholders = placeholders; self.hidden = hidden
     }
 
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXUIKit/Environment+AutocorrectionDisabled.swift

@@ -44,7 +44,7 @@ public extension View {
     /// It is similar to `View/autocorrectionDisabled(_:)`.
     ///
     /// ```
-    /// DiffableTextField("Text", value: $text, style: .normal)
+    /// DiffableTextField("Text...", value: $text, style: .normal)
     ///     .diffableTextViews_autocorrectionDisabled(true)
     /// ```
     ///

Sources/DiffableTextKitXUIKit/Environment+Font.swift

@@ -44,7 +44,7 @@ public extension View {
     /// It is similar to `View/font(_:)` but uses a SwiftUI-esque system font type.
     ///
     /// ```
-    /// DiffableTextField("Monospaced", value: $value, style: style)
+    /// DiffableTextField("Amount", value: $amount, style: .number)
     ///     .diffableTextViews_font(.body.monospaced())
     /// ```
     ///

Sources/DiffableTextKitXUIKit/Environment+KeyboardType.swift

@@ -44,7 +44,7 @@ public extension View {
     /// It is similar to `View/keyboardType(_:)`.
     ///
     /// ```
-    /// TextField("Amount", value: $amount, style: .currency("USD"))
+    /// DiffableTextField("Amount", value: $amount, style: .number)
     ///     .diffableTextViews_keyboardType(.decimalPad)
     /// ```
     ///

Sources/DiffableTextKitXUIKit/Environment+MultilineTextAlignment.swift

@@ -44,7 +44,7 @@ public extension View {
     /// It is similar to `View/multilineTextAlignment(_:)`.
     ///
     /// ```
-    /// DiffableTextField("Amount", value: $value, style: .number)
+    /// DiffableTextField("Amount", value: $amount, style: .number)
     ///     .diffableTextViews_multilineTextAlignment(.trailing)
     /// ```
     ///

Sources/DiffableTextKitXUIKit/Environment+SubmitLabel.swift

@@ -44,8 +44,8 @@ public extension View {
     /// It is similar to `View/submitLabel(_:)`.
     ///
     /// ```
-    /// DiffableTextField("Prints on submit...", value: $value, style: style)
-    ///     .diffableTextViews_submitLabel(.return)
+    /// DiffableTextField("Search", value: $text, style: .normal)
+    ///     .diffableTextViews_submitLabel(.search)
     /// ```
     ///
     /// **Notes**

Sources/DiffableTextKitXUIKit/Environment+TextContentType.swift

@@ -45,8 +45,12 @@ public extension View {
     /// It is similar to `View/textContentType(_:)`.
     ///
     /// ```
-    /// DiffableTextField("Enter your email", text: $emailAddress)
-    ///     .diffableTextViews_textContentTypetextContentType(.emailAddress)
+    /// DiffableTextField("Phone", value: $address) {
+    ///     .pattern("+## (###) ###-##-##")
+    ///     .placeholders("#") { $0.isASCII && $0.isNumber }
+    ///     .equals(())
+    /// }
+    /// .diffableTextViews_textContentType(.telephoneNumber)
     /// ```
     ///
     /// **Notes**

Sources/DiffableTextKitXUIKit/Environment+TextFieldStyle.swift

@@ -41,7 +41,7 @@ public extension View {
 
     /// Sets the text field style for diffable text views.
     ///
-    /// It is similar to View/textFieldStyle, but based on UIKit.
+    /// It is similar to `View/textFieldStyle(_:), but based on UIKit.
     ///
     /// ```
     /// DiffableTextField("Bordered", value: $value, style: style)
@@ -52,7 +52,7 @@ public extension View {
     ///
     /// - The value is read when the view is set up.
     /// - The default value is `UITextField.BorderStyle.none`.
-    /// - The `View/textFieldStyle` environment value is inaccessible.
+    /// - The `View/textFieldStyle(_:)` environment value is inaccessible.
     ///
     @inlinable func diffableTextViews_textFieldStyle(_ style: UITextField.BorderStyle) -> some View  {
         self.environment(\.diffableTextViews_textFieldStyle, style)

Sources/DiffableTextKitXUIKit/Environment+Tint.swift

@@ -44,8 +44,8 @@ public extension View {
     /// It is similar to `View/tint(_:)` and affects text selection.
     ///
     /// ```
-    /// DiffableTextField("Look, selection is green!", value: $value)
-    ///     .diffableTextViews_tint(.green)
+    /// DiffableTextField("Tinted", value: $value, style: style)
+    ///     .diffableTextViews_tint(.gray)
     /// ```
     ///
     /// **Notes**