@trycourier/courier-react-native 2.0.3 → 2.2.0

package/ios/CourierReactNativeViewManager.swift

@@ -96,56 +96,58 @@ class CourierReactNativeView : UIView {
         let cellStyles = iOS?["cellStyles"] as? [String : Any]
         
         // Unread
-        let unreadIndicatorBarColor = dict["unreadIndicatorBarColor"] as? String
+        let unreadIndicatorStyle = dict["unreadIndicatorStyle"] as? [String : Any]
         
         // Loading
         let loadingIndicatorColor = dict["loadingIndicatorColor"] as? String
         
         // Title
-        let titleFont = dict["titleFont"] as? [String : Any]
+        let titleStyle = dict["titleStyle"] as? [String : Any]
         
         // Time
-        let timeFont = dict["timeFont"] as? [String : Any]
+        let timeStyle = dict["timeStyle"] as? [String : Any]
         
         // Body
-        let bodyFont = dict["bodyFont"] as? [String : Any]
+        let bodyStyle = dict["bodyStyle"] as? [String : Any]
         
-        // Detail
-        let detailTitleFont = dict["detailTitleFont"] as? [String : Any]
+        // Info View
+        let infoViewStyle = dict["infoViewStyle"] as? [String : Any]
         
-        // Detail
-        let buttonStyles = dict["buttonStyles"] as? [String : Any]
+        // Button
+        let buttonStyle = dict["buttonStyle"] as? [String : Any]
         
         return CourierInboxTheme(
             messageAnimationStyle: messageAnimationStyle?.toRowAnimation() ?? .left,
-            unreadIndicatorBarColor: unreadIndicatorBarColor?.toColor(),
             loadingIndicatorColor: loadingIndicatorColor?.toColor(),
-            titleFont: dictionaryToFont(
-                dictionary: titleFont,
-                defaultFont: UIFont.boldSystemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .label
-            ),
-            timeFont: dictionaryToFont(
-                dictionary: timeFont,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .placeholderText
-            ),
-            bodyFont: dictionaryToFont(
-                dictionary: bodyFont,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .label
-            ),
-            detailTitleFont: dictionaryToFont(
-                dictionary: detailTitleFont,
-                defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
-                defaultColor: .label
-            ),
-            buttonStyles: dictionaryToButtonStyles(
-                dictionary: buttonStyles
-            ),
-            cellStyles: dictionaryToCellStyles(
-                dictionary: cellStyles
-            )
+            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()
         )
         
     }
@@ -170,17 +172,22 @@ class CourierReactNativeView : UIView {
         
     }
     
-    func dictionaryToButtonStyles(dictionary: [String : Any]?) -> CourierInboxButtonStyles {
+    func dictionaryToButton(dictionary: [String : Any]?) -> CourierInboxButton {
         
         guard let dict = dictionary else {
-            return CourierInboxButtonStyles()
+            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 CourierInboxButtonStyles(
+        return CourierInboxButton(
             font: dictionaryToFont(
                 dictionary: font,
                 defaultFont: UIFont.systemFont(ofSize: UIFont.labelFontSize),
@@ -192,151 +199,102 @@ class CourierReactNativeView : UIView {
         
     }
     
-    func dictionaryToCellStyles(dictionary: [String : Any]?) -> CourierInboxCellStyles {
+    func dictionaryToButtonStyle(dictionary: [String : Any]?) -> CourierInboxButtonStyle {
         
         guard let dict = dictionary else {
-            return CourierInboxCellStyles()
+            return CourierInboxButtonStyle()
         }
         
-        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)
+        let unread = dict["unread"] as? [String : Any]
+        let read = dict["read"] as? [String : Any]
         
-        return CourierInboxCellStyles(
-            separatorStyle: separatorStyle?.toSeparatorStyle() ?? .singleLine,
-            separatorInsets: separatorInsets,
-            separatorColor: separatorColor?.toColor(),
-            selectionStyle: selectionStyle?.toSelectionStyle() ?? .default
+        return CourierInboxButtonStyle(
+            unread: dictionaryToButton(dictionary: unread),
+            read: dictionaryToButton(dictionary: read)
         )
         
     }
     
-}
-
-internal extension InboxMessage {
-    
-    @objc func toDictionary() -> NSDictionary {
-        
-        let dictionary: [String: Any?] = [
-            "messageId": messageId,
-            "title": title,
-            "body": body,
-            "preview": preview,
-            "created": created,
-            "actions": actions?.map { $0.toDictionary() },
-            "data": data,
-            "read": isRead,
-            "opened": isOpened,
-            "archived": isArchived
-        ]
-
-        let mutableDictionary = NSMutableDictionary()
-        for (key, value) in dictionary {
-            if let unwrappedValue = value {
-                mutableDictionary[key] = unwrappedValue
-            }
-        }
-
-        return mutableDictionary
+    func dictionaryToInfoViewStyle(dictionary: [String : Any]?) -> CourierInboxInfoViewStyle {
         
-    }
-    
-}
-
-internal extension InboxAction {
-    
-    @objc func toDictionary() -> NSDictionary {
+        let defaultColor: UIColor = .label
+        let defaultFont: UIFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         
-        let dictionary: [String: Any?] = [
-            "content": content,
-            "href": href,
-            "data": data
-        ]
-
-        let mutableDictionary = NSMutableDictionary()
-        for (key, value) in dictionary {
-            if let unwrappedValue = value {
-                mutableDictionary[key] = unwrappedValue
-            }
-        }
-
-        return mutableDictionary
+        let defaultInboxFont = CourierInboxFont(
+            font: defaultFont,
+            color: defaultColor
+        )
         
-    }
-    
-}
-
-internal extension String {
-    
-    func toRowAnimation() -> UITableView.RowAnimation {
-        
-        switch self.lowercased() {
-            case "fade": return .fade
-            case "right": return .right
-            case "left": return .left
-            case "top": return .top
-            case "bottom": return .bottom
-            case "none": return .none
-            case "middle": return .middle
-            case "automatic":
-                if #available(iOS 11.0, *) {
-                    return .automatic
-                } else {
-                    return .fade
-                }
-            default: return .fade
+        guard let dict = dictionary else {
+            return CourierInboxInfoViewStyle(
+                font: defaultInboxFont,
+                button: CourierInboxButton(
+                    font: defaultInboxFont
+                )
+            )
         }
         
-    }
-    
-    func toSeparatorStyle() -> UITableViewCell.SeparatorStyle {
+        let font = dict["font"] as? [String : Any]
+        let button = dict["button"] as? [String : Any]
         
-        switch self.lowercased() {
-            case "none": return .none
-            case "singleLine": return .singleLine
-            case "singleLineEtched": return .singleLineEtched
-            default: return .singleLine
-        }
+        return CourierInboxInfoViewStyle(
+            font: dictionaryToFont(dictionary: font, defaultFont: defaultFont, defaultColor: defaultColor), 
+            button: dictionaryToButton(dictionary: button)
+        )
         
     }
     
-    func toSelectionStyle() -> UITableViewCell.SelectionStyle? {
-        
-        switch self.lowercased() {
-            case "none": return .none
-            case "blue": return .blue
-            case "gray": return .gray
-            case "default": return .default
-            default: return .default
+    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 toColor() -> UIColor? {
+    func dictionaryToCellStyles(dictionary: [String : Any]?) -> CourierInboxCellStyle {
         
-        var hexSanitized = trimmingCharacters(in: .whitespacesAndNewlines)
-        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
-
-        var rgb: UInt64 = 0
-
-        Scanner(string: hexSanitized).scanHexInt64(&rgb)
-
-        guard hexSanitized.count == 6 else {
-            return nil
+        guard let dict = dictionary else {
+            return CourierInboxCellStyle()
         }
-
-        return UIColor(
-            red: CGFloat((rgb & 0xFF0000) >> 16) / 255.0,
-            green: CGFloat((rgb & 0x00FF00) >> 8) / 255.0,
-            blue: CGFloat(rgb & 0x0000FF) / 255.0,
-            alpha: 1.0
+        
+        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
         )
         
     }

package/ios/Utils.swift

@@ -0,0 +1,199 @@
+//
+//  Utils.swift
+//  courier-react-native
+//
+//  Created by Michael Miller on 10/23/23.
+//
+
+import Foundation
+import Courier_iOS
+
+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"
+        }
+    }
+
+}
+
+internal extension [String: Any?] {
+    
+    func clean() -> NSMutableDictionary {
+        
+        let mutableDictionary = NSMutableDictionary()
+        for (key, value) in self {
+            if let unwrappedValue = value {
+                mutableDictionary[key] = unwrappedValue
+            }
+        }
+        
+        return mutableDictionary
+        
+    }
+    
+}
+
+internal extension CourierUserPreferences {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "items": items.map { $0.toDictionary() },
+            "paging": paging.toDictionary(),
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension CourierUserPreferencesTopic {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "defaultStatus": defaultStatus.rawValue,
+            "hasCustomRouting": hasCustomRouting,
+            "customRouting": customRouting.map { $0.rawValue },
+            "status": status,
+            "topicId": topicId,
+            "topicName": topicName,
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension CourierUserPreferencesPaging {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "cursor": cursor,
+            "more": more,
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension InboxMessage {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "messageId": messageId,
+            "title": title,
+            "body": body,
+            "preview": preview,
+            "created": created,
+            "actions": actions?.map { $0.toDictionary() },
+            "data": data,
+            "read": isRead,
+            "opened": isOpened,
+            "archived": isArchived
+        ]
+        
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension InboxAction {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "content": content,
+            "href": href,
+            "data": data
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension String {
+    
+    func toRowAnimation() -> UITableView.RowAnimation {
+        
+        switch self.lowercased() {
+            case "fade": return .fade
+            case "right": return .right
+            case "left": return .left
+            case "top": return .top
+            case "bottom": return .bottom
+            case "none": return .none
+            case "middle": return .middle
+            case "automatic":
+                if #available(iOS 11.0, *) {
+                    return .automatic
+                } else {
+                    return .fade
+                }
+            default: return .fade
+        }
+        
+    }
+    
+    func toSeparatorStyle() -> UITableViewCell.SeparatorStyle {
+        
+        switch self.lowercased() {
+            case "none": return .none
+            case "singleLine": return .singleLine
+            case "singleLineEtched": return .singleLineEtched
+            default: return .singleLine
+        }
+        
+    }
+    
+    func toSelectionStyle() -> UITableViewCell.SelectionStyle? {
+        
+        switch self.lowercased() {
+            case "none": return .none
+            case "blue": return .blue
+            case "gray": return .gray
+            case "default": return .default
+            default: return .default
+        }
+        
+    }
+    
+    func toColor() -> UIColor? {
+        
+        var hexSanitized = trimmingCharacters(in: .whitespacesAndNewlines)
+        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
+
+        var rgb: UInt64 = 0
+
+        Scanner(string: hexSanitized).scanHexInt64(&rgb)
+
+        guard hexSanitized.count == 6 else {
+            return nil
+        }
+
+        return UIColor(
+            red: CGFloat((rgb & 0xFF0000) >> 16) / 255.0,
+            green: CGFloat((rgb & 0x00FF00) >> 8) / 255.0,
+            blue: CGFloat(rgb & 0x0000FF) / 255.0,
+            alpha: 1.0
+        )
+        
+    }
+    
+}