[IOS-287]: Finished appear logic, added instrumentation

1Weather/Coordinators/AppCoordinator.swift

@@ -145,6 +145,7 @@ class AppCoordinator: Coordinator {
                 //Search the TodayCoordinator
                 //Search the TodayCoordinator
                 let todayCoordinator = (self.childCoordinators.first{ $0 is TodayCoordinator } as? TodayCoordinator)
                 let todayCoordinator = (self.childCoordinators.first{ $0 is TodayCoordinator } as? TodayCoordinator)
                 todayCoordinator?.showOnboardingOrPrivacyNoticeIfNeeded()
                 todayCoordinator?.showOnboardingOrPrivacyNoticeIfNeeded()
+                self.showPremiumNudgeIfNeeded()
             })
             })
         }
         }
     }
     }
@@ -207,6 +208,30 @@ class AppCoordinator: Coordinator {
         tabBarController.updateTabs()
         tabBarController.updateTabs()
     }
     }
     
     
+    private func openSubscriptionStorePopUp() {
+        let subscriptionCoordinator = SubscriptionCoordinator(parentViewController: tabBarController)
+        subscriptionCoordinator.parentCoordinator = self
+        childCoordinators.append(subscriptionCoordinator)
+        subscriptionCoordinator.startPopUp()
+        AppAnalytics.shared.log(event: .ANALYTICS_PREMIUM_NUDGE_VIEW)
+    }
+    
+    private func showPremiumNudgeIfNeeded() {
+        let appLaunchCount = Settings.shared.appLaunchCount
+        let currentAttemptsCount = Settings.shared.premiumNudgeAttempstCount
+        let totalAttempts = ConfigManager.shared.config.premiumNudgeTotalTimes
+        let sessionCount = ConfigManager.shared.config.premiumNudgeSessionShowing
+        
+        guard appLaunchCount > 1 && currentAttemptsCount < totalAttempts && !StoreManager.shared.hasSubscription else {
+            return
+        }
+        
+        if appLaunchCount % sessionCount == 0 {
+            Settings.shared.premiumNudgeAttempstCount += 1
+            self.openSubscriptionStorePopUp()
+        }
+    }
+    
     func viewControllerDidEnd(controller: UIViewController) {
     func viewControllerDidEnd(controller: UIViewController) {
         //do nothing
         //do nothing
     }
     }

1Weather/Coordinators/TodayCoordinator.swift

@@ -16,7 +16,6 @@ class TodayCoordinator: Coordinator {
     // MARK: - Private
     // MARK: - Private
     private let navigationController = ColoredNavigationController(nibName: nil, bundle: nil)
     private let navigationController = ColoredNavigationController(nibName: nil, bundle: nil)
     private var tabBarController: UITabBarController?
     private var tabBarController: UITabBarController?
-    private var waitingForConfig = true
     var todayViewController: TodayViewController?
     var todayViewController: TodayViewController?
     
     
     // MARK: - Public
     // MARK: - Public
@@ -36,11 +35,6 @@ class TodayCoordinator: Coordinator {
         }
         }
         navigationController.viewControllers = [todayViewController]
         navigationController.viewControllers = [todayViewController]
         tabBarController?.add(viewController: navigationController)
         tabBarController?.add(viewController: navigationController)
-        ConfigManager.shared.add(delegate: self)
-        
-        if waitingForConfig == false {
-            showPremiumNudgeIfNeeded()
-        }
     }
     }
     
     
     public func showOnboardingOrPrivacyNoticeIfNeeded() {
     public func showOnboardingOrPrivacyNoticeIfNeeded() {
@@ -110,32 +104,4 @@ class TodayCoordinator: Coordinator {
             }
             }
         }
         }
     }
     }
-    
-    public func showPremiumNudgeIfNeeded() {
-        guard tabBarController?.viewControllers?.isEmpty == false else {
-            return
-        }
-        
-        let appLaunchCount = Settings.shared.appLaunchCount
-        let currentAttemptsCount = Settings.shared.premiumNudgeAttempstCount
-        let totalAttempts = ConfigManager.shared.config.premiumNudgeTotalTimes
-        let sessionCount = ConfigManager.shared.config.premiumNudgeSessionShowing
-        
-        guard appLaunchCount != 0 && currentAttemptsCount <= totalAttempts && !StoreManager.shared.hasSubscription else {
-            return
-        }
-        
-        if appLaunchCount % sessionCount == 0 {
-            Settings.shared.premiumNudgeAttempstCount += 1
-            self.openSubscriptionStorePopUp()
-        }
-    }
-}
-
-//MARK: - ConfigManager Delegate
-extension TodayCoordinator: ConfigManagerDelegate {
-    func dataUpdated(by configManager: ConfigManager) {
-        waitingForConfig = false
-        showPremiumNudgeIfNeeded()
-    }
 }
 }

1Weather/UI/View controllers/Subscriptions/SubscriptionPopUpViewController.swift

@@ -43,6 +43,11 @@ class SubscriptionPopUpViewController: UIViewController {
         
         
         Settings.shared.initialSubscriptionShown = true
         Settings.shared.initialSubscriptionShown = true
     }
     }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        AppAnalytics.shared.log(event: .ANALYTICS_PREMIUM_NUDGE_CLOSE)
+    }
 }
 }
 
 
 private extension SubscriptionPopUpViewController {
 private extension SubscriptionPopUpViewController {

1Weather/UI/View controllers/Subscriptions/SubscriptionStoreViewController.swift

@@ -131,6 +131,7 @@ private extension SubscriptionStoreViewController {
     }
     }
 }
 }
 
 
+//MARK: - Header Delegate
 extension SubscriptionStoreViewController: SubscriptionTopViewDelegate {
 extension SubscriptionStoreViewController: SubscriptionTopViewDelegate {
     func handleCloseButton() {
     func handleCloseButton() {
         self.dismiss(animated: true)
         self.dismiss(animated: true)

OneWeatherAnalytics/OneWeatherAnalytics/AnalyticsEvent.swift

@@ -147,6 +147,8 @@ public enum AnalyticsEvent: String {
     case ANALYTICS_SUBSCRIPTION_UPGRADE_MONTHLY_CLICK = "UPGRADE_MONTHLY_CLICK"
     case ANALYTICS_SUBSCRIPTION_UPGRADE_MONTHLY_CLICK = "UPGRADE_MONTHLY_CLICK"
     case ANALYTICS_SUBSCRIPTION_VIEW_PREMIUM_SUCCESS = "VIEW_PREMIUM_SUCCESS"
     case ANALYTICS_SUBSCRIPTION_VIEW_PREMIUM_SUCCESS = "VIEW_PREMIUM_SUCCESS"
     case ANALYTICS_SUBSCRIPTION_PREMIUM_HAMBURGER_CLICK = "PREMIUM_HAMBURGER_CLICK"
     case ANALYTICS_SUBSCRIPTION_PREMIUM_HAMBURGER_CLICK = "PREMIUM_HAMBURGER_CLICK"
+    case ANALYTICS_PREMIUM_NUDGE_VIEW = "VIEW_PREMIUM_NUDGE"
+    case ANALYTICS_PREMIUM_NUDGE_CLOSE = "CLOSE_PREMIUM_NUDGE"
     
     
     // MARK: Minutely
     // MARK: Minutely
     case ANALYTICS_MINUTELY_PRECIP_TODAY_SEEN = "MINUTELY_PRECIP_TODAY_SEEN"
     case ANALYTICS_MINUTELY_PRECIP_TODAY_SEEN = "MINUTELY_PRECIP_TODAY_SEEN"