Option to add the application to the Dock from Settings

duckduckgo · May 1, 2024 · d2dbeb8 · d2dbeb8
1 parent 6c5e4c5
commit d2dbeb8
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 6 deletions.
diff --git a/DuckDuckGo/Application/DockCustomizer.swift b/DuckDuckGo/Application/DockCustomizer.swift
@@ -26,7 +26,7 @@ protocol DockCustomization {
     func addToDock() -> Bool
 }
 
-final class DockCustomizer: DockCustomization {
+final class DockCustomizer: DockCustomization, ObservableObject {
 
     static func appDict(appPath: String, bundleIdentifier: String) -> [String: AnyObject] {
         return ["tile-type": "file-tile" as AnyObject,

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -589,6 +589,10 @@ struct UserText {
     static let isDefaultBrowser = NSLocalizedString("preferences.default-browser.active", value: "DuckDuckGo is your default browser", comment: "Indicate that the browser is the default")
     static let isNotDefaultBrowser = NSLocalizedString("preferences.default-browser.inactive", value: "DuckDuckGo is not your default browser.", comment: "Indicate that the browser is not the default")
     static let makeDefaultBrowser = NSLocalizedString("preferences.default-browser.button.make-default", value: "Make DuckDuckGo Default…", comment: "represents a prompt message asking the user to make DuckDuckGo their default browser.")
+    static let shortcuts = NSLocalizedString("preferences.shortcuts", value: "Shortcuts", comment: "Name of the preferences section related to shortcuts")
+    static let isAddedToDock = NSLocalizedString("preferences.is-added-to-dock", value: "DuckDuckGo is added to the Dock.", comment: "Indicates that the browser is the added to macOS system Dock")
+    static let isNotAddedToDock = NSLocalizedString("preferences.not-added-to-dock", value: "DuckDuckGo is not added to the Dock.", comment: "Indicate that the browser is not added to macOS system Dock")
+    static let addToDock = NSLocalizedString("preferences.add-to-dock", value: "Add to Dock…", comment: "Action button to add the app to the Dock")
     static let onStartup = NSLocalizedString("preferences.on-startup", value: "On Startup", comment: "Name of the preferences section related to app startup")
     static let reopenAllWindowsFromLastSession = NSLocalizedString("preferences.reopen-windows", value: "Reopen all windows from last session", comment: "Option to control session restoration")
     static let showHomePage = NSLocalizedString("preferences.show-home", value: "Open a new window", comment: "Option to control session startup")

diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings
@@ -43464,6 +43464,18 @@
         }
       }
     },
+    "preferences.add-to-dock" : {
+      "comment" : "Action button to add the app to the Dock",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Add to Dock…"
+          }
+        }
+      }
+    },
     "preferences.always-on" : {
       "comment" : "Status indicator of a browser privacy protection feature.",
       "extractionState" : "extracted_with_value",
@@ -44904,6 +44916,18 @@
         }
       }
     },
+    "preferences.is-added-to-dock" : {
+      "comment" : "Indicates that the browser is the added to macOS system Dock",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "DuckDuckGo is added to the Dock."
+          }
+        }
+      }
+    },
     "preferences.main-settings" : {
       "comment" : "Section header in Preferences for main settings",
       "extractionState" : "extracted_with_value",
@@ -44964,6 +44988,18 @@
         }
       }
     },
+    "preferences.not-added-to-dock" : {
+      "comment" : "Indicate that the browser is not added to macOS system Dock",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "DuckDuckGo is not added to the Dock."
+          }
+        }
+      }
+    },
     "preferences.off" : {
       "comment" : "Status indicator of a browser privacy protection feature.",
       "extractionState" : "extracted_with_value",
@@ -45384,6 +45420,18 @@
         }
       }
     },
+    "preferences.shortcuts" : {
+      "comment" : "Name of the preferences section related to shortcuts",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Shortcuts"
+          }
+        }
+      }
+    },
     "preferences.show-home" : {
       "comment" : "Option to control session startup",
       "extractionState" : "extracted_with_value",

diff --git a/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift b/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
@@ -28,12 +28,46 @@ extension Preferences {
         @ObservedObject var startupModel: StartupPreferences
         @ObservedObject var downloadsModel: DownloadsPreferences
         @ObservedObject var searchModel: SearchPreferences
+        @ObservedObject var dockCustomizer: DockCustomizer
         @State private var showingCustomHomePageSheet = false
+        @State private var isAddedToDock = false
 
         var body: some View {
             PreferencePane(UserText.general) {
 
-                // SECTION 1: On Startup
+                // SECTION 1: Shortcuts
+                PreferencePaneSection(UserText.shortcuts, spacing: 4) {
+                    PreferencePaneSubSection {
+                        HStack {
+                            if isAddedToDock || dockCustomizer.isAddedToDock {
+                                HStack {
+                                    Image(.successCheckmark)
+                                    Text(UserText.isAddedToDock)
+                                }
+                                .transition(.opacity)
+                                .padding(.trailing, 8)
+                            } else {
+                                HStack {
+                                    Image(.warning).foregroundColor(Color(.linkBlue))
+                                    Text(UserText.isNotAddedToDock)
+                                }
+                                .padding(.trailing, 8)
+                                Button(action: {
+                                    withAnimation {
+                                        dockCustomizer.addToDock()
+                                        isAddedToDock = true
+                                    }
+                                }) {
+                                    Text(UserText.addToDock)
+                                        .fixedSize(horizontal: true, vertical: false)
+                                        .multilineTextAlignment(.center)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // SECTION 2: On Startup
                 PreferencePaneSection(UserText.onStartup) {
 
                     PreferencePaneSubSection {
@@ -49,7 +83,7 @@ extension Preferences {
                     }
                 }
 
-                // SECTION 2: Home Page
+                // SECTION 3: Home Page
                 PreferencePaneSection(UserText.homePage) {
 
                     PreferencePaneSubSection {
@@ -93,12 +127,12 @@ extension Preferences {
                     CustomHomePageSheet(startupModel: startupModel, isSheetPresented: $showingCustomHomePageSheet)
                 }
 
-                // SECTION 3: Search Settings
+                // SECTION 4: Search Settings
                 PreferencePaneSection(UserText.privateSearch) {
                     ToggleMenuItem(UserText.showAutocompleteSuggestions, isOn: $searchModel.showAutocompleteSuggestions).accessibilityIdentifier("PreferencesGeneralView.showAutocompleteSuggestions")
                 }
 
-                // SECTION 4: Downloads
+                // SECTION 5: Downloads
                 PreferencePaneSection(UserText.downloads) {
                     PreferencePaneSubSection {
                         ToggleMenuItem(UserText.downloadsOpenPopupOnCompletion,

diff --git a/DuckDuckGo/Preferences/View/PreferencesRootView.swift b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
@@ -87,7 +87,8 @@ enum Preferences {
                 case .general:
                     GeneralView(startupModel: StartupPreferences.shared,
                                 downloadsModel: DownloadsPreferences.shared,
-                                searchModel: SearchPreferences.shared)
+                                searchModel: SearchPreferences.shared,
+                                dockCustomizer: DockCustomizer())
                 case .sync:
                     SyncView()
                 case .appearance: