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

Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop

Browse Source
This commit is contained in:
Kevin G Christiano 2020-08-10 09:27:57 -04:00
commit bfcf192cf7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertOperation.m
View File

@ -121,11 +121,11 @@
if (self.isCancelled) { if (self.isCancelled) {
// Cancelled, dismiss immediately. // Cancelled, dismiss immediately.
[self dismissAlertView:YES]; [self dismissAlertView:YES forceful:YES];
} else if (self.isPaused) { } else if (self.isPaused) {
// Paused, dismiss for the time being if persistent. // Paused, dismiss for the time being if persistent.
[self dismissAlertView:!self.topAlertObject.persistent]; [self dismissAlertView:!self.topAlertObject.persistent forceful:YES];
} else if (!self.topAlertObject.persistent) { } else if (!self.topAlertObject.persistent) {
// Set timer to dismiss top alert if it's not persistent (or it's survival mode and not short bar). // Set timer to dismiss top alert if it's not persistent (or it's survival mode and not short bar).
@ -141,7 +141,7 @@
if (weakSelf.isFinished || [weakSelf checkAndHandleForCancellation]) { if (weakSelf.isFinished || [weakSelf checkAndHandleForCancellation]) {
return; return;
} }
[weakSelf dismissAlertView:YES]; [weakSelf dismissAlertView:YES forceful:NO];
}); });
} }
}]; }];
@ -159,19 +159,19 @@
if (!self.isAnimating) { if (!self.isAnimating) {
if (self.isDisplayed) { if (self.isDisplayed) {
[self dismissAlertView:YES]; [self dismissAlertView:YES forceful:YES];
} else if (self.isExecuting) { } else if (self.isExecuting) {
[self markAsFinished]; [self markAsFinished];
} }
} }
} }
- (void)dismissAlertView:(BOOL)andFinish { - (void)dismissAlertView:(BOOL)andFinish forceful:(BOOL)forceful {
if (self.isDisplayed && !self.isAnimating) { if (self.isDisplayed && !self.isAnimating) {
// Dismisses. // Dismisses.
[[[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:^(BOOL finished) { [[[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:^(BOOL finished) {
self.displayed = NO; self.displayed = NO;
if (andFinish) { if (andFinish) {
@ -188,7 +188,7 @@
self.paused = YES; self.paused = YES;
[self didChangeValueForKey:@"isPaused"]; [self didChangeValueForKey:@"isPaused"];
} }
[self dismissAlertView:!self.topAlertObject.persistent]; [self dismissAlertView:!self.topAlertObject.persistent forceful:YES];
} }
- (void)unpause { - (void)unpause {
@ -214,7 +214,7 @@
} }
- (void)topAlertCloseButtonPressed { - (void)topAlertCloseButtonPressed {
[self dismissAlertView:YES]; [self dismissAlertView:YES forceful:YES];
} }
@end @end

2
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertViewProtocol.h
View File

@ -17,7 +17,7 @@
- (void)showWithTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate completionHandler:(void (^ __nullable)(BOOL finished))completionHandler; - (void)showWithTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate completionHandler:(void (^ __nullable)(BOOL finished))completionHandler;
// Hides // Hides
- (void)hideAlertView:(void (^ __nullable)(BOOL finished))completionHandler; - (void)hideAlertView:(BOOL)forceful completionHandler:(void (^ __nullable)(BOOL finished))completionHandler;
// Collapses the notification if it has a short top message. Otherwise removes notification. // Collapses the notification if it has a short top message. Otherwise removes notification.
- (void)collapseNotification; - (void)collapseNotification;