Updated example projects

orchetect · Oct 17, 2024 · 8ff78d1 · 8ff78d1
1 parent 79ad9ec
commit 8ff78d1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/Examples/Movie Timecode/Movie Timecode/AddOrReplaceTimecodeTrackView.swift b/Examples/Movie Timecode/Movie Timecode/AddOrReplaceTimecodeTrackView.swift
@@ -41,7 +41,7 @@ struct AddOrReplaceTimecodeTrackView: View {
                     TimecodeField(timecode: $newStartTimecode)
                         .timecodeFormat([.showSubFrames])
                         .timecodeSubFramesStyle(.secondary, scale: .secondary)
-                        .timecodeValidationStyle(.red)
+                        .timecodeFieldValidationPolicy(.enforceValid)
                 }
 
                 LabeledContent("") {

diff --git a/Examples/Movie Timecode/Movie Timecode/ContentView.swift b/Examples/Movie Timecode/Movie Timecode/ContentView.swift
@@ -14,13 +14,15 @@ struct ContentView: View {
     @State private var operationType: OperationType = .addOrReplaceTimecodeTrack
 
     var body: some View {
-        Form {
-            sourceSection
-            operationsSection
+        NavigationStack {
+            Form {
+                sourceSection
+                operationsSection
+            }
+            .formStyle(.grouped)
+            .padding()
+            .navigationTitle("Movie Timecode")
         }
-        .formStyle(.grouped)
-        .padding()
-
         .fileImporter(
             isPresented: $isFileImporterShown,
             allowedContentTypes: [.quickTimeMovie, .mpeg4Movie]

diff --git a/Examples/Timecode Math/Timecode Math/ContentView.swift b/Examples/Timecode Math/Timecode Math/ContentView.swift
@@ -61,9 +61,10 @@ struct ExpressionsView: View {
         .foregroundStyle(.primary)
         .timecodeFormat([.showSubFrames])
         .timecodeSeparatorStyle(.secondary)
-        .timecodeValidationStyle(.red)
+        .timecodeSubFramesStyle(.secondary, scale: .secondary)
         .timecodeFieldInputStyle(.autoAdvance)
         .timecodeFieldInputWrapping(.noWrap)
+        .timecodeFieldValidationPolicy(.enforceValid)
     }
 }
 

diff --git a/Examples/Timecode UI/Timecode UI/TimecodeFieldView.swift b/Examples/Timecode UI/Timecode UI/TimecodeFieldView.swift
@@ -16,14 +16,16 @@ struct TimecodeFieldView: View {
 
     @State private var isEnabled: Bool = true
     @State private var timecodeFormat: Timecode.StringFormat = [.showSubFrames]
-    @State private var inputStyle: TimecodeField.InputStyle = .autoAdvance
-    @State private var inputWrapping: TimecodeField.InputWrapping = .wrap
     @State private var defaultStyle: DefaultStyle = .default
     @State private var separatorStyle: SeparatorStyle = .secondary
-    @State private var highlightStyle: HighlightStyle = .default
-    @State private var validationStyle: ValidationStyle = .red
     @State private var subFramesStyle: SubFramesStyle = .default
     @State private var subFramesScale: TextScale = .default
+    @State private var validationStyle: ValidationStyle = .red
+    @State private var highlightStyle: HighlightStyle = .default
+    @State private var inputStyle: TimecodeField.InputStyle = .continuousWithinComponent
+    @State private var inputWrapping: TimecodeField.InputWrapping = .noWrap
+    @State private var validationPolicy: TimecodeField.ValidationPolicy = .allowInvalid
+    @State private var validationAnimation: Bool = true
 
     @FocusState private var isEditing: Bool
 
@@ -43,6 +45,7 @@ struct TimecodeFieldView: View {
             .timecodeFieldHighlightStyle(highlightStyle.color)
             .timecodeFieldInputStyle(inputStyle)
             .timecodeFieldInputWrapping(inputWrapping)
+            .timecodeFieldValidationPolicy(validationPolicy, animation: validationAnimation)
             .timecodeFieldReturnAction(.focusNextComponent)
             .timecodeFieldEscapeAction(.resetComponentFocus())
             .font(.largeTitle)
@@ -139,6 +142,15 @@ struct TimecodeFieldView: View {
                     Text(wrapping.name).tag(wrapping)
                 }
             }
+            Picker("Validation Policy", selection: $validationPolicy) {
+                ForEach(TimecodeField.ValidationPolicy.allCases) { policy in
+                    Text(policy.name).tag(policy)
+                }
+            }
+            Toggle(isOn: $validationAnimation) {
+                Text("Validation Feedback Animation")
+            }
+            .disabled(validationPolicy != .enforceValid)
             Toggle(isOn: $timecodeFormat.option(.showSubFrames)) {
                 Text("Show SubFrames")
             }
@@ -312,7 +324,7 @@ extension TimecodeFieldView {
 
         var name: String {
             switch self {
-            case .default: "Default (Accent Color)"
+            case .default: "Default (Accent)"
             case .secondary: "Secondary"
             case .blue: "Blue"
             }
@@ -371,6 +383,15 @@ extension TimecodeField.InputWrapping {
     }
 }
 
+extension TimecodeField.ValidationPolicy {
+    var name: String {
+        switch self {
+        case .allowInvalid: "Allow Invalid"
+        case .enforceValid: "Enforce Valid"
+        }
+    }
+}
+
 #Preview {
     TimecodeFieldView()
         .frame(minHeight: 700)

diff --git a/Sources/TimecodeKitUI/SwiftUI/TimecodeField/TimecodeField Environment.swift b/Sources/TimecodeKitUI/SwiftUI/TimecodeField/TimecodeField Environment.swift
@@ -135,7 +135,7 @@ extension EnvironmentValues {
 @available(watchOS, unavailable)
 @available(tvOS, unavailable)
 struct TimecodeFieldValidationPolicyKey: EnvironmentKey {
-    public static let defaultValue: TimecodeField.ValidationPolicy = .allowInvalid
+    public static let defaultValue: TimecodeField.ValidationPolicy = .enforceValid
 }
 
 @_documentation(visibility: internal)