Fix for top notification dismiss bug

MVMCoreUI.xcodeproj/project.pbxproj

@@ -285,6 +285,8 @@
 		AF1C336F2885A16A006B1001 /* ActionCollapseNotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1C336E2885A16A006B1001 /* ActionCollapseNotificationHandler.swift */; };
 		AF1C33712885AE76006B1001 /* MVMCoreUIActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1C33702885AE76006B1001 /* MVMCoreUIActionHandler.swift */; };
 		AF1C33732885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1C33722885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift */; };
+		AF60A7F62892D2E300919EEB /* ActionDismissNotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF60A7F52892D2E300919EEB /* ActionDismissNotificationModel.swift */; };
+		AF60A7F82892D34D00919EEB /* ActionDismissNotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF60A7F72892D34D00919EEB /* ActionDismissNotificationHandler.swift */; };
 		AFE4A1D127DFB5EE00C458D0 /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */; };
 		AFE4A1D627DFBB6F00C458D0 /* UINavigationController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */; };
 		BB105859248DEFF70069D008 /* UICollectionViewLeftAlignedLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB105858248DEFF60069D008 /* UICollectionViewLeftAlignedLayout.swift */; };
@@ -883,6 +885,8 @@
 		AF1C336E2885A16A006B1001 /* ActionCollapseNotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionCollapseNotificationHandler.swift; sourceTree = "<group>"; };
 		AF1C33702885AE76006B1001 /* MVMCoreUIActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIActionHandler.swift; sourceTree = "<group>"; };
 		AF1C33722885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIActionOpenPageHandler.swift; sourceTree = "<group>"; };
+		AF60A7F52892D2E300919EEB /* ActionDismissNotificationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionDismissNotificationModel.swift; sourceTree = "<group>"; };
+		AF60A7F72892D34D00919EEB /* ActionDismissNotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionDismissNotificationHandler.swift; sourceTree = "<group>"; };
 		AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSColorTokens.xcframework; path = ../SharedFrameworks/VDSColorTokens.xcframework; sourceTree = "<group>"; };
 		AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Extension.swift"; sourceTree = "<group>"; };
 		BB105858248DEFF60069D008 /* UICollectionViewLeftAlignedLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICollectionViewLeftAlignedLayout.swift; sourceTree = "<group>"; };
@@ -1505,6 +1509,8 @@
 				C6687440259D92D400F32D13 /* ActionTopNotificationModel.swift */,
 				AF1C33642883B5A4006B1001 /* ActionTopNotificationHandler.swift */,
 				AF1C33722885D481006B1001 /* MVMCoreUIActionOpenPageHandler.swift */,
+				AF60A7F52892D2E300919EEB /* ActionDismissNotificationModel.swift */,
+				AF60A7F72892D34D00919EEB /* ActionDismissNotificationHandler.swift */,
 			);
 			path = Actions;
 			sourceTree = "<group>";
@@ -2999,6 +3005,7 @@
 				522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */,
 				AA7F32AB246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift in Sources */,
 				8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */,
+				AF60A7F82892D34D00919EEB /* ActionDismissNotificationHandler.swift in Sources */,
 				D253BB9E2458751F002DE544 /* BGImageMoleculeModel.swift in Sources */,
 				AA104AC924472DC7004D2810 /* HeadersH1ButtonModel.swift in Sources */,
 				0ABD1371237DB0450081388D /* ItemDropdownEntryField.swift in Sources */,
@@ -3041,6 +3048,7 @@
 				D23A8FD9260CE004007E14CE /* MFStyler+PaddingExtension.swift in Sources */,
 				1D6D258926899B0C00DEBB08 /* ImageButton.swift in Sources */,
 				C695A68123C9830D00BFB94E /* NumberedListModel.swift in Sources */,
+				AF60A7F62892D2E300919EEB /* ActionDismissNotificationModel.swift in Sources */,
 				01EB3684236097C0006832FA /* MoleculeModelProtocol.swift in Sources */,
 				D27CD4102339057800C1DC07 /* EyebrowHeadlineBodyLink.swift in Sources */,
 				AAB7EDF1246ADA2A00E54929 /* ListProgressBarThin.swift in Sources */,

MVMCoreUI/Atomic/Actions/ActionDismissNotificationHandler.swift

@@ -0,0 +1,23 @@
+//
+//  ActionDismissNotificationHandler.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 7/28/22.
+//  Copyright © 2022 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+import MVMCore
+
+/// Collapse the current top notification.
+open class ActionDismissNotificationHandler: MVMCoreActionHandlerProtocol {
+    required public init() {}
+    
+    open func performAction(_ model: ActionModelProtocol, delegateObject: DelegateObject?, additionalData: [AnyHashable : Any]?) async throws {
+        await withCheckedContinuation { continuation in
+            CoreUIObject.sharedInstance()?.globalTopAlertDelegate?.getTopAlertView?().hideAlertView?(true, completionHandler: { finished in
+                continuation.resume()
+            }) ?? continuation.resume()
+        }
+    }
+}

MVMCoreUI/Atomic/Actions/ActionDismissNotificationModel.swift

@@ -0,0 +1,23 @@
+//
+//  ActionDismissNotificationModel.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 7/28/22.
+//  Copyright © 2022 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+import MVMCore
+
+public struct ActionDismissNotificationModel: ActionModelProtocol {
+    
+    public static var identifier: String = "dismissNotification"
+    public var actionType: String = ActionDismissNotificationModel.identifier
+    public var extraParameters: JSONValueDictionary?
+    public var analyticsData: JSONValueDictionary?
+    
+    public init(_ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
+    }
+}

MVMCoreUI/Atomic/Molecules/TopNotification/NotificationModel.swift

@@ -85,24 +85,14 @@ open class NotificationModel: ContainerModel, MoleculeModelProtocol {
         }
         
         button?.size = .tiny
-        if button?.enabledTextColor == nil {
+        button?.style = .secondary
-            switch style {
+        switch style {
-            case .error, .warning:
+        case .error, .warning:
-                button?.enabledTextColor = Color(uiColor: .mvmBlack)
+            button?.enabledTextColor = Color(uiColor: .mvmBlack)
-            default:
+            button?.enabledBorderColor = Color(uiColor: .mvmBlack)
-                button?.enabledTextColor = Color(uiColor: .mvmWhite)
+        default:
-            }
+            button?.enabledTextColor = Color(uiColor: .mvmWhite)
-        }
+            button?.enabledBorderColor = Color(uiColor: .mvmWhite)
-        if button?.enabledBorderColor == nil {
-            switch style {
-            case .error, .warning:
-                button?.enabledBorderColor = Color(uiColor: .mvmBlack)
-            default:
-                button?.enabledBorderColor = Color(uiColor: .mvmWhite)
-            }
-        }
-        if button?.style == nil {
-            button?.style = .secondary
         }
         
         if closeButton?.color == nil {

MVMCoreUI/Atomic/Molecules/TopNotification/NotificationXButton.swift

@@ -7,15 +7,12 @@
 //
 
 import Foundation
+import MVMCore
 
 @objcMembers open class NotificationXButton: Button {
     
     open func closeTopAlert() {
-        if let delegate = MVMCoreUITopAlertView.sharedGlobal()?.animationDelegate {
+        _ = MVMCoreUIActionHandler.shared()?.asyncHandleAction(with: ActionDismissNotificationModel(), additionalData: nil, delegateObject: nil)
-            delegate.topAlertCloseButtonPressed()
-        } else {
-            MVMCoreUISession.sharedGlobal()?.topAlertView?.hideAlertView(true, completionHandler: nil)
-        }
     }
     
     open override func setupView() {

MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift

@@ -232,6 +232,7 @@ open class CoreUIModelMapping: ModelMapping {
         ModelRegistry.register(handler: ActionAlertHandler.self, for: ActionAlertModel.self)
         ModelRegistry.register(handler: ActionTopAlertHandler.self, for: ActionTopAlertModel.self)
         ModelRegistry.register(handler: ActionCollapseNotificationHandler.self, for: ActionCollapseNotificationModel.self)
+        ModelRegistry.register(handler: ActionDismissNotificationHandler.self, for: ActionDismissNotificationModel.self)
         ModelRegistry.register(handler: ActionOpenPanelHandler.self, for: ActionOpenPanelModel.self)
         ModelRegistry.register(handler: ActionTopNotificationHandler.self, for: ActionTopNotificationModel.self)
         ModelRegistry.register(handler: MVMCoreUIActionOpenPageHandler.self, for: ActionOpenPageModel.self, allowsReplace: true)

MVMCoreUI/TopAlert/MVMCoreTopAlertAnimationDelegateProtocol.h

@@ -16,7 +16,10 @@
 // Called when the top alert is ending an animation
 - (void)topAlertViewFinishAnimation;
 
-// Called when the top alert close button was pressed by the user
+// Called when the top alert is starting to dismiss.
-- (void)topAlertCloseButtonPressed;
+- (void)topAlertWillDismiss;
+
+// Called when the top alert is dismissed.
+- (void)topAlertDismissed;
 
 @end

MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.m

@@ -183,11 +183,11 @@
                     if (self.isCancelled) {
                         
                         // Cancelled, dismiss immediately.
-                        [self dismissAlertView:YES forceful:YES];
+                        [self dismissAlertView:YES];
                     } else if (self.isPaused) {
                         
                         // Paused, dismiss for the time being if persistent.
-                        [self dismissAlertView:!self.topAlertObject.persistent forceful:YES];
+                        [self dismissAlertView:YES];
                     } else {
                         [self updateDismissTimer];
                     }
@@ -223,7 +223,7 @@
         if (weakSelf.isFinished || [weakSelf checkAndHandleForCancellation]) {
             return;
         }
-        [weakSelf dismissAlertView:YES forceful:NO];
+        [weakSelf dismissAlertView:NO];
     });
     dispatch_resume(self.timerSource);
 }
@@ -235,27 +235,21 @@
     if (!self.isAnimating) {
         
         if (self.isDisplayed) {
-            [self dismissAlertView:YES forceful:YES];
+            [self dismissAlertView:YES];
         } else if (self.isExecuting) {
             [self markAsFinished];
         }
     }
 }
 
-- (void)dismissAlertView:(BOOL)andFinish forceful:(BOOL)forceful {
+- (void)dismissAlertView:(BOOL)forceful {
     if (self.timerSource) {
         dispatch_source_cancel(self.timerSource);
     }
     if (self.isDisplayed && !self.isAnimating) {
         
         // Dismisses.
-        [[[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:^(BOOL finished) {
+        [[[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView] hideAlertView:forceful completionHandler:NULL];
-            
-            self.displayed = NO;
-            if (andFinish) {
-                [self markAsFinished];
-            }
-        }];
     }
 }
 
@@ -266,7 +260,7 @@
         self.paused = YES;
         [self didChangeValueForKey:@"isPaused"];
     }
-    [self dismissAlertView:!self.topAlertObject.persistent forceful:YES];
+    [self dismissAlertView:YES];
 }
 
 - (void)unpause {
@@ -291,8 +285,20 @@
     self.animating = NO;
 }
 
+- (void)topAlertDismissed {
+    self.displayed = NO;
+    if (!self.isCancelled && self.isPaused && self.topAlertObject.persistent) { return; }
+    [self markAsFinished];
+}
+
+- (void)topAlertWillDismiss {
+    if (self.timerSource) {
+        dispatch_source_cancel(self.timerSource);
+    }
+}
+
 - (void)topAlertCloseButtonPressed {
-    [self dismissAlertView:YES forceful:YES];
+    [self dismissAlertView:YES];
 }
 
 - (id)copyWithZone:(nullable NSZone *)zone {

MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.m

@@ -70,11 +70,7 @@
 
 - (nonnull Button *)addCloseButtonWithAnimationDelegate:(nullable id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate {
     Button *closeButton = [MVMCoreUICommonViewsUtility addCloseButtonTo:self action:^(Button * _Nonnull button) {
-        if (animationDelegate) {
+        [[MVMCoreUIActionHandler sharedActionHandler] handleActionWithDictionary:@{KeyActionType: @"dismissNotification"} additionalData:nil delegateObject:nil];
-            [animationDelegate topAlertCloseButtonPressed];
-        } else {
-            [[MVMCoreUISession sharedGlobal].topAlertView hideAlertView:YES completionHandler:nil];
-        }
     } centeredVertically:YES];
     [closeButton.heightAnchor constraintEqualToConstant:16.0].active = YES;
     [closeButton.widthAnchor constraintEqualToConstant:16.0].active = YES;

MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m

@@ -226,6 +226,7 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
     __weak typeof(self) weakSelf = self;
     MVMCoreBlockOperation *operation = [MVMCoreBlockOperation blockOperationWithBlock:^(MVMCoreBlockOperation * _Nonnull operation) {
         [MVMCoreDispatchUtility performBlockOnMainThread:^{
+            [weakSelf.animationDelegate topAlertWillDismiss];
             [weakSelf.animationDelegate topAlertViewBeginAnimation];
         
             // accessibility - below line added to notify VI user through voiceover user when the top alert is closed
@@ -251,6 +252,7 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
                     if (completionHandler) {
                         completionHandler(finished);
                     }
+                    [weakSelf.animationDelegate topAlertDismissed];
                     weakSelf.topAlertObject = nil;
                     if (weakSelf.currentAlertOverridingStatusBar) {
                         weakSelf.currentAlertOverridingStatusBar = NO;