Simplify validation initialization

Author: johndelong

Sources/MSLSwiftUI/FormValidation/FormExample.swift

@@ -17,13 +17,13 @@ import SwiftUI
 
 struct UserFormInfo: FormValidatable, DefaultValueProvider {
     @FormFieldValidated(
-        requirement: .required(nil),
+        requirement: .required("Name is required"),
         validation: { $0.count < 3 ? "Name must be at least 3 characters" : nil }
     )
     var name = ""
 
     @FormFieldValidated(
-        requirement: .required("This field is required"),
+        requirement: .required("Phone number is required"),
         validation: { value in
             !(value?.isPhoneNumberValid() ?? false) ? "Phone number is not valid." : nil
         }
@@ -79,6 +79,7 @@ struct ExampleForm: View {
                         )
 
                     TextField("Phone Number", text: self.$userInfo.phoneNumber ?? "")
+                        .focused(self.$fieldToFocus, equals: "_phoneNumber")
                         .keyboardType(.phonePad)
                         .overlay(
                             ValidationErrorView(errorMessage: self.userInfo.$phoneNumber.errorMessage),

Sources/MSLSwiftUI/FormValidation/ValidatedPropertyWrapper.swift

@@ -5,7 +5,7 @@ public enum FormFieldRequirement: Equatable {
     case required(_ message: String?)
 
     /// A value is not required for this field
-    case notRequired
+    case optional
 }
 
 public enum FormFieldStatus: Equatable {
@@ -94,8 +94,8 @@ public struct FormFieldValidated<Value: Equatable>: ValidatedProtocol {
 
     public init(
         wrappedValue: Value,
-        requirement: FormFieldRequirement = .notRequired,
-        validation: @escaping (Value) -> String?
+        requirement: FormFieldRequirement = .optional,
+        validation: @escaping (Value) -> String? = { _ in return nil }
     ) {
         self.originalValue = wrappedValue