Merge branch 'main' into sam/vpn-snooze-initial-support

* main: Update VPN metadata to include entitlement (#3002) Remove noise from wake pixel (#2986) Release 7.126.0-1 (#2998) [DuckPlayer] - 2. Overlay Views (#2989) update translations for autocomplete settings changes (#2995) Fixes goBack() behavior (#2996) Re-add the autocomplete settings toggle pixels (#2991) Update BSK with autofill 12.0.1 (#2983) Final batch of new autofill pixels (#2977) don't attach a new home screen if autoclear is in progress (#2988) Custom DNS for VPN (#2971) Duck Player settings page (#2990) Add feature flag for improved New Tab Page (#2980)
duckduckgo · Jun 27, 2024 · 5bb79dc · 5bb79dc
2 parents 8f3c867 + 9ce5afe
commit 5bb79dc
Show file tree

Hide file tree

Showing 74 changed files with 1,368 additions and 364 deletions.
diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -33,6 +33,7 @@ public enum FeatureFlag: String {
     case autoconsentOnByDefault
     case history
     case historyRollout
+    case newTabPageSections
 }
 
 extension FeatureFlag: FeatureFlagSourceProviding {
@@ -62,7 +63,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.feature(.history))
         case .historyRollout:
             return .remoteReleasable(.subfeature(HistorySubFeature.onByDefault))
-
+        case .newTabPageSections:
+            return .internalOnly
         }
     }
 }

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -269,6 +269,14 @@ extension Pixel {
         case autofillToggledOff
         case autofillLoginsStacked
 
+        case autofillManagementOpened
+        case autofillManagementCopyUsername
+        case autofillManagementCopyPassword
+        case autofillManagementDeleteLogin
+        case autofillManagementDeleteAllLogins
+        case autofillManagementSaveLogin
+        case autofillManagementUpdateLogin
+
         case autofillMultipleAuthCallsTriggered
 
         case getDesktopCopy
@@ -404,6 +412,9 @@ extension Pixel {
         case networkProtectionWidgetDisconnectAttempt
         case networkProtectionWidgetDisconnectSuccess
 
+        case networkProtectionDNSUpdateCustom
+        case networkProtectionDNSUpdateDefault
+
         // MARK: remote messaging pixels
 
         case remoteMessageShown
@@ -656,12 +667,12 @@ extension Pixel {
         case settingsWebTrackingProtectionOpen
         case settingsGpcOn
         case settingsGpcOff
-        case settingsAutocompleteOn
-        case settingsAutocompleteOff
-        case settingsRecentlyVisitedOn
-        case settingsRecentlyVisitedOff
         case settingsGeneralAutocompleteOn
         case settingsGeneralAutocompleteOff
+        case settingsPrivateSearchAutocompleteOn
+        case settingsPrivateSearchAutocompleteOff
+        case settingsRecentlyVisitedOn
+        case settingsRecentlyVisitedOff
         case settingsAddressBarSelectorPressed
         case settingsAccessibilityOpen
         case settingsAccessiblityTextSize
@@ -960,6 +971,21 @@ extension Pixel.Event {
 
         case .autofillLoginsStacked: return "m_autofill_logins_stacked"
 
+        case .autofillManagementOpened:
+            return "m_autofill_management_opened"
+        case .autofillManagementCopyUsername:
+            return "m_autofill_management_copy_username"
+        case .autofillManagementCopyPassword:
+            return "m_autofill_management_copy_password"
+        case .autofillManagementDeleteLogin:
+            return "m_autofill_management_delete_login"
+        case .autofillManagementDeleteAllLogins:
+            return "m_autofill_management_delete_all_logins"
+        case .autofillManagementSaveLogin:
+            return "m_autofill_management_save_login"
+        case .autofillManagementUpdateLogin:
+            return "m_autofill_management_update_login"
+
         case .autofillMultipleAuthCallsTriggered: return "m_autofill_multiple_auth_calls_triggered"
 
         case .getDesktopCopy: return "m_get_desktop_copy"
@@ -1069,6 +1095,9 @@ extension Pixel.Event {
         case .networkProtectionServerMigrationAttemptSuccess: return "m_netp_ev_server_migration_attempt_success"
         case .networkProtectionServerMigrationAttemptFailure: return "m_netp_ev_server_migration_attempt_failed"
 
+        case .networkProtectionDNSUpdateCustom: return "m_netp_ev_update_dns_custom"
+        case .networkProtectionDNSUpdateDefault: return "m_netp_ev_update_dns_default"
+
             // MARK: remote messaging pixels
 
         case .remoteMessageShown: return "m_remote_message_shown"
@@ -1335,12 +1364,12 @@ extension Pixel.Event {
         case .settingsWebTrackingProtectionOpen: return "m_settings_web_tracking_protection_open"
         case .settingsGpcOn: return "m_settings_gpc_on"
         case .settingsGpcOff: return "m_settings_gpc_off"
-        case .settingsAutocompleteOn: return "m_settings_autocomplete_on"
-        case .settingsAutocompleteOff: return "m_settings_autocomplete_off"
-        case .settingsRecentlyVisitedOn: return "m_settings_autocomplete_recently-visited_on"
-        case .settingsRecentlyVisitedOff: return "m_settings_autocomplete_recently-visited_off"
         case .settingsGeneralAutocompleteOn: return "m_settings_general_autocomplete_on"
         case .settingsGeneralAutocompleteOff: return "m_settings_general_autocomplete_off"
+        case .settingsPrivateSearchAutocompleteOn: return "m_settings_private_search_autocomplete_on"
+        case .settingsPrivateSearchAutocompleteOff: return "m_settings_private_search_autocomplete_off"
+        case .settingsRecentlyVisitedOn: return "m_settings_autocomplete_recently-visited_on"
+        case .settingsRecentlyVisitedOff: return "m_settings_autocomplete_recently-visited_off"
         case .settingsAddressBarSelectorPressed: return "m_settings_address_bar_selector_pressed"
         case .settingsAccessibilityOpen: return "m_settings_accessibility_open"
         case .settingsAccessiblityTextSize: return "m_settings_accessiblity_text_size"

diff --git a/Core/UserDefaultsPropertyWrapper.swift b/Core/UserDefaultsPropertyWrapper.swift
@@ -150,8 +150,13 @@ public struct UserDefaultsWrapper<T> {
         case pixelExperimentForBrokenSitesCohort = "com.duckduckgo.ios.pixel.experiment.for.broken.sites.cohort"
 
         case duckPlayerMode = "com.duckduckgo.ios.duckPlayerMode"
+        case duckPlayerAskModeOverlayHidden = "com.duckduckgo.ios.duckPlayerAskModeOverlayHidden"
 
         case vpnRedditWorkaroundInstalled = "com.duckduckgo.ios.vpn.workaroundInstalled"
+
+        // Debug keys
+
+        case debugNewTabPageSectionsEnabledKey = "com.duckduckgo.ios.debug.newTabPageSectionsEnabled"
     }
 
     private let key: Key