@trycourier/courier-react-native 1.0.9 → 2.0.0-beta1

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

@@ -3,8 +3,8 @@ package com.courierreactnative
 import android.content.Intent
 import android.os.Bundle
 import com.courier.android.Courier
-import com.courier.android.pushNotification
-import com.courier.android.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
@@ -28,9 +28,9 @@ open class CourierReactNativeActivity : ReactActivity() {
     checkIntentForPushNotificationClick(intent)
 
     // Handle delivered messages on the main thread
-    Courier.getLastDeliveredMessage { message ->
-      postPushNotificationDelivered(message)
-    }
+//    Courier.getLastDeliveredMessage { message ->
+//      postPushNotificationDelivered(message)
+//    }
 
   }
 
@@ -46,17 +46,17 @@ open class CourierReactNativeActivity : ReactActivity() {
   }
 
   private fun checkIntentForPushNotificationClick(intent: Intent?) {
-    intent?.trackPushNotificationClick { message ->
-      postPushNotificationClicked(message)
-    }
+//    intent?.trackPushNotificationClick { message ->
+//      postPushNotificationClicked(message)
+//    }
   }
 
   private fun postPushNotificationDelivered(message: RemoteMessage) {
-    sendEvent(PUSH_DELIVERED_EVENT, JSONObject(message.pushNotification).toString())
+//    sendEvent(PUSH_DELIVERED_EVENT, JSONObject(message.pushNotification).toString())
   }
 
   private fun postPushNotificationClicked(message: RemoteMessage) {
-    sendEvent(PUSH_CLICKED_EVENT, JSONObject(message.pushNotification).toString())
+//    sendEvent(PUSH_CLICKED_EVENT, JSONObject(message.pushNotification).toString())
   }
 
 }

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

@@ -4,6 +4,9 @@ import android.content.Intent
 import com.courier.android.*
 import com.courier.android.models.CourierAgent
 import com.courier.android.models.CourierProvider
+import com.courier.android.modules.*
+import com.courier.android.utils.pushNotification
+import com.courier.android.utils.trackPushNotificationClick
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
@@ -13,8 +16,9 @@ import org.json.JSONObject
 
 class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
+  override fun getName() = "CourierReactNativeModule"
+
   companion object {
-    private const val COURIER_MODULE_NAME = "CourierReactNative"
     private const val COURIER_ERROR_TAG = "Courier Android SDK Error"
     private const val COURIER_PUSH_NOTIFICATION_DEBUG_LOG_EVENT = "courierDebugEvent"
     private const val COURIER_PUSH_NOTIFICATION_CLICKED_EVENT = "pushNotificationClicked"
@@ -25,47 +29,30 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     // the requests come from
     Courier.USER_AGENT = CourierAgent.REACT_NATIVE_ANDROID
 
-    Courier.shared.logListener = { data ->
-      sendEvent(reactContext, COURIER_PUSH_NOTIFICATION_DEBUG_LOG_EVENT, data)
-    }
+//    Courier.shared.logListener = { data ->
+//      sendEvent(reactContext, COURIER_PUSH_NOTIFICATION_DEBUG_LOG_EVENT, data)
+//    }
 
   }
 
-  override fun getName(): String {
-    return COURIER_MODULE_NAME
-  }
-
-  private val reactActivity: ReactActivity?
-    get() = currentActivity as? ReactActivity
-
-  @ReactMethod
-  fun signIn(userId: String, accessToken: String, promise: Promise) {
-    Courier.shared.signIn(
-      accessToken = accessToken,
-      userId = userId,
-      onSuccess = {
-        promise.resolve(null)
-      },
-      onFailure = { e ->
-        promise.reject(COURIER_ERROR_TAG, e)
-      }
-    )
-  }
+  private val reactActivity: ReactActivity? get() = currentActivity as? ReactActivity
 
   @ReactMethod
-  fun getFcmToken(promise: Promise) {
+  fun setDebugMode(isDebugging: Boolean, promise: Promise) {
     try {
-      val token = Courier.shared.fcmToken
-      promise.resolve(token)
+      Courier.shared.isDebugging = isDebugging
+      promise.resolve(Courier.shared.isDebugging)
     } catch (e: Exception) {
       promise.reject(COURIER_ERROR_TAG, e)
     }
   }
 
   @ReactMethod
-  fun setFcmToken(token: String, promise: Promise) {
-    Courier.shared.setFCMToken(
-      token,
+  fun signIn(accessToken: String, clientKey: String?, userId: String, promise: Promise) {
+    Courier.shared.signIn(
+      accessToken = accessToken,
+      clientKey = clientKey,
+      userId = userId,
       onSuccess = {
         promise.resolve(null)
       },
@@ -75,6 +62,37 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     )
   }
 
+//  @ReactMethod
+//  fun getFcmToken(promise: Promise) {
+//    Courier.shared.getFCMToken(
+//      onSuccess = { token ->
+//        promise.resolve(token)
+//      },
+//      onFailure = { e ->
+//        promise.reject(COURIER_ERROR_TAG, e)
+//      }
+//    )
+//  }
+//
+//  @ReactMethod
+//  fun setFcmToken(token: String, promise: Promise) {
+//
+//    token.let { fcmToken ->
+//
+//      Courier.shared.setFCMToken(
+//        fcmToken,
+//        onSuccess = {
+//          promise.resolve(null)
+//        },
+//        onFailure = { e ->
+//          promise.reject(COURIER_ERROR_TAG, e)
+//        }
+//      )
+//
+//    }
+//
+//  }
+//
   @ReactMethod
   fun getUserId(promise: Promise) {
     try {
@@ -96,112 +114,103 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
       }
     )
   }
-
-  @ReactMethod
-  fun sendPush(
-    authKey: String,
-    userId: String,
-    title: String,
-    body: String,
-    providers: ReadableArray,
-    promise: Promise
-  ) {
-    Courier.shared.sendPush(
-      authKey = authKey,
-      userId = userId,
-      title = title,
-      body = body,
-      providers = providers.toCourierProviders(),
-      onSuccess = { messageId ->
-        promise.resolve(messageId)
-      },
-      onFailure = { e ->
-        promise.reject(COURIER_ERROR_TAG, e)
-      }
-    )
-  }
-
-  @ReactMethod
-  fun requestNotificationPermission(promise: Promise) {
-    try {
-      reactActivity?.requestNotificationPermission { isGranted ->
-        val status = if (isGranted) NotificationPermissionStatus.AUTHORIZED else NotificationPermissionStatus.DENIED
-        promise.resolve(status.value)
-      }
-    } catch (e: Exception) {
-      promise.reject(COURIER_ERROR_TAG, e)
-    }
-  }
-
-  @ReactMethod
-  fun getNotificationPermissionStatus(promise: Promise) {
-    try {
-      reactActivity?.getNotificationPermissionStatus { isGranted ->
-        val status = if (isGranted) NotificationPermissionStatus.AUTHORIZED else NotificationPermissionStatus.DENIED
-        promise.resolve(status.value)
-      }
-    } catch (e: Exception) {
-      promise.reject(COURIER_ERROR_TAG, e)
-    }
-  }
-
-  @ReactMethod
-  fun registerPushNotificationClickedOnKilledState() {
-    reactActivity?.let { activity ->
-      checkIntentForPushNotificationClick(activity.intent)
-    }
-  }
-
-  private fun checkIntentForPushNotificationClick(intent: Intent?) {
-    intent?.trackPushNotificationClick { message ->
-      postPushNotificationClicked(message)
-    }
-  }
-
-  private fun postPushNotificationClicked(message: RemoteMessage) {
-    sendEvent(
-      reactApplicationContext,
-      COURIER_PUSH_NOTIFICATION_CLICKED_EVENT,
-      JSONObject(message.pushNotification).toString()
-    )
-  }
-
-  @ReactMethod
-  fun setDebugMode(isDebugging: Boolean, promise: Promise) {
-    try {
-      Courier.shared.isDebugging = isDebugging
-      promise.resolve(Courier.shared.isDebugging)
-    } catch (e: Exception) {
-      promise.reject(COURIER_ERROR_TAG, e)
-    }
-  }
-
-  private fun sendEvent(reactContext: ReactContext, eventName: String, params: String) {
-    reactContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(eventName, params)
-  }
-
-  @ReactMethod
-  fun addListener(eventName: String?) {
-    // Empty
-  }
-
-  @ReactMethod
-  fun removeListeners(count: Int?) {
-    // Empty
-  }
-
-  private fun ReadableArray.toCourierProviders(): List<CourierProvider> {
-    val providers: MutableList<CourierProvider> = mutableListOf()
-    for (provider in toArrayList()) {
-      CourierProvider.values().forEach {
-        if (it.value == provider) {
-          providers.add(it)
-        }
-      }
-    }
-    return providers
-  }
+//
+//  @ReactMethod
+//  fun sendPush(
+//    authKey: String,
+//    userId: String,
+//    title: String,
+//    body: String,
+//    providers: ReadableArray,
+//    promise: Promise
+//  ) {
+////    Courier.shared.sendPush(
+////      authKey = authKey,
+////      userId = userId,
+////      title = title,
+////      body = body,
+////      providers = providers.toCourierProviders(),
+////      onSuccess = { messageId ->
+////        promise.resolve(messageId)
+////      },
+////      onFailure = { e ->
+////        promise.reject(COURIER_ERROR_TAG, e)
+////      }
+////    )
+//  }
+//
+//  @ReactMethod
+//  fun requestNotificationPermission(promise: Promise) {
+////    try {
+////      reactActivity?.requestNotificationPermission { isGranted ->
+////        val status = if (isGranted) NotificationPermissionStatus.AUTHORIZED else NotificationPermissionStatus.DENIED
+////        promise.resolve(status.value)
+////      }
+////    } catch (e: Exception) {
+////      promise.reject(COURIER_ERROR_TAG, e)
+////    }
+//  }
+//
+//  @ReactMethod
+//  fun getNotificationPermissionStatus(promise: Promise) {
+////    try {
+////      reactActivity?.getNotificationPermissionStatus { isGranted ->
+////        val status = if (isGranted) NotificationPermissionStatus.AUTHORIZED else NotificationPermissionStatus.DENIED
+////        promise.resolve(status.value)
+////      }
+////    } catch (e: Exception) {
+////      promise.reject(COURIER_ERROR_TAG, e)
+////    }
+//  }
+//
+//  @ReactMethod
+//  fun registerPushNotificationClickedOnKilledState() {
+//    reactActivity?.let { activity ->
+//      checkIntentForPushNotificationClick(activity.intent)
+//    }
+//  }
+//
+//  private fun checkIntentForPushNotificationClick(intent: Intent?) {
+//    intent?.trackPushNotificationClick { message ->
+//      postPushNotificationClicked(message)
+//    }
+//  }
+//
+//  private fun postPushNotificationClicked(message: RemoteMessage) {
+//    sendEvent(
+//      reactApplicationContext,
+//      COURIER_PUSH_NOTIFICATION_CLICKED_EVENT,
+//      JSONObject(message.pushNotification).toString()
+//    )
+//  }
+//
+//
+//  private fun sendEvent(reactContext: ReactContext, eventName: String, params: String) {
+//    reactContext
+//      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+//      .emit(eventName, params)
+//  }
+//
+//  @ReactMethod
+//  fun addListener(eventName: String?) {
+//    // Empty
+//  }
+//
+//  @ReactMethod
+//  fun removeListeners(count: Int?) {
+//    // Empty
+//  }
+//
+//  private fun ReadableArray.toCourierProviders(): List<CourierProvider> {
+//    val providers: MutableList<CourierProvider> = mutableListOf()
+//    for (provider in toArrayList()) {
+//      CourierProvider.values().forEach {
+//        if (it.value == provider) {
+//          providers.add(it)
+//        }
+//      }
+//    }
+//    return providers
+//  }
 
 }

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

@@ -7,13 +7,11 @@ import com.facebook.react.uimanager.ViewManager
 
 
 class CourierReactNativePackage : ReactPackage {
-
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
     return listOf(CourierReactNativeModule(reactContext))
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return emptyList()
+    return listOf(CourierReactNativeViewManager())
   }
-
 }

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

@@ -0,0 +1,43 @@
+package com.courierreactnative
+
+import android.graphics.Color
+import android.view.View
+import android.widget.FrameLayout
+import com.courier.android.inbox.CourierInbox
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+
+class CourierReactNativeViewManager : SimpleViewManager<FrameLayout>() {
+
+  override fun getName() = "CourierReactNativeView"
+
+  override fun createViewInstance(reactContext: ThemedReactContext): FrameLayout {
+    return FrameLayout(reactContext)
+  }
+
+  @ReactProp(name = "theme")
+  fun setTheme(view: FrameLayout, theme: ReadableMap) {
+
+    view.removeAllViews()
+
+    // Create the view
+    val courierInbox = CourierInbox(view.context)
+
+    // Set the layout params
+    val layoutParams = FrameLayout.LayoutParams(
+      FrameLayout.LayoutParams.MATCH_PARENT,
+      FrameLayout.LayoutParams.MATCH_PARENT
+    )
+    courierInbox.layoutParams = layoutParams
+
+    // Add the view to the parent
+    view.addView(courierInbox)
+
+    view.setBackgroundColor(Color.parseColor(theme.getString("color")))
+
+  }
+
+}

package/courier-react-native.podspec

@@ -15,23 +15,31 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/trycourier/courier-react-native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
+  
+  # Courier Core Dependency
+  s.dependency "Courier_iOS", "2.0.4"
 
+  # 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.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
   s.dependency "React-Core"
-  s.dependency 'Courier-iOS', '1.1.2'
-  s.swift_version = '5.6'
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
     s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
     s.pod_target_xcconfig    = {
         "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
     }
-
+    s.dependency "React-RCTFabric"
     s.dependency "React-Codegen"
     s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
-  end
+   end
+  end    
 end

package/ios/CourierReactNative-Bridging-Header.h

@@ -1,3 +1,2 @@
-#import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 #import <React/RCTEventEmitter.h>

package/ios/CourierReactNative.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5E555C0D2413F4C50049A1A2 /* CourierReactNative.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* CourierReactNative.m */; };
+		5E555C0D2413F4C50049A1A2 /* CourierReactNative.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* CourierReactNative.mm */; };
 		F4FF95D7245B92E800C19C63 /*  CourierReactNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /*  CourierReactNative.swift */; };
 /* End PBXBuildFile section */
 
@@ -25,7 +25,7 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libCourierReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCourierReactNative.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		B3E7B5891CC2AC0600A0062D /* CourierReactNative.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CourierReactNative.m; sourceTree = "<group>"; };
+		B3E7B5891CC2AC0600A0062D /* CourierReactNative.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CourierReactNative.mm; sourceTree = "<group>"; };
 		F4FF95D5245B92E700C19C63 /* CourierReactNative-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CourierReactNative-Bridging-Header.h"; sourceTree = "<group>"; };
 		F4FF95D6245B92E800C19C63 /* CourierReactNative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourierReactNative.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -53,7 +53,7 @@
 			isa = PBXGroup;
 			children = (
 				F4FF95D6245B92E800C19C63 /* CourierReactNative.swift */,
-				B3E7B5891CC2AC0600A0062D /* CourierReactNative.m */,
+				B3E7B5891CC2AC0600A0062D /* CourierReactNative.mm */,
 				F4FF95D5245B92E700C19C63 /* CourierReactNative-Bridging-Header.h */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
@@ -117,7 +117,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F4FF95D7245B92E800C19C63 /* CourierReactNative.swift in Sources */,
-				B3E7B58A1CC2AC0600A0062D /* CourierReactNative.m in Sources */,
+				B3E7B58A1CC2AC0600A0062D /* CourierReactNative.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/ios/CourierReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+</Workspace>

package/ios/CourierReactNativeModule.m

@@ -0,0 +1,53 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(CourierReactNativeModule, NSObject)
+
+RCT_EXTERN_METHOD(
+  signIn: (NSString*)accessToken
+  withClientKey: (NSString*)clientKey
+  withUserId: (NSString*)userId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  signOut: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getUserId: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  readMessage: (NSString*)messageId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  unreadMessage: (NSString*)messageId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  readAllInboxMessages: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  addInboxListener: (NSString*)listenerId
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  removeInboxListener: (NSString*)listenerId
+)
+
+RCT_EXTERN_METHOD(
+  refreshInbox: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+@end