Merge branch 'develop' into feature/swiftified_textField

MVMCoreUI/BaseControllers/MFViewController.m

@@ -67,11 +67,13 @@
 }
 
 - (void)dismiss {
-    if (self.presentingViewController) {
-        [[MVMCoreNavigationHandler sharedNavigationHandler] dismissViewController:self animated:YES];
-    } else if (self.navigationController) {
-        [[MVMCoreNavigationHandler sharedNavigationHandler] popViewController:self animated:YES];
-    }
+    [MVMCoreDispatchUtility performBlockOnMainThread:^{
+        if (self.presentingViewController) {
+            [[MVMCoreNavigationHandler sharedNavigationHandler] dismissViewController:self animated:YES];
+        } else if (self.navigationController) {
+            [[MVMCoreNavigationHandler sharedNavigationHandler] popViewController:self animated:YES];
+        }
+    }];
 }
 
 - (BOOL)isVisibleViewController {
@@ -518,6 +520,7 @@
     
     // Don't track page state if there is a tab bar page control, it will be handled later.
     if (!self.manager) {
+        [MVMCoreUISession sharedGlobal].currentPageType = self.pageType;
         [self adobeTrackPageState];
     }
     
@@ -819,6 +822,7 @@
     if (self.initialLoadFinished) {
         [self updateNavigationBarUI:self.manager.navigationController];
     }
+    [MVMCoreUISession sharedGlobal].currentPageType = self.pageType;
     [self adobeTrackPageState];
 }
 

MVMCoreUI/OtherHandlers/MVMCoreUISession.h

@@ -22,6 +22,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic, nullable) MVMCoreUINavigationController *navigationController;
 @property (weak, nonatomic, nullable) MFLoadingViewController *loadingViewController;
 
+/// Tracks the current page type the user is currently viewing. KVO compliant.
+@property (nonatomic, strong, nullable) NSString *currentPageType;
+
 // for handscroll Animation on subclasses of MFScrollingViewController
 @property (assign, nonatomic) BOOL enableHandScrollAnimation;