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

package/android/build.gradle

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

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<ReactNativeCourierInbox>() {
+class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
 
   private companion object {
     const val ON_CLICK_MESSAGE_AT_INDEX = "courierClickMessageAtIndex"
@@ -26,14 +26,14 @@ class CourierReactNativeViewManager : SimpleViewManager<ReactNativeCourierInbox>
 
   override fun getName() = "CourierReactNativeView"
 
-  override fun createViewInstance(reactContext: ThemedReactContext): ReactNativeCourierInbox = ReactNativeCourierInbox(reactContext)
+  override fun createViewInstance(reactContext: ThemedReactContext): CourierInbox = CourierInbox(reactContext)
 
   private val View.reactContext: ThemedReactContext get() = context as ThemedReactContext
 
   @ReactProp(name = "onClickInboxMessageAtIndex")
-  fun setOnClickInboxMessageAtIndex(view: ReactNativeCourierInbox, callback: Boolean) {
+  fun setOnClickInboxMessageAtIndex(view: CourierInbox, callback: Boolean) {
 
-    view.inbox.setOnClickMessageListener { message, index ->
+    view.setOnClickMessageListener { message, index ->
 
       val map = Arguments.createMap()
       map.putMap("message", message.toWritableMap())
@@ -46,9 +46,9 @@ class CourierReactNativeViewManager : SimpleViewManager<ReactNativeCourierInbox>
   }
 
   @ReactProp(name = "onClickInboxActionForMessageAtIndex")
-  fun setOnClickInboxActionForMessageAtIndex(view: ReactNativeCourierInbox, callback: Boolean) {
+  fun setOnClickInboxActionForMessageAtIndex(view: CourierInbox, callback: Boolean) {
 
-    view.inbox.setOnClickActionListener { action, message, index ->
+    view.setOnClickActionListener { action, message, index ->
 
       val map = Arguments.createMap()
       map.putMap("action", action.toWritableMap())
@@ -62,9 +62,9 @@ class CourierReactNativeViewManager : SimpleViewManager<ReactNativeCourierInbox>
   }
 
   @ReactProp(name = "onScrollInbox")
-  fun setOnScrollInbox(view: ReactNativeCourierInbox, callback: Boolean) {
+  fun setOnScrollInbox(view: CourierInbox, callback: Boolean) {
 
-    view.inbox.setOnScrollInboxListener { offsetInDp ->
+    view.setOnScrollInboxListener { offsetInDp ->
 
       val offset = Arguments.createMap()
       offset.putInt("y", offsetInDp)
@@ -80,9 +80,9 @@ class CourierReactNativeViewManager : SimpleViewManager<ReactNativeCourierInbox>
   }
 
   @ReactProp(name = "theme")
-  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
+  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
   }
 
   private fun ReadableMap.toTheme(view: View): CourierInboxTheme {

package/package.json

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

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

@@ -1,49 +0,0 @@
-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)
-//      }
-//    }
-//  }
-
-}