Merge branch 'release/1.105.0' into bunn/duckplayer/enrollment

# Conflicts: # DuckDuckGo/Localizable.xcstrings
duckduckgo · Sep 3, 2024 · f474220 · f474220
2 parents 0dca406 + ba241fc
commit f474220
Show file tree

Hide file tree

Showing 16 changed files with 569 additions and 36 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 252
+CURRENT_PROJECT_VERSION = 253
diff --git a/DuckDuckGo/Assets.xcassets/Colors/SystemGray90.colorset/Contents.json b/DuckDuckGo/Assets.xcassets/Colors/SystemGray90.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.133",
+          "green" : "0.133",
+          "red" : "0.133"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift b/DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift
@@ -264,6 +264,13 @@ final class BookmarkOutlineViewDataSource: NSObject, BookmarksOutlineViewDataSou
         }
 
         let destination = destinationNode.isRoot ? PseudoFolder.bookmarks : destinationNode.representedObject
+
+        guard !isSearching || destination is BookmarkFolder else { return .none }
+
+        if let destinationFolder = destination as? BookmarkFolder {
+            self.dragDestinationFolder = destinationFolder
+        }
+
         let operation = dragDropManager.validateDrop(info, to: destination)
         self.dragDestinationFolder = (operation == .none || item == nil) ? nil : destinationNode.representedObject as? BookmarkFolder
 

diff --git a/DuckDuckGo/Bookmarks/Services/BookmarksContextMenu.swift b/DuckDuckGo/Bookmarks/Services/BookmarksContextMenu.swift
@@ -143,7 +143,7 @@ extension BookmarksContextMenu {
 
     static func menuItems(for folder: BookmarkFolder, target: AnyObject?, forSearch: Bool, includeManageBookmarksItem: Bool) -> [NSMenuItem] {
         // disable "Open All" if no Bookmarks in folder
-        var hasBookmarks = folder.children.contains(where: { $0 is Bookmark })
+        let hasBookmarks = folder.children.contains(where: { $0 is Bookmark })
         var items = [
             openInNewTabsMenuItem(folder: folder, target: target, enabled: hasBookmarks),
             openAllInNewWindowMenuItem(folder: folder, target: target, enabled: hasBookmarks),

diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
@@ -51,6 +51,7 @@ struct AddBookmarkPopoverView: View {
             otherActionTitle: UserText.delete,
             isOtherActionDisabled: false,
             otherAction: model.removeButtonAction,
+            isOtherActionTriggeredByEscKey: false,
             defaultActionTitle: UserText.done,
             isDefaultActionDisabled: model.isDefaultActionButtonDisabled,
             defaultAction: model.doneButtonAction

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
@@ -158,6 +158,9 @@ final class BookmarkListViewController: NSViewController {
         boxDivider.setContentHuggingPriority(.defaultHigh, for: .vertical)
         boxDivider.translatesAutoresizingMaskIntoConstraints = false
 
+        // keep OutlineView menu declaration before buttons as it‘s used as target
+        outlineView.menu = BookmarksContextMenu(bookmarkManager: bookmarkManager, delegate: self)
+
         stackView.orientation = .horizontal
         stackView.spacing = 4
         stackView.setHuggingPriority(.defaultHigh, for: .horizontal)
@@ -170,9 +173,6 @@ final class BookmarkListViewController: NSViewController {
         stackView.addArrangedSubview(buttonsDivider)
         stackView.addArrangedSubview(manageBookmarksButton)
 
-        // keep OutlineView menu declaration before the buttons as it‘s their target
-        outlineView.menu = BookmarksContextMenu(bookmarkManager: bookmarkManager, delegate: self)
-
         newBookmarkButton.bezelStyle = .shadowlessSquare
         newBookmarkButton.cornerRadius = 4
         newBookmarkButton.normalTintColor = .button
@@ -254,7 +254,6 @@ final class BookmarkListViewController: NSViewController {
         outlineView.usesAutomaticRowHeights = true
         outlineView.target = self
         outlineView.action = #selector(handleClick)
-        outlineView.menu = BookmarksContextMenu(bookmarkManager: bookmarkManager, delegate: self)
         outlineView.dataSource = dataSource
         outlineView.delegate = dataSource
 
@@ -452,7 +451,7 @@ final class BookmarkListViewController: NSViewController {
         expandFoldersAndScrollUntil(folder)
         outlineView.scrollToAdjustedPositionInOutlineView(folder)
 
-        guard let node = treeController.node(representing: folder) else { return }
+        guard let node = treeController.findNodeWithId(representing: folder) else { return }
 
         outlineView.highlight(node)
     }

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
@@ -473,6 +473,9 @@ extension BookmarkManagementDetailViewController: NSTableViewDelegate, NSTableVi
                    proposedRow row: Int,
                    proposedDropOperation dropOperation: NSTableView.DropOperation) -> NSDragOperation {
         let destination = destination(for: dropOperation, at: row)
+
+        guard !isSearching || destination is BookmarkFolder else { return .none }
+
         return dragDropManager.validateDrop(info, to: destination)
     }
 

diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
@@ -51,6 +51,7 @@ struct AddEditBookmarkDialogView: ModalView {
             otherActionTitle: viewModel.bookmarkModel.cancelActionTitle,
             isOtherActionDisabled: viewModel.bookmarkModel.isOtherActionDisabled,
             otherAction: viewModel.bookmarkModel.cancel,
+            isOtherActionTriggeredByEscKey: true,
             defaultActionTitle: viewModel.bookmarkModel.defaultActionTitle,
             isDefaultActionDisabled: viewModel.bookmarkModel.isDefaultActionDisabled,
             defaultAction: viewModel.bookmarkModel.addOrSave

diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkView.swift
@@ -36,6 +36,7 @@ struct AddEditBookmarkView: View {
     let otherActionTitle: String
     let isOtherActionDisabled: Bool
     let otherAction: @MainActor (_ dismiss: () -> Void) -> Void
+    let isOtherActionTriggeredByEscKey: Bool
 
     let defaultActionTitle: String
     let isDefaultActionDisabled: Bool
@@ -78,6 +79,7 @@ struct AddEditBookmarkView: View {
                     viewState: .init(buttonsState),
                     otherButtonAction: .init(
                         title: otherActionTitle,
+                        keyboardShortCut: isOtherActionTriggeredByEscKey ? .cancelAction : nil,
                         isDisabled: isOtherActionDisabled,
                         action: otherAction
                     ),

diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBarMenuPopover.swift b/DuckDuckGo/BookmarksBar/View/BookmarksBarMenuPopover.swift
@@ -113,12 +113,12 @@ final class BookmarksBarMenuPopover: NSPopover {
         return frame
     }
 
-    /// close other BookmarkListPopover-s shown from the main window when opening a new one
+    /// close other `BookmarksBarMenuPopover`-s and `BookmarkListPopover`-s shown from the main window when opening a new one
     static func closeBookmarkListPopovers(shownIn window: NSWindow?, except popoverToKeep: BookmarksBarMenuPopover? = nil) {
         guard let window,
               // ignore when opening a submenu from another BookmarkListPopover
               !(window.contentViewController?.nextResponder is Self) else { return }
-        for case let .some(popover as Self) in (window.childWindows ?? []).map(\.contentViewController?.nextResponder) where popover !== popoverToKeep && popover.isShown {
+        for case let .some(popover as NSPopover) in (window.childWindows ?? []).map(\.contentViewController?.nextResponder) where popover !== popoverToKeep && popover.isShown {
             popover.close()
         }
     }

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -362,8 +362,10 @@ struct UserText {
     static let duckPlayerContingencyMessageBody = NSLocalizedString("duck-player.video-contingency-message", value: "Duck Player's functionality has been affected by recent changes to YouTube. We’re working to fix these issues and appreciate your understanding.", comment: "Message explaining to the user that Duck Player is not available")
     static let duckPlayerContingencyMessageCTA = NSLocalizedString("duck-player.video-contingency-cta", value: "Learn More", comment: "Button for the message explaining to the user that Duck Player is not available so the user can learn more")
 
-    static let duckPlayerOnboardingChoiceModalTitle = NSLocalizedString("duck-player.onboarding-choice-modal-title", value: "Drowning in ads on YouTube?", comment: "Title for a Duck Player onboarding modal screen")
-    static let duckPlayerOnboardingChoiceModalMessage = NSLocalizedString("duck-player.onboarding-choice-modal-message", value: "Duck Player lets you watch without targeted ads and comes free to use in DuckDuckGo.", comment: "Message for a Duck Player onboarding modal screen")
+    static let duckPlayerOnboardingChoiceModalTitleTop = NSLocalizedString("duck-player.onboarding-choice-modal-title-top", value: "Drowning in ads on YouTube?", comment: "Top title for a Duck Player onboarding modal screen")
+    static let duckPlayerOnboardingChoiceModalTitleBottom = NSLocalizedString("duck-player.onboarding-choice-modal-title-bottom", value: "Try Duck Player!", comment: "Bottom title for a Duck Player onboarding modal screen")
+
+    static let duckPlayerOnboardingChoiceModalMessage = NSLocalizedString("duck-player.onboarding-choice-modal-message-body", value: "Duck Player lets you watch YouTube without targeted ads in DuckDuckGo and what you watch won't influence your recommendations.", comment: "Message for a Duck Player onboarding modal screen")
     static let duckPlayerOnboardingChoiceModalCTAConfirm = NSLocalizedString("duck-player.onboarding-choice-modal-CTA-confirm", value: "Turn on Duck Player", comment: "Confirm Button to enable Duck Player. -Duck Player- should not be translated")
     static let duckPlayerOnboardingChoiceModalCTADeny = NSLocalizedString("duck-player.onboarding-choice-modal-CTA-deny", value: "Not Now", comment: "Deny Button to enable Duck Player")