fix: Remove macOS add tags view (#546)

inseven · Jun 4, 2023 · 49fdbec · 49fdbec
1 parent d69cd18
commit 49fdbec
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 157 deletions.
diff --git a/core/Sources/BookmarksCore/Commands/BookmarkTagCommands.swift b/core/Sources/BookmarksCore/Commands/BookmarkTagCommands.swift
@@ -29,14 +29,6 @@ struct BookmarkTagCommands: View {
     var body: some View {
         Menu("Tags") {
 
-            Button("Add...") {
-                sectionViewModel.addTags()
-            }
-            .keyboardShortcut("t", modifiers: .command)
-            .disabled(sectionViewModel.selection.isEmpty)
-
-            Divider()
-
             ForEach(Array(sectionViewModel.selectionTags).sorted()) { tag in
                 Button(tag) {
                     sceneModel?.revealTag(tag)

diff --git a/core/Sources/BookmarksCore/Model/SectionViewModel.swift b/core/Sources/BookmarksCore/Model/SectionViewModel.swift
@@ -26,13 +26,6 @@ import Interact
 
 public class SectionViewModel: ObservableObject, Runnable {
 
-    public enum SheetType: Identifiable {
-
-        public var id: Self { self }
-
-        case addTags
-    }
-
     public enum State {
         case loading
         case ready
@@ -50,7 +43,6 @@ public class SectionViewModel: ObservableObject, Runnable {
     @Published public var selection: Set<Bookmark.ID> = []
     @Published public var previewURL: URL? = nil
 
-    @Published public var sheet: SheetType? = nil
     @Published public var lastError: Error? = nil
 
     @Published private var query: AnyQuery
@@ -202,10 +194,6 @@ public class SectionViewModel: ObservableObject, Runnable {
         self.bookmarks = []
     }
 
-    @MainActor public func addTags() {
-        sheet = .addTags
-    }
-
     @MainActor public func bookmarks(for ids: Set<Bookmark.ID>? = nil) -> [Bookmark] {
         let ids = ids ?? self.selection
         return ids.compactMap { bookmarksLookup[$0] }
@@ -282,20 +270,6 @@ public class SectionViewModel: ObservableObject, Runnable {
 #endif
     }
 
-    // TODO: Consider whether we should pull this down into the applicationModel.
-    @MainActor public func addTags(ids: Set<Bookmark.ID>? = nil, tags: Set<String>, markAsRead: Bool) {
-        guard let applicationModel else {
-            return
-        }
-        let bookmarks = bookmarks(for: ids)
-            .map { item in
-                item
-                    .adding(tags: tags)
-                    .setting(toRead: markAsRead ? false : item.toRead)
-            }
-        applicationModel.updateBookmarks(bookmarks, completion: errorHandler({ _ in }))
-    }
-
     @MainActor public func showPreview() {
         let bookmarks = bookmarks()
         previewURL = bookmarks.first?.url

diff --git a/core/Sources/BookmarksCore/Toolbars/SelectionToolbar.swift b/core/Sources/BookmarksCore/Toolbars/SelectionToolbar.swift
@@ -51,16 +51,6 @@ public struct SelectionToolbar: CustomizableToolbarContent {
             .disabled(sectionViewModel.selection.isEmpty)
         }
 
-        ToolbarItem(id: "tag") {
-            Button {
-                sectionViewModel.addTags()
-            } label: {
-                Label("Add Tags", systemImage: "tag")
-            }
-            .help("Add Tags")
-            .disabled(sectionViewModel.selection.isEmpty)
-        }
-
         ToolbarItem(id: "delete") {
             Button {
                 sectionViewModel.delete()

diff --git a/macos/Bookmarks-macOS.xcodeproj/project.pbxproj b/macos/Bookmarks-macOS.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		D80710F326C4B855007272C0 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80710F226C4B855007272C0 /* ContentView.swift */; };
-		D8164D6626C08DD500756D43 /* AddTagsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8164D6526C08DD500756D43 /* AddTagsView.swift */; };
 		D8164D6826C08EEC00756D43 /* BorderedSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8164D6726C08EEC00756D43 /* BorderedSelection.swift */; };
 		D83D15532A267533000B70BF /* SafariExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83D15522A267533000B70BF /* SafariExtensionHandler.swift */; };
 		D83D15552A267533000B70BF /* SafariExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83D15542A267533000B70BF /* SafariExtensionViewController.swift */; };
@@ -80,7 +79,6 @@
 
 /* Begin PBXFileReference section */
 		D80710F226C4B855007272C0 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
-		D8164D6526C08DD500756D43 /* AddTagsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTagsView.swift; sourceTree = "<group>"; };
 		D8164D6726C08EEC00756D43 /* BorderedSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BorderedSelection.swift; sourceTree = "<group>"; };
 		D83D15502A267533000B70BF /* Bookmarks for Safari.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Bookmarks for Safari.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D83D15522A267533000B70BF /* SafariExtensionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariExtensionHandler.swift; sourceTree = "<group>"; };
@@ -264,7 +262,6 @@
 		D8B04B43261F4A1200376ADD /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				D8164D6526C08DD500756D43 /* AddTagsView.swift */,
 				D8164D6726C08EEC00756D43 /* BorderedSelection.swift */,
 				D80710F226C4B855007272C0 /* ContentView.swift */,
 				D857BD6B2A2A8073007D82F0 /* EditView.swift */,
@@ -500,7 +497,6 @@
 				D840B01226210AF6001E95D1 /* GeneralSettingsView.swift in Sources */,
 				D840B00A2621042B001E95D1 /* SettingsView.swift in Sources */,
 				D891C454261E32F90024E1A6 /* BookmarksApp.swift in Sources */,
-				D8164D6626C08DD500756D43 /* AddTagsView.swift in Sources */,
 				D8A8001D2A1F76200042C03B /* View.swift in Sources */,
 				D8F3F28F26EE776900BFA43B /* LogInView.swift in Sources */,
 			);

diff --git a/macos/Bookmarks/Views/AddTagsView.swift b/macos/Bookmarks/Views/AddTagsView.swift
diff --git a/macos/Bookmarks/Views/SectionView.swift b/macos/Bookmarks/Views/SectionView.swift
@@ -141,12 +141,6 @@ struct SectionView: View {
         }
         .navigationTitle(sectionViewModel.title)
         .navigationSubtitle(sectionViewModel.subtitle)
-        .sheet(item: $sectionViewModel.sheet) { sheet in
-            switch sheet {
-            case .addTags:
-                AddTagsView(tagsModel: applicationModel.tagsModel, sectionViewModel: sectionViewModel)
-            }
-        }
         .presents($sectionViewModel.lastError)
         .focusedSceneObject(sectionViewModel)
     }