Add shortcut redirection

duckduckgo · Jul 18, 2024 · b5d9331 · b5d9331
1 parent 321eef5
commit b5d9331
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 2 deletions.
diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift
@@ -33,6 +33,7 @@ enum AutofillSettingsSource: String {
     case appIconShortcut = "app_icon_shortcut"
     case homeScreenWidget = "home_screen_widget"
     case lockScreenWidget = "lock_screen_widget"
+    case newTabPageShortcut = "new_tab_page_shortcut"
 }
 
 protocol AutofillLoginSettingsListViewControllerDelegate: AnyObject {

diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -742,6 +742,7 @@ class MainViewController: UIViewController {
                                                       homePageMessagesConfiguration: homePageConfiguration)
 
             controller.delegate = self
+            controller.shortcutsDelegate = self
 
             newTabPageViewController = controller
             addToContentContainer(controller: controller)
@@ -2030,6 +2031,32 @@ extension MainViewController: NewTabPageControllerDelegate {
     }
 }
 
+extension MainViewController: NewTabPageControllerShortcutsDelegate {
+    func newTabPageDidRequestDownloads(_ controller: NewTabPageViewController) {
+        segueToDownloads()
+    }
+
+    func newTabPageDidRequestBookmarks(_ controller: NewTabPageViewController) {
+        segueToBookmarks()
+    }
+
+    func newTabPageDidRequestPasswords(_ controller: NewTabPageViewController) {
+        launchAutofillLogins(source: .newTabPageShortcut)
+    }
+
+    func newTabPageDidRequestAIChat(_ controller: NewTabPageViewController) {
+        loadUrl(Constant.duckAIURL)
+    }
+
+    func newTabPageDidRequestSettings(_ controller: NewTabPageViewController) {
+        segueToSettings()
+    }
+
+    private enum Constant {
+        static let duckAIURL = URL(string: "https://duckduckgo.com/?q=DuckDuckGo+AI+Chat&ia=chat&duckai=1")!
+    }
+}
+
 extension MainViewController: TabDelegate {
 
     func tab(_ tab: TabViewController,

diff --git a/DuckDuckGo/NewTabPageControllerDelegate.swift b/DuckDuckGo/NewTabPageControllerDelegate.swift
@@ -25,3 +25,11 @@ protocol NewTabPageControllerDelegate: AnyObject {
     func newTabPageDidDeleteFavorite(_ controller: NewTabPageViewController, favorite: BookmarkEntity)
     func newTabPageDidEditFavorite(_ controller: NewTabPageViewController, favorite: BookmarkEntity)
 }
+
+protocol NewTabPageControllerShortcutsDelegate: AnyObject {
+    func newTabPageDidRequestDownloads(_ controller: NewTabPageViewController)
+    func newTabPageDidRequestBookmarks(_ controller: NewTabPageViewController)
+    func newTabPageDidRequestPasswords(_ controller: NewTabPageViewController)
+    func newTabPageDidRequestAIChat(_ controller: NewTabPageViewController)
+    func newTabPageDidRequestSettings(_ controller: NewTabPageViewController)
+}
diff --git a/DuckDuckGo/NewTabPageViewController.swift b/DuckDuckGo/NewTabPageViewController.swift
@@ -30,6 +30,7 @@ final class NewTabPageViewController: UIHostingController<NewTabPageView<Favorit
     private(set) lazy var faviconsFetcherOnboarding = FaviconsFetcherOnboarding(syncService: syncService, syncBookmarksAdapter: syncBookmarksAdapter)
 
     private let favoritesModel: FavoritesDefaultModel
+    private let shortcutsModel: ShortcutsModel
 
     init(interactionModel: FavoritesListInteracting,
          syncService: DDGSyncing,
@@ -40,13 +41,15 @@ final class NewTabPageViewController: UIHostingController<NewTabPageView<Favorit
         self.syncBookmarksAdapter = syncBookmarksAdapter
 
         self.favoritesModel = FavoritesDefaultModel(interactionModel: interactionModel)
+        self.shortcutsModel = ShortcutsModel(shortcutsPreferencesStorage: InMemoryShortcutsPreferencesStorage())
         let newTabPageView = NewTabPageView(messagesModel: NewTabPageMessagesModel(homePageMessagesConfiguration: homePageMessagesConfiguration),
                                             favoritesModel: favoritesModel,
-                                            shortcutsModel: ShortcutsModel(shortcutsPreferencesStorage: InMemoryShortcutsPreferencesStorage()))
+                                            shortcutsModel: shortcutsModel)
 
         super.init(rootView: newTabPageView)
 
         assignFavoriteModelActions()
+        assignShorcutsModelActions()
     }
 
     // MARK: - Private
@@ -76,12 +79,32 @@ final class NewTabPageViewController: UIHostingController<NewTabPageView<Favorit
         }
     }
 
+    private func assignShorcutsModelActions() {
+        shortcutsModel.onShortcutOpened = { [weak self] shortcut in
+            guard let self else { return }
+
+            switch shortcut {
+            case .aiChat:
+                shortcutsDelegate?.newTabPageDidRequestAIChat(self)
+            case .bookmarks:
+                shortcutsDelegate?.newTabPageDidRequestBookmarks(self)
+            case .downloads:
+                shortcutsDelegate?.newTabPageDidRequestDownloads(self)
+            case .passwords:
+                shortcutsDelegate?.newTabPageDidRequestPasswords(self)
+            case .settings:
+                shortcutsDelegate?.newTabPageDidRequestSettings(self)
+            }
+        }
+    }
+
     // MARK: - NewTabPage
 
     let isDragging: Bool = false
 
     weak var chromeDelegate: BrowserChromeDelegate?
     weak var delegate: NewTabPageControllerDelegate?
+    weak var shortcutsDelegate: NewTabPageControllerShortcutsDelegate?
 
     func launchNewSearch() {
 

diff --git a/DuckDuckGo/ShortcutsModel.swift b/DuckDuckGo/ShortcutsModel.swift
@@ -28,11 +28,17 @@ final class ShortcutsModel: ObservableObject {
 
     private let shortcutsPreferencesStorage: ShortcutsPreferencesStorage
 
+    var onShortcutOpened: ((NewTabPageShortcut) -> Void)?
+
     init(shortcutsPreferencesStorage: ShortcutsPreferencesStorage) {
         self.shortcutsPreferencesStorage = shortcutsPreferencesStorage
 
         enabledShortcuts = shortcutsPreferencesStorage.enabledShortcuts
     }
+
+    func openShortcut(_ shortcut: NewTabPageShortcut) {
+        onShortcutOpened?(shortcut)
+    }
 }
 
 final class InMemoryShortcutsPreferencesStorage: ShortcutsPreferencesStorage {

diff --git a/DuckDuckGo/ShortcutsView.swift b/DuckDuckGo/ShortcutsView.swift
@@ -25,7 +25,11 @@ struct ShortcutsView: View {
     var body: some View {
         NewTabPageGridView { _ in
             ForEach(model.enabledShortcuts) { shortcut in
-                ShortcutItemView(shortcut: shortcut, accessoryType: nil)
+                Button {
+                    model.openShortcut(shortcut)
+                } label: {
+                    ShortcutItemView(shortcut: shortcut, accessoryType: nil)
+                }
             }
         }
     }