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

file updates

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-10-29 11:27:55 -04:00
parent 213e0d2ce0
commit dc11171a98
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h
View File

@ -6,8 +6,8 @@
// Copyright © 2016 Verizon Wireless. All rights reserved. // Copyright © 2016 Verizon Wireless. All rights reserved.
// //
#import "MVMCoreOperation.h" #import <MVMCore/MVMCoreOperation.h>
#import "MVMCoreTopAlertAnimationDelegateProtocol.h" #import <MVMCoreUI/MVMCoreTopAlertAnimationDelegateProtocol.h>
@class MVMCoreTopAlertObject; @class MVMCoreTopAlertObject;

15
MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m
View File

@ -9,8 +9,7 @@
#import "MVMCoreTopAlertOperation.h" #import "MVMCoreTopAlertOperation.h"
#import "MVMCoreTopAlertObject.h" #import "MVMCoreTopAlertObject.h"
#import "MVMCoreAlertHandler.h" #import "MVMCoreAlertHandler.h"
#import "MVMCoreObject.h" #import <MVMCoreUI/MVMCoreUI-Swift.h>
#import "MVMCoreSessionObject.h"
@interface MVMCoreTopAlertOperation () { @interface MVMCoreTopAlertOperation () {
__block BOOL _paused; __block BOOL _paused;
@ -50,17 +49,17 @@
self.topAlertObject = topAlertObject; self.topAlertObject = topAlertObject;
// Sets the queue priority for various types of alerts. // Sets the queue priority for various types of alerts.
self.queuePriority = [[MVMCoreObject sharedInstance].globalTopAlertDelegate priorityForTopAlertByObject:topAlertObject]; self.queuePriority = [[CoreUIObject sharedInstance].globalTopAlertDelegate priorityForTopAlertByObject:topAlertObject];
} }
return self; return self;
} }
- (void)updateWithTopAlertObject:(nonnull MVMCoreTopAlertObject *)topAlertObject { - (void)updateWithTopAlertObject:(nonnull MVMCoreTopAlertObject *)topAlertObject {
self.topAlertObject = topAlertObject; self.topAlertObject = topAlertObject;
self.queuePriority = [[MVMCoreObject sharedInstance].globalTopAlertDelegate priorityForTopAlertByObject:topAlertObject]; self.queuePriority = [[CoreUIObject sharedInstance].globalTopAlertDelegate priorityForTopAlertByObject:topAlertObject];
if (self.isExecuting && !self.isCancelled && !self.isPaused) { if (self.isExecuting && !self.isCancelled && !self.isPaused) {
[self updateDismissTimer]; [self updateDismissTimer];
UIView <MVMCoreTopAlertViewProtocol>*topAlertView = [[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView]; UIView <MVMCoreTopAlertViewProtocol>*topAlertView = [[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView];
if ([topAlertView respondsToSelector:@selector(updateTopAlertWith:)]) { if ([topAlertView respondsToSelector:@selector(updateTopAlertWith:)]) {
[topAlertView updateTopAlertWith:topAlertObject]; [topAlertView updateTopAlertWith:topAlertObject];
} }
@ -123,12 +122,12 @@
if (![[MVMCoreAlertHandler sharedAlertHandler] mfAlertsSupressed]) { if (![[MVMCoreAlertHandler sharedAlertHandler] mfAlertsSupressed]) {
// Show // Show
if (![[MVMCoreObject sharedInstance].globalTopAlertDelegate respondsToSelector:@selector(getTopAlertView)]) { if (![[CoreUIObject sharedInstance].globalTopAlertDelegate respondsToSelector:@selector(getTopAlertView)]) {
// Needs to be a top alert view.... // Needs to be a top alert view....
[self markAsFinished]; [self markAsFinished];
} else { } else {
UIView <MVMCoreTopAlertViewProtocol>*topAlertView = [[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView]; UIView <MVMCoreTopAlertViewProtocol>*topAlertView = [[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView];
[topAlertView showWithTopAlertObject:self.topAlertObject animationDelegate:self completionHandler:^(BOOL finished) { [topAlertView showWithTopAlertObject:self.topAlertObject animationDelegate:self completionHandler:^(BOOL finished) {
self.displayed = YES; self.displayed = YES;
@ -201,7 +200,7 @@
if (self.isDisplayed && !self.isAnimating) { if (self.isDisplayed && !self.isAnimating) {
// Dismisses. // Dismisses.
[[[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:^(BOOL finished) { [[[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:^(BOOL finished) {
self.displayed = NO; self.displayed = NO;
if (andFinish) { if (andFinish) {