Drop bookmarks storyboard (#2148)

Task/Issue URL: https://app.asana.com/0/1199230911884351/1206472717181422/f
duckduckgo · Feb 5, 2024 · 2e4e1a3 · 2e4e1a3
1 parent b0f30b5
commit 2e4e1a3
Show file tree

Hide file tree

Showing 30 changed files with 1,046 additions and 1,230 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo/Bookmarks/Extensions/NSPopUpButtonExtension.swift b/DuckDuckGo/Bookmarks/Extensions/NSPopUpButtonExtension.swift
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkListTreeControllerDataSource.swift b/DuckDuckGo/Bookmarks/Model/BookmarkListTreeControllerDataSource.swift
@@ -20,14 +20,20 @@ import Foundation
 
 final class BookmarkListTreeControllerDataSource: BookmarkTreeControllerDataSource {
 
+    private let bookmarkManager: BookmarkManager
+
+    init(bookmarkManager: BookmarkManager) {
+        self.bookmarkManager = bookmarkManager
+    }
+
     func treeController(treeController: BookmarkTreeController, childNodesFor node: BookmarkNode) -> [BookmarkNode] {
         return node.isRoot ? childNodesForRootNode(node) : childNodes(node)
     }
 
     // MARK: - Private
 
     private func childNodesForRootNode(_ node: BookmarkNode) -> [BookmarkNode] {
-        let topLevelNodes = LocalBookmarkManager.shared.list?.topLevelEntities.compactMap { (item) -> BookmarkNode? in
+        let topLevelNodes = bookmarkManager.list?.topLevelEntities.compactMap { (item) -> BookmarkNode? in
             if let folder = item as? BookmarkFolder {
                 let itemNode = node.createChildNode(item)
                 itemNode.canHaveChildNodes = !folder.children.isEmpty

diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift b/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
@@ -51,6 +51,8 @@ protocol BookmarkManager: AnyObject {
     var listPublisher: Published<BookmarkList?>.Publisher { get }
     var list: BookmarkList? { get }
 
+    func requestSync()
+
 }
 
 final class LocalBookmarkManager: BookmarkManager {

diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift b/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
@@ -41,7 +41,7 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
 
     init(
         contentMode: ContentMode,
-        bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
+        bookmarkManager: BookmarkManager,
         treeController: BookmarkTreeController,
         presentFaviconsFetcherOnboarding: (() -> Void)? = nil
     ) {
@@ -117,11 +117,12 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
     }
 
     func outlineView(_ outlineView: NSOutlineView, viewFor tableColumn: NSTableColumn?, item: Any) -> NSView? {
-        guard let node = item as? BookmarkNode,
-              let cell = outlineView.makeView(withIdentifier: BookmarkOutlineViewCell.identifier, owner: self) as? BookmarkOutlineViewCell else {
-            assertionFailure("\(#file): Failed to create BookmarkOutlineViewCell or cast item to Node")
+        guard let node = item as? BookmarkNode else {
+            assertionFailure("\(#file): Failed to cast item to Node")
             return nil
         }
+        let cell = outlineView.makeView(withIdentifier: .init(BookmarkOutlineCellView.className()), owner: self) as? BookmarkOutlineCellView
+            ?? BookmarkOutlineCellView(identifier: .init(BookmarkOutlineCellView.className()))
 
         if let bookmark = node.representedObject as? Bookmark {
             cell.update(from: bookmark)

diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkSidebarTreeController.swift b/DuckDuckGo/Bookmarks/Model/BookmarkSidebarTreeController.swift
@@ -26,7 +26,7 @@ final class BookmarkSidebarTreeController: BookmarkTreeControllerDataSource {
 
     private let bookmarkManager: BookmarkManager
 
-    init(bookmarkManager: BookmarkManager = LocalBookmarkManager.shared) {
+    init(bookmarkManager: BookmarkManager) {
         self.bookmarkManager = bookmarkManager
     }
 

diff --git a/DuckDuckGo/Bookmarks/Model/PseudoFolder.swift b/DuckDuckGo/Bookmarks/Model/PseudoFolder.swift
@@ -16,12 +16,13 @@
 //  limitations under the License.
 //
 
+import AppKit
 import Foundation
 
 final class PseudoFolder: Equatable {
 
-    static let favorites = PseudoFolder(id: UUID().uuidString, name: UserText.favorites, icon: NSImage(named: "FavoriteFilledBorder")!)
-    static let bookmarks = PseudoFolder(id: UUID().uuidString, name: UserText.bookmarks, icon: NSImage(named: "Folder")!)
+    static let favorites = PseudoFolder(id: UUID().uuidString, name: UserText.favorites, icon: .favoriteFilledBorder)
+    static let bookmarks = PseudoFolder(id: UUID().uuidString, name: UserText.bookmarks, icon: .folder)
 
     let id: String
     let name: String
@@ -38,7 +39,7 @@ final class PseudoFolder: Equatable {
     }
 
     static func == (lhs: PseudoFolder, rhs: PseudoFolder) -> Bool {
-        return lhs.name == rhs.name
+        return lhs.id == rhs.id
     }
 
 }