Merge pull request #93 from zarghol/feature/improvements

Feature/improvements
worldline · May 31, 2021 · 9e92758 · 9e92758
2 parents b37249b + 9432778
commit 9e92758
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/RunningOrder/Sprint/Models/Search.swift b/RunningOrder/Sprint/Models/Search.swift
@@ -29,7 +29,7 @@ extension SearchSection {
             case .people:
                 return "person.circle"
             case .filter:
-                return ""
+                return "text.magnifyingglass"
             }
         }
 

diff --git a/RunningOrder/Sprint/Views/NewSprintView.swift b/RunningOrder/Sprint/Views/NewSprintView.swift
@@ -21,14 +21,12 @@ struct NewSprintView: View {
             TextField(
                 "Sprint Name",
                 text: $logic.name,
-                onEditingChanged: logic.fieldEditingChanged(valueKeyPath: \.name),
-                onCommit: logic.createSprint
+                onEditingChanged: logic.fieldEditingChanged(valueKeyPath: \.name)
             )
             TextField(
                 "Sprint Number",
                 value: $logic.number,
-                formatter: NumberFormatter(),
-                onCommit: logic.createSprint
+                formatter: NumberFormatter()
             )
 
             Picker(selection: $logic.colorIdentifier, label: Text("Sprint Color")) {
@@ -37,15 +35,18 @@ struct NewSprintView: View {
                         .foregroundColor(Color(identifier: sprintColor))
                         .tag(sprintColor)
                 }
-            }.labelsHidden()
+            }
+            .labelsHidden()
 
             Spacer(minLength: 20)
 
             HStack {
                 Button(action: dismiss) { Text("Cancel") }
+                    .keyboardShortcut(.cancelAction)
                 Spacer()
                 Button(action: logic.createSprint) { Text("Create") }
                     .disabled(!logic.areAllFieldsFilled)
+                    .keyboardShortcut(.defaultAction)
             }
         }
         .padding()

diff --git a/RunningOrder/Story/Views/NewStoryView.swift b/RunningOrder/Story/Views/NewStoryView.swift
@@ -31,15 +31,16 @@ struct NewStoryView: View {
             TextField(
                 "Story EPIC",
                 text: $logic.epic,
-                onEditingChanged: logic.fieldEditingChanged(valueKeyPath: \.epic),
-                onCommit: logic.createStory
+                onEditingChanged: logic.fieldEditingChanged(valueKeyPath: \.epic)
             )
 
             HStack {
                 Button(action: dismiss) { Text("Cancel") }
+                    .keyboardShortcut(.cancelAction)
                 Spacer()
                 Button(action: logic.createStory) { Text("Create") }
                     .disabled(!logic.areAllFieldsFilled)
+                    .keyboardShortcut(.defaultAction)
             }
         }
         .padding()

diff --git a/RunningOrder/Story/Views/StepsView.swift b/RunningOrder/Story/Views/StepsView.swift
@@ -12,6 +12,11 @@ struct StepsView: View {
     @Binding var storyInformation: StoryInformation
     @State private var selectedMode = DisplayMode.video
 
+    init(storyInformation: Binding<StoryInformation>) {
+        _storyInformation = storyInformation
+        _selectedMode = State(initialValue: storyInformation.wrappedValue.steps.isEmpty ? .video : .steps)
+    }
+
     var body: some View {
         ScrollView {
             VStack {