using height/width margin booleans instead of top/bottom/left/right double

Author: emawby

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

@@ -100,18 +100,10 @@ interface InAppMessageViewListener {
      * @param content in app message content and style
      */
     private void setMarginsFromContent(OSInAppMessageContent content) {
-        if (content.getTopMargin() != null && content.getTopMargin() == 0) {
-            this.marginPxSizeTop = content.getTopMargin();
-        }
-        if (content.getBottomMargin() != null && content.getBottomMargin() == 0) {
-            this.marginPxSizeBottom = content.getBottomMargin();
-        }
-        if (content.getLeftMargin() != null && content.getLeftMargin() == 0) {
-            this.marginPxSizeLeft = content.getLeftMargin();
-        }
-        if (content.getRightMargin() != null && content.getRightMargin() == 0) {
-            this.marginPxSizeRight = content.getRightMargin();
-        }
+        this.marginPxSizeTop = content.getUseHeightMargin() ? dpToPx(24) : 0;
+        this.marginPxSizeBottom = content.getUseHeightMargin() ? dpToPx(24) : 0;
+        this.marginPxSizeLeft = content.getUseWidthMargin() ? dpToPx(24) : 0;
+        this.marginPxSizeRight = content.getUseWidthMargin() ? dpToPx(24) : 0;
     }
 
     void setWebView(WebView webView) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageContent.kt

@@ -5,17 +5,13 @@ import org.json.JSONObject
 const val HTML = "html"
 const val STYLES = "styles"
 const val DISPLAY_DURATION = "display_duration"
-const val TOP_MARGIN = "top_margin"
-const val BOTTOM_MARGIN = "bottom_margin"
-const val LEFT_MARGIN = "left_margin"
-const val RIGHT_MARGIN = "right_margin"
+const val REMOVE_HEIGHT_MARGIN = "remove_height_margin"
+const val REMOVE_WIDTH_MARGIN = "remove_width_margin"
 
 internal open class OSInAppMessageContent constructor(jsonObject: JSONObject) {
     var contentHtml: String? = null
-    var topMargin: Int? = 1
-    var bottomMargin: Int? = 1
-    var leftMargin: Int? = 1
-    var rightMargin: Int? = 1
+    var useHeightMargin: Boolean = true
+    var useWidthMargin: Boolean = true
     // The following properties are populated from Javascript events
     var displayLocation: WebViewManager.Position? = null
     var displayDuration: Double? = null
@@ -25,9 +21,7 @@ internal open class OSInAppMessageContent constructor(jsonObject: JSONObject) {
         contentHtml = jsonObject.optString(HTML)
         displayDuration = jsonObject.optDouble(DISPLAY_DURATION)
         var styles: JSONObject? = jsonObject.optJSONObject(STYLES)
-        topMargin = styles?.optInt(TOP_MARGIN, 1)
-        bottomMargin = styles?.optInt(BOTTOM_MARGIN, 1)
-        leftMargin = styles?.optInt(LEFT_MARGIN, 1)
-        rightMargin = styles?.optInt(RIGHT_MARGIN,1)
+        useHeightMargin = !(styles?.optBoolean(REMOVE_HEIGHT_MARGIN, false) ?: false)
+        useWidthMargin = !(styles?.optBoolean(REMOVE_WIDTH_MARGIN, false) ?: false)
     }
 }