Merge pull request #1405 from OneSignal/Feature/IAM_lifecycle_events

IAM Lifecycle Events

Author: emawby

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -4,7 +4,9 @@
 
 import androidx.multidex.MultiDexApplication;
 
+import com.onesignal.OSInAppMessage;
 import com.onesignal.OSNotification;
+import com.onesignal.OSInAppMessageLifecycleHandler;
 import com.onesignal.OneSignal;
 import com.onesignal.sdktest.R;
 import com.onesignal.sdktest.constant.Tag;
@@ -19,6 +21,27 @@ public class MainApplication extends MultiDexApplication {
     public void onCreate() {
         super.onCreate();
 
+        OSInAppMessageLifecycleHandler handler = new OSInAppMessageLifecycleHandler() {
+            @Override
+            public void onWillDisplayInAppMessage(OSInAppMessage message) {
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onWillDisplayInAppMessage");
+            }
+            @Override
+            public void onDidDisplayInAppMessage(OSInAppMessage message) {
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onDidDisplayInAppMessage");
+            }
+            @Override
+            public void onWillDismissInAppMessage(OSInAppMessage message) {
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onWillDismissInAppMessage");
+            }
+            @Override
+            public void onDidDismissInAppMessage(OSInAppMessage message) {
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onDidDismissInAppMessage");
+            }
+        };
+
+        OneSignal.setInAppMessageLifecycleHandler(handler);
+
         OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.NONE);
 
         // OneSignal Initialization

OneSignalSDK/onesignal/src/main/java/com/onesignal/InAppMessageView.java

@@ -61,6 +61,7 @@ class InAppMessageView {
 
     interface InAppMessageViewListener {
         void onMessageWasShown();
+        void onMessageWillDismiss();
         void onMessageWasDismissed();
     }
 
@@ -243,7 +244,6 @@ public void run() {
 
                 if (messageController != null) {
                     animateInAppMessage(displayLocation, draggableRelativeLayout, parentRelativeLayout);
-                    messageController.onMessageWasShown();
                 }
 
                 startDismissTimerIfNeeded();
@@ -310,6 +310,9 @@ private void setUpDraggableLayout(final Context context,
         draggableRelativeLayout.setListener(new DraggableRelativeLayout.DraggableListener() {
             @Override
             public void onDismiss() {
+                if (messageController != null) {
+                    messageController.onMessageWillDismiss();
+                }
                 finishAfterDelay(null);
             }
 
@@ -388,6 +391,9 @@ private void startDismissTimerIfNeeded() {
 
         scheduleDismissRunnable = new Runnable() {
             public void run() {
+                if (messageController != null) {
+                    messageController.onMessageWillDismiss();
+                }
                 if (currentActivity != null) {
                     dismissAndAwaitNextMessage(null);
                     scheduleDismissRunnable = null;
@@ -489,9 +495,7 @@ private void dereferenceViews() {
     private void animateInAppMessage(WebViewManager.Position displayLocation, View messageView, View backgroundView) {
         final CardView messageViewCardView = messageView.findViewWithTag(IN_APP_MESSAGE_CARD_VIEW_TAG);
 
-        Animation.AnimationListener cardViewAnimCallback = null;
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M)
-            cardViewAnimCallback = createAnimationListenerForAndroidApi23Elevation(messageViewCardView);
+        Animation.AnimationListener cardViewAnimCallback = createAnimationListener(messageViewCardView);
 
         // Based on the location of the in app message apply and animation to match
         switch (displayLocation) {
@@ -508,7 +512,7 @@ private void animateInAppMessage(WebViewManager.Position displayLocation, View m
         }
     }
 
-    private Animation.AnimationListener createAnimationListenerForAndroidApi23Elevation(final CardView messageViewCardView) {
+    private Animation.AnimationListener createAnimationListener(final CardView messageViewCardView) {
         return new Animation.AnimationListener() {
             @Override
             public void onAnimationStart(Animation animation) {
@@ -518,7 +522,12 @@ public void onAnimationStart(Animation animation) {
             @Override
             public void onAnimationEnd(Animation animation) {
                 // For Android 6 API 23 devices, waits until end of animation to set elevation of CardView class
-                messageViewCardView.setCardElevation(dpToPx(5));
+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
+                    messageViewCardView.setCardElevation(dpToPx(5));
+                }
+                if (messageController != null) {
+                    messageController.onMessageWasShown();
+                }
             }
 
             @Override