@trycourier/courier-react-native 2.5.1 → 3.0.0

package/src/views/CourierInboxView.tsx

@@ -15,7 +15,7 @@ type CourierInboxViewProps = {
   style?: ViewStyle;
 };
 
-const ComponentName = 'CourierReactNativeView';
+const ComponentName = 'CourierInboxView';
 
 const LINKING_ERROR =
   `The package '@trycourier/courier-react-native' doesn't seem to be linked. Make sure: \n\n` +
@@ -44,7 +44,7 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
       onScrollInboxListener?.remove();
     }
 
-  }, [])
+  }, []);
 
   useEffect(() => {
 
@@ -54,17 +54,17 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
       onClickInboxMessageAtIndexListener = DeviceEventEmitter.addListener('courierClickMessageAtIndex', onClickInboxMessageAtIndex);
     }
 
-  }, [props.onClickInboxMessageAtIndex])
+  }, [props.onClickInboxMessageAtIndex]);
 
   const onClickInboxMessageAtIndex = (event: any) => {
 
     // Parse the native event data
     if (props.onClickInboxMessageAtIndex) {
 
-      const index = event["index"]
-      const message = event["message"] as InboxMessage
+      const index = event["index"];
+      const message = event["message"] as InboxMessage;
 
-      props.onClickInboxMessageAtIndex(message, index)
+      props.onClickInboxMessageAtIndex(message, index);
 
     }
 
@@ -85,11 +85,11 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
     // Parse the native event data
     if (props.onClickInboxActionForMessageAtIndex) {
 
-      const index = event["index"]
-      const action = event["action"] as InboxAction
-      const message = event["message"] as InboxMessage
+      const index = event["index"];
+      const action = event["action"] as InboxAction;
+      const message = event["message"] as InboxMessage;
 
-      props.onClickInboxActionForMessageAtIndex(action, message, index)
+      props.onClickInboxActionForMessageAtIndex(action, message, index);
 
     }
 
@@ -110,8 +110,8 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
     // Parse the native event data
     if (props.onScrollInbox) {
 
-      const contentOffset = event["contentOffset"]
-      props.onScrollInbox(contentOffset["y"], contentOffset["x"])
+      const contentOffset = event["contentOffset"];
+      props.onScrollInbox(contentOffset["y"], contentOffset["x"]);
 
     }
 

package/src/views/CourierPreferencesView.tsx

@@ -0,0 +1,53 @@
+import React from "react";
+import { Platform, requireNativeComponent, UIManager, ViewStyle } from "react-native";
+import { CourierPreferencesMode, CourierPreferencesTheme } from "src/models/CourierPreferencesTheme";
+
+type CourierPreferencesProps = {
+  mode?: CourierPreferencesMode,
+  theme?: { 
+    light?: CourierPreferencesTheme, 
+    dark?: CourierPreferencesTheme 
+  };
+  onPreferenceError?: (message: string) => void;
+  style?: ViewStyle;
+};
+
+const ComponentName = 'CourierPreferencesView';
+
+const LINKING_ERROR =
+  `The package '@trycourier/courier-react-native' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
+  '- You rebuilt the app after installing the package\n' +
+  '- You are not using Expo Go\n';
+
+const CourierPreferences =
+  UIManager.getViewManagerConfig(ComponentName) != null
+    ? requireNativeComponent<CourierPreferencesProps>(ComponentName)
+    : () => {
+        throw new Error(LINKING_ERROR);
+      };
+
+export const CourierPreferencesView = (props: CourierPreferencesProps) => {
+
+  const onPreferenceError = (event: any) => {
+
+    // Parse the native event data
+    if (props.onPreferenceError) {
+
+      const message = event["error"];
+      props.onPreferenceError(message);
+
+    }
+
+  }
+
+  return (
+    <CourierPreferences 
+      mode={props.mode}
+      theme={props.theme ?? { light: undefined, dark: undefined }}
+      onPreferenceError={(event: any) => onPreferenceError(event.nativeEvent)}
+      style={props.style}
+    />
+  )
+
+}

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

@@ -1,225 +0,0 @@
-package com.courierreactnative
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.view.View
-import androidx.recyclerview.widget.DividerItemDecoration
-import com.courier.android.inbox.*
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.uimanager.SimpleViewManager
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.annotations.ReactProp
-
-
-class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
-
-  private companion object {
-    const val ON_CLICK_MESSAGE_AT_INDEX = "courierClickMessageAtIndex"
-    const val ON_CLICK_ACTION_AT_INDEX = "courierClickActionAtIndex"
-    const val ON_SCROLL = "courierScrollInbox"
-  }
-
-  override fun getName() = "CourierReactNativeView"
-
-  override fun createViewInstance(reactContext: ThemedReactContext): CourierInbox = CourierInbox(reactContext)
-
-  private val View.reactContext: ThemedReactContext get() = context as ThemedReactContext
-
-  @ReactProp(name = "onClickInboxMessageAtIndex")
-  fun setOnClickInboxMessageAtIndex(view: CourierInbox, callback: Boolean) {
-
-    view.setOnClickMessageListener { message, index ->
-
-      val map = Arguments.createMap()
-      map.putMap("message", message.toWritableMap())
-      map.putInt("index", index)
-
-      view.reactContext.sendEvent(ON_CLICK_MESSAGE_AT_INDEX, map)
-
-    }
-
-  }
-
-  @ReactProp(name = "onClickInboxActionForMessageAtIndex")
-  fun setOnClickInboxActionForMessageAtIndex(view: CourierInbox, callback: Boolean) {
-
-    view.setOnClickActionListener { action, message, index ->
-
-      val map = Arguments.createMap()
-      map.putMap("action", action.toWritableMap())
-      map.putMap("message", message.toWritableMap())
-      map.putInt("index", index)
-
-      view.reactContext.sendEvent(ON_CLICK_ACTION_AT_INDEX, map)
-
-    }
-
-  }
-
-  @ReactProp(name = "onScrollInbox")
-  fun setOnScrollInbox(view: CourierInbox, callback: Boolean) {
-
-    view.setOnScrollInboxListener { offsetInDp ->
-
-      val offset = Arguments.createMap()
-      offset.putInt("y", offsetInDp)
-      offset.putInt("x", 0)
-
-      val map = Arguments.createMap()
-      map.putMap("contentOffset", offset)
-
-      view.reactContext.sendEvent(ON_SCROLL, map)
-
-    }
-
-  }
-
-  @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
-  }
-
-  private fun ReadableMap.toTheme(view: View): CourierInboxTheme {
-
-    val android = getMap("android")
-    val dividerItemDecoration = android?.getString("dividerItemDecoration")
-
-    val unreadIndicatorStyle = getMap("unreadIndicatorStyle")
-    val loadingIndicatorColor = getString("loadingIndicatorColor")
-
-    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(
-      unreadIndicatorStyle = unreadIndicatorStyle?.toUnreadIndicatorStyle() ?: CourierInboxUnreadIndicatorStyle(),
-      loadingIndicatorColor = loadingIndicatorColor?.toColor(),
-      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),
-    )
-
-  }
-
-  private fun String.toColor(): Int = Color.parseColor(this)
-
-  private fun String.toFont(context: Context): Typeface? {
-    return try {
-      val assetManager = context.assets
-      Typeface.createFromAsset(assetManager, this)
-    } catch (e: Exception) {
-      e.printStackTrace()
-      null
-    }
-  }
-
-  private fun String.toDivider(context: Context): DividerItemDecoration? = if (this == "vertical") DividerItemDecoration(context, DividerItemDecoration.VERTICAL) else null
-
-  private fun ReadableMap.toFont(context: Context): CourierInboxFont {
-
-    val typeface = getString("family")
-    val size = if (isNull("size")) null else getDouble("size")
-    val color = getString("color")
-
-    return CourierInboxFont(
-        typeface = typeface?.toFont(context),
-        color = color?.toColor(),
-        sizeInSp = size?.toInt()
-      )
-
-  }
-
-  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 CourierInboxButton(
-      font = font?.toFont(context),
-      backgroundColor = backgroundColor?.toColor(),
-      cornerRadiusInDp = cornerRadius?.toInt()
-    )
-
-  }
-
-  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/ios/CourierReactNativeViewManager.swift

@@ -1,302 +0,0 @@
-import Courier_iOS
-
-@objc(CourierReactNativeViewManager)
-class CourierReactNativeViewManager: RCTViewManager {
-
-    override func view() -> (CourierReactNativeView) {
-        return CourierReactNativeView()
-    }
-
-    @objc override static func requiresMainQueueSetup() -> Bool {
-        return true
-    }
-    
-}
-
-class CourierReactNativeView : UIView {
-    
-    @objc var theme: NSDictionary? = [:] {
-        didSet {
-            refreshInbox()
-        }
-    }
-    
-    @objc var onClickInboxMessageAtIndex: RCTBubblingEventBlock? = nil
-    
-    @objc var onClickInboxActionForMessageAtIndex: RCTBubblingEventBlock? = nil
-    
-    @objc var onScrollInbox: RCTBubblingEventBlock? = nil
-    
-    private func refreshInbox() {
-        
-        // Disable animations
-        UIView.setAnimationsEnabled(false)
-        
-        // Remove all previous views
-        subviews.forEach {
-            $0.removeFromSuperview()
-        }
-        
-        let lightTheme = theme?["light"] as? NSDictionary
-        let darkTheme = theme?["dark"] as? NSDictionary
-        
-        // Create the view
-        let courierInbox = CourierInbox(
-            lightTheme: dictionaryToTheme(dictionary: lightTheme) ?? .defaultLight,
-            darkTheme: dictionaryToTheme(dictionary: darkTheme) ?? .defaultDark,
-            didClickInboxMessageAtIndex: { [weak self] message, index in
-                self?.onClickInboxMessageAtIndex?([
-                    "message" : message.toDictionary(),
-                    "index" : index
-                ])
-            },
-            didClickInboxActionForMessageAtIndex: { [weak self] action, message, index in
-                self?.onClickInboxActionForMessageAtIndex?([
-                    "action" : action.toDictionary(),
-                    "message" : message.toDictionary(),
-                    "index" : index
-                ])
-            },
-            didScrollInbox: { [weak self] scrollView in
-                self?.onScrollInbox?([
-                    "contentOffset" : [
-                        "y": scrollView.contentOffset.y,
-                        "x": scrollView.contentOffset.x
-                    ]
-                ])
-            }
-        )
-
-        // Add the view to your UI
-        courierInbox.translatesAutoresizingMaskIntoConstraints = false
-        addSubview(courierInbox)
-
-        // Constrain the view how you'd like
-        NSLayoutConstraint.activate([
-            courierInbox.topAnchor.constraint(equalTo: topAnchor),
-            courierInbox.bottomAnchor.constraint(equalTo: bottomAnchor),
-            courierInbox.leadingAnchor.constraint(equalTo: leadingAnchor),
-            courierInbox.trailingAnchor.constraint(equalTo: trailingAnchor),
-        ])
-        
-        // Enable animations
-        UIView.setAnimationsEnabled(true)
-        
-    }
-    
-    func dictionaryToTheme(dictionary: NSDictionary?) -> CourierInboxTheme? {
-        
-        guard let dict = dictionary else {
-            return nil
-        }
-        
-        // iOS Theme
-        let iOS = dict["iOS"] as? [String : Any]
-        let messageAnimationStyle = iOS?["messageAnimationStyle"] as? String
-        let cellStyles = iOS?["cellStyles"] as? [String : Any]
-        
-        // Unread
-        let unreadIndicatorStyle = dict["unreadIndicatorStyle"] as? [String : Any]
-        
-        // Loading
-        let loadingIndicatorColor = dict["loadingIndicatorColor"] as? String
-        
-        // Title
-        let titleStyle = dict["titleStyle"] as? [String : Any]
-        
-        // Time
-        let timeStyle = dict["timeStyle"] as? [String : Any]
-        
-        // Body
-        let bodyStyle = dict["bodyStyle"] as? [String : Any]
-        
-        // Info View
-        let infoViewStyle = dict["infoViewStyle"] as? [String : Any]
-        
-        // Button
-        let buttonStyle = dict["buttonStyle"] as? [String : Any]
-        
-        return CourierInboxTheme(
-            messageAnimationStyle: messageAnimationStyle?.toRowAnimation() ?? .left,
-            loadingIndicatorColor: loadingIndicatorColor?.toColor(),
-            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()
-        )
-        
-    }
-    
-    func dictionaryToFont(dictionary: [String : Any]?, defaultFont: UIFont, defaultColor: UIColor) -> CourierInboxFont {
-        
-        guard let dict = dictionary else {
-            return CourierInboxFont(
-                font: defaultFont,
-                color: defaultColor
-            )
-        }
-        
-        let family = dict["family"] as? String ?? defaultFont.familyName
-        let size = dict["size"] as? CGFloat ?? defaultFont.pointSize
-        let color = dict["color"] as? String
-        
-        return CourierInboxFont(
-            font: UIFont(name: family, size: size) ?? defaultFont,
-            color: color?.toColor() ?? defaultColor
-        )
-        
-    }
-    
-    func dictionaryToButton(dictionary: [String : Any]?) -> CourierInboxButton {
-        
-        guard let dict = dictionary else {
-            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 CourierInboxButton(
-            font: dictionaryToFont(
-                dictionary: font,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .white
-            ),
-            backgroundColor: backgroundColor?.toColor(),
-            cornerRadius: cornerRadius ?? 8
-        )
-        
-    }
-    
-    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 CourierInboxCellStyle()
-        }
-        
-        let separatorStyle = dict["separatorStyle"] as? String
-        let separatorColor = dict["separatorColor"] as? String
-        let selectionStyle = dict["selectionStyle"] as? String
-        
-        let insets = dict["separatorInsets"] as? [String : Any]
-        let top = insets?["top"] as? CGFloat
-        let left = insets?["left"] as? CGFloat
-        let right = insets?["right"] as? CGFloat
-        let bottom = insets?["bottom"] as? CGFloat
-        let separatorInsets = UIEdgeInsets(top: top ?? 0, left: left ?? 0, bottom: bottom ?? 0, right: right ?? 0)
-        
-        return CourierInboxCellStyle(
-            separatorStyle: separatorStyle?.toSeparatorStyle() ?? .singleLine,
-            separatorInsets: separatorInsets,
-            separatorColor: separatorColor?.toColor(),
-            selectionStyle: selectionStyle?.toSelectionStyle() ?? .default
-        )
-        
-    }
-    
-}