Using OSInAppMessageContent to pass layout properties

Author: emawby

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

@@ -19,7 +19,6 @@
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.webkit.WebView;
-import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 
@@ -84,12 +83,12 @@ interface InAppMessageViewListener {
     private InAppMessageViewListener messageController;
     private Runnable scheduleDismissRunnable;
 
-    InAppMessageView(@NonNull WebView webView, @NonNull WebViewManager.Position displayLocation, int pageHeight, double dismissDuration, boolean disableDragDismiss) {
+    InAppMessageView(@NonNull WebView webView, @NonNull OSInAppMessageContent content, boolean disableDragDismiss) {
         this.webView = webView;
-        this.displayLocation = displayLocation;
-        this.pageHeight = pageHeight;
+        this.displayLocation = content.getDisplayLocation();
+        this.pageHeight = content.getPageHeight();
         this.pageWidth = ViewGroup.LayoutParams.MATCH_PARENT;
-        this.dismissDuration = Double.isNaN(dismissDuration) ? 0 : dismissDuration;
+        this.dismissDuration = content.getDismissDuration() == null ? 0 : dismissDuration;
         this.hasBackground = !displayLocation.isBanner();
         this.disableDragDismiss = disableDragDismiss;
     }
@@ -117,17 +116,7 @@ void checkIfShouldDismiss() {
             finishAfterDelay(null);
         }
     }
-
-    void useHeightMargins(boolean shouldUseMargin) {
-        marginPxSizeBottom = shouldUseMargin ? MARGIN_PX_SIZE : 0;
-        marginPxSizeTop = shouldUseMargin ? MARGIN_PX_SIZE : 0;
-    }
-
-    void useWidthMargins(boolean shouldUseMargin) {
-        marginPxSizeLeft = shouldUseMargin ? MARGIN_PX_SIZE : 0;
-        marginPxSizeRight = shouldUseMargin ? MARGIN_PX_SIZE : 0;
-    }
-
+    
     /**
      * This will fired when the device is rotated for example with a new provided height for the WebView
      * Called to shrink or grow the WebView when it receives a JS resize event with a new height.

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

@@ -64,6 +64,7 @@ boolean isBanner() {
 
     @NonNull private Activity activity;
     @NonNull private OSInAppMessageInternal message;
+    @NonNull private OSInAppMessageContent messageContent;
 
     @Nullable private String currentActivityName = null;
     private Integer lastPageHeight = null;
@@ -77,9 +78,10 @@ interface OneSignalGenericCallback {
         void onComplete();
     }
 
-    protected WebViewManager(@NonNull OSInAppMessageInternal message, @NonNull Activity activity) {
+    protected WebViewManager(@NonNull OSInAppMessageInternal message, @NonNull Activity activity, @NonNull OSInAppMessageContent content) {
         this.message = message;
         this.activity = activity;
+        this.messageContent = content;
     }
 
     /**
@@ -91,7 +93,7 @@ protected WebViewManager(@NonNull OSInAppMessageInternal message, @NonNull Activ
      */
     static void showMessageContent(@NonNull final OSInAppMessageInternal message, @NonNull final OSInAppMessageContent content) {
         final Activity currentActivity = OneSignal.getCurrentActivity();
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "in app message showHTMLString on currentActivity: " + currentActivity);
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "in app message showMessageContent on currentActivity: " + currentActivity);
         /* IMPORTANT
          * This is the starting route for grabbing the current Activity and passing it to InAppMessageView */
         if (currentActivity != null) {
@@ -103,11 +105,11 @@ static void showMessageContent(@NonNull final OSInAppMessageInternal message, @N
                     @Override
                     public void onComplete() {
                         lastInstance = null;
-                        initInAppMessage(currentActivity, message, content.getContentHtml());
+                        initInAppMessage(currentActivity, message, content);
                     }
                 });
             } else {
-                initInAppMessage(currentActivity, message, content.getContentHtml());
+                initInAppMessage(currentActivity, message, content);
             }
             return;
         }
@@ -130,14 +132,14 @@ static void dismissCurrentInAppMessage() {
         }
     }
 
-    private static void initInAppMessage(@NonNull final Activity currentActivity, @NonNull OSInAppMessageInternal message, @NonNull String htmlStr) {
+    private static void initInAppMessage(@NonNull final Activity currentActivity, @NonNull OSInAppMessageInternal message, @NonNull OSInAppMessageContent content) {
         try {
             final String base64Str = Base64.encodeToString(
-                    htmlStr.getBytes("UTF-8"),
+                    content.getContentHtml().getBytes("UTF-8"),
                     Base64.NO_WRAP
             );
 
-            final WebViewManager webViewManager = new WebViewManager(message, currentActivity);
+            final WebViewManager webViewManager = new WebViewManager(message, currentActivity, content);
             lastInstance = webViewManager;
 
             // Web view must be created on the main thread.
@@ -200,7 +202,9 @@ private void handleRenderComplete(JSONObject jsonObject) {
             Position displayType = getDisplayLocation(jsonObject);
             int pageHeight = displayType == Position.FULL_SCREEN ? -1 : getPageHeightData(jsonObject);
             boolean dragToDismissDisabled = getDragToDismissDisabled(jsonObject);
-            createNewInAppMessageView(displayType, pageHeight, dragToDismissDisabled);
+            messageContent.setDisplayLocation(displayType);
+            messageContent.setPageHeight(pageHeight);
+            createNewInAppMessageView(dragToDismissDisabled);
         }
 
         private int getPageHeightData(JSONObject jsonObject) {
@@ -414,9 +418,9 @@ private void setMessageView(InAppMessageView view) {
         }
     }
 
-    private void createNewInAppMessageView(@NonNull Position displayLocation, int pageHeight, boolean dragToDismissDisabled) {
-        lastPageHeight = pageHeight;
-        InAppMessageView newView = new InAppMessageView(webView, displayLocation, pageHeight, message.getDisplayDuration(), dragToDismissDisabled);
+    private void createNewInAppMessageView(boolean dragToDismissDisabled) {
+        lastPageHeight = messageContent.getPageHeight();
+        InAppMessageView newView = new InAppMessageView(webView, messageContent, dragToDismissDisabled);
         setMessageView(newView);
         messageView.setMessageController(new InAppMessageView.InAppMessageViewListener() {
             @Override

OneSignalSDK/unittest/src/test/java/com/onesignal/OneSignalPackagePrivateHelper.java

@@ -621,8 +621,8 @@ public void dismissAndAwaitNextMessage(@Nullable final OneSignalGenericCallback
          super.dismissAndAwaitNextMessage(callback);
       }
 
-      protected WebViewManager(@NonNull OSInAppMessageInternal message, @NonNull Activity activity) {
-         super(message, activity);
+      protected WebViewManager(@NonNull OSInAppMessageInternal message, @NonNull Activity activity, @NonNull com.onesignal.OSInAppMessageContent content) {
+         super(message, activity, content);
       }
    }