diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h index 0c5a865d..5eeafc9f 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h @@ -30,6 +30,9 @@ NS_ASSUME_NONNULL_BEGIN // View Controller can override this method and do custom action instead of opening the left panel - (BOOL)isOverridingLeftButton; +//return desired status bar style based on different View Controller +- (UIStatusBarStyle)panelPreferredStatusBarStyle; + @end NS_ASSUME_NONNULL_END diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h index 2ef7fa25..88b61188 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h @@ -105,6 +105,9 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) { + (CGFloat)getApplicationViewWidth; + (CGFloat)getApplicationViewMaxSize; +// return subviewcontrollers' prefer status bar style +- (UIStatusBarStyle)getDefaultStatusBarStyle; + #pragma mark - Main Subclassables // Can subclass to set threshold for when the drawers are permanently extended. Default is 1000 for the left panel and 2000 for both. diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index d70bdb6e..dd76cc92 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -877,7 +877,25 @@ CGFloat const PanelAnimationDuration = 0.2; } - (UIStatusBarStyle)preferredStatusBarStyle { - return self.topAlertView.statusBarStyle; + if (self.topAlertView.topAlertObject) { + return self.topAlertView.statusBarStyle; + } else { + UIStatusBarStyle style = [self getDefaultStatusBarStyle]; + if (self.topAlertView.statusBarStyle != style) { + [self.topAlertView resetStatusBar]; + } + return style; + } +} + +- (UIStatusBarStyle)getDefaultStatusBarStyle { + UIViewController *viewController = [self getCurrentDetailViewController]; + if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] + && [viewController respondsToSelector:@selector(panelPreferredStatusBarStyle)] + && [((UIViewController *)viewController) panelPreferredStatusBarStyle]) { + return [((UIViewController *)viewController) panelPreferredStatusBarStyle]; + } + return UIStatusBarStyleDefault; } #pragma mark - Getters diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h index 46d56cb6..f4de6d5b 100644 --- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h +++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h @@ -41,6 +41,9 @@ - (void)expandStatusBarView; - (void)collapseStatusBarView; +//reset status bar color to default based on splitview +- (void)resetStatusBar; + // Can be subclassed for custom views. - (nonnull MVMCoreUITopAlertBaseView *)topAlertViewForTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id )animationDelegate statusBarColor:(UIColor *_Nullable *_Nullable)statusBarColor; diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m index 735f28d9..a582638c 100644 --- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m +++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m @@ -189,7 +189,6 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed."; [weakSelf.superview layoutIfNeeded]; } completion:^(BOOL finished) { [weakSelf.animationDelegate topAlertViewFinishAnimation]; - [weakSelf setStatusBarColor:[UIColor whiteColor] statusBarStyle:UIStatusBarStyleDefault]; UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil); UIView *view = weakSelf.currentAlert; @@ -204,6 +203,9 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed."; [operation markAsFinished]; completionHandler(finished); weakSelf.topAlertObject = nil; + [MVMCoreDispatchUtility performBlockOnMainThread:^{ + [weakSelf resetStatusBar]; + }]; }]; }]; }]; @@ -242,4 +244,10 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed."; }]; } +- (void)resetStatusBar { + UIStatusBarStyle style = [[MVMCoreUISplitViewController mainSplitViewController] getDefaultStatusBarStyle]; + UIColor *backgroundColor = style == UIStatusBarStyleDefault ? [UIColor whiteColor] : [UIColor blackColor]; + [self setStatusBarColor:backgroundColor statusBarStyle:style]; +} + @end