Merge pull request #230 from Iterable/MOB-1573-Replace-Dialog-with-DialogFragment

[MOB-1573] - Replace Dialog with DialogFragments

Author: Ayyanchira

app/src/androidTest/java/com/iterable/iterableapi/MainActivityTest.java

@@ -1,9 +1,9 @@
 package com.iterable.iterableapi;
 
 import android.content.Intent;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.intent.rule.IntentsTestRule;
 import androidx.test.espresso.web.webdriver.Locator;
@@ -69,7 +69,7 @@ public void setUp() throws Exception {
         server.setDispatcher(dispatcher);
         // This is done so we don't hold a reference to the previous in-app notification.
         // We should handle in-app dismissal when the parent activity is destroyed though.
-        IterableInAppHTMLNotification.notification = null;
+        IterableInAppFragmentHTMLNotification.notification = null;
         IterableApi.overrideURLEndpointPath(server.url("").toString());
         IterableApi.sharedInstance = new IterableApi();
         IterableTestUtils.createIterableApiNew(new IterableTestUtils.ConfigBuilderExtender() {

iterableapi/src/androidTest/java/com/iterable/iterableapi/IterableInAppTest.java

@@ -11,7 +11,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static junit.framework.Assert.assertEquals;
 
 /**
@@ -22,12 +21,12 @@
 @MediumTest
 public class IterableInAppTest {
 
-    IterableInAppHTMLNotification notification;
+    IterableInAppFragmentHTMLNotification notification;
 
     @Before
     @UiThreadTest
     public void setUp() throws Exception {
-        notification = IterableInAppHTMLNotification.createInstance(getApplicationContext(), "");
+        notification = new IterableInAppFragmentHTMLNotification();
     }
 
     @Test

iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppDisplayer.java

@@ -2,11 +2,9 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Rect;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
 
 class IterableInAppDisplayer {
@@ -18,14 +16,14 @@ class IterableInAppDisplayer {
     }
 
     boolean isShowingInApp() {
-        return IterableInAppHTMLNotification.getInstance() != null;
+        return IterableInAppFragmentHTMLNotification.getInstance() != null;
     }
 
     boolean showMessage(@NonNull IterableInAppMessage message, IterableInAppLocation location, @NonNull final IterableHelper.IterableUrlCallback clickCallback) {
         Activity currentActivity = activityMonitor.getCurrentActivity();
         // Prevent double display
         if (currentActivity != null) {
-            return IterableInAppDisplayer.showIterableNotificationHTML(currentActivity,
+            return IterableInAppDisplayer.showIterableFragmentNotificationHTML(currentActivity,
                     message.getContent().html,
                     message.getMessageId(),
                     clickCallback,
@@ -36,50 +34,6 @@ boolean showMessage(@NonNull IterableInAppMessage message, IterableInAppLocation
         return false;
     }
 
-    /**
-     * Displays an html rendered InApp Notification
-     * @param context
-     * @param htmlString
-     * @param messageId
-     * @param clickCallback
-     * @param backgroundAlpha
-     * @param padding
-     */
-    static boolean showIterableNotificationHTML(@NonNull Context context, @Nullable String htmlString, String messageId, final IterableHelper.IterableUrlCallback clickCallback, double backgroundAlpha, Rect padding, boolean callbackOnCancel, IterableInAppLocation location) {
-        if (context instanceof Activity) {
-            Activity currentActivity = (Activity) context;
-            if (htmlString != null) {
-                if (IterableInAppHTMLNotification.getInstance() != null) {
-                    IterableLogger.w(IterableInAppManager.TAG, "Skipping the in-app notification: another notification is already being displayed");
-                    return false;
-                }
-
-                IterableInAppHTMLNotification notification = IterableInAppHTMLNotification.createInstance(context, htmlString);
-                notification.setTrackParams(messageId);
-                notification.setCallback(clickCallback);
-                notification.setBackgroundAlpha(backgroundAlpha);
-                notification.setPadding(padding);
-                notification.setOwnerActivity(currentActivity);
-                notification.setLocation(location);
-
-                if (callbackOnCancel) {
-                    notification.setOnCancelListener(new DialogInterface.OnCancelListener() {
-                        @Override
-                        public void onCancel(DialogInterface dialog) {
-                            clickCallback.execute(null);
-                        }
-                    });
-                }
-
-                notification.show();
-                return true;
-            }
-        } else {
-            IterableLogger.w(IterableInAppManager.TAG, "To display in-app notifications, the context must be of an instance of: Activity");
-        }
-        return false;
-    }
-
     /**
      * Displays an html rendered InApp Notification
      * @param context