fixing IAM didDisplay to fire after animation has completed

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.h

@@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)messageViewDidSelectAction:(OSInAppMessageInternal *)message withAction:(OSInAppMessageAction *)action;
 - (void)messageViewDidDisplayPage:(OSInAppMessageInternal *)message withPageId:(NSString *)pageId;
+- (void)messageViewControllerDidDisplay:(OSInAppMessageInternal *)message;
 - (void)messageViewControllerWillDismiss:(OSInAppMessageInternal *)message;
 - (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message displayed:(BOOL)displayed;
 - (void)webViewContentFinishedLoading:(OSInAppMessageInternal *)message;

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m

@@ -137,9 +137,8 @@ - (void)viewWillDisappear:(BOOL)animated {
 
 - (void)applicationIsActive:(NSNotification *)notification {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Application Active"];
-
     // Animate the showing of the IAM when opening the app from background
-    [self animateAppearance];
+    [self animateAppearance:NO];
 }
 
 - (void)applicationIsInBackground:(NSNotification *)notification {
@@ -195,7 +194,7 @@ - (void)setupInitialMessageUI {
         if (!finished)
             return;
 
-        [self animateAppearance];
+        [self animateAppearance:YES];
     }];
 }
 
@@ -485,13 +484,17 @@ - (void)dismissCurrentInAppMessage:(BOOL)up withVelocity:(double)velocity {
  For banners the initialYConstraint is set to LOW_CONSTRAINT_PRIORITY
  For center modal and full screen, the transform is set to CGAffineTransformIdentity (original scale)
  */
-- (void)animateAppearance {
+- (void)animateAppearance:(BOOL)firstDisplay {
     self.initialYConstraint.priority = LOW_CONSTRAINT_PRIORITY;
 
     [UIView animateWithDuration:0.3f animations:^{
         self.messageView.hidden = false;
         self.messageView.transform = CGAffineTransformIdentity;
         [self.view layoutIfNeeded];
+    } completion:^(BOOL finished) {
+        if (firstDisplay) {
+            [self.delegate messageViewControllerDidDisplay:self.message];
+        }
     }];
 }
 
@@ -749,7 +752,7 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIV
             [self addConstraintsForMessage];
 
             // Reanimate and show IAM
-            [self animateAppearance];
+            [self animateAppearance:NO];
         }];
     }];
 }

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

@@ -572,6 +572,14 @@ - (id)getTriggerValueForKey:(NSString *)key {
 }
 
 #pragma mark OSInAppMessageViewControllerDelegate Methods
+- (void)messageViewControllerDidDisplay:(OSInAppMessageInternal *)message {
+    [self onDidDisplayInAppMessage:message];
+}
+
+- (void)messageViewControllerWillDismiss:(OSInAppMessageInternal *)message {
+    [self onWillDismissInAppMessage:message];
+}
+
 - (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message displayed:(BOOL)displayed {
     @synchronized (self.messageDisplayQueue) {
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Dismissing IAM and preparing to show next IAM"];
@@ -604,10 +612,6 @@ - (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message disp
     }
 }
 
-- (void)messageViewControllerWillDismiss:(OSInAppMessageInternal *)message {
-    [self onWillDismissInAppMessage:message];
-}
-
 - (void)evaluateMessageDisplayQueue {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Evaluating message display queue"];
     // No IAMs are showing currently
@@ -847,7 +851,6 @@ - (void)webViewContentFinishedLoading:(OSInAppMessageInternal *)message {
     [self addKeySceneToWindow:self.window];
 
     [self.window makeKeyAndVisible];
-    [self onDidDisplayInAppMessage:message];
 }
 
 // Required to display if the app is using a Scene