@trycourier/courier-react-native 2.0.3 → 2.2.0

package/README.md

@@ -186,6 +186,19 @@ These are all the available features of the SDK.
                 Automatically manages push notification device tokens and gives convenient functions for handling push notification receiving and clicking.
             </td>
         </tr>
+        <tr width="600px">
+            <td align="center">
+                4
+            </td>
+            <td align="left">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Preferences.md">
+                    <code>Preferences</code>
+                </a>
+            </td>
+            <td align="left">
+                Allow users to update which types of notifications they would like to receive.
+            </td>
+        </tr>
     </tbody>
 </table>
 

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.0.37'
-  api 'androidx.recyclerview:recyclerview:1.3.1'
+  api 'com.github.trycourier:courier-android:2.3.0'
+  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

@@ -1,12 +1,15 @@
 package com.courierreactnative
 
+import android.Manifest
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 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 +75,48 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     )
   }
 
-  @ReactMethod // TODO: Update in the future
+  @ReactMethod
   fun requestNotificationPermission(promise: Promise) {
-    reactActivity?.requestNotificationPermission()
+
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+      promise.resolve("unknown")
+      return
+    }
+
+    // Request the push permission
+    reactActivity?.let { context ->
+
+      val permissionState: Int = ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS)
+
+      if (permissionState == PackageManager.PERMISSION_DENIED) {
+        ActivityCompat.requestPermissions(context, arrayOf(Manifest.permission.POST_NOTIFICATIONS), 1)
+      }
+
+    }
+
+    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)
+
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+      promise.resolve("unknown")
+      return
+    }
+
+    reactActivity?.let { context ->
+
+      val permissionState: Int = ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS)
+      val status = if (permissionState == PackageManager.PERMISSION_GRANTED) "authorized" else "denied"
+      promise.resolve(status)
+      return
+
+    }
+
+    promise.resolve("unknown")
+
   }
 
   @ReactMethod
@@ -147,9 +182,15 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
 
   }
 
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun getToken(key: String): String? {
+    return Courier.shared.getToken(key)
+  }
+
   @ReactMethod
-  fun setFcmToken(token: String, promise: Promise) {
-    Courier.shared.setFCMToken(
+  fun setToken(key: String, token: String, promise: Promise) {
+    Courier.shared.setToken(
+      provider = key,
       token = token,
       onSuccess = {
         promise.resolve(null)
@@ -160,18 +201,6 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     )
   }
 
-  @ReactMethod
-  fun getFcmToken(promise: Promise) {
-    Courier.shared.getFCMToken(
-      onSuccess = { token ->
-        promise.resolve(token)
-      },
-      onFailure = { e ->
-        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
-      }
-    )
-  }
-
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun readMessage(messageId: String): String {
     Courier.shared.readMessage(messageId)
@@ -274,4 +303,54 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     return Courier.shared.inboxPaginationLimit.toString()
   }
 
+  @ReactMethod
+  fun getUserPreferences(paginationCursor: String, promise: Promise) {
+
+    val cursor = if (paginationCursor != "") paginationCursor else null
+
+    Courier.shared.getUserPreferences(
+      paginationCursor = cursor,
+      onSuccess = { preferences ->
+        promise.resolve(preferences.toWritableMap())
+      },
+      onFailure = { e ->
+        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
+      }
+    )
+
+  }
+
+  @ReactMethod
+  fun getUserPreferencesTopic(topicId: String, promise: Promise) {
+    Courier.shared.getUserPreferenceTopic(
+      topicId = topicId,
+      onSuccess = { topic ->
+        promise.resolve(topic.toWritableMap())
+      },
+      onFailure = { e ->
+        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
+      }
+    )
+  }
+
+  @ReactMethod
+  fun putUserPreferencesTopic(topicId: String, status: String, hasCustomRouting: Boolean, customRouting: ReadableArray, promise: Promise) {
+
+    val routing = customRouting.toArrayList().map { CourierPreferenceChannel.fromString(it as String) }
+
+    Courier.shared.putUserPreferenceTopic(
+      topicId = topicId,
+      status = CourierPreferenceStatus.fromString(status),
+      hasCustomRouting = hasCustomRouting,
+      customRouting = routing,
+      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/android/src/main/java/com/courierreactnative/Extensions.kt

@@ -1,7 +1,6 @@
 package com.courierreactnative
 
-import com.courier.android.models.InboxAction
-import com.courier.android.models.InboxMessage
+import com.courier.android.models.*
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableArray
@@ -12,9 +11,58 @@ 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 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)
+
+  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 ->

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.0.4"
+  s.dependency "Courier_iOS", "2.7.2"
 
   # 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/CourierReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/CourierReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/CourierReactNative.xcodeproj/xcuserdata/mike.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CourierReactNative.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/CourierReactNativeModule.m

@@ -45,19 +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
-  withResolver: (RCTPromiseResolveBlock)resolve
-  withRejecter: (RCTPromiseRejectBlock)reject
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  getToken: (NSString*)key
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
@@ -95,6 +91,33 @@ RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
   setInboxPaginationLimit: (double)limit
 )
 
+RCT_EXTERN_METHOD(
+  getUserPreferences: (NSString*)paginationCursor
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getUserPreferencesTopic: (NSString*)topicId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getUserPreferencesTopic: (NSString*)topicId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  putUserPreferencesTopic: (NSString*)topicId
+  withStatus: (NSString*)status
+  withHasCustomRouting: (BOOL*)hasCustomRouting
+  withCustomRouting: (NSArray*)customRouting
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
 RCT_EXTERN_METHOD(
   registerPushNotificationClickedOnKilledState
 )

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,9 @@ 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:)
+    func getToken(key: NSString) -> String? {
+        return Courier.shared.getToken(providerKey: key as String)
     }
 
     @objc(iOSForegroundPresentationOptions:)
@@ -380,6 +377,57 @@ class CourierReactNativeModule: RCTEventEmitter {
         Courier.shared.inboxPaginationLimit = Int(limit)
         return String(describing: Courier.shared.inboxPaginationLimit)
     }
+    
+    @objc(getUserPreferences: withResolver: withRejecter:)
+    func getUserPreferences(paginationCursor: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
+        let cursor = paginationCursor != "" ? paginationCursor as String : nil
+        
+        Courier.shared.getUserPreferences(
+            paginationCursor: cursor,
+            onSuccess: { preferences in
+                resolve(preferences.toDictionary())
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
+    
+    @objc(getUserPreferencesTopic: withResolver: withRejecter:)
+    func getUserPreferencesTopic(topicId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
+        Courier.shared.getUserPreferencesTopic(
+            topicId: topicId as String,
+            onSuccess: { topic in
+                resolve(topic.toDictionary())
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
+    
+    @objc(putUserPreferencesTopic: withStatus: withHasCustomRouting: withCustomRouting: withResolver: withRejecter:)
+        func putUserPreferencesTopic(topicId: NSString, status: NSString, hasCustomRouting: Bool, customRouting: [NSString], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+
+        
+        Courier.shared.putUserPreferencesTopic(
+            topicId: topicId as String,
+            status: CourierUserPreferencesStatus(rawValue: status as String) ?? .unknown,
+            hasCustomRouting: hasCustomRouting,
+            customRouting: customRouting.map { CourierUserPreferencesChannel(rawValue: $0 as String) ?? .unknown },
+            onSuccess: {
+                resolve(nil)
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
 
     override func supportedEvents() -> [String]! {
         return [
@@ -432,18 +480,3 @@ extension NSDictionary {
     }
     
 }
-
-extension UNAuthorizationStatus {
-
-    var name: String {
-        switch (self) {
-        case .notDetermined: return "notDetermined"
-        case .denied: return "denied"
-        case .authorized: return "authorized"
-        case .provisional: return "provisional"
-        case .ephemeral: return "ephemeral"
-        @unknown default: return "unknown"
-        }
-    }
-
-}