NetP Design Review minus errors

DuckDuckGo.xcodeproj/project.pbxproj

@@ -5838,7 +5838,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Conditionally embeds the PacketTunnelProvider extension for debug builds.\n# To be moved to the Embed App Extensions phase on release.\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n# Copy the extension\n    cp -R \"${BUILT_PRODUCTS_DIR}/PacketTunnelProvider.appex\" \"${BUILT_PRODUCTS_DIR}/${PLUGINS_FOLDER_PATH}\"\nfi\n";
+			shellScript = "# Conditionally embeds the PacketTunnelProvider extension for debug builds.\n# To be moved to the Embed App Extensions phase on release.\nif [ \"${CONFIGURATION}\" = \"Debug\" ] || [ \"${CONFIGURATION}\" = \"Alpha\" ]; then\n# Copy the extension\n    cp -R \"${BUILT_PRODUCTS_DIR}/PacketTunnelProvider.appex\" \"${BUILT_PRODUCTS_DIR}/${PLUGINS_FOLDER_PATH}\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -8229,7 +8229,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG APP_TRACKING_PROTECTION NETWORK_PROTECTION";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NETWORK_PROTECTION";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -156,7 +156,7 @@
       },
       {
         "package": "TrackerRadarKit",
-        "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git",
+        "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit",
         "state": {
           "branch": null,
           "revision": "4684440d03304e7638a2c8086895367e90987463",

DuckDuckGo/Assets.xcassets/InviteLock.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Invite-Lock-96.pdf",
+      "filename" : "lock-100.pdf",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/InviteLockSuccess.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Invite-Lock-Success-96.pdf",
+      "filename" : "lock-success-100.pdf",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/VPN.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "VPN.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

DuckDuckGo/Assets.xcassets/VPNDisabled.imageset/Contents.json

@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "VPNDisabled.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

DuckDuckGo/NetworkProtectionDebugViewController.swift

@@ -18,8 +18,13 @@
 //
 
 import UIKit
+
+#if NETWORK_PROTECTION
+
 import NetworkProtection
 
+#endif
+
 final class NetworkProtectionDebugViewController: UITableViewController {
     private let titles = [
         Sections.keychain: "Keychain"
@@ -37,6 +42,15 @@ final class NetworkProtectionDebugViewController: UITableViewController {
 
     }
 
+    enum SimulateFailureRows: Int, CaseIterable {
+
+        case tunnelFailure
+        case controllerFailure
+
+    }
+
+#if NETWORK_PROTECTION
+
     private let tokenStore: NetworkProtectionTokenStore
 
     init?(coder: NSCoder,
@@ -51,6 +65,8 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         self.init(coder: coder, tokenStore: NetworkProtectionKeychainTokenStore())
     }
 
+#endif
+
     override func numberOfSections(in tableView: UITableView) -> Int {
         return Sections.allCases.count
     }
@@ -88,12 +104,13 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         }
     }
 
+    #if NETWORK_PROTECTION
+
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         switch Sections(rawValue: indexPath.section) {
         case .keychain:
             switch KeychainRows(rawValue: indexPath.row) {
-            case .clearAuthToken:
-                try? tokenStore.deleteToken()
+            case .clearAuthToken: clearAuthToken()
             default: break
             }
         default: break
@@ -102,4 +119,11 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         tableView.deselectRow(at: indexPath, animated: true)
     }
 
+    // MARK: Selection Actions
+
+    private func clearAuthToken() {
+        try? tokenStore.deleteToken()
+    }
+
+    #endif
 }

DuckDuckGo/NetworkProtectionInviteView.swift

@@ -27,12 +27,16 @@ struct NetworkProtectionInviteView: View {
     @ObservedObject var model: NetworkProtectionInviteViewModel
 
     var body: some View {
-        switch model.currentStep {
-        case .codeEntry:
-            codeEntryView
-        case .success:
-            successView
+        Group {
+            switch model.currentStep {
+            case .codeEntry:
+                codeEntryView
+            case .success:
+                successView
+            }
         }
+        .transition(.slideFromRight)
+        .animation(.default, value: model.currentStep.isSuccess)
     }
 
     @ViewBuilder
@@ -54,12 +58,13 @@ struct NetworkProtectionInviteView: View {
             .background(Color.textFieldBackground)
             .cornerRadius(10)
             .disabled(model.shouldDisableTextField)
-            Button(UserText.inviteDialogSubmitButton) {
+            Button(UserText.inviteDialogContinueButton) {
                 Task {
                     await model.submit()
                 }
             }
             .buttonStyle(PrimaryButtonStyle(disabled: model.shouldDisableSubmit))
+            .disabled(model.shouldDisableSubmit)
         }
         .alert(isPresented: $model.shouldShowAlert) {
             Alert(
@@ -99,16 +104,16 @@ private struct NetworkProtectionInviteMessageView<Content>: View where Content:
                     Text(messageData.title)
                         .font(.system(size: 22, weight: .semibold))
                         .multilineTextAlignment(.center)
-                        .foregroundColor(.primary)
+                        .foregroundColor(.textPrimary)
                     Text(messageData.message)
                         .font(.system(size: 16))
                         .multilineTextAlignment(.center)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(.textSecondary)
                         .padding(.bottom, 16)
                     interactiveContent()
                     Spacer()
                     Text(UserText.netPInviteOnlyMessage)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(.textSecondary)
                         .font(.system(size: 13))
                         .multilineTextAlignment(.center)
                 }
@@ -128,7 +133,16 @@ private struct NetworkProtectionInviteMessageData {
     let footer = UserText.netPInviteOnlyMessage
 }
 
+extension AnyTransition {
+    static var slideFromRight: AnyTransition {
+        AnyTransition.asymmetric(
+            insertion: .move(edge: .trailing),
+            removal: .move(edge: .leading))}
+}
+
 private extension Color {
+    static let textPrimary = Color(designSystemColor: .textPrimary)
+    static let textSecondary = Color(designSystemColor: .textSecondary)
     static let textFieldBackground = Color(designSystemColor: .surface)
     static let viewBackground = Color(designSystemColor: .background)
 }

DuckDuckGo/NetworkProtectionInviteViewModel.swift

@@ -24,6 +24,10 @@ import NetworkProtection
 
 enum NetworkProtectionInviteStep {
     case codeEntry, success
+
+    var isSuccess: Bool {
+        self == .success
+    }
 }
 
 final class NetworkProtectionInviteViewModel: ObservableObject {
@@ -49,13 +53,18 @@ final class NetworkProtectionInviteViewModel: ObservableObject {
         self.redemptionCoordinator = redemptionCoordinator
     }
 
+    private var isLoading = false
+
     @MainActor
     func submit() async {
-        shouldDisableSubmit = true
+        guard !isLoading else {
+            return
+        }
+        isLoading = true
         shouldDisableTextField = true
         defer {
-            shouldDisableSubmit = false
             shouldDisableTextField = false
+            isLoading = false
         }
         do {
             try await redemptionCoordinator.redeem(text.trimmingWhitespace())

DuckDuckGo/NetworkProtectionStatusView.swift

@@ -43,10 +43,10 @@ struct NetworkProtectionStatusView: View {
                 VStack(alignment: .leading, spacing: 4) {
                     Text(UserText.netPStatusViewTitle)
                         .font(.system(size: 16))
-                        .foregroundColor(.primary)
+                        .foregroundColor(.textPrimary)
                     Text(statusModel.statusMessage)
                         .font(.system(size: 13))
-                        .foregroundColor(.secondary)
+                        .foregroundColor(.textSecondary)
                 }
 
                 Toggle("", isOn: Binding(
@@ -58,7 +58,7 @@ struct NetworkProtectionStatusView: View {
                     }
                 ))
                 .disabled(statusModel.shouldDisableToggle)
-                .toggleStyle(SwitchToggleStyle(tint: .toggleColor))
+                .toggleStyle(SwitchToggleStyle(tint: .controlColor))
             }
             .listRowBackground(Color.cellBackground)
         } header: {
@@ -73,8 +73,8 @@ struct NetworkProtectionStatusView: View {
     @ViewBuilder
     private func header() -> some View {
         HStack {
-            Spacer()
-            VStack(alignment: .center, spacing: 16) {
+            Spacer(minLength: 0)
+            VStack(alignment: .center, spacing: 8) {
                 Image(statusModel.statusImageID)
                     .resizable()
                     .scaledToFit()
@@ -83,15 +83,18 @@ struct NetworkProtectionStatusView: View {
                 Text(statusModel.headerTitle)
                     .font(.system(size: 17, weight: .semibold))
                     .multilineTextAlignment(.center)
-                    .foregroundColor(.primary)
+                    .foregroundColor(.textPrimary)
                 Text(UserText.netPStatusHeaderMessage)
                     .font(.system(size: 13))
                     .multilineTextAlignment(.center)
-                    .foregroundColor(.secondary)
+                    .foregroundColor(.textSecondary)
+                    .padding(.bottom, 8)
             }
             .padding(.bottom, 4)
+            // Pads beyond the default header inset
+            .padding(.horizontal, -16)
             .background(Color.viewBackground)
-            Spacer()
+            Spacer(minLength: 0)
         }
     }
 
@@ -113,7 +116,7 @@ struct NetworkProtectionStatusView: View {
                 )
             }
         } header: {
-            Text(UserText.netPStatusViewConnectionDetails).foregroundColor(.primary)
+            Text(UserText.netPStatusViewConnectionDetails).foregroundColor(.textPrimary)
         } footer: {
             inviteOnlyFooter()
         }
@@ -123,8 +126,8 @@ struct NetworkProtectionStatusView: View {
     private func inviteOnlyFooter() -> some View {
         // Needs to be inlined like this for the markdown parsing to work
         Text("\(UserText.netPInviteOnlyMessage) [\(UserText.netPStatusViewShareFeedback)](https://form.asana.com/?k=_wNLt6YcT5ILpQjDuW0Mxw&d=137249556945)")
-            .foregroundColor(.secondary)
-            .accentColor(.accentColor)
+            .foregroundColor(.textSecondary)
+            .accentColor(Color.controlColor)
             .font(.system(size: 13))
             .padding(.top, 6)
     }
@@ -140,11 +143,11 @@ private struct NetworkProtectionServerItemView: View {
             Image(imageID)
             Text(title)
                 .font(.system(size: 16))
-                .foregroundColor(.primary)
-            Spacer()
+                .foregroundColor(.textPrimary)
+            Spacer(minLength: 2)
             Text(value)
                 .font(.system(size: 16))
-                .foregroundColor(.secondary)
+                .foregroundColor(.textSecondary)
         }
         .listRowBackground(Color.cellBackground)
     }
@@ -186,11 +189,11 @@ private extension View {
 }
 
 private extension Color {
-    static let titleText = Color(designSystemColor: .textPrimary)
-    static let messageText = Color(designSystemColor: .textSecondary)
+    static let textPrimary = Color(designSystemColor: .textPrimary)
+    static let textSecondary = Color(designSystemColor: .textSecondary)
     static let cellBackground = Color(designSystemColor: .surface)
     static let viewBackground = Color(designSystemColor: .background)
-    static let toggleColor = Color(designSystemColor: .accent)
+    static let controlColor = Color(designSystemColor: .accent)
 }
 
 struct NetworkProtectionStatusView_Previews: PreviewProvider {