Skip to content

Commit

Permalink
Addresses Copy Review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@diegoreymendez
diegoreymendez committed Feb 11, 2025
1 parent 512c163 commit 9be39d1
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 10 deletions.
26 changes: 26 additions & 0 deletions DuckDuckGo-macOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */;
Expand Down Expand Up @@ -10228,6 +10242,7 @@
buildRules = (
);
dependencies = (
7BBDC8192D5B5D4A0061E9EC /* PBXTargetDependency */,
4BBA2D2B2B6AD01E00F6A470 /* PBXTargetDependency */,
4BBA2D292B6ACD4D00F6A470 /* PBXTargetDependency */,
4B5F14FE2A1529230060320F /* PBXTargetDependency */,
Expand Down Expand Up @@ -10713,6 +10728,7 @@
buildRules = (
);
dependencies = (
7BBDC8172D5B5D430061E9EC /* PBXTargetDependency */,
7B4627742B9AF2C8004ACE0B /* PBXTargetDependency */,
4B5F14FC2A15291D0060320F /* PBXTargetDependency */,
31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */,
Expand Down Expand Up @@ -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 */;
Expand Down
8 changes: 6 additions & 2 deletions DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down
30 changes: 22 additions & 8 deletions DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedApps.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<objects>
<viewController storyboardIdentifier="ExcludedAppsViewController" id="Clu-Bo-JRW" userLabel="Excluded Apps View Controller" customClass="ExcludedAppsViewController" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="fBT-ND-Nbh">
<rect key="frame" x="0.0" y="0.0" width="475" height="307"/>
<rect key="frame" x="0.0" y="0.0" width="475" height="355"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DEQ-Uh-Y7p" userLabel="Add Domain Button">
<rect key="frame" x="13" y="13" width="130" height="32"/>
<buttonCell key="cell" type="push" title="Add Application" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0Dz-eI-5jh">
<rect key="frame" x="13" y="13" width="157" height="32"/>
<buttonCell key="cell" type="push" title="Browse Applications" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0Dz-eI-5jh">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand All @@ -24,7 +24,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KAc-ZW-ZAV" userLabel="Remove Domain Button">
<rect key="frame" x="141" y="13" width="83" height="32"/>
<rect key="frame" x="168" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Remove" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="atA-bI-IOY">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -116,15 +116,15 @@
</scroller>
</scrollView>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aur-0h-QzR" userLabel="Title Label">
<rect key="frame" x="18" y="271" width="97" height="16"/>
<rect key="frame" x="18" y="319" width="97" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Excluded Apps" id="s7t-C5-auR">
<font key="font" metaFont="systemMedium" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<searchField wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mWM-R4-iMO">
<rect key="frame" x="300" y="268" width="155" height="22"/>
<rect key="frame" x="300" y="316" width="155" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="155" id="dkQ-Pw-ZiZ"/>
</constraints>
Expand All @@ -150,18 +150,31 @@ DQ
<action selector="doneButtonClicked:" target="Clu-Bo-JRW" id="k4m-1a-883"/>
</connections>
</button>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YoB-2a-42r">
<rect key="frame" x="18" y="271" width="439" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="435" id="nhD-dD-ymj"/>
</constraints>
<textFieldCell key="cell" title="Add apps that aren’t compatible with VPNs to use them without turning off the VPN." id="Sdp-5T-OkX">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="DEQ-Uh-Y7p" secondAttribute="bottom" constant="20" symbolic="YES" id="1t9-2b-NEc"/>
<constraint firstAttribute="trailing" secondItem="goL-jl-7Gp" secondAttribute="trailing" constant="20" symbolic="YES" id="Mhr-Vk-Rvt"/>
<constraint firstItem="aPG-Pg-rGL" firstAttribute="top" secondItem="YoB-2a-42r" secondAttribute="bottom" constant="16" id="NbV-AI-wXM"/>
<constraint firstItem="goL-jl-7Gp" firstAttribute="centerY" secondItem="KAc-ZW-ZAV" secondAttribute="centerY" id="QCh-7x-Dce"/>
<constraint firstItem="YoB-2a-42r" firstAttribute="top" secondItem="aur-0h-QzR" secondAttribute="bottom" constant="16" id="T6w-hi-nxQ"/>
<constraint firstItem="aPG-Pg-rGL" firstAttribute="leading" secondItem="fBT-ND-Nbh" secondAttribute="leading" constant="20" symbolic="YES" id="TTl-Hg-Kzm"/>
<constraint firstItem="aur-0h-QzR" firstAttribute="leading" secondItem="fBT-ND-Nbh" secondAttribute="leading" constant="20" symbolic="YES" id="Zkn-6A-LN5"/>
<constraint firstItem="aur-0h-QzR" firstAttribute="top" secondItem="fBT-ND-Nbh" secondAttribute="top" constant="20" symbolic="YES" id="cLt-41-8Hx"/>
<constraint firstItem="DEQ-Uh-Y7p" firstAttribute="top" secondItem="aPG-Pg-rGL" secondAttribute="bottom" constant="20" symbolic="YES" id="gNi-xV-uiQ"/>
<constraint firstAttribute="trailing" secondItem="mWM-R4-iMO" secondAttribute="trailing" constant="20" symbolic="YES" id="kW6-bo-Dmq"/>
<constraint firstItem="YoB-2a-42r" firstAttribute="leading" secondItem="aur-0h-QzR" secondAttribute="leading" id="ksC-04-oz0"/>
<constraint firstAttribute="trailing" secondItem="aPG-Pg-rGL" secondAttribute="trailing" constant="20" symbolic="YES" id="mep-rx-dHT"/>
<constraint firstItem="aPG-Pg-rGL" firstAttribute="top" secondItem="aur-0h-QzR" secondAttribute="bottom" constant="16" id="puI-Hj-uEZ"/>
<constraint firstItem="KAc-ZW-ZAV" firstAttribute="centerY" secondItem="DEQ-Uh-Y7p" secondAttribute="centerY" id="tAJ-2N-TdG"/>
<constraint firstItem="mWM-R4-iMO" firstAttribute="centerY" secondItem="aur-0h-QzR" secondAttribute="centerY" id="uAh-fu-IdN"/>
<constraint firstItem="DEQ-Uh-Y7p" firstAttribute="leading" secondItem="fBT-ND-Nbh" secondAttribute="leading" constant="20" symbolic="YES" id="vDY-Nh-AQ8"/>
Expand All @@ -170,6 +183,7 @@ DQ
</view>
<connections>
<outlet property="addAppButton" destination="DEQ-Uh-Y7p" id="WrZ-Qw-Wzu"/>
<outlet property="descriptionLabel" destination="YoB-2a-42r" id="u6i-UA-qs2"/>
<outlet property="doneButton" destination="goL-jl-7Gp" id="8Yb-2X-umJ"/>
<outlet property="removeAppButton" destination="KAc-ZW-ZAV" id="mSg-jy-HD8"/>
<outlet property="tableView" destination="pIp-Qw-5G1" id="kNl-PR-zGb"/>
Expand All @@ -178,7 +192,7 @@ DQ
</viewController>
<customObject id="fm2-qY-a3s" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="354.5" y="780.5"/>
<point key="canvasLocation" x="354.5" y="804.5"/>
</scene>
</scenes>
<resources>
Expand Down
2 changes: 2 additions & 0 deletions DuckDuckGo/NetworkProtection/ExcludedApps/ExcludedAppsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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() {
Expand Down

0 comments on commit 9be39d1

Please sign in to comment.