@loyalytics/swan-react-native-sdk 2.5.1-beta.0 → 2.5.1-beta.2

package/android/build.gradle

@@ -7,6 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+        classpath("com.android.tools.build:gradle:${safeExtGet('androidGradlePluginVersion', '8.2.2')}")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.9.22')}")
     }
 }
@@ -19,7 +20,7 @@ android {
     compileSdkVersion safeExtGet('compileSdkVersion', 34)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
         targetSdkVersion safeExtGet('targetSdkVersion', 34)
     }
 
@@ -29,6 +30,12 @@ android {
         }
     }
 
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+
     def javaVersion = safeExtGet('jvmTargetVersion', '17')
 
     compileOptions {
@@ -55,6 +62,18 @@ repositories {
     mavenCentral()
 }
 
+// For standalone builds (CI, local `./gradlew test`), react-native:+ can't resolve
+// because the host app's Maven repo isn't available. Substitute with react-android
+// from Maven Central. When consumed by an app, rootProject.name != 'swan-android'
+// so this block is skipped and the app's own dependency resolution applies.
+if (rootProject.name == 'swan-android') {
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute module('com.facebook.react:react-native') using module('com.facebook.react:react-android:0.76.2')
+        }
+    }
+}
+
 dependencies {
     implementation "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion', '1.9.22')}"
@@ -63,4 +82,7 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
+    testImplementation "org.robolectric:robolectric:4.14.1"
+    testImplementation "androidx.test:core:1.6.1"
+    testImplementation "org.json:json:20231013"
 }

package/android/gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

package/android/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'swan-android'

package/android/src/main/kotlin/com/loyalytics/swan/templates/carousel/CarouselAutoRemoteViews.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.widget.RemoteViews
 import com.loyalytics.swan.R
+import org.json.JSONObject
 
 /**
  * Builds RemoteViews for auto-carousel using ViewFlipper.
@@ -12,6 +13,9 @@ import com.loyalytics.swan.R
  * All images are added as children to the ViewFlipper which handles
  * cycling natively with slide animations. No AlarmManager needed.
  *
+ * Each child embeds per-item title and body text alongside the image,
+ * so text rotates together with the corresponding image.
+ *
  * The entire flipper area gets a single click action (auto-carousel
  * uses one deep link for the whole notification, same as CleverTap).
  *
@@ -31,6 +35,7 @@ object CarouselAutoRemoteViews {
         notificationId: Int,
         title: String,
         body: String,
+        items: List<JSONObject>,
         bitmaps: List<Bitmap?>,
         intervalMs: Int,
         messageId: String,
@@ -44,12 +49,16 @@ object CarouselAutoRemoteViews {
 
             // autoStart and flipInterval are set in XML (RemoteViews doesn't allow setAutoStart)
 
-            // Add each bitmap as a child of the ViewFlipper
+            // Add each item as a child of the ViewFlipper with image + title + body
             removeAllViews(R.id.swan_carousel_flipper)
-            val validBitmaps = bitmaps.filterNotNull().take(MAX_FLIPPER_IMAGES)
-            for (bitmap in validBitmaps) {
-                val childView = RemoteViews(packageName, R.layout.swan_carousel_flipper_item)
-                childView.setImageViewBitmap(R.id.swan_carousel_flipper_image, bitmap)
+            val limit = minOf(items.size, bitmaps.size, MAX_FLIPPER_IMAGES)
+            for (i in 0 until limit) {
+                val bitmap = bitmaps[i] ?: continue
+                val item = items[i]
+                val childView = RemoteViews(packageName, R.layout.swan_carousel_auto_flipper_item)
+                childView.setImageViewBitmap(R.id.swan_carousel_auto_flipper_image, bitmap)
+                childView.setTextViewText(R.id.swan_carousel_auto_flipper_title, item.optString("title", ""))
+                childView.setTextViewText(R.id.swan_carousel_auto_flipper_body, item.optString("body", ""))
                 addView(R.id.swan_carousel_flipper, childView)
             }
 
@@ -62,9 +71,10 @@ object CarouselAutoRemoteViews {
             )
         }
 
+        val firstItemTitle = items.firstOrNull()?.optString("title", "") ?: ""
         val collapsed = RemoteViews(packageName, R.layout.swan_carousel_collapsed).apply {
             setTextViewText(R.id.swan_carousel_collapsed_title, title)
-            setTextViewText(R.id.swan_carousel_collapsed_body, body)
+            setTextViewText(R.id.swan_carousel_collapsed_body, firstItemTitle.ifEmpty { body })
         }
 
         return AutoCarouselViews(expanded, collapsed)

package/android/src/main/kotlin/com/loyalytics/swan/templates/carousel/CarouselRemoteViews.kt

@@ -28,6 +28,8 @@ object CarouselRemoteViews {
         notificationId: Int,
         title: String,
         body: String,
+        itemTitle: String,
+        itemBody: String,
         bitmaps: List<Bitmap?>,
         currentIndex: Int,
         totalItems: Int,
@@ -39,6 +41,8 @@ object CarouselRemoteViews {
         val expanded = RemoteViews(packageName, R.layout.swan_carousel_expanded).apply {
             setTextViewText(R.id.swan_carousel_title, title)
             setTextViewText(R.id.swan_carousel_body, body)
+            setTextViewText(R.id.swan_carousel_item_title, itemTitle)
+            setTextViewText(R.id.swan_carousel_item_body, itemBody)
             setTextViewText(R.id.swan_carousel_counter, "${currentIndex + 1} / $totalItems")
 
             // Populate ViewFlipper with all images
@@ -92,7 +96,7 @@ object CarouselRemoteViews {
 
         val collapsed = RemoteViews(packageName, R.layout.swan_carousel_collapsed).apply {
             setTextViewText(R.id.swan_carousel_collapsed_title, title)
-            setTextViewText(R.id.swan_carousel_collapsed_body, body)
+            setTextViewText(R.id.swan_carousel_collapsed_body, itemTitle.ifEmpty { body })
         }
 
         return CarouselViews(expanded, collapsed)

package/android/src/main/kotlin/com/loyalytics/swan/templates/carousel/CarouselTemplate.kt

@@ -84,7 +84,8 @@ class CarouselTemplate : SwanNotificationTemplate {
             notificationId: Int,
             messageId: String,
             itemIndex: Int,
-            itemRoute: String
+            itemRoute: String,
+            isContentIntent: Boolean = false
         ): PendingIntent {
             val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
                 ?: Intent(Intent.ACTION_MAIN).apply {
@@ -107,8 +108,15 @@ class CarouselTemplate : SwanNotificationTemplate {
                 PendingIntent.FLAG_UPDATE_CURRENT
             }
 
+            // Use different request codes for image click vs content intent to prevent collision
+            val requestCode = if (isContentIntent) {
+                "${notificationId}CONTENT_CLICK".hashCode()
+            } else {
+                "$notificationId${ACTION_CLICK}$itemIndex".hashCode()
+            }
+
             return PendingIntent.getActivity(
-                context, "$notificationId${ACTION_CLICK}$itemIndex".hashCode(), launchIntent, flags
+                context, requestCode, launchIntent, flags
             )
         }
     }
@@ -321,7 +329,9 @@ class CarouselTemplate : SwanNotificationTemplate {
                 context = context,
                 notificationId = notificationId,
                 title = title,
-                body = currentItem.optString("title", body),
+                body = body,
+                itemTitle = currentItem.optString("title", ""),
+                itemBody = currentItem.optString("body", ""),
                 bitmaps = scaledBitmaps,
                 currentIndex = currentIndex,
                 totalItems = items.size,
@@ -398,6 +408,7 @@ class CarouselTemplate : SwanNotificationTemplate {
             notificationId = notificationId,
             title = title,
             body = body,
+            items = items,
             bitmaps = scaledBitmaps,
             intervalMs = intervalMs,
             messageId = messageId,
@@ -444,13 +455,16 @@ class CarouselTemplate : SwanNotificationTemplate {
         extras: Bundle
     ): PendingIntent {
         // For CLICK, use PendingIntent.getActivity() to avoid Android 12+ trampoline restriction
+        // This is always the content intent (notification body tap) — image clicks go through
+        // createClickActivityPendingIntent() directly from RemoteViews builders
         if (action == ACTION_CLICK) {
             return createClickActivityPendingIntent(
                 context,
                 notificationId,
                 extras.getString(EXTRA_MESSAGE_ID, ""),
                 extras.getInt(EXTRA_ITEM_INDEX, 0),
-                extras.getString(EXTRA_ITEM_ROUTE, "")
+                extras.getString(EXTRA_ITEM_ROUTE, ""),
+                isContentIntent = true
             )
         }
 
@@ -517,7 +531,9 @@ class CarouselTemplate : SwanNotificationTemplate {
             }
             else -> {
                 expanded.setViewPadding(R.id.swan_carousel_header, px16, 0, px16, px8)
-                expanded.setViewPadding(R.id.swan_carousel_counter, 0, px2, px16, px4)
+                expanded.setViewPadding(R.id.swan_carousel_item_title, px16, 0, px16, 0)
+                expanded.setViewPadding(R.id.swan_carousel_item_body, px16, 0, px16, 0)
+                expanded.setViewPadding(R.id.swan_carousel_counter, px16, 0, px16, 0)
             }
         }
     }

package/android/src/main/res/layout/swan_carousel_auto_expanded.xml

@@ -41,7 +41,7 @@
     <ViewFlipper
         android:id="@+id/swan_carousel_flipper"
         android:layout_width="match_parent"
-        android:layout_height="144dp"
+        android:layout_height="wrap_content"
         android:layout_below="@id/swan_carousel_auto_header"
         android:inAnimation="@anim/swan_slide_in_right"
         android:outAnimation="@anim/swan_slide_out_left"

package/android/src/main/res/layout/swan_carousel_auto_flipper_item.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/swan_carousel_auto_flipper_image"
+        android:layout_width="match_parent"
+        android:layout_height="144dp"
+        android:scaleType="centerCrop"
+        android:contentDescription="Carousel image" />
+
+    <TextView
+        android:id="@+id/swan_carousel_auto_flipper_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="13sp"
+        android:textStyle="bold"
+        android:textColor="#DE000000"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:paddingTop="4dp" />
+
+    <TextView
+        android:id="@+id/swan_carousel_auto_flipper_body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        android:textColor="#8A000000"
+        android:maxLines="1"
+        android:ellipsize="end" />
+</LinearLayout>

package/android/src/main/res/layout/swan_carousel_expanded.xml

@@ -78,17 +78,51 @@
             android:contentDescription="Next" />
     </RelativeLayout>
 
-    <!-- Counter -->
-    <TextView
-        android:id="@+id/swan_carousel_counter"
-        android:layout_width="wrap_content"
+    <!-- Item title + body + counter -->
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:textSize="11sp"
-        android:textColor="#8A000000"
+        android:orientation="horizontal"
         android:paddingStart="0dp"
         android:paddingEnd="0dp"
-        android:paddingTop="2dp"
-        android:paddingBottom="4dp" />
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/swan_carousel_item_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                android:textStyle="bold"
+                android:textColor="#DE000000"
+                android:maxLines="1"
+                android:ellipsize="end" />
+
+            <TextView
+                android:id="@+id/swan_carousel_item_body"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:textColor="#8A000000"
+                android:maxLines="1"
+                android:ellipsize="end" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/swan_carousel_counter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="11sp"
+            android:textColor="#8A000000"
+            android:paddingStart="8dp"
+            android:paddingEnd="0dp" />
+    </LinearLayout>
 
 </LinearLayout>

package/lib/commonjs/version.js

@@ -8,5 +8,5 @@ exports.SDK_VERSION = void 0;
 // This file is generated from package.json version during build.
 // See scripts/generate-version.js
 
-const SDK_VERSION = exports.SDK_VERSION = '2.5.1-beta.0';
+const SDK_VERSION = exports.SDK_VERSION = '2.5.1-beta.2';
 //# sourceMappingURL=version.js.map

package/lib/module/version.js

@@ -4,5 +4,5 @@
 // This file is generated from package.json version during build.
 // See scripts/generate-version.js
 
-export const SDK_VERSION = '2.5.1-beta.0';
+export const SDK_VERSION = '2.5.1-beta.2';
 //# sourceMappingURL=version.js.map

package/lib/typescript/commonjs/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SDK_VERSION = "2.5.1-beta.0";
+export declare const SDK_VERSION = "2.5.1-beta.2";
 //# sourceMappingURL=version.d.ts.map

package/lib/typescript/module/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SDK_VERSION = "2.5.1-beta.0";
+export declare const SDK_VERSION = "2.5.1-beta.2";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loyalytics/swan-react-native-sdk",
-  "version": "2.5.1-beta.0",
+  "version": "2.5.1-beta.2",
   "description": "React Native SDK for Swan",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",