@trycourier/courier-react-native 4.1.0 → 5.0.0

package/android/build.gradle

@@ -104,7 +104,7 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.11.0'
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:4.4.1'
+  api 'com.github.trycourier:courier-android:4.6.3'
   api 'androidx.recyclerview:recyclerview:1.3.2'
 
 }

package/android/src/main/java/com/courierreactnative/CourierInboxViewManager.kt

@@ -63,7 +63,7 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
 
     view.setOnClickActionListener { action, message, index ->
       val map = Arguments.createMap()
-      map.putMap("action", action.toWritableMap())
+      map.putString("action", action.toJson())
       map.putString("message", message.toJson())
       map.putInt("index", index)
       themedReactContext?.sendEvent(ON_CLICK_ACTION_AT_INDEX, map)
@@ -102,6 +102,12 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
 
     val brandId = getString("brandId")
 
+    val tabIndicatorColor = getString("tabIndicatorColor")
+    val tabStyle = getMap("tabStyle")
+
+    val readingSwipeActionStyle = getMap("readingSwipeActionStyle")
+    val archivingSwipeActionStyle = getMap("archivingSwipeActionStyle")
+
     val unreadIndicatorStyle = getMap("unreadIndicatorStyle")
     val loadingIndicatorColor = getString("loadingIndicatorColor")
 
@@ -109,12 +115,39 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
     val timeStyle = getMap("timeStyle")
     val bodyStyle = getMap("bodyStyle")
     val infoViewStyle = getMap("infoViewStyle")
-    val buttonStyles = getMap("buttonStyles")
+    val buttonStyles = getMap("buttonStyle")
 
     val context = view.context
 
     return CourierInboxTheme(
       brandId = brandId,
+      tabIndicatorColor = tabIndicatorColor?.toColor(),
+      tabStyle = tabStyle?.toTabStyle(context) ?: CourierStyles.Inbox.TabStyle(
+        selected = CourierStyles.Inbox.TabItemStyle(
+          font = CourierStyles.Font(
+            sizeInSp = 18
+          ),
+          indicator = CourierStyles.Inbox.TabIndicatorStyle(
+            font = CourierStyles.Font(
+              sizeInSp = 14
+            ),
+            color = null
+          )
+        ),
+        unselected = CourierStyles.Inbox.TabItemStyle(
+          font = CourierStyles.Font(
+            sizeInSp = 18
+          ),
+          indicator = CourierStyles.Inbox.TabIndicatorStyle(
+            font = CourierStyles.Font(
+              sizeInSp = 14
+            ),
+            color = null
+          )
+        )
+      ),
+      readingSwipeActionStyle = readingSwipeActionStyle?.toReadingSwipeActionStyle() ?: CourierStyles.Inbox.ReadingSwipeActionStyle(),
+      archivingSwipeActionStyle = archivingSwipeActionStyle?.toArchivingSwipeActionStyle() ?: CourierStyles.Inbox.ArchivingSwipeActionStyle(),
       unreadIndicatorStyle = unreadIndicatorStyle?.toUnreadIndicatorStyle() ?: CourierStyles.Inbox.UnreadIndicatorStyle(),
       loadingIndicatorColor = loadingIndicatorColor?.toColor(),
       titleStyle = titleStyle?.toTextStyle(context) ?: CourierStyles.Inbox.TextStyle(
@@ -154,6 +187,69 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
 
   }
 
+  private fun ReadableMap.toTabStyle(context: Context): CourierStyles.Inbox.TabStyle {
+
+    val selected = getMap("selected")
+    val unselected = getMap("unselected")
+
+    return CourierStyles.Inbox.TabStyle(
+      selected = selected?.toTabItemStyle(context) ?: CourierStyles.Inbox.TabItemStyle(
+        font = CourierStyles.Font(
+          sizeInSp = 18
+        ),
+        indicator = CourierStyles.Inbox.TabIndicatorStyle(
+          font = CourierStyles.Font(
+            sizeInSp = 14
+          ),
+          color = null
+        )
+      ),
+      unselected = unselected?.toTabItemStyle(context) ?: CourierStyles.Inbox.TabItemStyle(
+        font = CourierStyles.Font(
+          sizeInSp = 18
+        ),
+        indicator = CourierStyles.Inbox.TabIndicatorStyle(
+          font = CourierStyles.Font(
+            sizeInSp = 14
+          ),
+          color = null
+        )
+      ),
+    )
+
+  }
+
+  private fun ReadableMap.toTabItemStyle(context: Context): CourierStyles.Inbox.TabItemStyle {
+
+    val font = getMap("font")
+    val indicator = getMap("indicator")
+
+    return CourierStyles.Inbox.TabItemStyle(
+      font = font?.toFont(context) ?: CourierStyles.Font(
+        sizeInSp = 18
+      ),
+      indicator = indicator?.toTabIndicatorStyle(context) ?: CourierStyles.Inbox.TabIndicatorStyle(
+        font = CourierStyles.Font(
+          sizeInSp = 14
+        ),
+        color = null
+      ),
+    )
+
+  }
+
+  private fun ReadableMap.toTabIndicatorStyle(context: Context): CourierStyles.Inbox.TabIndicatorStyle {
+
+    val font = getMap("font")
+    val color = getString("color")
+
+    return CourierStyles.Inbox.TabIndicatorStyle(
+      font = font?.toFont(context) ?: CourierStyles.Font(),
+      color = color?.toColor(),
+    )
+
+  }
+
   private fun ReadableMap.toUnreadIndicatorStyle(): CourierStyles.Inbox.UnreadIndicatorStyle {
 
     val indicator = getString("indicator")
@@ -172,6 +268,39 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
 
   }
 
+  private fun ReadableMap.toReadingSwipeActionStyle(): CourierStyles.Inbox.ReadingSwipeActionStyle? {
+
+    val readDict = getMap("read") ?: return null
+    val unreadDict = getMap("unread") ?: return null
+
+    val read = readDict.toSwipeActionStyle() ?: return null
+    val unread = unreadDict.toSwipeActionStyle() ?: return null
+
+    return CourierStyles.Inbox.ReadingSwipeActionStyle(
+      read = read,
+      unread = unread
+    )
+
+  }
+
+  private fun ReadableMap.toArchivingSwipeActionStyle(): CourierStyles.Inbox.ArchivingSwipeActionStyle? {
+    // TODO: Icon
+
+    val archiveDict = getMap("archive") ?: return null
+    val archive = archiveDict.toSwipeActionStyle() ?: return null
+
+    return CourierStyles.Inbox.ArchivingSwipeActionStyle(archive = archive)
+  }
+
+  private fun ReadableMap.toSwipeActionStyle(): CourierStyles.Inbox.SwipeActionStyle? {
+    // TODO: Icon
+
+    val colorString = getString("color") ?: return null
+    val color = colorString.toColor()
+
+    return CourierStyles.Inbox.SwipeActionStyle(icon = null, color = color)
+  }
+
   private fun ReadableMap.toButtonStyle(context: Context): CourierStyles.Inbox.ButtonStyle {
 
     val unread = getMap("unread")

package/android/src/main/java/com/courierreactnative/CourierReactNativeActivity.kt

@@ -1,9 +1,9 @@
 package com.courierreactnative
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import com.courier.android.Courier
-import com.courier.android.models.CourierAgent
 import com.courier.android.utils.getLastDeliveredMessage
 import com.courier.android.utils.pushNotification
 import com.courier.android.utils.trackPushNotificationClick
@@ -15,13 +15,13 @@ open class CourierReactNativeActivity : ReactActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
 
+    // Update the user agent
+    Courier.agent = Utils.COURIER_AGENT
+
     // Starts the Courier SDK
     // Used to ensure shared preferences works properly
     Courier.initialize(this)
 
-    // Update the user agent
-    Courier.agent = CourierAgent.ReactNativeAndroid(version = "4.1.0")
-
     super.onCreate(savedInstanceState)
 
     // See if there is a pending click event
@@ -45,6 +45,7 @@ open class CourierReactNativeActivity : ReactActivity() {
     }
   }
 
+  @SuppressLint("VisibleForTests")
   private fun postPushNotificationDelivered(message: RemoteMessage) {
     reactInstanceManager.currentReactContext?.sendEvent(
       eventName = CourierEvents.Push.DELIVERED_EVENT,
@@ -52,6 +53,7 @@ open class CourierReactNativeActivity : ReactActivity() {
     )
   }
 
+  @SuppressLint("VisibleForTests")
   private fun postPushNotificationClicked(message: RemoteMessage) {
     reactInstanceManager.currentReactContext?.sendEvent(
       eventName = CourierEvents.Push.CLICKED_EVENT,

package/android/src/main/java/com/courierreactnative/CourierSharedModule.kt

@@ -3,7 +3,7 @@ package com.courierreactnative
 import com.courier.android.Courier
 import com.courier.android.models.CourierAuthenticationListener
 import com.courier.android.models.CourierInboxListener
-import com.courier.android.models.InboxMessage
+import com.courier.android.models.InboxMessageSet
 import com.courier.android.models.remove
 import com.courier.android.modules.addAuthenticationListener
 import com.courier.android.modules.addInboxListener
@@ -24,10 +24,12 @@ import com.courier.android.modules.tenantId
 import com.courier.android.modules.tokens
 import com.courier.android.modules.unreadMessage
 import com.courier.android.modules.userId
+import com.courier.android.ui.inbox.InboxMessageFeed
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.WritableMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -235,39 +237,80 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
-  fun addInboxListener(loadingId: String, errorId: String, messagesId: String): String {
+  fun addInboxListener(loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String): String {
 
     val listener = Courier.shared.addInboxListener(
-      onInitialLoad = {
-
+      onLoading = {
         reactApplicationContext.sendEvent(
           eventName = loadingId,
           value = null
         )
-
       },
       onError = { e ->
-
         reactApplicationContext.sendEvent(
           eventName = errorId,
           value = e.message ?: "Courier Inbox Error"
         )
-
       },
-      onMessagesChanged = { messages: List<InboxMessage>, unreadMessageCount: Int, totalMessageCount: Int, canPaginate: Boolean ->
-
+      onUnreadCountChanged = { unreadCount ->
+        reactApplicationContext.sendEvent(
+          eventName = unreadCountId,
+          value = unreadCount
+        )
+      },
+      onFeedChanged = { messageSet ->
+        reactApplicationContext.sendEvent(
+          eventName = feedId,
+          value = messageSet.toJson()
+        )
+      },
+      onArchiveChanged = { messageSet ->
+        reactApplicationContext.sendEvent(
+          eventName = feedId,
+          value = messageSet.toJson()
+        )
+      },
+      onPageAdded = { feed, messageSet ->
         val json = Arguments.createMap()
-        json.putArray("messages", messages.toList().map { it.toJson() }.toWritableArray())
-        json.putInt("unreadMessageCount", unreadMessageCount)
-        json.putInt("totalMessageCount", totalMessageCount)
-        json.putBoolean("canPaginate", canPaginate)
-
+        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
+        json.putArray("messages", messageSet.messages.map { it.toJson() }.toWritableArray())
+        json.putInt("totalMessageCount", messageSet.totalCount)
+        json.putBoolean("canPaginate", messageSet.canPaginate)
         reactApplicationContext.sendEvent(
-          eventName = messagesId,
+          eventName = pageAddedId,
           value = json
         )
-
-      }
+      },
+      onMessageAdded = { feed, index, message ->
+        val json = Arguments.createMap()
+        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
+        json.putInt("index", index)
+        json.putString("message", message.toJson())
+        reactApplicationContext.sendEvent(
+          eventName = messageAddedId,
+          value = json
+        )
+      },
+      onMessageChanged = { feed, index, message ->
+        val json = Arguments.createMap()
+        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
+        json.putInt("index", index)
+        json.putString("message", message.toJson())
+        reactApplicationContext.sendEvent(
+          eventName = messageAddedId,
+          value = json
+        )
+      },
+      onMessageRemoved = { feed, index, message ->
+        val json = Arguments.createMap()
+        json.putString("feed", if (feed == InboxMessageFeed.FEED) "feed" else "archived")
+        json.putInt("index", index)
+        json.putString("message", message.toJson())
+        reactApplicationContext.sendEvent(
+          eventName = messageAddedId,
+          value = json
+        )
+      },
     )
 
     // Add listener
@@ -278,6 +321,14 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   }
 
+  private fun InboxMessageSet.toJson(): WritableMap? {
+    val json = Arguments.createMap()
+    json.putArray("messages", messages.toList().map { it.toJson() }.toWritableArray())
+    json.putInt("totalMessageCount", totalCount)
+    json.putBoolean("canPaginate", canPaginate)
+    return json
+  }
+
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun removeInboxListener(listenerId: String): String {
     val listener = inboxListeners[listenerId]
@@ -300,10 +351,10 @@ class CourierSharedModule(reactContext: ReactApplicationContext): ReactNativeMod
   }
 
   @ReactMethod
-  fun fetchNextPageOfMessages(promise: Promise) = CoroutineScope(Dispatchers.Main).launch {
+  fun fetchNextPageOfMessages(promise: Promise, inboxMessageFeed: String) = CoroutineScope(Dispatchers.Main).launch {
     try {
-      val messages = Courier.shared.fetchNextInboxPage()
-      promise.resolve(messages.map { it.toJson() }.toWritableArray())
+      val messageSet = Courier.shared.fetchNextInboxPage(if (inboxMessageFeed == "archived") InboxMessageFeed.ARCHIVE else InboxMessageFeed.FEED)
+      promise.resolve(messageSet?.toJson())
     } catch (e: Exception) {
       promise.apiError(e)
     }

package/android/src/main/java/com/courierreactnative/ReactNativeModule.kt

@@ -1,7 +1,6 @@
 package com.courierreactnative
 
 import com.courier.android.Courier
-import com.courier.android.models.CourierAgent
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -17,7 +16,7 @@ abstract class ReactNativeModule(val tag: String, private val name: String, reac
 
     // User Agent is used to ensure we know the SDK
     // the requests come from
-    Courier.agent = CourierAgent.ReactNativeAndroid(version = "4.1.0")
+    Courier.agent = Utils.COURIER_AGENT
 
   }
 

package/android/src/main/java/com/courierreactnative/Utils.kt

@@ -4,11 +4,7 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.courier.android.models.CourierPreferenceTopic
-import com.courier.android.models.CourierUserPreferences
-import com.courier.android.models.InboxAction
-import com.courier.android.models.InboxMessage
-import com.courier.android.models.Paging
+import com.courier.android.models.CourierAgent
 import com.courier.android.ui.CourierStyles
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
@@ -18,151 +14,16 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 
-internal fun ReactContext.sendEvent(eventName: String, value: Any?) {
-  getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(eventName, value)
-}
-
-internal fun CourierUserPreferences.toWritableMap(): WritableMap {
-
-  val map = Arguments.createMap()
-
-  val itemsArray = Arguments.createArray()
-  items.forEach { topic ->
-    itemsArray.pushMap(topic.toWritableMap())
-  }
-  map.putArray("items", itemsArray)
-
-  map.putMap("paging", paging.toWritableMap())
-
-  return map
-
+internal object Utils {
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.0.0")
 }
 
-internal fun CourierPreferenceTopic.toWritableMap(): WritableMap {
-
-  val map = Arguments.createMap()
-  map.putString("defaultStatus", defaultStatus.value)
-  map.putBoolean("hasCustomRouting", hasCustomRouting)
-  map.putString("status", status.value)
-  map.putString("topicId", topicId)
-  map.putString("topicName", topicName)
-  map.putString("sectionId", sectionId)
-  map.putString("sectionName", sectionName)
-
-  val actionsArray = Arguments.createArray()
-  customRouting.forEach { routing ->
-    actionsArray.pushString(routing.value)
-  }
-  map.putArray("customRouting", actionsArray)
-
-  return map
-
-}
-
-internal fun Paging.toWritableMap(): WritableMap {
-
-  val map = Arguments.createMap()
-
-  cursor?.let {
-    map.putString("cursor", it)
-  }
-
-  map.putBoolean("more", more)
-
-  return map
-
-}
-
-@JvmName("toWritableArrayInboxMessage")
-internal fun List<InboxMessage>.toWritableArray(): WritableArray {
-
-  val messagesArray = Arguments.createArray()
-
-  forEach { message ->
-    messagesArray.pushMap(message.toWritableMap())
-  }
-
-  return messagesArray
-
-}
-
-internal fun InboxMessage.toWritableMap(): WritableMap {
-
-  val map = Arguments.createMap()
-  map.putString("messageId", messageId)
-  map.putString("title", title)
-  map.putString("body", body)
-  map.putString("preview", preview)
-  map.putString("created", created)
-
-  actions?.let { actionList ->
-    val actionsArray = Arguments.createArray()
-    actionList.forEach { action ->
-      actionsArray.pushMap(action.toWritableMap())
-    }
-    map.putArray("actions", actionsArray)
-  }
-
-  map.putMap("data", data.toWritableMap())
-  map.putBoolean("read", isRead)
-  map.putBoolean("opened", isOpened)
-  map.putBoolean("archived", isArchived)
-
-  val trackingIds = Arguments.createMap()
-  trackingIds.putString("clickTrackingId", clickTrackingId)
-
-  map.putMap("trackingIds", trackingIds)
-
-  return map
-
-}
-
-internal fun InboxAction.toWritableMap(): WritableMap {
-
-  val map = Arguments.createMap()
-  map.putString("content", content)
-  map.putString("href", href)
-  map.putMap("data", data.toWritableMap())
-
-  return map
-
-}
-
-internal fun Map<String, Any>?.toWritableMap(): WritableMap {
-  val map = Arguments.createMap()
-  this?.forEach { (key, value) ->
-    when (value) {
-      is String -> map.putString(key, value)
-      is Int -> map.putInt(key, value)
-      is Double -> map.putDouble(key, value)
-      is Boolean -> map.putBoolean(key, value)
-      is Map<*, *> -> map.putMap(key, (value as? Map<String, Any>).toWritableMap())
-      is List<*> -> map.putArray(key, (value as? List<Any>).toWritableArray())
-      else -> map.putNull(key)
-    }
-  }
-  return map
-}
-
-internal fun List<Any>?.toWritableArray(): WritableArray {
-  val array = Arguments.createArray()
-  this?.forEach { item ->
-    when (item) {
-      is String -> array.pushString(item)
-      is Int -> array.pushInt(item)
-      is Double -> array.pushDouble(item)
-      is Boolean -> array.pushBoolean(item)
-      is Map<*, *> -> array.pushMap((item as? Map<String, Any>).toWritableMap())
-      is List<*> -> array.pushArray((item as? List<Any>).toWritableArray())
-      else -> array.pushNull()
-    }
-  }
-  return array
+internal fun ReactContext.sendEvent(eventName: String, value: Any?) {
+  getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(eventName, value)
 }
 
 internal fun String.toDivider(context: Context): DividerItemDecoration? = if (this == "vertical") DividerItemDecoration(context, DividerItemDecoration.VERTICAL) else null
 
-
 internal fun String.toColor(): Int = Color.parseColor(this)
 
 internal fun String.toFont(context: Context): Typeface? {
@@ -215,6 +76,38 @@ internal fun ReadableMap.toInfoViewStyle(context: Context): CourierStyles.InfoVi
 
 }
 
+internal fun Map<String, Any>?.toWritableMap(): WritableMap {
+  val map = Arguments.createMap()
+  this?.forEach { (key, value) ->
+    when (value) {
+      is String -> map.putString(key, value)
+      is Int -> map.putInt(key, value)
+      is Double -> map.putDouble(key, value)
+      is Boolean -> map.putBoolean(key, value)
+      is Map<*, *> -> map.putMap(key, (value as? Map<String, Any>).toWritableMap())
+      is List<*> -> map.putArray(key, (value as? List<Any>).toWritableArray())
+      else -> map.putNull(key)
+    }
+  }
+  return map
+}
+
+internal fun List<Any>?.toWritableArray(): WritableArray {
+  val array = Arguments.createArray()
+  this?.forEach { item ->
+    when (item) {
+      is String -> array.pushString(item)
+      is Int -> array.pushInt(item)
+      is Double -> array.pushDouble(item)
+      is Boolean -> array.pushBoolean(item)
+      is Map<*, *> -> array.pushMap((item as? Map<String, Any>).toWritableMap())
+      is List<*> -> array.pushArray((item as? List<Any>).toWritableArray())
+      else -> array.pushNull()
+    }
+  }
+  return array
+}
+
 internal fun Any.toJson(): String {
   return GsonBuilder().setPrettyPrinting().create().toJson(this)
 }

package/courier-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   
   # Courier Core Dependency
-  s.dependency "Courier_iOS", "4.4.2"
+  s.dependency "Courier_iOS", "5.2.0"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/ios/CourierInboxReactNativeManager.m

@@ -2,6 +2,8 @@
 
 @interface RCT_EXTERN_MODULE(CourierInboxViewManager, RCTViewManager)
 
+RCT_EXPORT_VIEW_PROPERTY(canSwipePages, BOOL)
+
 RCT_EXPORT_VIEW_PROPERTY(theme, NSDictionary)
 
 RCT_EXPORT_VIEW_PROPERTY(onClickInboxMessageAtIndex, RCTBubblingEventBlock)