fix: Use ‘Done’ button on iOS tag editor (#694)

inseven · Jun 26, 2023 · 3e2eccd · 3e2eccd
1 parent 193c868
commit 3e2eccd
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/...s/BookmarksCore/Modifiers/Closeable.swift → ...BookmarksCore/Modifiers/Dismissable.swift b/...s/BookmarksCore/Modifiers/Closeable.swift → ...BookmarksCore/Modifiers/Dismissable.swift
@@ -20,18 +20,43 @@
 
 import SwiftUI
 
-struct Closeable: ViewModifier {
+enum DismissableAction {
+    case close
+    case done
+}
+
+struct Dismissable: ViewModifier {
 
     @Environment(\.dismiss) var dismiss
 
+    let action: DismissableAction
+
+    var placement: ToolbarItemPlacement {
+        switch action {
+        case .close:
+            return .cancellationAction
+        case .done:
+            return .confirmationAction
+        }
+    }
+
+    var text: String {
+        switch action {
+        case .close:
+            return "Close"
+        case .done:
+            return "Done"
+        }
+    }
+
     func body(content: Content) -> some View {
         content
             .toolbar {
-                ToolbarItem(placement: .cancellationAction) {
+                ToolbarItem(placement: placement) {
                     Button {
                         dismiss()
                     } label: {
-                        Text("Close")
+                        Text(text)
                     }
                 }
             }
@@ -41,8 +66,8 @@ struct Closeable: ViewModifier {
 
 extension View {
 
-    func closeable() -> some View {
-        return modifier(Closeable())
+    func dismissable(_ action: DismissableAction) -> some View {
+        return modifier(Dismissable(action: action))
     }
 
 }
diff --git a/core/Sources/BookmarksCore/Views/PhoneEditTagsView.swift b/core/Sources/BookmarksCore/Views/PhoneEditTagsView.swift
@@ -90,7 +90,7 @@ public struct PhoneEditTagsView: View {
             }
             .navigationTitle("Tags")
             .navigationBarTitleDisplayMode(.inline)
-            .closeable()
+            .dismissable(.done)
             .defaultFocus($focus, .input)
         }
         .navigationViewStyle(.stack)

diff --git a/core/Sources/BookmarksCore/Views/PhoneInfoView.swift b/core/Sources/BookmarksCore/Views/PhoneInfoView.swift
@@ -34,7 +34,7 @@ public struct PhoneInfoView: View {
             InfoContentView(applicationModel: applicationModel, id: id)
                 .environmentObject(applicationModel.tagsModel)
                 .navigationBarTitleDisplayMode(.inline)
-                .closeable()
+                .dismissable(.close)
         }
     }
 

diff --git a/core/Sources/BookmarksCore/Views/PhoneSettingsView.swift b/core/Sources/BookmarksCore/Views/PhoneSettingsView.swift
@@ -78,7 +78,7 @@ public struct PhoneSettingsView: View {
                 }
             }
             .navigationBarTitle("Settings", displayMode: .inline)
-            .closeable()
+            .dismissable(.close)
             .sheet(item: $sheet) { sheet in
                 switch sheet {
                 case .about:

diff --git a/core/Sources/BookmarksCore/Views/PhoneTagsView.swift b/core/Sources/BookmarksCore/Views/PhoneTagsView.swift
@@ -32,7 +32,7 @@ public struct PhoneTagsView: View {
         NavigationView {
             TagsContentView(applicationModel: applicationModel)
                 .navigationBarTitle("Tags", displayMode: .inline)
-                .closeable()
+                .dismissable(.close)
         }
     }