From 9be39d133898ccb565a4a57d72a21571e33264a0 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 11 Feb 2025 11:31:17 +0100 Subject: [PATCH] Addresses Copy Review feedback --- DuckDuckGo-macOS.xcodeproj/project.pbxproj | 26 ++++++++++++++++ .../UserText+NetworkProtection.swift | 8 +++-- .../ExcludedApps/ExcludedApps.storyboard | 30 ++++++++++++++----- .../ExcludedAppsViewController.swift | 2 ++ 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/DuckDuckGo-macOS.xcodeproj/project.pbxproj b/DuckDuckGo-macOS.xcodeproj/project.pbxproj index 9399123b5b..6a1f67a2fe 100644 --- a/DuckDuckGo-macOS.xcodeproj/project.pbxproj +++ b/DuckDuckGo-macOS.xcodeproj/project.pbxproj @@ -3409,6 +3409,20 @@ remoteGlobalIDString = 4B2537592A11BE7300610219; remoteInfo = NetworkProtectionSystemExtension; }; + 7BBDC8162D5B5D430061E9EC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AA585D76248FD31100E9A3E2 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 4B4BEC1F2A11B4E2001D9AC5; + remoteInfo = DuckDuckGoNotifications; + }; + 7BBDC8182D5B5D4A0061E9EC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AA585D76248FD31100E9A3E2 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 4B4BEC1F2A11B4E2001D9AC5; + remoteInfo = DuckDuckGoNotifications; + }; 7BDA36F72B7E082100AD5388 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = AA585D76248FD31100E9A3E2 /* Project object */; @@ -10228,6 +10242,7 @@ buildRules = ( ); dependencies = ( + 7BBDC8192D5B5D4A0061E9EC /* PBXTargetDependency */, 4BBA2D2B2B6AD01E00F6A470 /* PBXTargetDependency */, 4BBA2D292B6ACD4D00F6A470 /* PBXTargetDependency */, 4B5F14FE2A1529230060320F /* PBXTargetDependency */, @@ -10713,6 +10728,7 @@ buildRules = ( ); dependencies = ( + 7BBDC8172D5B5D430061E9EC /* PBXTargetDependency */, 7B4627742B9AF2C8004ACE0B /* PBXTargetDependency */, 4B5F14FC2A15291D0060320F /* PBXTargetDependency */, 31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */, @@ -14727,6 +14743,16 @@ target = 4B2537592A11BE7300610219 /* NetworkProtectionSystemExtension */; targetProxy = 7B4627732B9AF2C8004ACE0B /* PBXContainerItemProxy */; }; + 7BBDC8172D5B5D430061E9EC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 4B4BEC1F2A11B4E2001D9AC5 /* DuckDuckGoNotifications */; + targetProxy = 7BBDC8162D5B5D430061E9EC /* PBXContainerItemProxy */; + }; + 7BBDC8192D5B5D4A0061E9EC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 4B4BEC1F2A11B4E2001D9AC5 /* DuckDuckGoNotifications */; + targetProxy = 7BBDC8182D5B5D4A0061E9EC /* PBXContainerItemProxy */; + }; 7BDA36F82B7E082100AD5388 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 7BDA36E42B7E037100AD5388 /* VPNProxyExtension */; diff --git a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift index 01e211007e..1628542250 100644 --- a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift +++ b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift @@ -214,8 +214,6 @@ extension UserText { static let vpnExcludedSitesTitle = NSLocalizedString("vpn.excluded.sites.title", value: "Excluded Websites", comment: "Excluded Sites title in VPN settings") - static let vpnExcludedAppsTitle = NSLocalizedString("vpn.excluded.apps.title", value: "Excluded Apps", comment: "Excluded Apps title in VPN settings") - static let vpnGeneralTitle = NSLocalizedString("vpn.general.title", value: "General", comment: "General section title in VPN settings") static let vpnShortcutsSettingsTitle = NSLocalizedString("vpn.shortcuts.settings.title", value: "Shortcuts", comment: "Shortcuts section title in VPN settings") @@ -226,6 +224,12 @@ extension UserText { static let vpnNotificationsConnectionDropsOrStatusChangesTitle = NSLocalizedString("vpn.notifications.connection.drops.or.status.changes.title", value: "VPN connection drops or status changes", comment: "Title of the VPN notification option") + // MARK: - Excluded Apps + + static let vpnExcludedAppsTitle = NSLocalizedString("vpn.excluded.apps.title", value: "Excluded Apps", comment: "Excluded Apps title in VPN settings") + + static let vpnExcludedAppsDescription = NSLocalizedString("vpn.excluded.apps.description", value: "Add apps that aren’t compatible with VPNs to use them without turning off the VPN.", comment: "Excluded Apps description in VPN settings") + // MARK: - Location static let vpnLocationChangeButtonTitle = NSLocalizedString("vpn.location.change.button.title", value: "Change...", comment: "Title of the VPN location preference change button") diff --git a/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedApps.storyboard b/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedApps.storyboard index 85e7822093..cf8df9fcf1 100644 --- a/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedApps.storyboard +++ b/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedApps.storyboard @@ -10,12 +10,12 @@ - + + + + + + + + + + + + + + + - @@ -170,6 +183,7 @@ DQ + @@ -178,7 +192,7 @@ DQ - + diff --git a/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedAppsViewController.swift b/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedAppsViewController.swift index 3f85200251..576127b494 100644 --- a/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedAppsViewController.swift +++ b/DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedAppsViewController.swift @@ -45,6 +45,7 @@ final class ExcludedAppsViewController: NSViewController { @IBOutlet var removeAppButton: NSButton! @IBOutlet var doneButton: NSButton! @IBOutlet var titleLabel: NSTextField! + @IBOutlet var descriptionLabel: NSTextField! private let faviconManagement: FaviconManagement = FaviconManager.shared @@ -80,6 +81,7 @@ final class ExcludedAppsViewController: NSViewController { removeAppButton.title = UserText.remove doneButton.title = UserText.done titleLabel.stringValue = UserText.vpnExcludedAppsTitle + descriptionLabel.stringValue = UserText.vpnExcludedAppsDescription } private func updateRemoveButtonState() {