@trycourier/courier-react-native 4.1.1 → 5.0.2

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

@@ -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")
 
@@ -115,6 +121,33 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
 
     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/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/Utils.kt

@@ -15,7 +15,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 
 internal object Utils {
-  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "4.1.1")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.0.2")
 }
 
 internal fun ReactContext.sendEvent(eventName: String, value: Any?) {

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.5.4"
+  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)

package/ios/CourierInboxReactNativeManager.swift

@@ -14,6 +14,12 @@ class CourierInboxViewManager: RCTViewManager {
 }
 
 class CourierInboxView : UIView {
+  
+    @objc var canSwipePages: Bool = false {
+        didSet {
+            refresh()
+        }
+    }
     
     @objc var theme: NSDictionary? = [:] {
         didSet {
@@ -39,6 +45,7 @@ class CourierInboxView : UIView {
         let darkTheme = theme?["dark"] as? NSDictionary
         
         let courierInbox = CourierInbox(
+            canSwipePages: self.canSwipePages,
             lightTheme: lightTheme?.toInboxTheme() ?? .defaultLight,
             darkTheme: darkTheme?.toInboxTheme() ?? .defaultDark,
             didClickInboxMessageAtIndex: { [weak self] message, index in
@@ -85,10 +92,160 @@ class CourierInboxView : UIView {
         UIView.setAnimationsEnabled(true)
         
     }
+  
+    internal static func defaultTabStyle() -> CourierStyles.Inbox.TabStyle {
+        return CourierStyles.Inbox.TabStyle(
+            selected: CourierStyles.Inbox.TabItemStyle(
+                font: CourierStyles.Font(
+                    font: UIFont.boldSystemFont(ofSize: UIFont.labelFontSize),
+                    color: .label
+                ),
+                indicator: CourierStyles.Inbox.TabIndicatorStyle(
+                    font: CourierStyles.Font(
+                        font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize),
+                        color: .white
+                    ),
+                    color: .systemBlue
+                )
+            ),
+            unselected: CourierStyles.Inbox.TabItemStyle(
+                font: CourierStyles.Font(
+                    font: UIFont.boldSystemFont(ofSize: UIFont.labelFontSize),
+                    color: .secondaryLabel
+                ),
+                indicator: CourierStyles.Inbox.TabIndicatorStyle(
+                    font: CourierStyles.Font(
+                        font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize),
+                        color: .label
+                    ),
+                    color: .lightGray
+                )
+            )
+        )
+    }
+  
+    internal static func defaultReadingStyle() -> CourierStyles.Inbox.ReadingSwipeActionStyle {
+      return CourierStyles.Inbox.ReadingSwipeActionStyle(
+        read: CourierStyles.Inbox.SwipeActionStyle(
+            icon: UIImage(systemName: "envelope.fill"),
+            color: .systemGray
+        ),
+        unread: CourierStyles.Inbox.SwipeActionStyle(
+            icon: UIImage(systemName: "envelope.open.fill"),
+            color: .systemBlue
+        )
+      )
+    }
+    
+    internal static func defaultArchivingStyle() -> CourierStyles.Inbox.ArchivingSwipeActionStyle {
+      return CourierStyles.Inbox.ArchivingSwipeActionStyle(
+        archive: CourierStyles.Inbox.SwipeActionStyle(
+            icon: UIImage(systemName: "archivebox.fill"),
+            color: .systemRed
+        )
+      )
+    }
     
 }
 
 internal extension NSDictionary {
+  
+    func toTabStyle() -> CourierStyles.Inbox.TabStyle? {
+      
+        guard let selectedDict = self["selected"] as? NSDictionary, let unselectedDict = self["unselected"] as? NSDictionary else {
+            return nil
+        }
+        
+        guard let selected = selectedDict.toTabItemStyle(), let unselected = unselectedDict.toTabItemStyle() else {
+          return nil
+        }
+        
+        return CourierStyles.Inbox.TabStyle(
+          selected: selected,
+          unselected: unselected
+        )
+      
+    }
+  
+    func toTabItemStyle() -> CourierStyles.Inbox.TabItemStyle? {
+    
+        guard let fontDict = self["font"] as? NSDictionary, let indicatorDict = self["indicator"] as? NSDictionary else {
+            return nil
+        }
+        
+        let font = fontDict.toFont()
+        guard let indicator = indicatorDict.toTabIndicatorStyle() else {
+            return nil
+        }
+        
+        return CourierStyles.Inbox.TabItemStyle(font: font, indicator: indicator)
+      
+    }
+  
+    func toTabIndicatorStyle() -> CourierStyles.Inbox.TabIndicatorStyle? {
+      
+        guard let fontDict = self["font"] as? NSDictionary, let colorString = self["color"] as? String else {
+            return nil
+        }
+      
+        let font = fontDict.toFont()
+        guard let color = colorString.toColor() else {
+          return nil
+        }
+        
+        return CourierStyles.Inbox.TabIndicatorStyle(
+          font: font,
+          color: color
+        )
+      
+    }
+  
+    func toReadingSwipeActionStyle() -> CourierStyles.Inbox.ReadingSwipeActionStyle? {
+      
+        guard let readDict = self["read"] as? NSDictionary, let unreadDict = self["unread"] as? NSDictionary else {
+            return nil
+        }
+        
+        guard let read = readDict.toSwipeActionStyle(), let unread = unreadDict.toSwipeActionStyle() else {
+            return nil
+        }
+        
+        return CourierStyles.Inbox.ReadingSwipeActionStyle(
+            read: read,
+            unread: unread
+        )
+      
+    }
+  
+    func toArchivingSwipeActionStyle() -> CourierStyles.Inbox.ArchivingSwipeActionStyle? {
+      
+        // TODO: Icon
+      
+        guard let archiveDict = self["archive"] as? NSDictionary else {
+            return nil
+        }
+        
+        guard let archive = archiveDict.toSwipeActionStyle() else {
+            return nil
+        }
+        
+        return CourierStyles.Inbox.ArchivingSwipeActionStyle(archive: archive)
+      
+    }
+  
+    func toSwipeActionStyle() -> CourierStyles.Inbox.SwipeActionStyle? {
+      
+        // TODO: Icon
+      
+        guard let colorString = self["color"] as? String else {
+            return nil
+        }
+        
+        let color = colorString.toColor() ?? .systemBlue
+        
+        return CourierStyles.Inbox.SwipeActionStyle(icon: nil, color: color)
+      
+    }
     
     func toUnreadIndicatorStyle() -> CourierStyles.Inbox.UnreadIndicatorStyle {
         
@@ -137,6 +294,10 @@ internal extension NSDictionary {
         let defaultTheme = CourierInboxTheme()
         
         let brandId = self["brandId"] as? String
+        let tabIndicatorColor = self["tabIndicatorColor"] as? String
+        let tabStyle = self["tabStyle"] as? NSDictionary
+        let readingSwipeActionStyle = self["readingSwipeActionStyle"] as? NSDictionary
+        let archivingSwipeActionStyle = self["archivingSwipeActionStyle"] as? NSDictionary
         let unreadIndicatorStyle = self["unreadIndicatorStyle"] as? NSDictionary
         let loadingIndicatorColor = self["loadingIndicatorColor"] as? String
         let titleStyle = self["titleStyle"] as? NSDictionary
@@ -151,6 +312,10 @@ internal extension NSDictionary {
         
         return CourierInboxTheme(
             brandId: brandId,
+            tabIndicatorColor: tabIndicatorColor?.toColor(),
+            tabStyle: tabStyle?.toTabStyle() ?? CourierInboxView.defaultTabStyle(),
+            readingSwipeActionStyle: readingSwipeActionStyle?.toReadingSwipeActionStyle() ?? CourierInboxView.defaultReadingStyle(),
+            archivingSwipeActionStyle: archivingSwipeActionStyle?.toArchivingSwipeActionStyle() ?? CourierInboxView.defaultArchivingStyle(),
             messageAnimationStyle: messageAnimationStyle?.toRowAnimation() ?? .left,
             loadingIndicatorColor: loadingIndicatorColor?.toColor(),
             unreadIndicatorStyle: unreadIndicatorStyle?.toUnreadIndicatorStyle() ?? defaultTheme.unreadIndicatorStyle,

package/ios/CourierReactNativeDelegate.m

@@ -22,7 +22,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
     if (self) {
         
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"4.1.1"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.0.2"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];

package/ios/CourierReactNativeEventEmitter.swift

@@ -14,7 +14,7 @@ internal class CourierReactNativeEventEmitter: RCTEventEmitter {
         
         // Set the user agent
         // Used to know the platform performing requests
-        Courier.agent = CourierAgent.reactNativeIOS("4.1.1")
+        Courier.agent = CourierAgent.reactNativeIOS("5.0.2")
         
     }
     

package/ios/CourierReactNativeModule.m

@@ -109,7 +109,13 @@ RCT_EXTERN_METHOD(
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
   addInboxListener: (NSString*)loadingId
   withErrorId: (NSString*)errorId
-  withMessagesId: (NSString*)messagesId
+  withUnreadCountId: (NSString*)unreadCountId
+  withFeedId: (NSString*)feedId
+  withArchiveId: (NSString*)archiveId
+  withPageAddedId: (NSString*)pageAddedId
+  withMessageChangedId: (NSString*)messageChangedId
+  withMessageAddedId: (NSString*)messageAddedId
+  withMessageRemovedId: (NSString*)messageRemovedId
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
@@ -126,7 +132,8 @@ RCT_EXTERN_METHOD(
 )
 
 RCT_EXTERN_METHOD(
-  fetchNextPageOfMessages: (RCTPromiseResolveBlock)resolve
+  fetchNextPageOfMessages: (NSString*)inboxMessageFeed
+  withResolver: (RCTPromiseResolveBlock)resolve
   withRejecter: (RCTPromiseRejectBlock)reject
 )