@trycourier/courier-react-native 2.0.0-beta7 → 2.0.0-beta8

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

@@ -3,9 +3,9 @@ package com.courierreactnative
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
+import android.os.Handler
 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
@@ -16,7 +16,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
 
-class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
+class CourierReactNativeViewManager : SimpleViewManager<ReactNativeCourierInbox>() {
 
   private companion object {
     const val ON_CLICK_MESSAGE_AT_INDEX = "courierClickMessageAtIndex"
@@ -26,16 +26,14 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
 
   override fun getName() = "CourierReactNativeView"
 
-  override fun createViewInstance(reactContext: ThemedReactContext): CourierInbox {
-    return CourierInbox(reactContext)
-  }
+  override fun createViewInstance(reactContext: ThemedReactContext): ReactNativeCourierInbox = ReactNativeCourierInbox(reactContext)
 
   private val View.reactContext: ThemedReactContext get() = context as ThemedReactContext
 
   @ReactProp(name = "onClickInboxMessageAtIndex")
-  fun setOnClickInboxMessageAtIndex(view: CourierInbox, callback: Boolean) {
+  fun setOnClickInboxMessageAtIndex(view: ReactNativeCourierInbox, callback: Boolean) {
 
-    view.setOnClickMessageListener { message, index ->
+    view.inbox.setOnClickMessageListener { message, index ->
 
       val map = Arguments.createMap()
       map.putMap("message", message.toWritableMap())
@@ -48,9 +46,9 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
   }
 
   @ReactProp(name = "onClickInboxActionForMessageAtIndex")
-  fun setOnClickInboxActionForMessageAtIndex(view: CourierInbox, callback: Boolean) {
+  fun setOnClickInboxActionForMessageAtIndex(view: ReactNativeCourierInbox, callback: Boolean) {
 
-    view.setOnClickActionListener { action, message, index ->
+    view.inbox.setOnClickActionListener { action, message, index ->
 
       val map = Arguments.createMap()
       map.putMap("action", action.toWritableMap())
@@ -64,9 +62,9 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
   }
 
   @ReactProp(name = "onScrollInbox")
-  fun setOnScrollInbox(view: CourierInbox, callback: Boolean) {
+  fun setOnScrollInbox(view: ReactNativeCourierInbox, callback: Boolean) {
 
-    view.setOnScrollInboxListener { offsetInDp ->
+    view.inbox.setOnScrollInboxListener { offsetInDp ->
 
       val offset = Arguments.createMap()
       offset.putInt("y", offsetInDp)
@@ -82,9 +80,9 @@ class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
   }
 
   @ReactProp(name = "theme")
-  fun setTheme(view: CourierInbox, theme: ReadableMap) {
-    view.lightTheme = theme.getMap("light")?.toTheme(view) ?: CourierInboxTheme.DEFAULT_LIGHT
-    view.darkTheme = theme.getMap("dark")?.toTheme(view) ?: CourierInboxTheme.DEFAULT_DARK
+  fun setTheme(view: ReactNativeCourierInbox, theme: ReadableMap) {
+    view.inbox.lightTheme = theme.getMap("light")?.toTheme(view) ?: CourierInboxTheme.DEFAULT_LIGHT
+    view.inbox.darkTheme = theme.getMap("dark")?.toTheme(view) ?: CourierInboxTheme.DEFAULT_DARK
   }
 
   private fun ReadableMap.toTheme(view: View): CourierInboxTheme {

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

@@ -0,0 +1,49 @@
+package com.courierreactnative
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import com.courier.android.inbox.CourierInbox
+
+class ReactNativeCourierInbox @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : FrameLayout(context, attrs, defStyleAttr) {
+
+  var inbox: CourierInbox
+
+  init {
+
+    // Create an instance of CourierInbox
+    inbox = CourierInbox(context, attrs, defStyleAttr)
+
+    // Set layout parameters to fill parent
+    val layoutParams = LayoutParams(
+      LayoutParams.MATCH_PARENT,
+      LayoutParams.MATCH_PARENT
+    )
+
+    // Apply the layout parameters
+    inbox.layoutParams = layoutParams
+
+    // Add it as a child of this custom view
+    addView(inbox)
+
+  }
+
+//  private var mRequestedLayout = false
+//
+//  @SuppressLint("WrongCall")
+//  override fun requestLayout() {
+//    super.requestLayout()
+//    // We need to intercept this method because if we don't our children will never update
+//    // Check https://stackoverflow.com/questions/49371866/recyclerview-wont-update-child-until-i-scroll
+//    if (!mRequestedLayout) {
+//      mRequestedLayout = true
+//      post {
+//        mRequestedLayout = false
+//        layout(left, top, right, bottom)
+//        onLayout(false, left, top, right, bottom)
+//      }
+//    }
+//  }
+
+}

package/ios/CourierReactNativeDelegate.m

@@ -65,10 +65,14 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
     }
     ];
     
-    NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered" object:nil userInfo:pushNotification];
+    dispatch_async(dispatch_get_main_queue(), ^{
     
-    completionHandler(notificationPresentationOptions);
+        NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered" object:nil userInfo:pushNotification];
+        
+        completionHandler(notificationPresentationOptions);
+        
+    });
     
 }
 
@@ -86,11 +90,13 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
     }
     ];
     
-    NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:pushNotification];
-    
     dispatch_async(dispatch_get_main_queue(), ^{
+        
+        NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:pushNotification];
+        
         completionHandler();
+        
     });
     
 }

package/ios/CourierReactNativeModule.m

@@ -95,8 +95,13 @@ RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
   setInboxPaginationLimit: (double)limit
 )
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+RCT_EXTERN_METHOD(
   registerPushNotificationClickedOnKilledState
 )
 
++ (BOOL)requiresMainQueueSetup
+{
+  return YES;
+}
+
 @end

package/ios/CourierReactNativeModule.swift

@@ -129,17 +129,13 @@ class CourierReactNativeModule: RCTEventEmitter {
         
     }
     
-    @objc func registerPushNotificationClickedOnKilledState() -> String {
-        
-        let event = CourierReactNativeModule.PushEvents.CLICKED_EVENT
+    @objc func registerPushNotificationClickedOnKilledState() {
         
         sendMessage(
-            name: event,
+            name: CourierReactNativeModule.PushEvents.CLICKED_EVENT,
             message: lastClickedMessage
         )
         
-        return event
-        
     }
     
     @objc(getNotificationPermissionStatus: withRejecter:)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/courier-react-native",
-  "version": "2.0.0-beta7",
+  "version": "2.0.0-beta8",
   "description": "Inbox & Push Notifications for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",