From 834d224ae0e3a50c57293d72bb37137b1b0d4500 Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Wed, 23 Oct 2019 11:53:37 -0400 Subject: [PATCH 1/2] Revert "Fix #1696: Make "My First Ad" use a shorter dismissal duration (#1703)" --- BraveRewardsUI/Ads/AdsViewController.swift | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/BraveRewardsUI/Ads/AdsViewController.swift b/BraveRewardsUI/Ads/AdsViewController.swift index bc692e44f..d6924bc9f 100644 --- a/BraveRewardsUI/Ads/AdsViewController.swift +++ b/BraveRewardsUI/Ads/AdsViewController.swift @@ -17,14 +17,6 @@ public class AdsViewController: UIViewController { let animatedOut: () -> Void } - /// Whether or not this ads container is being used to display "my first ad" - /// - /// Setting this to true disables the debug ads override and uses a shorter dismissal duration - private var isFirstAd = false - - /// The number of seconds until the "my first ad" is automatically dismissed - private let myFirstAdDismissalInterval: TimeInterval = 3 - /// The number of seconds until the ad is automatically dismissed private let automaticDismissalInterval: TimeInterval = 8 @@ -105,8 +97,8 @@ public class AdsViewController: UIViewController { // Invalidate and reschedule timer.invalidate() } - var dismissInterval = isFirstAd ? myFirstAdDismissalInterval : automaticDismissalInterval - if !AppConstants.BuildChannel.isRelease && !isFirstAd, let override = Preferences.Rewards.adsDurationOverride.value, override > 0 { + var dismissInterval = automaticDismissalInterval + if !AppConstants.BuildChannel.isRelease, let override = Preferences.Rewards.adsDurationOverride.value, override > 0 { dismissInterval = TimeInterval(override) } dismissTimers[adView] = Timer.scheduledTimer(withTimeInterval: dismissInterval, repeats: false, block: { [weak self] _ in @@ -310,7 +302,6 @@ extension AdsViewController { /// Display a "My First Ad" on a presenting controller and be notified if they tap it public static func displayFirstAd(on presentingController: UIViewController, completion: @escaping (AdsNotificationHandler.Action, URL) -> Void) { let adsViewController = AdsViewController() - adsViewController.isFirstAd = true presentingController.addChild(adsViewController) presentingController.view.addSubview(adsViewController.view) From 45c11cd7fe0c95f89e5a38e6a7709b3c8ad2c97c Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Wed, 23 Oct 2019 11:54:59 -0400 Subject: [PATCH 2/2] Fix #1773: Make ad auto-dismissal time 30 seconds --- BraveRewardsUI/Ads/AdsViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BraveRewardsUI/Ads/AdsViewController.swift b/BraveRewardsUI/Ads/AdsViewController.swift index d6924bc9f..c7abc8c8a 100644 --- a/BraveRewardsUI/Ads/AdsViewController.swift +++ b/BraveRewardsUI/Ads/AdsViewController.swift @@ -18,7 +18,7 @@ public class AdsViewController: UIViewController { } /// The number of seconds until the ad is automatically dismissed - private let automaticDismissalInterval: TimeInterval = 8 + private let automaticDismissalInterval: TimeInterval = 30 private var displayedAds: [AdView: DisplayedAd] = [:] private(set) var visibleAdView: AdView?