feat(android15) : Support Android 15 SDK-3997

build.gradle

@@ -21,6 +21,7 @@ buildscript {
 
 plugins {
     alias(libs.plugins.sonarqube)
+    alias(libs.plugins.compose.compiler) apply false
 }
 allprojects {
     repositories {

clevertap-core/src/main/java/com/clevertap/android/sdk/CTXtensions.kt

@@ -10,10 +10,16 @@ import android.content.SharedPreferences
 import android.location.Location
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
+import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.annotation.MainThread
 import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import com.clevertap.android.sdk.events.EventGroup.PUSH_NOTIFICATION_VIEWED
 import com.clevertap.android.sdk.task.CTExecutorFactory
 import org.json.JSONArray
@@ -299,3 +305,40 @@ fun String?.toJsonOrNull(): JSONObject? {
         }
     }
 }
+
+/**
+ * Adjusts the margins of the view based on the system bar insets (such as the status bar, navigation bar,
+ * or display cutout) using the provided margin adjustment logic.
+ *
+ * This function sets a listener on the view to handle window insets and invokes the provided `marginAdjuster`
+ * block to allow custom margin adjustments. The `marginAdjuster` lambda receives the system bar insets and
+ * the view's margin layout parameters, allowing the caller to modify the margins as needed.
+ *
+ * @param marginAdjuster A lambda function that takes two parameters:
+ *  - `bars`: The insets for system bars and display cutouts, representing the space occupied by UI elements
+ *     such as the status bar or navigation bar.
+ *  - `mlp`: The `MarginLayoutParams` of the view, which can be modified to adjust the margins based on the insets.
+ *
+ * Example usage:
+ * ```
+ * view.applyInsetsWithMarginAdjustment { insets, layoutParams ->
+ *     layoutParams.leftMargin = insets.left
+ *     layoutParams.rightMargin = insets.right
+ *     layoutParams.topMargin = insets.top
+ *     layoutParams.bottomMargin = insets.bottom
+ * }
+ * ```
+ */
+fun View.applyInsetsWithMarginAdjustment(marginAdjuster : (insets:Insets, mlp:MarginLayoutParams) -> Unit) {
+    ViewCompat.setOnApplyWindowInsetsListener(this
+    ) { v, insets ->
+        val bars: Insets = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+        )
+        v.updateLayoutParams<MarginLayoutParams> {
+            marginAdjuster(bars,this)
+        }
+        WindowInsetsCompat.CONSUMED
+    }
+}
+

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppHtmlCoverFragment.java

@@ -1,7 +1,17 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.clevertap.android.sdk.Constants;
 
 public class CTInAppHtmlCoverFragment extends CTInAppBaseFullHtmlFragment {
@@ -19,4 +29,20 @@ protected RelativeLayout.LayoutParams getLayoutParamsForCloseButton() {
         closeIvLp.setMargins(0, sub, sub, 0);
         return closeIvLp;
     }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        View inAppView = super.onCreateView(inflater, container, savedInstanceState);
+        if (inAppView != null) {
+            applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+                mlp.leftMargin = insets.left;
+                mlp.rightMargin = insets.right;
+                mlp.topMargin = insets.top;
+                mlp.bottomMargin = insets.bottom;
+                return null;
+            });
+        }
+        return inAppView;
+    }
 }

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppHtmlFooterFragment.java

@@ -1,8 +1,11 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.clevertap.android.sdk.R;
 
 public class CTInAppHtmlFooterFragment extends CTInAppBasePartialHtmlFragment {
@@ -14,6 +17,13 @@ ViewGroup getLayout(View view) {
 
     @Override
     View getView(LayoutInflater inflater, ViewGroup container) {
-        return inflater.inflate(R.layout.inapp_html_footer, container, false);
+        View inAppView =  inflater.inflate(R.layout.inapp_html_footer, container, false);
+        applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+            mlp.leftMargin = insets.left;
+            mlp.rightMargin = insets.right;
+            mlp.bottomMargin = insets.bottom;
+            return null;
+        });
+        return inAppView;
     }
 }

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppHtmlHeaderFragment.java

@@ -1,8 +1,11 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.clevertap.android.sdk.R;
 
 public class CTInAppHtmlHeaderFragment extends CTInAppBasePartialHtmlFragment {
@@ -14,7 +17,13 @@ ViewGroup getLayout(View view) {
 
     @Override
     View getView(LayoutInflater inflater, ViewGroup container) {
-        return inflater.inflate(R.layout.inapp_html_header, container, false);
+        View inAppView = inflater.inflate(R.layout.inapp_html_header, container, false);
+        applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+            mlp.leftMargin = insets.left;
+            mlp.rightMargin = insets.right;
+            mlp.topMargin = insets.top;
+            return null;
+        });
+        return inAppView;
     }
-
 }

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeCoverFragment.java

@@ -1,5 +1,7 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
 import android.annotation.SuppressLint;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
@@ -14,9 +16,12 @@
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
 import androidx.annotation.Nullable;
+
 import com.clevertap.android.sdk.R;
 import com.clevertap.android.sdk.customviews.CloseImageView;
+
 import java.util.ArrayList;
 
 public class CTInAppNativeCoverFragment extends CTInAppBaseFullNativeFragment {
@@ -27,6 +32,13 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         ArrayList<Button> inAppButtons = new ArrayList<>();
         View inAppView = inflater.inflate(R.layout.inapp_cover, container, false);
+        applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+            mlp.leftMargin = insets.left;
+            mlp.rightMargin = insets.right;
+            mlp.topMargin = insets.top;
+            mlp.bottomMargin = insets.bottom;
+            return null;
+        });
 
         FrameLayout fl = inAppView.findViewById(R.id.inapp_cover_frame_layout);
 

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeCoverImageFragment.java

@@ -1,5 +1,7 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -20,7 +22,13 @@ public class CTInAppNativeCoverImageFragment extends CTInAppBaseFullFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         View inAppView = inflater.inflate(R.layout.inapp_cover_image, container, false);
-
+        applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+            mlp.leftMargin = insets.left;
+            mlp.rightMargin = insets.right;
+            mlp.topMargin = insets.top;
+            mlp.bottomMargin = insets.bottom;
+            return null;
+        });
         FrameLayout fl = inAppView.findViewById(R.id.inapp_cover_image_frame_layout);
         fl.setBackgroundColor(Color.parseColor(inAppNotification.getBackgroundColor()));
 

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeFooterFragment.java

@@ -1,5 +1,7 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -17,6 +19,7 @@
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+
 import com.clevertap.android.sdk.R;
 import java.util.ArrayList;
 
@@ -90,7 +93,13 @@ public boolean onTouch(View v, MotionEvent event) {
                 return true;
             }
         });
-
+        applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+            mlp.leftMargin = insets.left;
+            mlp.rightMargin = insets.right;
+            mlp.bottomMargin = insets.bottom;
+            return null;
+        });
         return inAppView;
     }
+
 }

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeHeaderFragment.java

@@ -1,5 +1,7 @@
 package com.clevertap.android.sdk.inapp;
 
+import static com.clevertap.android.sdk.CTXtensions.applyInsetsWithMarginAdjustment;
+
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -15,9 +17,12 @@
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+
 import com.clevertap.android.sdk.R;
+
 import java.util.ArrayList;
 
 public class CTInAppNativeHeaderFragment extends CTInAppBasePartialNativeFragment {
@@ -87,7 +92,12 @@ public boolean onTouch(View v, MotionEvent event) {
                 return true;
             }
         });
-
+        applyInsetsWithMarginAdjustment(inAppView, (insets, mlp) -> {
+            mlp.leftMargin = insets.left;
+            mlp.rightMargin = insets.right;
+            mlp.topMargin = insets.top;
+            return null;
+        });
         return inAppView;
     }
 }

clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeInterstitialFragment.java

@@ -3,7 +3,6 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -23,10 +22,13 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.activity.ComponentDialog;
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
+import androidx.fragment.app.FragmentActivity;
 import androidx.media3.common.util.UnstableApi;
 
 import com.clevertap.android.sdk.Logger;
@@ -45,7 +47,7 @@
 
     private boolean exoPlayerFullscreen = false;
 
-    private Dialog fullScreenDialog;
+    private ComponentDialog fullScreenDialog;
 
     private ImageView fullScreenIcon;
 
@@ -61,6 +63,15 @@
     private FrameLayout videoFrameInDialog;
 
     private ViewGroup.LayoutParams imageViewLayoutParams;
+    private final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(false) {
+        @Override
+        public void handleOnBackPressed() {
+            if (exoPlayerFullscreen) {
+                closeFullscreenDialog();
+                onBackPressedCallback.setEnabled(false);
+            }
+        }
+    };
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -199,9 +210,11 @@ private void initFullScreenIconForStream() {
         fullScreenIcon.setImageDrawable(ResourcesCompat.getDrawable(this.context.getResources(), R.drawable.ct_ic_fullscreen_expand, null));
         fullScreenIcon.setOnClickListener(v -> {
             if (!exoPlayerFullscreen) {
+                onBackPressedCallback.setEnabled(true);
                 openFullscreenDialog();
             } else {
                 closeFullscreenDialog();
+                onBackPressedCallback.setEnabled(false);
             }
         });
 
@@ -311,6 +324,7 @@ public void onPause() {
         }
         if (exoPlayerFullscreen) {
             closeFullscreenDialog();
+            onBackPressedCallback.setEnabled(false);
         }
         handle.savePosition();
         handle.pause();
@@ -365,21 +379,20 @@ private void openFullscreenDialog() {
         if (fullScreenDialog == null) {
             // create only once
             // create full screen dialog and show
-            fullScreenDialog = new Dialog(this.context, android.R.style.Theme_Black_NoTitleBar_Fullscreen) {
-                public void onBackPressed() {
-                    if (exoPlayerFullscreen) {
-                        closeFullscreenDialog();
-                    }
-                    super.onBackPressed();
-                }
-            };
+            fullScreenDialog = new ComponentDialog(this.context, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
             ViewGroup.LayoutParams fullScreenParams = new FrameLayout.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.MATCH_PARENT
             );
             videoFrameInDialog = new FrameLayout(context);
             fullScreenDialog.addContentView(videoFrameInDialog, fullScreenParams);
+
+            FragmentActivity activity = getActivity();
+            if (activity != null) {
+                fullScreenDialog.getOnBackPressedDispatcher().addCallback(activity,onBackPressedCallback);
+            }
         }
+
         videoFrameInDialog.addView(playerView);
         exoPlayerFullscreen = true;
         fullScreenDialog.show();