Initial implementation for new exclusions in VPN settings complete

DuckDuckGo.xcodeproj/project.pbxproj

@@ -3435,7 +3435,7 @@
 /* Begin PBXCopyFilesBuildPhase section */
 		4B2D065D2A11D2AE00DE1F49 /* Embed Login Items */ = {
 			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			dstPath = Contents/Library/LoginItems;
 			dstSubfolderSpec = 1;
 			files = (

DuckDuckGo/Assets.xcassets/Images/Globe-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Globe-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Window-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Window-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift

@@ -179,6 +179,8 @@ 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")
@@ -214,6 +216,12 @@ extension UserText {
         return String(format: message, count)
     }
 
+    // MARK: - Exclusions
+
+    static let vpnSettingsExclusionsDescription = NSLocalizedString("vpn.setting.exclusions.description", value: "Some websites and apps are not compatible with VPNs. Exclude these sites and apps to use them while connected to the VPN.", comment: "The description shown for the exclusions section in VPN settings")
+
+    static let vpnSettingsManageExclusionsButtonTitle = NSLocalizedString("vpn.setting.exclusions.manage.button.title", value: "Manage...", comment: "Title for the button to manage exclusions")
+
     // MARK: - Excluded Domains
 
     static let vpnExcludedDomainsDescription = NSLocalizedString("vpn.setting.excluded.domains.description", value: "Excluded websites will bypass the VPN.", comment: "Excluded Sites description")

DuckDuckGo/Localizable.xcstrings

@@ -68885,6 +68885,18 @@
         }
       }
     },
+    "vpn.excluded.apps.title" : {
+      "comment" : "Excluded Apps title in VPN settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Excluded Apps"
+          }
+        }
+      }
+    },
     "vpn.excluded.domains.add.domain" : {
       "comment" : "Add Domain button for the excluded sites view",
       "extractionState" : "extracted_with_value",
@@ -69065,6 +69077,18 @@
         }
       }
     },
+    "vpn.exclusions.title" : {
+      "comment" : "Exclusions section title in VPN settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Exclusions"
+          }
+        }
+      }
+    },
     "vpn.feedback-form.button.cancel" : {
       "comment" : "Title for the Cancel button of the VPN feedback form",
       "extractionState" : "extracted_with_value",
@@ -71585,6 +71609,30 @@
         }
       }
     },
+    "vpn.setting.exclusions.description" : {
+      "comment" : "The description shown for the exclusions section in VPN settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Some websites and apps are not compatible with VPNs. Exclude these sites and apps to use them while connected to the VPN."
+          }
+        }
+      }
+    },
+    "vpn.setting.exclusions.manage.button.title" : {
+      "comment" : "Title for the button to manage exclusions",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Manage..."
+          }
+        }
+      }
+    },
     "vpn.setting.title.connect.on.login" : {
       "comment" : "Connect on Login setting title",
       "extractionState" : "extracted_with_value",

DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift

@@ -86,6 +86,16 @@ final class VPNPreferencesModel: ObservableObject {
         proxySettings.proxyAvailable
     }
 
+    var excludedDomainsCount: Int {
+        proxySettings.excludedDomains.count
+    }
+
+    var excludedAppsCount: Int {
+        proxySettings.appRoutingRules.filter { (bundleId, rule) in
+            rule == .exclude
+        }.count
+    }
+
     @Published var notifyStatusChanges: Bool {
         didSet {
             settings.notifyStatusChanges = notifyStatusChanges

DuckDuckGo/Preferences/View/PreferencesVPNView.swift

@@ -118,23 +118,24 @@ extension Preferences {
 
                     PreferencePaneSection {
                         TextMenuItemHeader(UserText.vpnExclusionsTitle)
+                        TextMenuItemCaption(UserText.vpnSettingsExclusionsDescription)
 
                         SubfeatureGroup {
-                            SubfeatureView(iconName: "VPN-Icon",
+                            SubfeatureView(icon: Image(.globe16),
                                            title: UserText.vpnExcludedSitesTitle,
-                                           description: "None",
-                                           buttonName: "Manage...",
-                                           buttonAction: { /* no-op */ },
+                                           description: exclusionCountString(value: model.excludedDomainsCount),
+                                           buttonName: UserText.vpnSettingsManageExclusionsButtonTitle,
+                                           buttonAction: { model.manageExcludedSites() },
                                            enabled: true)
 
                             Divider()
                                 .foregroundColor(Color.secondary)
 
-                            SubfeatureView(iconName: "VPN-Icon",
-                                           title: "Excluded Apps",
-                                           description: "None",
-                                           buttonName: "Manage...",
-                                           buttonAction: { /* no-op */ },
+                            SubfeatureView(icon: Image(.window16),
+                                           title: UserText.vpnExcludedAppsTitle,
+                                           description: exclusionCountString(value: model.excludedAppsCount),
+                                           buttonName: UserText.vpnSettingsManageExclusionsButtonTitle,
+                                           buttonAction: { /* will be implemented in follow-up PR */ },
                                            enabled: true)
                         }
                     }
@@ -203,6 +204,12 @@ extension Preferences {
                 }
             }
         }
+
+        /// Resolves the text to be used for exclusion counts
+        ///
+        private func exclusionCountString(value: Int) -> String {
+            value > 0 ? String(value) : "None"
+        }
     }
 }
 

LocalPackages/PreferencesUI/Package.swift

@@ -15,6 +15,9 @@ let package = Package(
     targets: [
         .target(
             name: "PreferencesUI",
+            dependencies: [
+                .product(name: "SwiftUIExtensions", package: "SwiftUIExtensions")
+            ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
             ]

LocalPackages/PreferencesUI/Sources/PreferencesUI/SubfeatureView.swift

@@ -20,15 +20,16 @@ import SwiftUI
 import SwiftUIExtensions
 
 public struct SubfeatureView: View {
-    public var iconName: String
+    public var icon: Image
     public var title: String
     public var description: String
     public var buttonName: String?
     public var buttonAction: (() -> Void)?
     public var enabled: Bool
 
-    public init(iconName: String, title: String, description: String, buttonName: String? = nil, buttonAction: (() -> Void)? = nil, enabled: Bool = true) {
-        self.iconName = iconName
+    public init(icon: Image, title: String, description: String, buttonName: String? = nil, buttonAction: (() -> Void)? = nil, enabled: Bool = true) {
+
+        self.icon = icon
         self.title = title
         self.description = description
         self.buttonName = buttonName
@@ -40,7 +41,7 @@ public struct SubfeatureView: View {
         VStack(alignment: .center) {
             VStack {
                 HStack(alignment: .center, spacing: 8) {
-                    Image(iconName, bundle: .module)
+                    icon
                         .padding(4)
                         .background(Color(.badgeBackground))
                         .cornerRadius(4)