react-native-firework-sdk 1.7.1 → 1.9.0-beta.3

package/ios/Modules/Shopping/ShoppingModule.swift

@@ -21,6 +21,7 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
     private var cartIconVisible = true
     private var itemCounts = 0
     private var customClickCartIconEnabled = false
+    private var productInfoViewConfiguration: ProductInfoViewConfiguration?
 
     override func supportedEvents() -> [String]! {
         ShoppingEventName.allCases.map { $0.rawValue }
@@ -30,6 +31,10 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         return true
     }
 
+    override var methodQueue: DispatchQueue {
+        return DispatchQueue.main
+    }
+
     private static func generateCallbackId() -> Int {
         struct CBIdIncreasingFactor {
             static var callbackId = 0
@@ -41,15 +46,18 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
 
     @objc
     func initialize() {
-        DispatchQueue.main.async {
-            FireworkVideoSDK.shopping.shoppingDelegate = self
-            FireworkVideoSDK.shopping.cartViewControllerProvider = self
-        }
+        FireworkVideoSDK.shopping.shoppingDelegate = self
+        FireworkVideoSDK.shopping.cartViewControllerProvider = self
     }
 
     @objc
     func setCartIconVisible(_ visible: Bool) {
         cartIconVisible = visible
+        guard let rProductInfoViewConfigurator = productInfoViewConfigurator else {
+            return
+        }
+
+        rProductInfoViewConfigurator.1.shoppingCartIconConfiguration.isHidden = !visible
     }
 
     @objc
@@ -59,13 +67,8 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         guard let rProductInfoViewConfigurator = productInfoViewConfigurator else {
             return
         }
-        DispatchQueue.main.async {
-            var shoppingCartIconConfiguration = rProductInfoViewConfigurator.1
-                .shoppingCartIconConfiguration
-            shoppingCartIconConfiguration.indicator.isHidden = itemCounts == 0
-            rProductInfoViewConfigurator.1.shoppingCartIconConfiguration =
-                shoppingCartIconConfiguration
-        }
+
+        rProductInfoViewConfigurator.1.shoppingCartIconConfiguration.indicator.isHidden = itemCounts == 0
     }
 
     @objc
@@ -119,33 +122,11 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
                 ])
         #endif
 
-        DispatchQueue.main.async {
-            for product in rProducts {
-                productHydrating.hydrateProduct(
-                    product.productId, { build in
-                        return ShoppingModule.hydrateProduct(product, build)
-                    })
-            }
-        }
-    }
-
-    @objc
-    func updateProductViewConfig(_ config: [String: Any]?, cbId: NSNumber) {
-        let config = RCTConvert.buildProductInfoViewConfiguration(config)
-        guard let rConfig = config, let rProductInfoViewConfigurator = productInfoViewConfigurator,
-            rProductInfoViewConfigurator.0 == Int(truncating: cbId)
-        else {
-            return
-        }
-
-        DispatchQueue.main.async {
-            // The configuration of CartIcon'visible determined by global cartIconVisible
-            rProductInfoViewConfigurator.1.shoppingCartIconConfiguration.isHidden = !self
-                .cartIconVisible
-            // The configuration of CartIcon'indicator'visible determined by global itemCounts
-            rProductInfoViewConfigurator.1.shoppingCartIconConfiguration.indicator.isHidden =
-                self.itemCounts == 0
-            ShoppingModule.hydrateProductViewConfig(rConfig, rProductInfoViewConfigurator.1)
+        for product in rProducts {
+            productHydrating.hydrateProduct(
+                product.productId, { build in
+                    return ShoppingModule.hydrateProduct(product, build)
+                })
         }
     }
 
@@ -157,27 +138,23 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
 
         addToCartHandlerMap.removeValue(forKey: Int(truncating: cbId))
 
-        DispatchQueue.main.async {
-            if res == "success" {
-                handler(.feedbackOnly(.success(message: tips ?? "success")))
-            } else {
-                handler(.feedbackOnly(.failure(message: tips ?? "failure")))
-            }
+        if res == "success" {
+            handler(.feedbackOnly(.success(message: tips ?? "success")))
+        } else {
+            handler(.feedbackOnly(.failure(message: tips ?? "failure")))
         }
     }
 
     @objc
     func jumpToCartPage(_ cbId: NSNumber, props: NSDictionary) {
-        DispatchQueue.main.async {
-            let properties: [String: Any] = (props as? [String: Any]) ?? [:]
-            let noti = Notification(
-                name: Notification.Name(rawValue: "showCustomCartView"), object: nil,
-                userInfo: [
-                    "cbId": Int(truncating: cbId),
-                    "properties": properties
-                ])
-            NotificationCenter.default.post(noti)
-        }
+        let properties: [String: Any] = (props as? [String: Any]) ?? [:]
+        let noti = Notification(
+            name: Notification.Name(rawValue: "showCustomCartView"), object: nil,
+            userInfo: [
+                "cbId": Int(truncating: cbId),
+                "properties": properties
+            ])
+        NotificationCenter.default.post(noti)
     }
 
     @objc
@@ -189,6 +166,22 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         resolver([:])
     }
 
+    @objc
+    func setProductInfoViewConfiguration(_ config: [String: Any]?) {
+        let config = RCTConvert.buildProductInfoViewConfiguration(config)
+        guard let rConfig = config else {
+            return
+        }
+
+        productInfoViewConfiguration = rConfig
+
+        guard let rProductInfoViewConfigurator = productInfoViewConfigurator else {
+            return
+        }
+
+        ShoppingModule.hydrateProductViewConfig(rConfig, rProductInfoViewConfigurator.1)
+    }
+
     @objc
     func clearCallbackId(_ cbId: NSNumber, eventName: String) {
         if eventName == ShoppingEventName.updateProductDetails.rawValue {
@@ -207,6 +200,11 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         let callbackId = ShoppingModule.generateCallbackId()
         self.productInfoViewConfigurator = (callbackId, productInfoViewConfigurator)
         productInfoViewConfigurator.shoppingCartIconConfiguration.isHidden = !self.cartIconVisible
+        productInfoViewConfigurator.shoppingCartIconConfiguration.indicator.isHidden = itemCounts == 0
+
+        if let productInfoViewConfiguration = productInfoViewConfiguration {
+            ShoppingModule.hydrateProductViewConfig(productInfoViewConfiguration, productInfoViewConfigurator)
+        }
 
         #if DEBUG
             let formatter = DateFormatter()
@@ -290,21 +288,32 @@ extension ShoppingModule {
         _ config: ProductInfoViewConfiguration,
         _ productInfoViewConfigurator: ProductInfoViewConfigurable
     ) {
-        if let buttonConfiguration = config.addToCartButton {
-            var config = productInfoViewConfigurator.productDetailsConfiguration
-            if let backgroundColor = buttonConfiguration.backgroundColor,
+        var productDetailsConfiguration = productInfoViewConfigurator.productDetailsConfiguration
+
+        if let addToCartButtonConfiguration = config.addToCartButton {
+            if let backgroundColor = addToCartButtonConfiguration.backgroundColor,
                 backgroundColor.count > 0 {
-                config.addToCartButton.backgroundColor = backgroundColor.uicolor()
+                productDetailsConfiguration.addToCartButton.backgroundColor = backgroundColor.uicolor()
             }
-            if let textColor = buttonConfiguration.textColor,
+
+            if let textColor = addToCartButtonConfiguration.textColor,
                 textColor.count > 0 {
-                config.addToCartButton.textColor = textColor.uicolor()
+                productDetailsConfiguration.addToCartButton.textColor = textColor.uicolor()
             }
-            if let fontSize = buttonConfiguration.fontSize {
-                config.addToCartButton.font = UIFont.systemFont(ofSize: fontSize)
+
+            if let fontSize = addToCartButtonConfiguration.fontSize {
+                let iOSFontInfo = addToCartButtonConfiguration.iOSFontInfo ?? FontInfo()
+                productDetailsConfiguration.addToCartButton.font = iOSFontInfo.getFont(fontSize)
             }
-            productInfoViewConfigurator.productDetailsConfiguration = config
         }
+
+        if let linkButtonConfiguration = config.linkButton {
+            if let isHidden = linkButtonConfiguration.isHidden {
+                productDetailsConfiguration.linkButtonConfiguration.isHidden = isHidden
+            }
+        }
+
+        productInfoViewConfigurator.productDetailsConfiguration = productDetailsConfiguration
     }
 
 }

package/ios/Utils/AppLanguage/Bundle+FWSwizzle.swift

@@ -0,0 +1,58 @@
+//
+//  Bundle+FWSwizzle.swift
+//  
+//  Created by linjie jiang on 2023/2/7.
+//
+
+import Foundation
+import FireworkVideo
+
+public extension Bundle {
+    static func swizzleMethodsForBundle() {
+        FWSwizzleUtil.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(Bundle.localizedString(forKey:value:table:)),
+            customSelector: #selector(Bundle.fw_localizedString(forKey:value:table:)))
+    }
+
+    @objc func fw_localizedString(
+        forKey key: String,
+        value: String?,
+        table tableName: String?
+    ) -> String {
+        if let language = FWAppLanguageManager.shared.appLanguage,
+           let languageCode = FWAppLanguageManager.shared.appLanguageCode,
+           Bundle(for: FireworkVideoSDK.self) == self {
+            let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
+
+            var languageBundlePath: String?
+            let defaultLanguageBundlePath = iOSSDKBundle.path(forResource: "Base", ofType: "lproj")
+            if languageCode == "en" {
+                languageBundlePath = defaultLanguageBundlePath
+            } else if let path = iOSSDKBundle.path(forResource: language, ofType: "lproj") {
+                languageBundlePath = path
+            } else if let path = iOSSDKBundle.path(forResource: languageCode, ofType: "lproj") {
+                languageBundlePath = path
+            } else {
+                let targeLanguageList = iOSSDKBundle.localizations.filter { item in
+                    return item != "Base" && item != "en"
+                }
+                if let targeLanguage = targeLanguageList.first(where: { item in
+                    let targeLanguageCode = FWLanguageUtil.getLanguageCode(item)
+                    return languageCode == targeLanguageCode
+                }) {
+                    languageBundlePath = iOSSDKBundle.path(forResource: targeLanguage, ofType: "lproj")
+                }
+            }
+
+            if let resultLanguageBundlePath = languageBundlePath ?? defaultLanguageBundlePath,
+               let resultLanguageBundle = Bundle(path: resultLanguageBundlePath) {
+                return resultLanguageBundle.fw_localizedString(forKey: key, value: value, table: tableName)
+            } else {
+                return self.fw_localizedString(forKey: key, value: value, table: tableName)
+            }
+        } else {
+            return self.fw_localizedString(forKey: key, value: value, table: tableName)
+        }
+    }
+}

package/ios/Utils/AppLanguage/FWAppLanguageManager.swift

@@ -0,0 +1,118 @@
+//
+//  FWAppLanguageManager.swift
+//  
+//  Created by linjie jiang on 2023/2/7.
+//
+
+import Foundation
+
+private let appLanguageStorageKey = "firework_sdk_app_language_storage_key"
+
+public enum AppLanguageLayoutDirection: Int {
+    case ltr, rtl, unsupported
+}
+
+public class FWAppLanguageManager {
+    public static let shared = FWAppLanguageManager()
+
+    private var _systemLanguage: String?
+    private var _systemLanguageCode: String? {
+        guard let language = _systemLanguage else {
+            return nil
+        }
+
+        return FWLanguageUtil.getLanguageCode(language)
+    }
+
+    public var appLanguage: String? {
+        didSet {
+            if appLanguage != nil {
+                FWAppLanguageManager.swizzelMethods()
+            }
+        }
+    }
+
+    public var appLanguageCode: String? {
+        guard let language = appLanguage else {
+            return nil
+        }
+
+        return FWLanguageUtil.getLanguageCode(language)
+    }
+
+    public var appLanguageLayoutDirection: AppLanguageLayoutDirection? {
+        guard let languageCode = appLanguageCode else {
+            return nil
+        }
+        let direction = Locale.characterDirection(forLanguage: languageCode)
+        switch direction {
+        case .leftToRight:
+            return .ltr
+        case .rightToLeft:
+            return .rtl
+        default:
+            return .unsupported
+        }
+    }
+
+    public var shouldHorizontalFlip: Bool {
+        guard let appLanguageCode = appLanguageCode else {
+            return false
+        }
+
+        guard let systemLanguageCode = _systemLanguageCode else {
+            return false
+        }
+
+        let appLanguageDirection = Locale.characterDirection(forLanguage: appLanguageCode)
+        let systemLanguageDirection = Locale.characterDirection(forLanguage: systemLanguageCode)
+
+        if appLanguageDirection == .leftToRight, systemLanguageDirection == .rightToLeft {
+            return true
+        }
+
+        if appLanguageDirection == .rightToLeft, systemLanguageDirection == .leftToRight {
+            return true
+        }
+
+        return false
+    }
+
+    private static func swizzelMethods() {
+        DispatchQueue.once {
+            UIViewController.swizzleMethodsForViewController()
+            Bundle.swizzleMethodsForBundle()
+            URLSession.swizzleMethodsForURLSession()
+            NumberFormatter.swizzleMethodsForNumberFormatter()
+            UIImageView.swizzleMethodsForImageView()
+            UILabel.swizzleMethodsForLabel()
+            UITextField.swizzleMethodsForTextField()
+            UITextView.swizzleMethodsForTextView()
+            UIWindow.swizzleMethodsForWindow()
+            UIView.swizzleMethodsForView()
+        }
+    }
+
+    private init() {
+        self._systemLanguage = Locale.preferredLanguages.first
+        self.appLanguage = UserDefaults.standard.object(forKey: appLanguageStorageKey) as? String
+        #if DEBUG
+        print("""
+        FWAppLanguageManager init method
+        current app language: \(self.appLanguage ?? "")
+        system language: \(self._systemLanguage ?? "")
+        """)
+        #endif
+    }
+
+    public func changeAppLanguage(_ language: String) -> Bool {
+        if FWLanguageUtil.isValidLanguage(language) {
+            appLanguage = language
+            UserDefaults.standard.set(language, forKey: appLanguageStorageKey)
+            UserDefaults.standard.synchronize()
+            return true
+        } else {
+            return false
+        }
+    }
+}

package/ios/Utils/AppLanguage/FWLanguageUtil.swift

@@ -0,0 +1,39 @@
+//
+//  FWLanguageUtil.swift
+//  
+//  Created by linjie jiang on 2023/2/9.
+//
+
+import Foundation
+
+public class FWLanguageUtil {
+    public static func getLanguageCode(_ language: String) -> String? {
+        guard language.count > 0 else {
+            return nil
+        }
+
+        var languageCode = ""
+        #if compiler(>=5.7)
+        if #available(iOS 16, *) {
+            languageCode = Locale(identifier: language).language.languageCode?.identifier ?? ""
+        } else {
+            languageCode = Locale(identifier: language).languageCode ?? ""
+        }
+        #else
+        languageCode = Locale(identifier: language).languageCode ?? ""
+        #endif
+        return languageCode.lowercased()
+    }
+
+    public static func isValidLanguage(_ language: String) -> Bool {
+        guard language.count > 0 else {
+            return false
+        }
+
+        let languageWithUnderline = language.replacingOccurrences(of: "-", with: "_")
+
+        let availableIdentifiers = Locale.availableIdentifiers
+
+        return availableIdentifiers.contains(language) || availableIdentifiers.contains(languageWithUnderline)
+    }
+}

package/ios/Utils/AppLanguage/NumberFormatter+FWSwizzle.swift

@@ -0,0 +1,25 @@
+//
+//  NumberFormatter+FWSwizzle.swift
+//  
+//  Created by linjie jiang on 2023/2/20.
+//
+
+import Foundation
+
+public extension NumberFormatter {
+    static func swizzleMethodsForNumberFormatter() {
+        FWSwizzleUtil.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(NumberFormatter.string(from:)),
+            customSelector: #selector(NumberFormatter.fw_string(from:)))
+    }
+
+    @objc func fw_string(from number: NSNumber) -> String? {
+        if let language = FWAppLanguageManager.shared.appLanguage,
+           self.numberStyle == .currency {
+            self.locale = Locale(identifier: language)
+        }
+
+        return fw_string(from: number)
+    }
+}

package/ios/Utils/AppLanguage/UIImageView+FWSwizzle.swift

@@ -0,0 +1,91 @@
+//
+//  UIImageView+FWSwizzle.swift
+//
+//  Created by linjie jiang on 2023/2/22.
+//
+
+import UIKit
+import FireworkVideo
+
+private let FWImageNamesWithDirections: [String] = [
+    "shopping-cart",
+    "left-arrow",
+    "right-arrow",
+    "speaker-unmute",
+    "speaker-mute"
+]
+
+extension UIImageView {
+    static func swizzleMethodsForImageView() {
+        FWSwizzleUtil.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(UIImageView.didMoveToWindow),
+            customSelector: #selector(UIImageView.fw_imageViewDidMoveToWindow))
+        FWSwizzleUtil.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(setter: UIImageView.image),
+            customSelector: #selector(UIImageView.fw_setImage(_:))
+        )
+        FWSwizzleUtil.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(UIImageView.awakeFromNib),
+            customSelector: #selector(UIImageView.fw_imageViewAwakeFromNib)
+        )
+    }
+
+    @objc func fw_imageViewDidMoveToWindow() {
+        fw_imageViewDidMoveToWindow()
+        updateViewType(self.image)
+    }
+
+    @objc func fw_setImage(_ image: UIImage?) {
+        fw_setImage(image)
+        updateViewType(image)
+    }
+    
+    @objc func fw_imageViewAwakeFromNib() {
+        self.fw_imageViewAwakeFromNib()
+        updateViewType(self.image)
+    }
+
+    private func updateViewType(_ image: UIImage?) {
+        self.fwrtl_viewType = shouldFlipImage(image) ? FWRTLViewTypeFlip : FWRTLViewTypeAuto
+    }
+
+    private func shouldFlipImage(_ image: UIImage?) -> Bool {
+        guard let image = image else {
+            return false
+        }
+
+        if FWAppLanguageManager.shared.shouldHorizontalFlip, self.isIOSSDKView {
+            let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
+
+            for imageName in FWImageNamesWithDirections {
+                let targetImage = UIImage(named: imageName, in: iOSSDKBundle, compatibleWith: nil)
+                if image.isEqual(targetImage) {
+                    return true
+                }
+                
+                if let cgImage = image.cgImage,
+                   let targetCgImage = targetImage?.cgImage,
+                   cgImage == targetCgImage {
+                    return true
+                }
+                
+                if let ciImage = image.ciImage,
+                   let targetCiImage = targetImage?.ciImage,
+                   ciImage == targetCiImage {
+                    return true
+                }
+            }
+        }
+
+        if FWAppLanguageManager.shared.shouldHorizontalFlip,
+           image.flipsForRightToLeftLayoutDirection == true,
+           self.isIOSSDKView {
+            return true
+        }
+
+        return false
+    }
+}

package/ios/Utils/AppLanguage/UILabel+FWSwizzle.swift

@@ -0,0 +1,98 @@
+//
+//  UILabel+FWSwizzle.swift
+//
+//  Created by linjie jiang on 2023/2/22.
+//
+
+import UIKit
+
+extension UILabel {
+    private struct AssociatedKeys {
+        static var fwHasCalculatedTextAlignment = "fwHasCalculatedTextAlignmentKey"
+    }
+
+    private var fwHasCalculatedTextAlignment: Bool {
+        get {
+            let result = objc_getAssociatedObject(self, &AssociatedKeys.fwHasCalculatedTextAlignment) as? Bool
+            return result ?? false
+        }
+
+        set {
+            objc_setAssociatedObject(
+                self,
+                &AssociatedKeys.fwHasCalculatedTextAlignment,
+                newValue,
+                .OBJC_ASSOCIATION_RETAIN_NONATOMIC
+            )
+        }
+    }
+
+    static func swizzleMethodsForLabel() {
+        FWSwizzleUtil.swizzleSelector(cls: self,
+                                    originalSelector: #selector(setter: UILabel.textAlignment),
+                                    customSelector: #selector(UILabel.fw_setLabelTextAlignment(_:)))
+        FWSwizzleUtil.swizzleSelector(cls: self,
+                                    originalSelector: #selector(UILabel.didMoveToWindow),
+                                    customSelector: #selector(UILabel.fw_labelDidMoveToWindow))
+        FWSwizzleUtil.swizzleSelector(cls: self,
+                                      originalSelector: #selector(UILabel.removeFromSuperview),
+                                    customSelector: #selector(UILabel.fw_labelRemoveFromSuperview))
+    }
+
+    @objc func fw_setLabelTextAlignment(_ textAlignment: NSTextAlignment) {
+        self.fwrtl_addReloadBlock(forKey: "alignment") { [weak self] in
+            guard let self = self else {
+                return
+            }
+
+            self.fw_setLabelTextAlignment(self.calculatedTextAlignment(textAlignment))
+        }
+    }
+
+    @objc func fw_labelDidMoveToWindow() {
+        fw_labelDidMoveToWindow()
+        if shouldCalculateTextAlignment(),
+           !self.fwHasCalculatedTextAlignment,
+           self.isIOSSDKView {
+            self.textAlignment = self.textAlignment
+        }
+    }
+
+    @objc func fw_labelRemoveFromSuperview() {
+        fw_labelRemoveFromSuperview()
+        self.fwHasCalculatedTextAlignment = false
+    }
+
+    private func calculatedTextAlignment(_ textAlignment: NSTextAlignment) -> NSTextAlignment {
+        if shouldCalculateTextAlignment(),
+           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection {
+            self.fwHasCalculatedTextAlignment = true
+            if layoutDirection == .rtl {
+                if textAlignment == .center {
+                    return textAlignment
+                } else if textAlignment == .right {
+                    return .left
+                } else {
+                    return .right
+                }
+            } else if layoutDirection == .ltr {
+                return .left
+            }
+        } else {
+            return textAlignment
+        }
+        return textAlignment
+    }
+
+    private func shouldCalculateTextAlignment() -> Bool {
+        if FWAppLanguageManager.shared.shouldHorizontalFlip,
+           self.isIOSSDKView,
+           let layoutDirection = FWAppLanguageManager.shared.appLanguageLayoutDirection,
+           layoutDirection != .unsupported,
+           fwrtl_shouldUseCalculatedTextAlignment() {
+            return true
+        }
+
+        return false
+    }
+}