@trycourier/courier-react-native 2.1.0 → 2.2.1

package/android/build.gradle

@@ -101,8 +101,8 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:2.1.1'
-  api 'androidx.recyclerview:recyclerview:1.3.1'
+  api 'com.github.trycourier:courier-android:2.3.1'
+  api 'androidx.recyclerview:recyclerview:1.3.2'
 
 }
 

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

@@ -6,10 +6,7 @@ import com.courier.android.Courier
 import com.courier.android.utils.getLastDeliveredMessage
 import com.courier.android.utils.pushNotification
 import com.courier.android.utils.trackPushNotificationClick
-//import com.courier.android.pushNotification
-//import com.courier.android.trackPushNotificationClick
 import com.facebook.react.ReactActivity
-import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.firebase.messaging.RemoteMessage
 import org.json.JSONObject
 

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

@@ -4,9 +4,7 @@ import android.content.Intent
 import com.courier.android.Courier
 import com.courier.android.models.*
 import com.courier.android.modules.*
-import com.courier.android.utils.isPushPermissionGranted
 import com.courier.android.utils.pushNotification
-import com.courier.android.utils.requestNotificationPermission
 import com.courier.android.utils.trackPushNotificationClick
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.*
@@ -72,16 +70,31 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     )
   }
 
-  @ReactMethod // TODO: Update in the future
+  @ReactMethod
   fun requestNotificationPermission(promise: Promise) {
-    reactActivity?.requestNotificationPermission()
+
+    reactActivity?.let { activity ->
+      Courier.shared.requestNotificationPermission(activity)
+    }
+
+    promise.resolve("unknown")
+
   }
 
-  @ReactMethod // TODO: Update in the future
+  @ReactMethod
   fun getNotificationPermissionStatus(promise: Promise) {
-    val granted = reactActivity?.isPushPermissionGranted
-    val status = if (granted == true) "authorized" else "denied"
-    promise.resolve(status)
+
+    reactActivity?.let { context ->
+
+      val isGranted = Courier.shared.isPushPermissionGranted(context)
+      val status = if (isGranted) "authorized" else "denied"
+      promise.resolve(status)
+      return
+
+    }
+
+    promise.resolve("unknown")
+
   }
 
   @ReactMethod
@@ -148,23 +161,18 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
   }
 
   @ReactMethod
-  fun setFcmToken(token: String, promise: Promise) {
-    Courier.shared.setFCMToken(
-      token = token,
-      onSuccess = {
-        promise.resolve(null)
-      },
-      onFailure = { e ->
-        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
-      }
-    )
+  fun getToken(key: String, promise: Promise) {
+    val token = Courier.shared.getToken(key)
+    promise.resolve(token)
   }
 
   @ReactMethod
-  fun getFcmToken(promise: Promise) {
-    Courier.shared.getFCMToken(
-      onSuccess = { token ->
-        promise.resolve(token)
+  fun setToken(key: String, token: String, promise: Promise) {
+    Courier.shared.setToken(
+      provider = key,
+      token = token,
+      onSuccess = {
+        promise.resolve(null)
       },
       onFailure = { e ->
         promise.reject(CourierEvents.COURIER_ERROR_TAG, e)

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

@@ -5,10 +5,7 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.view.View
 import androidx.recyclerview.widget.DividerItemDecoration
-import com.courier.android.inbox.CourierInbox
-import com.courier.android.inbox.CourierInboxButtonStyles
-import com.courier.android.inbox.CourierInboxFont
-import com.courier.android.inbox.CourierInboxTheme
+import com.courier.android.inbox.*
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.SimpleViewManager
@@ -90,26 +87,41 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
     val android = getMap("android")
     val dividerItemDecoration = android?.getString("dividerItemDecoration")
 
-    val unreadIndicatorBarColor = getString("unreadIndicatorBarColor")
+    val unreadIndicatorStyle = getMap("unreadIndicatorStyle")
     val loadingIndicatorColor = getString("loadingIndicatorColor")
 
-    val titleFont = getMap("titleFont")
-    val timeFont = getMap("timeFont")
-    val bodyFont = getMap("bodyFont")
-    val detailTitleFont = getMap("detailTitleFont")
+    val titleStyle = getMap("titleStyle")
+    val timeStyle = getMap("timeStyle")
+    val bodyStyle = getMap("bodyStyle")
+    val infoViewStyle = getMap("infoViewStyle")
     val buttonStyles = getMap("buttonStyles")
 
     val context = view.context
 
     return CourierInboxTheme(
-      dividerItemDecoration = dividerItemDecoration?.toDivider(context),
-      unreadIndicatorBarColor = unreadIndicatorBarColor?.toColor(),
+      unreadIndicatorStyle = unreadIndicatorStyle?.toUnreadIndicatorStyle() ?: CourierInboxUnreadIndicatorStyle(),
       loadingIndicatorColor = loadingIndicatorColor?.toColor(),
-      titleFont = titleFont?.toFont(context) ?: CourierInboxFont(),
-      timeFont = timeFont?.toFont(context) ?: CourierInboxFont(),
-      bodyFont = bodyFont?.toFont(context) ?: CourierInboxFont(),
-      detailTitleFont = detailTitleFont?.toFont(context) ?: CourierInboxFont(),
-      buttonStyles = buttonStyles?.toButtonStyles(context) ?: CourierInboxButtonStyles()
+      titleStyle = titleStyle?.toTextStyle(context) ?: CourierInboxTextStyle(
+        unread = CourierInboxFont(),
+        read = CourierInboxFont(),
+      ),
+      timeStyle = timeStyle?.toTextStyle(context) ?: CourierInboxTextStyle(
+        unread = CourierInboxFont(),
+        read = CourierInboxFont(),
+      ),
+      bodyStyle = bodyStyle?.toTextStyle(context) ?: CourierInboxTextStyle(
+        unread = CourierInboxFont(),
+        read = CourierInboxFont(),
+      ),
+      buttonStyle = buttonStyles?.toButtonStyle(context) ?: CourierInboxButtonStyle(
+        unread = CourierInboxButton(),
+        read = CourierInboxButton(),
+      ),
+      infoViewStyle = infoViewStyle?.toInfoStyle(context) ?: CourierInboxInfoViewStyle(
+        font = CourierInboxFont(),
+        button = CourierInboxButton(),
+      ),
+      dividerItemDecoration = dividerItemDecoration?.toDivider(context),
     )
 
   }
@@ -142,13 +154,43 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
 
   }
 
-  private fun ReadableMap.toButtonStyles(context: Context): CourierInboxButtonStyles {
+  private fun ReadableMap.toTextStyle(context: Context): CourierInboxTextStyle {
+
+    val unread = getMap("unread")
+    val read = getMap("read")
+
+    return CourierInboxTextStyle(
+      unread = unread?.toFont(context) ?: CourierInboxFont(),
+      read = read?.toFont(context) ?: CourierInboxFont(),
+    )
+
+  }
+
+  private fun ReadableMap.toUnreadIndicatorStyle(): CourierInboxUnreadIndicatorStyle {
+
+    val indicator = getString("indicator")
+    val color = getString("color")
+
+    var style = CourierInboxUnreadIndicator.LINE
+
+    if (indicator == "dot") {
+      style = CourierInboxUnreadIndicator.DOT
+    }
+
+    return CourierInboxUnreadIndicatorStyle(
+      indicator = style,
+      color = color?.toColor(),
+    )
+
+  }
+
+  private fun ReadableMap.toButton(context: Context): CourierInboxButton {
 
     val font = getMap("font")
     val backgroundColor = getString("backgroundColor")
     val cornerRadius = if (isNull("cornerRadius")) null else getDouble("cornerRadius")
 
-    return CourierInboxButtonStyles(
+    return CourierInboxButton(
       font = font?.toFont(context),
       backgroundColor = backgroundColor?.toColor(),
       cornerRadiusInDp = cornerRadius?.toInt()
@@ -156,4 +198,28 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
 
   }
 
+  private fun ReadableMap.toButtonStyle(context: Context): CourierInboxButtonStyle {
+
+    val unread = getMap("unread")
+    val read = getMap("read")
+
+    return CourierInboxButtonStyle(
+      unread = unread?.toButton(context) ?: CourierInboxButton(),
+      read = read?.toButton(context) ?: CourierInboxButton()
+    )
+
+  }
+
+  private fun ReadableMap.toInfoStyle(context: Context): CourierInboxInfoViewStyle {
+
+    val font = getMap("font")
+    val button = getMap("button")
+
+    return CourierInboxInfoViewStyle(
+      font = font?.toFont(context) ?: CourierInboxFont(),
+      button = button?.toButton(context) ?: CourierInboxButton()
+    )
+
+  }
+
 }

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", "2.1.3"
+  s.dependency "Courier_iOS", "2.7.3"
 
   # 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/CourierReactNativeModule.m

@@ -45,17 +45,15 @@ RCT_EXTERN_METHOD(
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  getApnsToken
-)
-
 RCT_EXTERN_METHOD(
-  getFcmToken: (RCTPromiseResolveBlock)resolve
+  setToken: (NSString*)key
+  withToken: (NSString*)token
+  withResolver: (RCTPromiseResolveBlock)resolve
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
 RCT_EXTERN_METHOD(
-  setFcmToken: (NSString*)token
+  getToken: (NSString*)key
   withResolver: (RCTPromiseResolveBlock)resolve
   withRejecter: (RCTPromiseRejectBlock)reject
 )

package/ios/CourierReactNativeModule.swift

@@ -226,11 +226,12 @@ class CourierReactNativeModule: RCTEventEmitter {
         
     }
 
-    @objc(setFcmToken: withResolver: withRejecter:)
-    func setFcmToken(token: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    @objc(setToken: withToken: withResolver: withRejecter:)
+    func setToken(key: NSString, token: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
-        Courier.shared.setFCMToken(
-            token as String,
+        Courier.shared.setToken(
+            providerKey: key as String,
+            token: token as String,
             onSuccess: {
                 resolve(nil)
             },
@@ -241,13 +242,18 @@ class CourierReactNativeModule: RCTEventEmitter {
     
     }
     
-    @objc(getFcmToken: withRejecter:)
-    func getFcmToken(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        resolve(Courier.shared.fcmToken)
-    }
-
-    @objc func getApnsToken() -> String? {
-        return Courier.shared.apnsToken
+    @objc(getToken: withResolver: withRejecter:)
+    func getToken(key: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
+        let provider = key as String
+        
+        Task {
+            
+            let token = await Courier.shared.getToken(providerKey: provider)
+            resolve(token)
+            
+        }
+        
     }
 
     @objc(iOSForegroundPresentationOptions:)

package/ios/CourierReactNativeViewManager.swift

@@ -96,56 +96,58 @@ class CourierReactNativeView : UIView {
         let cellStyles = iOS?["cellStyles"] as? [String : Any]
         
         // Unread
-        let unreadIndicatorBarColor = dict["unreadIndicatorBarColor"] as? String
+        let unreadIndicatorStyle = dict["unreadIndicatorStyle"] as? [String : Any]
         
         // Loading
         let loadingIndicatorColor = dict["loadingIndicatorColor"] as? String
         
         // Title
-        let titleFont = dict["titleFont"] as? [String : Any]
+        let titleStyle = dict["titleStyle"] as? [String : Any]
         
         // Time
-        let timeFont = dict["timeFont"] as? [String : Any]
+        let timeStyle = dict["timeStyle"] as? [String : Any]
         
         // Body
-        let bodyFont = dict["bodyFont"] as? [String : Any]
+        let bodyStyle = dict["bodyStyle"] as? [String : Any]
         
-        // Detail
-        let detailTitleFont = dict["detailTitleFont"] as? [String : Any]
+        // Info View
+        let infoViewStyle = dict["infoViewStyle"] as? [String : Any]
         
-        // Detail
-        let buttonStyles = dict["buttonStyles"] as? [String : Any]
+        // Button
+        let buttonStyle = dict["buttonStyle"] as? [String : Any]
         
         return CourierInboxTheme(
             messageAnimationStyle: messageAnimationStyle?.toRowAnimation() ?? .left,
-            unreadIndicatorBarColor: unreadIndicatorBarColor?.toColor(),
             loadingIndicatorColor: loadingIndicatorColor?.toColor(),
-            titleFont: dictionaryToFont(
-                dictionary: titleFont,
-                defaultFont: UIFont.boldSystemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .label
-            ),
-            timeFont: dictionaryToFont(
-                dictionary: timeFont,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .placeholderText
-            ),
-            bodyFont: dictionaryToFont(
-                dictionary: bodyFont,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .label
-            ),
-            detailTitleFont: dictionaryToFont(
-                dictionary: detailTitleFont,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .label
-            ),
-            buttonStyles: dictionaryToButtonStyles(
-                dictionary: buttonStyles
-            ),
-            cellStyles: dictionaryToCellStyles(
-                dictionary: cellStyles
-            )
+            unreadIndicatorStyle: dictionaryToUnreadStyle(dictionary: unreadIndicatorStyle),
+            titleStyle: dictionaryToTextStyle(dictionary: titleStyle),
+            timeStyle: dictionaryToTextStyle(dictionary: timeStyle),
+            bodyStyle: dictionaryToTextStyle(dictionary: bodyStyle),
+            buttonStyle: dictionaryToButtonStyle(dictionary: buttonStyle),
+            cellStyle: dictionaryToCellStyles(dictionary: cellStyles),
+            infoViewStyle: dictionaryToInfoViewStyle(dictionary: infoViewStyle)
+        )
+        
+    }
+    
+    func dictionaryToUnreadStyle(dictionary: [String : Any]?) -> CourierInboxUnreadIndicatorStyle {
+        
+        guard let dict = dictionary else {
+            return CourierInboxUnreadIndicatorStyle()
+        }
+        
+        let indicator = dict["indicator"] as? String
+        let color = dict["color"] as? String
+        
+        var style: CourierInboxUnreadIndicator = .line
+
+        if (indicator == "dot") {
+            style = .dot
+        }
+        
+        return CourierInboxUnreadIndicatorStyle(
+            indicator: style,
+            color: color?.toColor()
         )
         
     }
@@ -170,17 +172,22 @@ class CourierReactNativeView : UIView {
         
     }
     
-    func dictionaryToButtonStyles(dictionary: [String : Any]?) -> CourierInboxButtonStyles {
+    func dictionaryToButton(dictionary: [String : Any]?) -> CourierInboxButton {
         
         guard let dict = dictionary else {
-            return CourierInboxButtonStyles()
+            return CourierInboxButton(
+                font: CourierInboxFont(
+                    font: UIFont.systemFont(ofSize: UIFont.labelFontSize),
+                    color: .white
+                )
+            )
         }
         
         let font = dict["font"] as? [String : Any]
         let backgroundColor = dict["backgroundColor"] as? String
         let cornerRadius = dict["cornerRadius"] as? CGFloat
         
-        return CourierInboxButtonStyles(
+        return CourierInboxButton(
             font: dictionaryToFont(
                 dictionary: font,
                 defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
@@ -192,10 +199,84 @@ class CourierReactNativeView : UIView {
         
     }
     
-    func dictionaryToCellStyles(dictionary: [String : Any]?) -> CourierInboxCellStyles {
+    func dictionaryToButtonStyle(dictionary: [String : Any]?) -> CourierInboxButtonStyle {
+        
+        guard let dict = dictionary else {
+            return CourierInboxButtonStyle()
+        }
+        
+        let unread = dict["unread"] as? [String : Any]
+        let read = dict["read"] as? [String : Any]
+        
+        return CourierInboxButtonStyle(
+            unread: dictionaryToButton(dictionary: unread),
+            read: dictionaryToButton(dictionary: read)
+        )
+        
+    }
+    
+    func dictionaryToInfoViewStyle(dictionary: [String : Any]?) -> CourierInboxInfoViewStyle {
+        
+        let defaultColor: UIColor = .label
+        let defaultFont: UIFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+        
+        let defaultInboxFont = CourierInboxFont(
+            font: defaultFont,
+            color: defaultColor
+        )
+        
+        guard let dict = dictionary else {
+            return CourierInboxInfoViewStyle(
+                font: defaultInboxFont,
+                button: CourierInboxButton(
+                    font: defaultInboxFont
+                )
+            )
+        }
+        
+        let font = dict["font"] as? [String : Any]
+        let button = dict["button"] as? [String : Any]
+        
+        return CourierInboxInfoViewStyle(
+            font: dictionaryToFont(dictionary: font, defaultFont: defaultFont, defaultColor: defaultColor), 
+            button: dictionaryToButton(dictionary: button)
+        )
+        
+    }
+    
+    func dictionaryToTextStyle(dictionary: [String : Any]?) -> CourierInboxTextStyle {
+        
+        let defaultColor: UIColor = .label
+        let defaultFont: UIFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+        
+        let defaultInboxFont = CourierInboxFont(
+            font: defaultFont,
+            color: defaultColor
+        )
+        
+        let defaultText = CourierInboxTextStyle(
+            unread: defaultInboxFont,
+            read: defaultInboxFont
+        )
+        
+        guard let dict = dictionary else {
+            return defaultText
+        }
+        
+        let unread = dict["unread"] as? [String : Any]
+        let read = dict["read"] as? [String : Any]
+        
+        return CourierInboxTextStyle(
+            unread: dictionaryToFont(dictionary: unread, defaultFont: defaultFont, defaultColor: defaultColor),
+            read: dictionaryToFont(dictionary: read, defaultFont: defaultFont, defaultColor: defaultColor)
+        )
+        
+    }
+    
+    func dictionaryToCellStyles(dictionary: [String : Any]?) -> CourierInboxCellStyle {
         
         guard let dict = dictionary else {
-            return CourierInboxCellStyles()
+            return CourierInboxCellStyle()
         }
         
         let separatorStyle = dict["separatorStyle"] as? String
@@ -209,7 +290,7 @@ class CourierReactNativeView : UIView {
         let bottom = insets?["bottom"] as? CGFloat
         let separatorInsets = UIEdgeInsets(top: top ?? 0, left: left ?? 0, bottom: bottom ?? 0, right: right ?? 0)
         
-        return CourierInboxCellStyles(
+        return CourierInboxCellStyle(
             separatorStyle: separatorStyle?.toSeparatorStyle() ?? .singleLine,
             separatorInsets: separatorInsets,
             separatorColor: separatorColor?.toColor(),