duckduckgo · diegoreymendez · Dec 20, 2024 · Oct 6, 2024 · Dec 3, 2024 · Dec 3, 2024
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -483,8 +483,32 @@ extension Pixel {
 
         case networkProtectionWidgetConnectAttempt
         case networkProtectionWidgetConnectSuccess
+        case networkProtectionWidgetConnectCancelled
+        case networkProtectionWidgetConnectFailure
         case networkProtectionWidgetDisconnectAttempt
         case networkProtectionWidgetDisconnectSuccess
+        case networkProtectionWidgetDisconnectCancelled
+        case networkProtectionWidgetDisconnectFailure
+
+        case vpnControlCenterConnectAttempt
+        case vpnControlCenterConnectSuccess
+        case vpnControlCenterConnectCancelled
+        case vpnControlCenterConnectFailure
+
+        case vpnControlCenterDisconnectAttempt
+        case vpnControlCenterDisconnectSuccess
+        case vpnControlCenterDisconnectCancelled
+        case vpnControlCenterDisconnectFailure
+
+        case vpnShortcutConnectAttempt
+        case vpnShortcutConnectSuccess
+        case vpnShortcutConnectCancelled
+        case vpnShortcutConnectFailure
+
+        case vpnShortcutDisconnectAttempt
+        case vpnShortcutDisconnectSuccess
+        case vpnShortcutDisconnectCancelled
+        case vpnShortcutDisconnectFailure
 
         case networkProtectionDNSUpdateCustom
         case networkProtectionDNSUpdateDefault
@@ -1451,9 +1475,9 @@ extension Pixel.Event {
         case .remoteMessagePrimaryActionClicked: return "m_remote_message_primary_action_clicked"
         case .remoteMessageSecondaryActionClicked: return "m_remote_message_secondary_action_clicked"
         case .remoteMessageSheet: return "m_remote_message_sheet"
-            
+
             // MARK: debug pixels
-            
+
         case .dbCrashDetected: return "m_d_crash"
         case .dbCrashDetectedDaily: return "m_d_crash_daily"
         case .crashOnCrashHandlersSetUp: return "m_d_crash_on_handlers_setup"
@@ -1755,8 +1779,32 @@ extension Pixel.Event {
 
         case .networkProtectionWidgetConnectAttempt: return "m_netp_widget_connect_attempt"
         case .networkProtectionWidgetConnectSuccess: return "m_netp_widget_connect_success"
+        case .networkProtectionWidgetConnectCancelled: return "m_netp_widget_connect_cancelled"
+        case .networkProtectionWidgetConnectFailure: return "m_netp_widget_connect_failure"
         case .networkProtectionWidgetDisconnectAttempt: return "m_netp_widget_disconnect_attempt"
         case .networkProtectionWidgetDisconnectSuccess: return "m_netp_widget_disconnect_success"
+        case .networkProtectionWidgetDisconnectCancelled: return "m_netp_widget_disconnect_cancelled"
+        case .networkProtectionWidgetDisconnectFailure: return "m_netp_widget_disconnect_failure"
+
+        case .vpnControlCenterConnectAttempt: return "m_vpn_control-center_connect_attempt"
+        case .vpnControlCenterConnectSuccess: return "m_vpn_control-center_connect_success"
+        case .vpnControlCenterConnectCancelled: return "m_vpn_control-center_connect_cancelled"
+        case .vpnControlCenterConnectFailure: return "m_vpn_control-center_connect_failure"
+
+        case .vpnControlCenterDisconnectAttempt: return "m_vpn_control-center_disconnect_attempt"
+        case .vpnControlCenterDisconnectSuccess: return "m_vpn_control-center_disconnect_success"
+        case .vpnControlCenterDisconnectCancelled: return "m_vpn_control-center_disconnect_cancelled"
+        case .vpnControlCenterDisconnectFailure: return "m_vpn_control-center_disconnect_failure"
+
+        case .vpnShortcutConnectAttempt: return "m_vpn_shortcut_connect_attempt"
+        case .vpnShortcutConnectSuccess: return "m_vpn_shortcut_connect_success"
+        case .vpnShortcutConnectCancelled: return "m_vpn_shortcut_connect_cancelled"
+        case .vpnShortcutConnectFailure: return "m_vpn_shortcut_connect_failure"
+
+        case .vpnShortcutDisconnectAttempt: return "m_vpn_shortcut_disconnect_attempt"
+        case .vpnShortcutDisconnectSuccess: return "m_vpn_shortcut_disconnect_success"
+        case .vpnShortcutDisconnectCancelled: return "m_vpn_shortuct_disconnect_cancelled"
+        case .vpnShortcutDisconnectFailure: return "m_vpn_shortcut_disconnect_failure"
 
         // MARK: Secure Vault
         case .secureVaultL1KeyMigration: return "m_secure-vault_keystore_event_l1-key-migration"

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -50,8 +50,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/DesignResourcesKit",
       "state" : {
-        "revision" : "ad133f76501edcb2bfa841e33aebc0da5f92bb5c",
-        "version" : "3.3.0"
+        "revision" : "ba2f7e26575a9529ce268ce16f01760187649ce6"
       }
     },
     {

diff --git a/DuckDuckGo/DuckDuckGo.entitlements b/DuckDuckGo/DuckDuckGo.entitlements
@@ -10,6 +10,8 @@
 	<array>
 		<string>packet-tunnel-provider</string>
 	</array>
+	<key>com.apple.developer.siri</key>
+	<true/>
 	<key>com.apple.developer.web-browser</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>

diff --git a/DuckDuckGo/DuckDuckGoAlpha.entitlements b/DuckDuckGo/DuckDuckGoAlpha.entitlements
@@ -8,6 +8,8 @@
 	<array>
 		<string>packet-tunnel-provider</string>
 	</array>
+	<key>com.apple.developer.siri</key>
+	<true/>
 	<key>com.apple.developer.web-browser</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>

diff --git a/DuckDuckGo/HomeMessage.xcassets/ControlCenterWidget/Contents.json b/DuckDuckGo/HomeMessage.xcassets/ControlCenterWidget/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...uckGo/HomeMessage.xcassets/ControlCenterWidget/ControlCenterBottom.imageset/Contents.json b/...uckGo/HomeMessage.xcassets/ControlCenterWidget/ControlCenterBottom.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 624697 1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/.../HomeMessage.xcassets/ControlCenterWidget/ControlCenterBottom.imageset/Frame 624697 1.pdf b/.../HomeMessage.xcassets/ControlCenterWidget/ControlCenterBottom.imageset/Frame 624697 1.pdf
diff --git a/...kGo/HomeMessage.xcassets/WidgetEducation/WidgetEducationHomeScreen.imageset/Contents.json b/...kGo/HomeMessage.xcassets/WidgetEducation/WidgetEducationHomeScreen.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "[email protected]",
+      "filename" : "Frame 624697.pdf",
       "idiom" : "universal"
     }
   ],

diff --git a/.../HomeMessage.xcassets/WidgetEducation/WidgetEducationHomeScreen.imageset/Frame 624697.pdf b/.../HomeMessage.xcassets/WidgetEducation/WidgetEducationHomeScreen.imageset/Frame 624697.pdf
diff --git a/...omeMessage.xcassets/WidgetEducation/WidgetEducationHomeScreeniOS17.imageset/Contents.json b/...omeMessage.xcassets/WidgetEducation/WidgetEducationHomeScreeniOS17.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...onHomeScreen.imageset/[email protected] → ...eScreeniOS17.imageset/[email protected] b/...onHomeScreen.imageset/[email protected] → ...eScreeniOS17.imageset/[email protected]
diff --git a/DuckDuckGo/Info.plist b/DuckDuckGo/Info.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>youtube</string>
-	</array>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>com.duckduckgo.app.configurationRefresh</string>
@@ -154,10 +150,16 @@
 	<string>$(GROUP_ID_PREFIX)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>youtube</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
+	<key>NSAdvertisingAttributionReportEndpoint</key>
+	<string>https://duckduckgo.com</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -175,10 +177,15 @@
 	<string>Allows you to save images to your device</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
 	<string>This is required to use voice search. DuckDuckGo never records what you say.</string>
+	<key>NSSupportsLiveActivities</key>
+	<true/>
 	<key>NSUserActivityTypes</key>
 	<array>
+		<string>CancelSnoozeLiveActivityAppIntentIntent</string>
 		<string>ConfigurationIntent</string>
 	</array>
+	<key>SUBSCRIPTION_APP_GROUP</key>
+	<string>$(AppIdentifierPrefix)$(SUBSCRIPTION_APP_GROUP)</string>
 	<key>UIApplicationShortcutItems</key>
 	<array>
 		<dict>
@@ -213,10 +220,6 @@
 	</array>
 	<key>UIStatusBarHidden</key>
 	<true/>
-	<key>SUBSCRIPTION_APP_GROUP</key>
-	<string>$(AppIdentifierPrefix)$(SUBSCRIPTION_APP_GROUP)</string>
-	<key>NSSupportsLiveActivities</key>
-	<true/>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleDefault</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
@@ -226,8 +229,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSAdvertisingAttributionReportEndpoint</key>
-	<string>https://duckduckgo.com</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
 	<key>VAULT_APP_GROUP</key>

diff --git a/DuckDuckGo/NetworkProtectionStatusView.swift b/DuckDuckGo/NetworkProtectionStatusView.swift
@@ -65,7 +65,9 @@ struct NetworkProtectionStatusView: View {
         })
         .applyInsetGroupedListStyle()
         .sheet(isPresented: $statusModel.showAddWidgetEducationView) {
-            widgetEducationSheet()
+            if #available(iOS 17.0, *) {
+                widgetEducationSheet()
+            }
         }
         .onAppear {
             if #available(iOS 18.0, *) {
@@ -413,6 +415,7 @@ struct NetworkProtectionStatusView: View {
 
     // MARK: - Sheets
 
+    @available(iOS 17.0, *)
     private func widgetEducationSheet() -> some View {
         NavigationView {
             WidgetEducationView()

diff --git a/DuckDuckGo/NetworkProtectionStatusViewModel.swift b/DuckDuckGo/NetworkProtectionStatusViewModel.swift
@@ -468,7 +468,7 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
             await disableNetP()
         }
 
-        WidgetCenter.shared.reloadTimelines(ofKind: "VPNStatusWidget")
+        VPNReloadStatusWidgets()
     }
 
     @MainActor

diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift
@@ -26,24 +26,14 @@ struct NetworkProtectionVPNSettingsView: View {
     var body: some View {
         VStack {
             List {
-                // Widget only available for iOS 17 and up
-                if #available(iOS 17.0, *) {
-                    Section {
-                        NavigationLink {
-                            WidgetEducationView.vpn
-                        } label: {
-                            Text(UserText.vpnSettingsAddWidget).daxBodyRegular()
-                        }
-                    }
-                    .listRowBackground(Color(designSystemColor: .surface))
-                }
-
                 switch viewModel.viewKind {
                 case .loading: EmptyView()
                 case .unauthorized: notificationsUnauthorizedView
                 case .authorized: notificationAuthorizedView
                 }
 
+                shortcutsView
+
                 toggleSection(
                     text: UserText.netPExcludeLocalNetworksSettingTitle,
                     headerText: UserText.netPExcludeLocalNetworksSettingHeader,
@@ -156,17 +146,68 @@ struct NetworkProtectionVPNSettingsView: View {
         .listRowBackground(Color(designSystemColor: .surface))
     }
 
+    @ViewBuilder
+    private var shortcutsView: some View {
+        // Widget only available for iOS 17 and up
+        if #available(iOS 17.0, *) {
+            Section {
+                NavigationLink {
+                    WidgetEducationView.vpn
+                } label: {
+                    Label {
+                        Text(UserText.vpnSettingsAddWidget)
+                    } icon: {
+                        Image(.addWidgetColor24)
+                            .frame(width: 24, height: 24)
+                    }.daxBodyRegular()
+                }
+
+                #if ALPHA || DEBUG
+                if #available(iOS 18.0, *) {
+                    NavigationLink {
+                        ControlCenterWidgetEducationView(navBarTitle: "Add DuckDuckGo VPN Shortcut to Your Control Center",
+                                                         widget: .vpnToggle)
+                    } label: {
+                        Label {
+                            Text(UserText.vpnSettingsAddControlCenterWidget)
+                        } icon: {
+                            Image(.settingsColor24)
+                                .frame(width: 24, height: 24)
+                        }.daxBodyRegular()
+                    }
+                }
+
+                NavigationLink {
+                    SiriEducationView()
+                } label: {
+                    Label {
+                        Text(UserText.vpnSettingsControlWithSiri)
+                    } icon: {
+                        Image(.askSiriColor24)
+                            .frame(width: 24, height: 24)
+                    }.daxBodyRegular()
+                }
+                #endif
+            } header: {
+                Text(UserText.netPVPNShortcutsSectionHeader)
+            }
+            .listRowBackground(Color(designSystemColor: .surface))
+        }
+    }
 }
 
+@available(iOS 17.0, *)
 private extension WidgetEducationView {
+
     static var vpn: Self {
         WidgetEducationView(
-            navBarTitle: UserText.vpnSettingsAddWidget,
+            navBarTitle: UserText.settingsAddVPNWidget,
             thirdParagraphText: UserText.addVPNWidgetSettingsThirdParagraph,
-            widgetExampleImageConfig: .init(
-                image: Image("WidgetEducationVPNWidgetExample"),
+            thirdParagraphDetail: .image(
+                Image("WidgetEducationVPNWidgetExample"),
                 maxWidth: 164,
-                horizontalOffset: -7
+                horizontalOffset: -7,
+                dropsShadow: true
             )
         )
     }

diff --git a/DuckDuckGo/NetworkProtectionWidgetRefreshModel.swift b/DuckDuckGo/NetworkProtectionWidgetRefreshModel.swift
@@ -36,7 +36,7 @@ class NetworkProtectionWidgetRefreshModel {
     }
 
     public func refreshVPNWidget() {
-        WidgetCenter.shared.reloadTimelines(ofKind: "VPNStatusWidget")
+        VPNReloadStatusWidgets()
     }
 
 }