From dc11171a9829f2fb93bd3449de2d597f9af7ef80 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Thu, 29 Oct 2020 11:27:55 -0400 Subject: [PATCH] file updates --- MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h | 4 ++-- MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h b/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h index 6dadc898..73acec1e 100644 --- a/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h +++ b/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h @@ -6,8 +6,8 @@ // Copyright © 2016 Verizon Wireless. All rights reserved. // -#import "MVMCoreOperation.h" -#import "MVMCoreTopAlertAnimationDelegateProtocol.h" +#import +#import @class MVMCoreTopAlertObject; diff --git a/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m b/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m index 6eb8f045..bcf9515a 100644 --- a/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m +++ b/MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m @@ -9,8 +9,7 @@ #import "MVMCoreTopAlertOperation.h" #import "MVMCoreTopAlertObject.h" #import "MVMCoreAlertHandler.h" -#import "MVMCoreObject.h" -#import "MVMCoreSessionObject.h" +#import @interface MVMCoreTopAlertOperation () { __block BOOL _paused; @@ -50,17 +49,17 @@ self.topAlertObject = topAlertObject; // 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; } - (void)updateWithTopAlertObject:(nonnull MVMCoreTopAlertObject *)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) { [self updateDismissTimer]; - UIView *topAlertView = [[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView]; + UIView *topAlertView = [[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView]; if ([topAlertView respondsToSelector:@selector(updateTopAlertWith:)]) { [topAlertView updateTopAlertWith:topAlertObject]; } @@ -123,12 +122,12 @@ if (![[MVMCoreAlertHandler sharedAlertHandler] mfAlertsSupressed]) { // Show - if (![[MVMCoreObject sharedInstance].globalTopAlertDelegate respondsToSelector:@selector(getTopAlertView)]) { + if (![[CoreUIObject sharedInstance].globalTopAlertDelegate respondsToSelector:@selector(getTopAlertView)]) { // Needs to be a top alert view.... [self markAsFinished]; } else { - UIView *topAlertView = [[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView]; + UIView *topAlertView = [[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView]; [topAlertView showWithTopAlertObject:self.topAlertObject animationDelegate:self completionHandler:^(BOOL finished) { self.displayed = YES; @@ -201,7 +200,7 @@ if (self.isDisplayed && !self.isAnimating) { // Dismisses. - [[[MVMCoreObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:^(BOOL finished) { + [[[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:^(BOOL finished) { self.displayed = NO; if (andFinish) {