Skip to content

Commit

Permalink
Fix brave/brave-ios#5981: Full Screen - Popover Callout Optimizations (…
Browse files Browse the repository at this point in the history 
…brave/brave-ios#7292)
  • Loading branch information
@soner-yuksel
soner-yuksel authored Apr 20, 2023
1 parent 57955af commit 70e1a46
Show file tree
Hide file tree
Showing 7 changed files with 271 additions and 242 deletions.
33 changes: 23 additions & 10 deletions Sources/Brave/Frontend/Browser/BrowserViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public class BrowserViewController: UIViewController {
if case .sendTabToSelfEntriesAddedRemotely(let newEntries) = stateChange {
// Fetching the last URL that has been sent from synced sessions
if let requestedURL = newEntries.last?.url {
self?.presentTabReceivedCallout(url: requestedURL)
self?.presentTabReceivedToast(url: requestedURL)
}
}
})
Expand Down Expand Up @@ -1182,16 +1182,8 @@ public class BrowserViewController: UIViewController {
presentOnboardingIntro()

// Full Screen Callout Presentation
// Priority: P3A - VPN - Default Browser - Rewards
// TODO: Remove the dispatch after with a proper fix and fix calling present functions before super.viewDidAppear
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
self.presentP3AScreenCallout()
self.presentBottomBarCallout()
self.presentVPNAlertCallout()
self.presentDefaultBrowserScreenCallout()
self.presentBraveRewardsScreenCallout()
self.presentCookieNotificationBlockingCalloutIfNeeded()
self.presentLinkReceiptCallout(skipSafeGuards: false)
self.presentFullScreenCallouts()
}

screenshotHelper.viewIsVisible = true
Expand Down Expand Up @@ -3103,6 +3095,27 @@ extension BrowserViewController {
}
}

extension BrowserViewController {
func presentTabReceivedToast(url: URL) {
// 'Tab Received' indicator will only be shown in normal browsing
if !PrivateBrowsingManager.shared.isPrivateBrowsing {
let toast = ButtonToast(
labelText: Strings.Callout.tabReceivedCalloutTitle,
image: UIImage(braveSystemNamed: "brave.tablet.and.phone"),
buttonText: Strings.goButtonTittle,
completion: { [weak self] buttonPressed in
guard let self = self else { return }

if buttonPressed {
self.tabManager.addTabAndSelect(URLRequest(url: url), isPrivate: false)
}
})

show(toast: toast, duration: ButtonToastUX.toastDismissAfter)
}
}
}

extension BrowserViewController: UNUserNotificationCenterDelegate {
public func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
if response.notification.request.identifier == Self.defaultBrowserNotificationId {
Expand Down
271 changes: 152 additions & 119 deletions Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Callout.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,110 +16,36 @@ import SafariServices
// MARK: - Callouts

extension BrowserViewController {

func presentPassCodeMigration() {
if KeychainWrapper.sharedAppContainerKeychain.authenticationInfo() != nil {
let controller = UIHostingController(rootView: PasscodeMigrationContainerView())
controller.rootView.dismiss = { [unowned controller] enableBrowserLock in
KeychainWrapper.sharedAppContainerKeychain.setAuthenticationInfo(nil)
Preferences.Privacy.lockWithPasscode.value = enableBrowserLock
controller.dismiss(animated: true)
}
controller.modalPresentationStyle = .overFullScreen
// No animation to ensure we don't leak the users tabs
present(controller, animated: false)
}
}

func presentBottomBarCallout() {
guard traitCollection.userInterfaceIdiom == .phone else { return }

// Check the blockCookieConsentNotices callout can be shown
guard shouldShowCallout(calloutType: .blockCookieConsentNotices) else {
return
// Priority: P3A - Bottom Bar - VPN - Default Browser - Rewards - Cookie Notification - Link Receipt
func presentFullScreenCallouts() {
for type in FullScreenCalloutType.allCases {
presentScreenCallout(for: type)
}

// Onboarding should be completed to show callouts
if Preferences.Onboarding.basicOnboardingCompleted.value != OnboardingState.completed.rawValue {
return
}

// Show if bottom bar is not enabled
if Preferences.General.isUsingBottomBar.value {
return
}

var bottomBarView = OnboardingBottomBarView()
bottomBarView.switchBottomBar = { [weak self] in
guard let self else { return }

self.dismiss(animated: false) {
Preferences.General.isUsingBottomBar.value = true
}
}
bottomBarView.dismiss = { [weak self] in
guard let self = self else { return }

self.dismiss(animated: false)
}

let popup = PopupViewController(rootView: bottomBarView, isDismissable: true)

isOnboardingOrFullScreenCalloutPresented = true
present(popup, animated: false)
}

func presentVPNInAppEventCallout() {
// If the onboarding has not completed we do not show any promo screens.
// This will most likely be the case for users who have not installed the app yet.
if Preferences.Onboarding.basicOnboardingCompleted.value != OnboardingState.completed.rawValue {
return
}

switch BraveVPN.vpnState {
case .purchased:
presentLinkReceiptCallout(skipSafeGuards: true)
case .expired, .notPurchased:
if VPNProductInfo.isComplete {
presentCorrespondingVPNViewController()
} else {
// This is flaky. We fetch VPN prices from Apple asynchronously and it makes no sense to
// show anything if there's no price data. We try to wait one second and see if the price data is there.
// If not we do not show anything.
// This can happen if the app is not in memory and we have to fresh launch it upon tapping on the in app event.
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [self] in
if VPNProductInfo.isComplete {
presentCorrespondingVPNViewController()
}
}
}
private func presentScreenCallout(for type: FullScreenCalloutType) {
switch type {
case .p3a:
presentP3AScreenCallout()
case .bottomBar:
presentBottomBarCallout()
case .vpn:
presentVPNAlertCallout()
case .defaultBrowser:
presentDefaultBrowserScreenCallout()
case .rewards:
presentBraveRewardsScreenCallout()
case .blockCookieConsentNotices:
presentCookieNotificationBlockingCallout()
case .linkReceipt:
presentLinkReceiptCallout()
}
}

func presentLinkReceiptCallout(skipSafeGuards: Bool) {
if !skipSafeGuards {
// Show this onboarding only if the VPN has been purchased
guard case .purchased = BraveVPN.vpnState else { return }

guard shouldShowCallout(calloutType: .linkReceipt) else {
return
}

if Preferences.Onboarding.basicOnboardingCompleted.value != OnboardingState.completed.rawValue {
return
}
}

var linkReceiptView = OnboardingLinkReceiptView()
linkReceiptView.linkReceiptAction = {
self.openURLInNewTab(BraveUX.braveVPNLinkReceiptProd, isPrivate: PrivateBrowsingManager.shared.isPrivateBrowsing, isPrivileged: false)
}
let popup = PopupViewController(rootView: linkReceiptView, isDismissable: true)
isOnboardingOrFullScreenCalloutPresented = true
present(popup, animated: false)
}
// MARK: Conditional Callout Methods

func presentP3AScreenCallout() {
private func presentP3AScreenCallout() {
// Check the blockCookieConsentNotices callout can be shown
guard shouldShowCallout(calloutType: .p3a) else {
return
Expand Down Expand Up @@ -162,9 +88,47 @@ extension BrowserViewController {
present(onboardingP3ACalloutController, animated: false)
}
}

func presentVPNAlertCallout() {

private func presentBottomBarCallout() {
guard traitCollection.userInterfaceIdiom == .phone else { return }

// Check the blockCookieConsentNotices callout can be shown
guard shouldShowCallout(calloutType: .blockCookieConsentNotices) else {
return
}

// Onboarding should be completed to show callouts
if Preferences.Onboarding.basicOnboardingCompleted.value != OnboardingState.completed.rawValue {
return
}

// Show if bottom bar is not enabled
if Preferences.General.isUsingBottomBar.value {
return
}

var bottomBarView = OnboardingBottomBarView()
bottomBarView.switchBottomBar = { [weak self] in
guard let self else { return }

self.dismiss(animated: false) {
Preferences.General.isUsingBottomBar.value = true
}
}
bottomBarView.dismiss = { [weak self] in
guard let self = self else { return }

self.dismiss(animated: false)
}

let popup = PopupViewController(rootView: bottomBarView, isDismissable: true)

isOnboardingOrFullScreenCalloutPresented = true
present(popup, animated: false)
}

private func presentVPNAlertCallout() {
// Check the vpn alert callout can be shown
guard shouldShowCallout(calloutType: .vpn) else {
return
}
Expand All @@ -177,7 +141,7 @@ extension BrowserViewController {
if onboardingNotCompleted
|| showedPopup.value
|| !VPNProductInfo.isComplete {
FullScreenCalloutManager.FullScreenCalloutType.vpn.preferenceValue.value = false
FullScreenCalloutType.vpn.preferenceValue.value = false
return
}

Expand All @@ -196,8 +160,8 @@ extension BrowserViewController {
showedPopup.value = true
present(popup, animated: false)
}

func presentDefaultBrowserScreenCallout() {
private func presentDefaultBrowserScreenCallout() {
// Check the blockCookieConsentNotices callout can be shown
guard shouldShowCallout(calloutType: .defaultBrowser) else {
return
Expand Down Expand Up @@ -234,8 +198,8 @@ extension BrowserViewController {
present(onboardingController, animated: true)
}
}

func presentBraveRewardsScreenCallout() {
private func presentBraveRewardsScreenCallout() {
// Check the blockCookieConsentNotices callout can be shown
guard shouldShowCallout(calloutType: .rewards) else {
return
Expand All @@ -255,26 +219,52 @@ extension BrowserViewController {
}
}

func presentTabReceivedCallout(url: URL) {
// 'Tab Received' indicator will only be shown in normal browsing
if !PrivateBrowsingManager.shared.isPrivateBrowsing {
let toast = ButtonToast(
labelText: Strings.Callout.tabReceivedCalloutTitle,
image: UIImage(braveSystemNamed: "brave.tablet.and.phone"),
buttonText: Strings.goButtonTittle,
completion: { [weak self] buttonPressed in
guard let self = self else { return }

if buttonPressed {
self.tabManager.addTabAndSelect(URLRequest(url: url), isPrivate: false)
}
})
private func presentCookieNotificationBlockingCallout() {
// Check the blockCookieConsentNotices callout can be shown
guard shouldShowCallout(calloutType: .blockCookieConsentNotices) else {
return
}

// Don't show this if we already enabled the setting
guard !FilterListStorage.shared.isEnabled(for: FilterList.cookieConsentNoticesComponentID) else { return }
// Don't show this if we are presenting another popup already
guard !isOnboardingOrFullScreenCalloutPresented else { return }
// We only show the popup on second launch
guard !Preferences.General.isFirstLaunch.value else { return }
// Ensure we successfully shown basic onboarding first
guard Preferences.FullScreenCallout.omniboxCalloutCompleted.value else { return }

let popover = PopoverController(
contentController: CookieNotificationBlockingConsentViewController(),
contentSizeBehavior: .preferredContentSize)
popover.addsConvenientDismissalMargins = false
popover.present(from: topToolbar.locationView.shieldsButton, on: self)
}

private func presentLinkReceiptCallout(skipSafeGuards: Bool = false) {
if !skipSafeGuards {
// Show this onboarding only if the VPN has been purchased
guard case .purchased = BraveVPN.vpnState else { return }

show(toast: toast, duration: ButtonToastUX.toastDismissAfter)
guard shouldShowCallout(calloutType: .linkReceipt) else {
return
}

if Preferences.Onboarding.basicOnboardingCompleted.value != OnboardingState.completed.rawValue {
return
}
}

var linkReceiptView = OnboardingLinkReceiptView()
linkReceiptView.linkReceiptAction = {
self.openURLInNewTab(BraveUX.braveVPNLinkReceiptProd, isPrivate: PrivateBrowsingManager.shared.isPrivateBrowsing, isPrivileged: false)
}
let popup = PopupViewController(rootView: linkReceiptView, isDismissable: true)
isOnboardingOrFullScreenCalloutPresented = true
present(popup, animated: false)
}

func shouldShowCallout(calloutType: FullScreenCalloutManager.FullScreenCalloutType) -> Bool {
private func shouldShowCallout(calloutType: FullScreenCalloutType) -> Bool {
if Preferences.DebugFlag.skipNTPCallouts == true || isOnboardingOrFullScreenCalloutPresented || topToolbar.inOverlayMode {
return false
}
Expand All @@ -285,4 +275,47 @@ extension BrowserViewController {

return true
}

// MARK: Non-Conditional Callouts Methods

func presentPassCodeMigration() {
if KeychainWrapper.sharedAppContainerKeychain.authenticationInfo() != nil {
let controller = PasscodeMigrationViewController()
controller.rootView.dismiss = { [unowned controller] enableBrowserLock in
KeychainWrapper.sharedAppContainerKeychain.setAuthenticationInfo(nil)
Preferences.Privacy.lockWithPasscode.value = enableBrowserLock
controller.dismiss(animated: true)
}
controller.modalPresentationStyle = .overFullScreen
// No animation to ensure we don't leak the users tabs
present(controller, animated: false)
}
}

func presentVPNInAppEventCallout() {
// If the onboarding has not completed we do not show any promo screens.
// This will most likely be the case for users who have not installed the app yet.
if Preferences.Onboarding.basicOnboardingCompleted.value != OnboardingState.completed.rawValue {
return
}

switch BraveVPN.vpnState {
case .purchased:
presentLinkReceiptCallout(skipSafeGuards: true)
case .expired, .notPurchased:
if VPNProductInfo.isComplete {
presentCorrespondingVPNViewController()
} else {
// This is flaky. We fetch VPN prices from Apple asynchronously and it makes no sense to
// show anything if there's no price data. We try to wait one second and see if the price data is there.
// If not we do not show anything.
// This can happen if the app is not in memory and we have to fresh launch it upon tapping on the in app event.
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [self] in
if VPNProductInfo.isComplete {
presentCorrespondingVPNViewController()
}
}
}
}
}
}
Loading

0 comments on commit 70e1a46

Please sign in to comment.