Add: onDismiss callback for site creation overlays

Author: hassaanelgarem

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift

@@ -103,10 +103,12 @@ class JetpackFeaturesRemovalCoordinator {
     /// Used to display Site Creation overlays.
     /// - Parameters:
     ///   - viewController: View controller where the overlay should be presented in.
-    static func presentSiteCreationOverlayIfNeeded(in viewController: UIViewController) {
+    static func presentSiteCreationOverlayIfNeeded(in viewController: UIViewController, onDismiss: JetpackOverlayDismissCallback? = nil) {
         let phase = siteCreationPhase()
-        let viewModel = JetpackFullscreenOverlaySiteCreationViewModel(phase: phase)
+        var viewModel = JetpackFullscreenOverlaySiteCreationViewModel(phase: phase)
+        viewModel.onDismiss = onDismiss
         guard viewModel.shouldShowOverlay else {
+            onDismiss?()
             return
         }
         createAndPresentOverlay(with: viewModel, in: viewController)

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayGeneralViewModel.swift

@@ -163,6 +163,8 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
     var titleLabelMaxNumberOfLines: Int {
         return 2
     }
+
+    var onDismiss: JetpackOverlayDismissCallback?
 }
 
 private extension JetpackFullscreenOverlayGeneralViewModel {

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlaySiteCreationViewModel.swift

@@ -73,6 +73,8 @@ struct JetpackFullscreenOverlaySiteCreationViewModel: JetpackFullscreenOverlayVi
     var titleLabelMaxNumberOfLines: Int {
         return 3
     }
+
+    var onDismiss: JetpackOverlayDismissCallback?
 }
 
 private extension JetpackFullscreenOverlaySiteCreationViewModel {

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewController.swift

@@ -211,6 +211,7 @@ class JetpackFullscreenOverlayViewController: UIViewController {
     @objc private func closeButtonPressed(sender: UIButton) {
         dismiss(animated: true, completion: nil)
         viewModel.trackCloseButtonTapped()
+        viewModel.onDismiss?()
     }
 
 
@@ -222,6 +223,7 @@ class JetpackFullscreenOverlayViewController: UIViewController {
     @IBAction func continueButtonPressed(_ sender: Any) {
         dismiss(animated: true, completion: nil)
         viewModel.trackContinueButtonTapped()
+        viewModel.onDismiss?()
     }
 
     @IBAction func learnMoreButtonPressed(_ sender: Any) {

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewModel.swift

@@ -1,5 +1,7 @@
 import Foundation
 
+typealias JetpackOverlayDismissCallback = () -> Void
+
 /// Protocol used to configure `JetpackFullscreenOverlayViewController`
 protocol JetpackFullscreenOverlayViewModel {
     var title: String { get }
@@ -13,6 +15,7 @@ protocol JetpackFullscreenOverlayViewModel {
     var shouldShowCloseButton: Bool { get }
     var analyticsSource: String { get }
     var titleLabelMaxNumberOfLines: Int { get }
+    var onDismiss: JetpackOverlayDismissCallback? { get }
 
     func trackOverlayDisplayed()
     func trackLearnMoreTapped()