mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/swiftified_textField

Browse Source
This commit is contained in:
Kevin G Christiano 2019-10-22 09:52:47 -04:00
commit 64f4356a74
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCoreUI/BaseControllers/MFViewController.m
View File

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

3
MVMCoreUI/OtherHandlers/MVMCoreUISession.h
View File

@ -22,6 +22,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (weak, nonatomic, nullable) MVMCoreUINavigationController *navigationController; @property (weak, nonatomic, nullable) MVMCoreUINavigationController *navigationController;
@property (weak, nonatomic, nullable) MFLoadingViewController *loadingViewController; @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 // for handscroll Animation on subclasses of MFScrollingViewController
@property (assign, nonatomic) BOOL enableHandScrollAnimation; @property (assign, nonatomic) BOOL enableHandScrollAnimation;