react-native-firework-sdk 1.4.2 → 1.5.0

package/ios/Models/NativeToRN/FireworkSDK+Json.swift

@@ -5,8 +5,8 @@
 //  Created by Jeff on 2021/12/21.
 //
 
-import Foundation
 import FireworkVideo
+import Foundation
 
 extension FireworkVideoSDKError {
     var jsErrorName: String {
@@ -25,13 +25,17 @@ extension FireworkVideoSDKError {
 
 extension VideoPlaybackDetails {
     var jsObject: [String: Any?] {
-        [ "videoId": videoID,
-         "duration": duration,
-         "caption": caption,
-         "badge": badge,
-         "playerSize": ["width": playerSize.width,
-                         "height": playerSize.height],
-         "hasCTA": hasCTA]
+        [
+            "videoId": videoID,
+            "duration": duration,
+            "caption": caption,
+            "badge": badge,
+            "playerSize": [
+                "width": playerSize.width,
+                "height": playerSize.height
+            ],
+            "hasCTA": hasCTA
+        ]
     }
 }
 
@@ -40,9 +44,15 @@ extension VideoFeedError {
         var error: [String: String] = [:]
         switch self {
         case .contentSourceError(let sourceError):
-            error = ["name": "contentSourceError", "reason": sourceError.failureReason ?? "Content source error"]
+            error = [
+                "name": "contentSourceError",
+                "reason": sourceError.failureReason ?? "Content source error"
+            ]
         case .videoShareError(let shareError):
-            error = ["name": "videoShareError", "reason": shareError.failureReason ?? "Video share error"]
+            error = [
+                "name": "videoShareError",
+                "reason": shareError.failureReason ?? "Video share error"
+            ]
         case .unknownError(let unknownError):
             error = ["name": "unknownError", "reason": unknownError.localizedDescription]
         default:
@@ -58,27 +68,27 @@ extension FeedEventDetails {
         var result: [String: Any] = [
             "index": index,
             "id": id,
-            "duration": duration,
+            "duration": duration
         ]
         if let title = caption {
             result["title"] = title
         }
 
         var sourceStr: String = ""
-        switch(source) {
+        switch source {
         case .discover:
             sourceStr = "discover"
-        case .channel(channelID: let channelID):
+        case .channel(let channelID):
             sourceStr = "channel"
             result["channel"] = channelID
-        case .channelPlaylist(channelID: let channelID, playlistID: let playlistID):
+        case .channelPlaylist(let channelID, let playlistID):
             sourceStr = "playlist"
             result["channel"] = channelID
             result["playlist"] = playlistID
         case .playlistGroup(groupID: let playlistGroupID):
             sourceStr = "playlistGroup"
             result["playlistGroup"] = playlistGroupID
-        case .dynamicContent(channelID: let channelID, parameters: let parameters):
+        case .dynamicContent(let channelID, let parameters):
             sourceStr = "dynamicContent"
             result["channel"] = channelID
             result["dynamicContentParameters"] = parameters
@@ -86,7 +96,7 @@ extension FeedEventDetails {
             break
         }
 
-        result["source"] = sourceStr;
+        result["source"] = sourceStr
 
         return result
     }
@@ -100,9 +110,11 @@ extension LiveStreamEventDetails {
 
 extension LiveStreamMessageDetails {
     var jsObject: [String: Any] {
-        return ["messageId": messageID,
-                "username": username,
-                "text": text]
+        return [
+            "messageId": messageID,
+            "username": username,
+            "text": text
+        ]
     }
 }
 
@@ -111,9 +123,15 @@ extension StoryBlockError {
         var error: [String: String] = [:]
         switch self {
         case .contentSourceError(let sourceError):
-            error = ["name": "contentSourceError", "reason": sourceError.failureReason ?? "Content source error"]
+            error = [
+                "name": "contentSourceError",
+                "reason": sourceError.failureReason ?? "Content source error"
+            ]
         case .videoShareError(let shareError):
-            error = ["name": "videoShareError", "reason": shareError.failureReason ?? "Video share error"]
+            error = [
+                "name": "videoShareError",
+                "reason": shareError.failureReason ?? "Video share error"
+            ]
         case .unknownError(underlyingError: let unknownError):
             error = ["name": "unknownError", "reason": unknownError.localizedDescription]
         default:

package/ios/Models/RNToNative/RCTConvert+FireworkSDKModule.swift

@@ -5,18 +5,19 @@
 //  Created by Jeff on 2021/12/20.
 //
 
+import FireworkVideo
 import Foundation
 import UIKit
-import FireworkVideo
 
 extension RCTConvert {
-    static func videoPlayerContentConfiguration(_ config: [String: AnyObject]) -> VideoPlayerContentConfiguration {
+    static func videoPlayerContentConfiguration(_ config: [String: AnyObject])
+        -> VideoPlayerContentConfiguration {
         var finalConfig = VideoPlayerContentConfiguration()
-        
+
         if let style = videoPlayerStyle(config["playerStyle"] as? String) {
             finalConfig.playerStyle = style
         }
-        
+
         if let action = videoCompleteAction(config["videoCompleteAction"] as? String) {
             finalConfig.videoCompleteAction = action
         }
@@ -38,18 +39,20 @@ extension RCTConvert {
         }
 
         if let launchBehaviorString = config["launchBehavior"] as? String,
-           let launchBehavior = VideoPlayerConfiguration.VideoLaunchBehavior(rawValue: launchBehaviorString) {
+            let launchBehavior = VideoPlayerConfiguration.VideoLaunchBehavior(
+                rawValue: launchBehaviorString) {
             finalConfig.onFirstLaunch = launchBehavior.behavior()
         }
 
         if let showBranding = config["showBranding"] as? Bool {
             finalConfig.videoDetail.fireworkAttribution.isHidden = !showBranding
         }
-        
+
         return finalConfig
     }
-    
-    static func videoPlayerStyle(_ style: String?) -> VideoPlayerContentConfiguration.VideoPlayerStyle? {
+
+    static func videoPlayerStyle(_ style: String?) -> VideoPlayerContentConfiguration
+        .VideoPlayerStyle? {
         guard let rStyle = style else {
             return nil
         }
@@ -59,8 +62,9 @@ extension RCTConvert {
             return .fullBleed
         }
     }
-    
-    static func videoCompleteAction(_ action: String?) -> VideoPlayerContentConfiguration.VideoCompleteAction? {
+
+    static func videoCompleteAction(_ action: String?) -> VideoPlayerContentConfiguration
+        .VideoCompleteAction? {
         guard let action = action else {
             return nil
         }
@@ -70,7 +74,7 @@ extension RCTConvert {
             return .advanceToNext
         }
     }
-    
+
     static func ctaButtonStyle(_ style: [String: AnyObject]?) -> ButtonContentConfiguration? {
         guard let rStyle = style else {
             return nil
@@ -85,27 +89,49 @@ extension RCTConvert {
         if let fontSize = rStyle["fontSize"] as? Double {
             btnContentConfig.font = UIFont.systemFont(ofSize: fontSize)
         }
-        
+
         return btnContentConfig
     }
-    
+
     static func adBadgeConfiguration(_ config: [String: AnyObject]?) -> AdBadgeConfiguration? {
         guard let rConfig = config else {
             return nil
         }
-        
+
         let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
         guard let rJsonData = jsonData else {
             return nil
         }
-        
+
         var result: AdBadgeConfiguration?
         do {
             result = try JSONDecoder().decode(AdBadgeConfiguration.self, from: rJsonData)
         } catch let error {
             print(error.localizedDescription)
         }
-        
+
+        return result
+    }
+
+    static func trackPurchaseParameters(_ parameters: [String: AnyObject]?)
+        -> TrackPurchaseParameters? {
+        guard let rParameters = parameters else {
+            return nil
+        }
+
+        let jsonData = try? JSONSerialization.data(
+            withJSONObject: rParameters, options: .prettyPrinted)
+        guard let rJsonData = jsonData else {
+            return nil
+        }
+
+        var result: TrackPurchaseParameters?
+        do {
+            result = try JSONDecoder().decode(TrackPurchaseParameters.self, from: rJsonData)
+        } catch let error {
+            print(error.localizedDescription)
+        }
+
         return result
     }
 }

package/ios/Models/RNToNative/RCTConvert+Shopping.swift

@@ -12,27 +12,28 @@ extension RCTConvert {
         guard let rRawProducts = rawProducts else {
             return nil
         }
-        
+
         var products = [Product]()
         for rawProduct in rRawProducts {
-            let product = buildProduct(rawProduct as? [String : Any])
+            let product = buildProduct(rawProduct as? [String: Any])
             if let rProduct = product {
                 products.append(rProduct)
             }
         }
         return products
     }
-    
+
     static func buildProduct(_ product: [String: Any]?) -> Product? {
         guard let rProduct = product else {
             return nil
         }
-        
-        let jsonData = try? JSONSerialization.data(withJSONObject: rProduct, options: .prettyPrinted)
+
+        let jsonData = try? JSONSerialization.data(
+            withJSONObject: rProduct, options: .prettyPrinted)
         guard let rJsonData = jsonData else {
             return nil
         }
-        
+
         var result: Product?
         do {
             result = try JSONDecoder().decode(Product.self, from: rJsonData)
@@ -41,24 +42,25 @@ extension RCTConvert {
         }
         return result
     }
-    
-    static func buildProductInfoViewConfiguration(_ config: [String: Any]?) -> ProductInfoViewConfiguration? {
+
+    static func buildProductInfoViewConfiguration(_ config: [String: Any]?)
+        -> ProductInfoViewConfiguration? {
         guard let rConfig = config else {
             return nil
         }
-        
+
         let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
         guard let rJsonData = jsonData else {
             return nil
         }
-        
+
         var result: ProductInfoViewConfiguration?
         do {
             result = try JSONDecoder().decode(ProductInfoViewConfiguration.self, from: rJsonData)
         } catch let error {
             print(error.localizedDescription)
         }
-        
+
         return result
     }
 }

package/ios/Models/RNToNative/RCTConvert+StoryBlock.swift

@@ -9,16 +9,18 @@ import Foundation
 
 extension StoryBlockSourceType {
     static var sourceTypeMapper: [String: StoryBlockSourceType] {
-        ["discover": .discover,
-         "channel": .channel,
-         "playlist": .playlist,
-         "dynamicContent": .dynamicContent]
+        [
+            "discover": .discover,
+            "channel": .channel,
+            "playlist": .playlist,
+            "dynamicContent": .dynamicContent
+        ]
     }
 }
 
 @objc
-public extension RCTConvert {
-    static func storyBlockSourceType(_ type: String?) -> StoryBlockSourceType {
+extension RCTConvert {
+    public static func storyBlockSourceType(_ type: String?) -> StoryBlockSourceType {
         guard let rType = type else {
             return .discover
         }

package/ios/Models/RNToNative/RCTConvert+VideoFeed.swift

@@ -9,63 +9,82 @@ import Foundation
 
 extension VideFeedSourceType {
     static var sourceTypeMapper: [String: VideFeedSourceType] {
-        ["discover": .discover,
-         "channel": .channel,
-         "playlist": .playlist,
-         "playlistGroup": .playlistGroup,
-         "dynamicContent": .dynamicContent]
+        [
+            "discover": .discover,
+            "channel": .channel,
+            "playlist": .playlist,
+            "playlistGroup": .playlistGroup,
+            "dynamicContent": .dynamicContent
+        ]
     }
 }
 
 extension VideoFeedMode {
     static var feedModeMapper: [String: VideoFeedMode] {
-        ["row": .row,
-         "column": .column,
-         "grid": .grid]
+        [
+            "row": .row,
+            "column": .column,
+            "grid": .grid
+        ]
     }
 }
 
 @objc
-public extension RCTConvert {
-    static func videoFeedSourceType(_ type: String?) -> VideFeedSourceType {
+extension RCTConvert {
+    public static func videoFeedSourceType(_ type: String?) -> VideFeedSourceType {
         guard let rType = type else {
             return .discover
         }
-        
+
         return VideFeedSourceType.sourceTypeMapper[rType] ?? .discover
     }
-    
-    static func videoFeedMode(_ type: String?) -> VideoFeedMode {
+
+    public static func videoFeedMode(_ type: String?) -> VideoFeedMode {
         guard let rType = type else {
             return .row
         }
-        
+
         return VideoFeedMode.feedModeMapper[rType] ?? .row
     }
-    
-    static func videoFeedConfiguration(_ config: [String: AnyObject]?) -> VideoFeedConfiguration? {
+
+    public static func videoFeedConfiguration(_ config: [String: AnyObject]?)
+        -> VideoFeedConfiguration? {
         guard let rConfig = config else {
             return nil
         }
-        
+
         let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
         guard let rJsonData = jsonData else {
             return nil
         }
-        
+
         return try? JSONDecoder().decode(VideoFeedConfiguration.self, from: rJsonData)
     }
-    
-    static func videoPlayerConfiguration(_ config: [String: AnyObject]?) -> VideoPlayerConfiguration? {
+
+    public static func videoPlayerConfiguration(_ config: [String: AnyObject]?)
+        -> VideoPlayerConfiguration? {
         guard let rConfig = config else {
             return nil
         }
-        
+
         let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
         guard let rJsonData = jsonData else {
             return nil
         }
-        
+
         return try? JSONDecoder().decode(VideoPlayerConfiguration.self, from: rJsonData)
     }
+
+    public static func adConfiguration(_ config: [String: AnyObject]?) -> AdConfiguration? {
+        guard let rConfig = config else {
+            return nil
+        }
+
+        let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
+        guard let rJsonData = jsonData else {
+            return nil
+        }
+
+        return try? JSONDecoder().decode(AdConfiguration.self, from: rJsonData)
+    }
 }

package/ios/Modules/FWNavigatorModule/FWNavigatorContainerViewController.swift

@@ -15,12 +15,13 @@ class FWNavigatorContainerViewController: UIViewController {
         super.viewDidLoad()
         loadContent()
     }
-    
+
     private func loadContent() {
-        let rctRootView = RCTRootView.init(bridge: RCTBridge.current(), moduleName: moduleName, initialProperties: properties)
+        let rctRootView = RCTRootView.init(
+            bridge: RCTBridge.current(), moduleName: moduleName, initialProperties: properties)
         view.addSubview(rctRootView)
         rctRootView.translatesAutoresizingMaskIntoConstraints = false
-        
+
         NSLayoutConstraint.activate([
             rctRootView.leftAnchor.constraint(equalTo: view.leftAnchor),
             rctRootView.topAnchor.constraint(equalTo: view.topAnchor),

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -10,19 +10,28 @@ import FireworkVideo
 @objc(FWNavigatorModule)
 class FWNavigatorModule: RCTEventEmitter, FWNavigator {
     override func supportedEvents() -> [String]! {
-        return [FWEventName.LogMessage.rawValue]
+        return [FWEventName.logMessage.rawValue]
     }
-    
+
     override class func requiresMainQueueSetup() -> Bool {
         return true
     }
 
+    // swiftlint:disable function_body_length
+
     @objc(pushNativeContainer:resolver:rejecter:)
-    func pushNativeContainer(_ props: NSDictionary?, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    func pushNativeContainer(
+        _ props: NSDictionary?, resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock
+    ) {
         #if DEBUG
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-        sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Enter pushNativeContainer \(formatter.string(from: Date()))"])
+            let formatter = DateFormatter()
+            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+            sendEvent(
+                withName: FWEventName.logMessage.rawValue,
+                body: [
+                    "message": "[iOS] Enter pushNativeContainer \(formatter.string(from: Date()))"
+                ])
         #endif
 
         DispatchQueue.main.async {
@@ -42,31 +51,52 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
             }
 
             #if DEBUG
-            self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Before creating containerViewController \(formatter.string(from: Date()))"])
+                self.sendEvent(
+                    withName: FWEventName.logMessage.rawValue,
+                    body: [
+                        "message":
+                            "[iOS] Before creating containerViewController \(formatter.string(from: Date()))"
+                    ])
             #endif
 
             let containerViewController = FWNavigatorContainerViewController()
 
             #if DEBUG
-            self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] After creating containerViewController \(formatter.string(from: Date()))"])
+                self.sendEvent(
+                    withName: FWEventName.logMessage.rawValue,
+                    body: [
+                        "message":
+                            "[iOS] After creating containerViewController \(formatter.string(from: Date()))"
+                    ])
             #endif
 
             containerViewController.moduleName = appComponentName
             containerViewController.properties = props
             containerViewController.modalPresentationStyle = .fullScreen
             if presentedVC.modalPresentationStyle == .custom,
-               let presentingVC = presentedVC.presentingViewController,
-               presentingVC is FireworkVideo.PlayerViewController {
+                let presentingVC = presentedVC.presentingViewController,
+                presentingVC is FireworkVideo.PlayerViewController
+            {
                 containerViewController.modalPresentationStyle = .overFullScreen
             }
 
             #if DEBUG
-            self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Present containerViewController \(formatter.string(from: Date()))"])
+                self.sendEvent(
+                    withName: FWEventName.logMessage.rawValue,
+                    body: [
+                        "message":
+                            "[iOS] Present containerViewController \(formatter.string(from: Date()))"
+                    ])
             #endif
 
             presentedVC.present(containerViewController, animated: true) {
                 #if DEBUG
-                self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Finish presenting containerViewController \(formatter.string(from: Date()))"])
+                    self.sendEvent(
+                        withName: FWEventName.logMessage.rawValue,
+                        body: [
+                            "message":
+                                "[iOS] Finish presenting containerViewController \(formatter.string(from: Date()))"
+                        ])
                 #endif
 
                 resolver(true)
@@ -74,10 +104,15 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         }
     }
 
+    // swiftlint:enable function_body_length
+
     @objc(popNativeContainer:rejecter:)
-    func popNativeContainer(_ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    func popNativeContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
         DispatchQueue.main.async {
-            if let navigatorContainerVC = RCTPresentedViewController() as? FWNavigatorContainerViewController,
+            if let navigatorContainerVC = RCTPresentedViewController()
+                as? FWNavigatorContainerViewController,
                 navigatorContainerVC.presentingViewController != nil {
                 navigatorContainerVC.dismiss(animated: true) {
                     resolver(true)
@@ -87,9 +122,9 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
                 gCartViewController = nil
                 resolver(true)
             } else if let presentedVC = RCTPresentedViewController(),
-                      let presentingVC = presentedVC.presentingViewController {
+                let presentingVC = presentedVC.presentingViewController {
                 if presentedVC.modalPresentationStyle == .custom,
-                   presentingVC is FireworkVideo.PlayerViewController {
+                    presentingVC is FireworkVideo.PlayerViewController {
                     // For consistency with Android SDK behavior
                     presentedVC.dismiss(animated: false) {
                         DispatchQueue.main.async {
@@ -110,12 +145,14 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
     }
 
     @objc(canPopNativeContainer:rejecter:)
-    func canPopNativeContainer(_ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+    func canPopNativeContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
         DispatchQueue.main.async {
             if let presentedVC = RCTPresentedViewController(),
                 presentedVC.presentingViewController != nil {
                 resolver(true)
-            } else if let _ = gCartViewController {
+            } else if gCartViewController != nil {
                 resolver(true)
             } else {
                 resolver(false)
@@ -123,4 +160,3 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         }
     }
 }
-

package/ios/Modules/FWNavigatorModule/FWNavigatorProtocol.swift

@@ -8,7 +8,11 @@
 import Foundation
 
 protocol FWNavigator {
-    func pushNativeContainer(_ props: NSDictionary?, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
-    func popNativeContainer(_ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
-    func canPopNativeContainer(_ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
+    func pushNativeContainer(
+        _ props: NSDictionary?, resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock)
+    func popNativeContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
+    func canPopNativeContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
 }

package/ios/Modules/FireworkSDKModule/AdBadgeConfiguration.swift

@@ -11,8 +11,9 @@ struct AdBadgeConfiguration: Codable {
     var badgeTextType: BadgeTextType = .ad
     var backgroundColor: String?
     var textColor: String?
-    
+
     enum BadgeTextType: String, Codable {
+        // swiftlint:disable:next identifier_name
         case ad, sponsored
     }
 }