Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show VPN onboarding tips #3429

Merged
merged 38 commits into from
Oct 28, 2024
Merged

Show VPN onboarding tips #3429

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4d26d2a
Add VPN tips
diegoreymendez Sep 24, 2024
b1c4384
Add VPN tips
diegoreymendez Sep 24, 2024
d2ecf8f
WIP
diegoreymendez Oct 6, 2024
1d52ac9
Implemented the presentation logic for all vpn tips
diegoreymendez Oct 10, 2024
c65665a
Makes several improvements to the the VPN tips
diegoreymendez Oct 10, 2024
5429913
WIP
diegoreymendez Oct 10, 2024
0b7ab76
Code cleanup
diegoreymendez Oct 11, 2024
5e67a21
Code cleanup
diegoreymendez Oct 11, 2024
a695491
Rolls back some unrelated changes
diegoreymendez Oct 11, 2024
c0885b6
Rolls back an unnecessary change
diegoreymendez Oct 11, 2024
3e95e05
Code cleanup
diegoreymendez Oct 11, 2024
7bb757f
Code cleanup
diegoreymendez Oct 11, 2024
fc2c5fb
Code cleanup
diegoreymendez Oct 11, 2024
696c0aa
Improved TipGroup support for older iOS versions
diegoreymendez Oct 11, 2024
b05febb
Further improvements to TipGroup
diegoreymendez Oct 11, 2024
c83510e
Fixes a compilation warning
diegoreymendez Oct 11, 2024
b8e8393
Fixes some additional build errors
diegoreymendez Oct 11, 2024
f26b6eb
Some final minor fixes
diegoreymendez Oct 11, 2024
20cbcda
Merges the latest from main
diegoreymendez Oct 11, 2024
2e99922
Wires in the remote feature flag
diegoreymendez Oct 11, 2024
89f2a21
Temporarily comments some Xcode 16-only code
diegoreymendez Oct 11, 2024
ab8e06c
Makes some changes to fix swiflint errors and document disabled code
diegoreymendez Oct 11, 2024
888b67a
Several changes to VPN tips
diegoreymendez Oct 15, 2024
dcc360c
Merge branch 'main' into diego/add-vpn-tips
diegoreymendez Oct 15, 2024
953f864
Moves some TipKit code to BSK to share with macOS
diegoreymendez Oct 15, 2024
5965ead
Updated the VPN tip icons
diegoreymendez Oct 16, 2024
e8a3a96
Standardized some names and identifiers
diegoreymendez Oct 16, 2024
d6dfb0d
Updates BSK
diegoreymendez Oct 17, 2024
9b590e5
Revert "Updates BSK"
diegoreymendez Oct 22, 2024
6afd8f8
Adjusts alignment and image size for the VPN onboarding tips
diegoreymendez Oct 22, 2024
f19be75
Fixes tips
diegoreymendez Oct 22, 2024
21debb0
Merges the latest from main
diegoreymendez Oct 22, 2024
3e7e88d
Updates BSK
diegoreymendez Oct 22, 2024
d7ec9f9
Removes the BSK dependency change
diegoreymendez Oct 22, 2024
88249e9
Fixes some final build issues
diegoreymendez Oct 22, 2024
048d21d
Several updates
diegoreymendez Oct 23, 2024
d2b999d
Fixes swiftlint warnings
diegoreymendez Oct 28, 2024
aedfecf
Fixes a compilation error
diegoreymendez Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Core/UserDefaultsPropertyWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ public struct UserDefaultsWrapper<T> {
case duckPlayerPixelExperimentLastDayPixelFired = "com.duckduckgo.ios.duckplayer.pixel.experiment.last.day.pixel.fired.v2"
case duckPlayerPixelExperimentLastVideoIDRendered = "com.duckduckgo.ios.duckplayer.pixel.experiment.last.videoID.rendered.v2"
case duckPlayerPixelExperimentOverride = "com.duckduckgo.ios.duckplayer.pixel.experiment.override.v2"


// TipKit
case resetTipKitOnNextLaunch = "com.duckduckgo.ios.tipKit.resetOnNextLaunch"
}

private let key: Key
Expand Down
48 changes: 48 additions & 0 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,16 @@
6FE127462C2054A900EB5724 /* NewTabPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FE127452C2054A900EB5724 /* NewTabPageViewController.swift */; };
6FE1274B2C20943500EB5724 /* ShortcutItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FE1274A2C20943500EB5724 /* ShortcutItemView.swift */; };
6FF915822B88E07A0042AC87 /* AdAttributionFetcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF915802B88E0750042AC87 /* AdAttributionFetcherTests.swift */; };
7B1604E82CB685B400A44EC6 /* Logger+TipKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1604E72CB685B400A44EC6 /* Logger+TipKit.swift */; };
7B1604EC2CB68BDA00A44EC6 /* TipKitController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1604EB2CB68BDA00A44EC6 /* TipKitController.swift */; };
7B1604EE2CB68D2600A44EC6 /* TipKitDebugOptionsUIActionHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1604ED2CB68D2600A44EC6 /* TipKitDebugOptionsUIActionHandling.swift */; };
7BC571202BDBB877003B0CCE /* VPNActivationDateStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC5711F2BDBB877003B0CCE /* VPNActivationDateStore.swift */; };
7BC571212BDBB977003B0CCE /* VPNActivationDateStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC5711F2BDBB877003B0CCE /* VPNActivationDateStore.swift */; };
7BC97CC42CB7ECDE00FF521F /* TipGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC97CC32CB7ECDE00FF521F /* TipGroup.swift */; };
7BF78E022CA2CC3E0026A1FC /* TipKitAppEventHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BF78E012CA2CC3E0026A1FC /* TipKitAppEventHandling.swift */; };
7BFD5FD52C9DA310000FF959 /* VPNAddWidgetTip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD5FD42C9DA310000FF959 /* VPNAddWidgetTip.swift */; };
7BFD5FD72C9DB9D7000FF959 /* VPNChangeLocationTip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD5FD62C9DB9D7000FF959 /* VPNChangeLocationTip.swift */; };
7BFD5FD92C9DBC24000FF959 /* VPNUseSnoozeTip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD5FD82C9DBC24000FF959 /* VPNUseSnoozeTip.swift */; };
83004E802193BB8200DA013C /* WKNavigationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83004E7F2193BB8200DA013C /* WKNavigationExtension.swift */; };
83004E862193E5ED00DA013C /* TabViewControllerBrowsingMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83004E852193E5ED00DA013C /* TabViewControllerBrowsingMenuExtension.swift */; };
83004E882193E8C700DA013C /* TabViewControllerLongPressMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83004E872193E8C700DA013C /* TabViewControllerLongPressMenuExtension.swift */; };
Expand Down Expand Up @@ -1634,7 +1642,15 @@
6FE127452C2054A900EB5724 /* NewTabPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTabPageViewController.swift; sourceTree = "<group>"; };
6FE1274A2C20943500EB5724 /* ShortcutItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutItemView.swift; sourceTree = "<group>"; };
6FF915802B88E0750042AC87 /* AdAttributionFetcherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdAttributionFetcherTests.swift; sourceTree = "<group>"; };
7B1604E72CB685B400A44EC6 /* Logger+TipKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logger+TipKit.swift"; sourceTree = "<group>"; };
7B1604EB2CB68BDA00A44EC6 /* TipKitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipKitController.swift; sourceTree = "<group>"; };
7B1604ED2CB68D2600A44EC6 /* TipKitDebugOptionsUIActionHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipKitDebugOptionsUIActionHandling.swift; sourceTree = "<group>"; };
7BC5711F2BDBB877003B0CCE /* VPNActivationDateStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VPNActivationDateStore.swift; sourceTree = "<group>"; };
7BC97CC32CB7ECDE00FF521F /* TipGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipGroup.swift; sourceTree = "<group>"; };
7BF78E012CA2CC3E0026A1FC /* TipKitAppEventHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipKitAppEventHandling.swift; sourceTree = "<group>"; };
7BFD5FD42C9DA310000FF959 /* VPNAddWidgetTip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNAddWidgetTip.swift; sourceTree = "<group>"; };
7BFD5FD62C9DB9D7000FF959 /* VPNChangeLocationTip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNChangeLocationTip.swift; sourceTree = "<group>"; };
7BFD5FD82C9DBC24000FF959 /* VPNUseSnoozeTip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNUseSnoozeTip.swift; sourceTree = "<group>"; };
83004E7F2193BB8200DA013C /* WKNavigationExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKNavigationExtension.swift; sourceTree = "<group>"; };
83004E832193E14C00DA013C /* UIAlertControllerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = UIAlertControllerExtension.swift; path = ../Core/UIAlertControllerExtension.swift; sourceTree = "<group>"; };
83004E852193E5ED00DA013C /* TabViewControllerBrowsingMenuExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewControllerBrowsingMenuExtension.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4009,6 +4025,28 @@
name = AdAttribution;
sourceTree = "<group>";
};
7BF78E002CA2CC100026A1FC /* TipKit */ = {
isa = PBXGroup;
children = (
7B1604E72CB685B400A44EC6 /* Logger+TipKit.swift */,
7BF78E012CA2CC3E0026A1FC /* TipKitAppEventHandling.swift */,
7B1604EB2CB68BDA00A44EC6 /* TipKitController.swift */,
7B1604ED2CB68D2600A44EC6 /* TipKitDebugOptionsUIActionHandling.swift */,
7BC97CC32CB7ECDE00FF521F /* TipGroup.swift */,
);
path = TipKit;
sourceTree = "<group>";
};
7BFD5FD32C9DA235000FF959 /* TipKit */ = {
isa = PBXGroup;
children = (
7BFD5FD42C9DA310000FF959 /* VPNAddWidgetTip.swift */,
7BFD5FD62C9DB9D7000FF959 /* VPNChangeLocationTip.swift */,
7BFD5FD82C9DBC24000FF959 /* VPNUseSnoozeTip.swift */,
);
name = TipKit;
sourceTree = "<group>";
};
830FA79B1F8E81FB00FCE105 /* ContentBlocker */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4237,6 +4275,7 @@
F13B4BF41F18C74500814661 /* Tabs */,
F1386BA21E6846320062FC3C /* TabSwitcher */,
98F3A1D6217B36EE0011A0D4 /* Themes */,
7BF78E002CA2CC100026A1FC /* TipKit */,
F11CEF581EBB66C80088E4D7 /* Tutorials */,
CB48D32F2B90CE8500631D8B /* UserBehaviorMonitor */,
F1D796ED1E7AE4090019D451 /* UserInterface */,
Expand Down Expand Up @@ -5539,6 +5578,7 @@
EECD94B22A28B8580085C66E /* NetworkProtection */ = {
isa = PBXGroup;
children = (
7BFD5FD32C9DA235000FF959 /* TipKit */,
4BD96E072C4DCCD1003BC32C /* LiveActivity */,
4B37E04E2B928C91009E81CA /* Resources */,
EE01EB412AFC1DE10096AAC9 /* PreferredLocation */,
Expand Down Expand Up @@ -7322,9 +7362,11 @@
EE4FB1882A28D11900E5CBA7 /* NetworkProtectionStatusViewModel.swift in Sources */,
6FB1FE9E2C24D41D0075B68B /* NewTabPageSectionsDebugView.swift in Sources */,
8540BD5623D9E9C20057FDD2 /* PreserveLoginsSettingsViewController.swift in Sources */,
7B1604EC2CB68BDA00A44EC6 /* TipKitController.swift in Sources */,
851672D12BED1FC900592F24 /* AutocompleteView.swift in Sources */,
3161D13227AC161B00285CF6 /* DownloadMetadata.swift in Sources */,
D664C7C72B289AA200CBFA76 /* PurchaseInProgressView.swift in Sources */,
7BFD5FD72C9DB9D7000FF959 /* VPNChangeLocationTip.swift in Sources */,
F1668BCE1E798081008CBA04 /* BookmarksViewController.swift in Sources */,
8590CB69268A4E190089F6BF /* DebugEtagStorage.swift in Sources */,
C1CDA3162AFB9C7F006D1476 /* AutofillNeverPromptWebsitesManager.swift in Sources */,
Expand Down Expand Up @@ -7397,6 +7439,7 @@
9F5E5AB02C3E4C6000165F54 /* ContextualOnboardingPresenter.swift in Sources */,
310D091B2799F54900DC0060 /* DownloadManager.swift in Sources */,
98D98A7425ED88D100D8E3DF /* BrowsingMenuEntryViewCell.swift in Sources */,
7BFD5FD92C9DBC24000FF959 /* VPNUseSnoozeTip.swift in Sources */,
98F3A1D8217B37010011A0D4 /* Theme.swift in Sources */,
4B2C79612C5B27AC00A240CC /* VPNSnoozeActivityAttributes.swift in Sources */,
CB9B873C278C8FEA001F4906 /* WidgetEducationView.swift in Sources */,
Expand Down Expand Up @@ -7496,6 +7539,7 @@
3157B43827F4C8490042D3D7 /* FaviconsHelper.swift in Sources */,
85F200042216F5D8006BB258 /* FindInPageView.swift in Sources */,
D652498E2B515A6A0056B0DE /* SubscriptionSettingsViewModel.swift in Sources */,
7B1604E82CB685B400A44EC6 /* Logger+TipKit.swift in Sources */,
8548D95E25262B1B005AAE49 /* ViewHighlighter.swift in Sources */,
F4D7221026F29A70007D6193 /* BookmarkDetailsCell.swift in Sources */,
F1617C131E572E0300DEDCAF /* TabSwitcherViewController.swift in Sources */,
Expand All @@ -7508,6 +7552,7 @@
D63FF8982C1B6A45006DE24D /* DuckPlayer.swift in Sources */,
85B9CB8921AEBDD5009001F1 /* FavoriteHomeCell.swift in Sources */,
C1935A102C88D131001AD72D /* AutofillSurveyManager.swift in Sources */,
7B1604EE2CB68D2600A44EC6 /* TipKitDebugOptionsUIActionHandling.swift in Sources */,
98999D5922FDA41500CBBE1B /* BasicAuthenticationAlert.swift in Sources */,
C13B32D22A0E750700A59236 /* AutofillSettingStatus.swift in Sources */,
1DDF40202BA049FA006850D9 /* SettingsRootView.swift in Sources */,
Expand Down Expand Up @@ -7651,6 +7696,7 @@
31CC224928369B38001654A4 /* AutofillLoginSettingsListViewController.swift in Sources */,
F1D796EC1E7AB8930019D451 /* SaveBookmarkActivity.swift in Sources */,
F4B0B78C252CAFF700830156 /* OnboardingWidgetsViewController.swift in Sources */,
7BFD5FD52C9DA310000FF959 /* VPNAddWidgetTip.swift in Sources */,
C17B595A2A03AAD30055F2D1 /* PasswordGenerationPromptViewController.swift in Sources */,
8531A08E1F9950E6000484F0 /* UnprotectedSitesViewController.swift in Sources */,
CBD4F13C279EBF4A00B20FD7 /* HomeMessage.swift in Sources */,
Expand Down Expand Up @@ -7800,6 +7846,7 @@
F15D43201E706CC500BF2CDC /* AutocompleteViewController.swift in Sources */,
BD862E092B30F63E0073E2EE /* VPNMetadataCollector.swift in Sources */,
D6E83C682B23B6A3006C8AFB /* FontSettings.swift in Sources */,
7BF78E022CA2CC3E0026A1FC /* TipKitAppEventHandling.swift in Sources */,
1DEAADF62BA4809400E25A97 /* CookiePopUpProtectionView.swift in Sources */,
31EF52E1281B3BDC0034796E /* AutofillLoginListItemViewModel.swift in Sources */,
C1EA86602C74CB6C00E8604D /* SyncPromoView.swift in Sources */,
Expand Down Expand Up @@ -7829,6 +7876,7 @@
85B9814E2B5EB618009AC9A6 /* SwipeTabsCoordinator.swift in Sources */,
985AAE4524899369007A43EC /* HomeScreenTransition.swift in Sources */,
85E58C2C28FDA94F006A801A /* FavoritesViewController.swift in Sources */,
7BC97CC42CB7ECDE00FF521F /* TipGroup.swift in Sources */,
1E8AD1CF27C000A000ABA377 /* CompleteDownloadRow.swift in Sources */,
98D98A8F25ED952F00D8E3DF /* BrowsingMenuButton.swift in Sources */,
6FB1FEA22C256ACD0075B68B /* NewTabPageManager.swift in Sources */,
Expand Down
6 changes: 6 additions & 0 deletions DuckDuckGo/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ import os.log

var privacyProDataReporter: PrivacyProDataReporting!

// MARK: - Feature specific app event handlers

private let tipKitAppEventsHandler = TipKitAppEventHandler()

// MARK: lifecycle

@UserDefaultsWrapper(key: .privacyConfigCustomURL, defaultValue: nil)
Expand Down Expand Up @@ -384,6 +388,8 @@ import os.log
didCrashDuringCrashHandlersSetUp = false
}

tipKitAppEventsHandler.appDidFinishLaunching()

return true
}

Expand Down
Loading