react-native-firework-sdk 2.1.0 → 2.2.0

package/ios/FireworkVideoUI/FireworkVideoUI.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:FireworkVideoUI.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

package/ios/FireworkVideoUI/FireworkVideoUI.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/FireworkVideoUI/FireworkVideoUITests/FireworkVideoUITests.swift

@@ -0,0 +1,37 @@
+//
+//  FireworkVideoUITests.swift
+//  FireworkVideoUITests
+//
+//  Created by linjie jiang on 4/25/23.
+//
+
+import XCTest
+@testable import FireworkVideoUI
+
+final class FireworkVideoUITests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // Any test you write for XCTest can be annotated as throws and async.
+        // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
+        // Mark your test async to allow awaiting for asynchronous code to complete.
+        // Check the results with assertions afterwards.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}

package/ios/FireworkVideoUI/Podfile

@@ -0,0 +1,15 @@
+# Uncomment the next line to define a global platform for your project
+platform :ios, '12.1'
+
+target 'FireworkVideoUI' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for FireworkVideoUI
+  pod 'FireworkVideo', '1.9.0'
+
+  target 'FireworkVideoUITests' do
+    # Pods for testing
+  end
+
+end

package/ios/FireworkVideoUI/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - FireworkVideo (1.9.0)
+
+DEPENDENCIES:
+  - FireworkVideo (= 1.9.0)
+
+SPEC REPOS:
+  trunk:
+    - FireworkVideo
+
+SPEC CHECKSUMS:
+  FireworkVideo: 77edd3eb890c09a0656c8599bee874a38aefec53
+
+PODFILE CHECKSUM: fc28c17eb5d44ab66c794e84553cdc6abe3b5426
+
+COCOAPODS: 1.12.1

package/ios/Models/NativeToRN/FireworkEventName.swift

@@ -17,16 +17,20 @@ enum FWEventName: String, CaseIterable {
     case videoLaunchBehaviorUpdated = "fw:video-launch-behavior-updated"  // emitted in JS side
     case adBadgeConfigurationUpdated = "fw:ad-badge-configuration-updated"  // emitted in JS side
     case appLanguageUpdated = "fw:app-language-updated"  // emitted in JS side
+    case nativeAppLanguageUpdated = "fw:native-app-language-updated" // emitted in native side
     case logMessage = "fw:log-message"
 }
 
 enum VideoPlaybackSubEventName: String {
     case impression = "fw:video:impression"
     case start = "fw:video:start"
+    case pause = "fw:video:pause"
+    case resume = "fw:video:resume"
     case firstQuartile = "fw:video:first-quartile"
     case midpoint = "fw:video:midpoint"
     case thirdQuartile = "fw:video:third-quartile"
     case complete = "fw:video:complete"
+    case adStart = "fw:video:ad-start"
     case adEnd = "fw:video:ad-end"
     case clickCTA = "fw:video:click-cta"
     case clickShare = "fw:video:click-share"

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

@@ -34,7 +34,11 @@ extension VideoPlaybackDetails {
                 "width": playerSize.width,
                 "height": playerSize.height
             ],
-            "hasCTA": hasCTA
+            "hasCTA": hasCTA,
+            "progress": progress,
+            "ctaActionType": ctaActionType ?? "",
+            "ctaActionURL": ctaActionURL ?? "",
+            "feedId": feedId ?? "",
         ]
     }
 }

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

@@ -13,7 +13,8 @@ extension StoryBlockSourceType {
             "discover": .discover,
             "channel": .channel,
             "playlist": .playlist,
-            "dynamicContent": .dynamicContent
+            "dynamicContent": .dynamicContent,
+            "hashtagPlaylist": .hashtagPlaylist
         ]
     }
 }

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

@@ -15,7 +15,8 @@ extension VideFeedSourceType {
             "channel": .channel,
             "playlist": .playlist,
             "playlistGroup": .playlistGroup,
-            "dynamicContent": .dynamicContent
+            "dynamicContent": .dynamicContent,
+            "hashtagPlaylist": .hashtagPlaylist
         ]
     }
 }

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -5,8 +5,6 @@
 //  Created by Big Bear Xiong on 2022/4/21.
 //
 
-// swiftlint:disable file_length
-
 import FireworkVideo
 
 private let FWExitButtonImageNames: [String] = [
@@ -231,20 +229,10 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
     func startFloatingPlayer(
         _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
     ) {
-        guard let playerInfo = FWNavigatorModule.getPlayerInfo() else {
-            resolver(false)
-            return
-        }
-
-        if playerInfo.mode == .fullscreen {
-            do {
-                try playerInfo.playerVC.startPictureInPicture()
-                resolver(true)
-            } catch {
-                resolver(false)
-            }
-        } else {
-            // current player is already in floating mode.
+        do {
+            try PictureInPictureController.start()
+            resolver(true)
+        } catch {
             resolver(false)
         }
     }
@@ -303,77 +291,6 @@ extension FWNavigatorModule {
         return nil
     }
 
-    private static func getWindowList() -> [UIWindow] {
-        var windowList: [UIWindow] = []
-        if #available(iOS 13.0, *) {
-            for scene in UIApplication.shared.connectedScenes {
-                if let currentSene = scene as? UIWindowScene {
-                    for window in currentSene.windows {
-                        windowList.append(window)
-                    }
-                }
-            }
-        } else {
-            for window in UIApplication.shared.windows {
-                windowList.append(window)
-            }
-        }
-
-        return windowList
-    }
-
-    private static func getFurthestAncestorController(_ controller: UIViewController) -> UIViewController {
-        guard let parentVC = controller.parent else {
-            return controller
-        }
-
-        return getFurthestAncestorController(parentVC)
-    }
-
-    private static func getPlayerViewController(_ viewController: UIViewController) -> PlayerViewController? {
-        if let playerVC = viewController as? PlayerViewController {
-            return playerVC
-        }
-
-        for childVC in viewController.children {
-            if let playerVC = getPlayerViewController(childVC) {
-                return playerVC
-            }
-        }
-
-        return nil
-    }
-
-    private static func getPlayerInfo() -> PlayerInfo? {
-        let windowList: [UIWindow] = getWindowList()
-
-        if let floatingPlayerWindow = windowList.first(where: { window in
-            NSStringFromClass(type(of: window)) == "FireworkVideo.FloatingPlayerController"
-        }) {
-            if let rootVC = floatingPlayerWindow.rootViewController,
-               let playerVC = getPlayerViewController(rootVC) {
-                return PlayerInfo(playerVC: playerVC, mode: .floating)
-            }
-            return nil
-        }
-
-        if let keyWindow = windowList.first(where: { window in
-            return window.isKeyWindow
-        }) {
-            if let rootVC = keyWindow.rootViewController,
-               let presentedVC = rootVC.presentedViewController {
-                let furthestAncestorController = getFurthestAncestorController(presentedVC)
-                if let playerVC = getPlayerViewController(furthestAncestorController) {
-                    return PlayerInfo(playerVC: playerVC, mode: .fullscreen)
-                }
-            }
-
-            return nil
-        }
-
-        return nil
-    }
-
     private static func isIOSSDKViewController(_ controller: UIViewController?) -> Bool {
         guard let controller = controller else {
             return false
@@ -390,19 +307,10 @@ extension FWNavigatorModule {
 
 extension FWNavigatorModule {
     static func stopFloatingPlayer() -> Bool {
-        guard let playerInfo = self.getPlayerInfo() else {
-            return false
-        }
-
-        if playerInfo.mode == .floating {
-            do {
-                try playerInfo.playerVC.stopPictureInPicture()
-                return true
-            } catch {
-                return false
-            }
-        } else {
-            // current player is in fullscreen player
+        do {
+            try PictureInPictureController.stop()
+            return true
+        } catch {
             return false
         }
     }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule+EventTracking.swift

@@ -9,14 +9,6 @@ import FireworkVideo
 import Foundation
 
 extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
-    func fireworkVideoDidPause(_ videoPlayback: VideoPlaybackDetails) {
-
-    }
-
-    func fireworkVideoDidResume(_ videoPlayback: VideoPlaybackDetails) {
-
-    }
-
     func fireworkVideoDidRecordImpression(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
         sendEvent(
@@ -37,6 +29,26 @@ extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
             ])
     }
 
+    func fireworkVideoDidPause(_ videoPlayback: VideoPlaybackDetails) {
+        guard enableVideoPlayBackEvent else { return }
+        sendEvent(
+            withName: FWEventName.videoPlayback.rawValue,
+            body: [
+                "eventName": VideoPlaybackSubEventName.pause.rawValue,
+                "info": videoPlayback.jsObject
+            ])
+    }
+
+    func fireworkVideoDidResume(_ videoPlayback: VideoPlaybackDetails) {
+        guard enableVideoPlayBackEvent else { return }
+        sendEvent(
+            withName: FWEventName.videoPlayback.rawValue,
+            body: [
+                "eventName": VideoPlaybackSubEventName.resume.rawValue,
+                "info": videoPlayback.jsObject
+            ])
+    }
+
     func fireworkVideoReachedFirstQuartile(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
         sendEvent(
@@ -77,36 +89,42 @@ extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
             ])
     }
 
-    func fireworkVideoDidTapCTAButton(_ videoPlayback: VideoPlaybackDetails) {
+    func fireworkVideoDidStartPlayingAd(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
         sendEvent(
             withName: FWEventName.videoPlayback.rawValue,
             body: [
-                "eventName": VideoPlaybackSubEventName.clickCTA.rawValue,
+                "eventName": VideoPlaybackSubEventName.adStart.rawValue,
                 "info": videoPlayback.jsObject
             ])
     }
 
-    func fireworkVideoDidTapShareButton(_ videoPlayback: VideoPlaybackDetails) {
+    func fireworkVideoDidFinishPlayingAd(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
         sendEvent(
             withName: FWEventName.videoPlayback.rawValue,
             body: [
-                "eventName": VideoPlaybackSubEventName.clickShare.rawValue,
+                "eventName": VideoPlaybackSubEventName.adEnd.rawValue,
                 "info": videoPlayback.jsObject
             ])
     }
 
-    func fireworkVideoDidStartPlayingAd(_ videoPlayback: VideoPlaybackDetails) {
-
+    func fireworkVideoDidTapCTAButton(_ videoPlayback: VideoPlaybackDetails) {
+        guard enableVideoPlayBackEvent else { return }
+        sendEvent(
+            withName: FWEventName.videoPlayback.rawValue,
+            body: [
+                "eventName": VideoPlaybackSubEventName.clickCTA.rawValue,
+                "info": videoPlayback.jsObject
+            ])
     }
 
-    func fireworkVideoDidFinishPlayingAd(_ videoPlayback: VideoPlaybackDetails) {
+    func fireworkVideoDidTapShareButton(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
         sendEvent(
             withName: FWEventName.videoPlayback.rawValue,
             body: [
-                "eventName": VideoPlaybackSubEventName.adEnd.rawValue,
+                "eventName": VideoPlaybackSubEventName.clickShare.rawValue,
                 "info": videoPlayback.jsObject
             ])
     }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -7,6 +7,9 @@
 //  The FireworkSDKModule Wrap native FireworkVideoSDK class,then expose to JavaScript in Objective-C
 
 import FireworkVideo
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 var gShareBaseURL: String?
 var gAdBadgeConfiguration: AdBadgeConfiguration?
@@ -23,6 +26,14 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
     /// Decide whether to send video playback event to RN.
     var enableVideoPlayBackEvent: Bool = false
 
+    override init() {
+        super.init()
+        _ = AppLanguageManager.shared
+        NotificationCenter.default.addObserver(
+            self, selector: #selector(FireworkSDKModule.onAppLanguageChanged),
+            name: AppLanguageManager.NotificationName.AppLanguageChanged, object: nil)
+    }
+
     override func supportedEvents() -> [String]! {
         FWEventName.allCases.map { $0.rawValue }
     }
@@ -64,14 +75,11 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         #endif
         let sdkInitOptions = RCTConvert.sdkInitOptions(options)
         gVideoLaunchBehavior = sdkInitOptions?.videoLaunchBehavior
-        gShareBaseURL = sdkInitOptions?.shareBaseURL
 
         FireworkVideoSDK.initializeSDK(delegate: self, userID: sdkInitOptions?.userId)
         FireworkVideoSDK.ctaDelegate = self
         FireworkVideoSDK.eventTracking.videoPlaybackDelegate = self
         FireworkVideoSDK.eventTracking.feedDelegate = self
-
-        FWAppLanguageManager.shared.initializeManager()
         resolver([:])
     }
 
@@ -96,6 +104,8 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             return
         }
 
+        _ = AppLanguageManager.shared
+
         VideoFeedViewController.openVideoPlayer(with: urlString, feedContentConfig, presentedVC) { _ in
 
         }
@@ -181,10 +191,8 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         sendEvent(withName: FWEventName.logMessage.rawValue, body: ["message": message])
         #endif
 
-        DispatchQueue.main.async {
-            let result = FWAppLanguageManager.shared.changeAppLanguage(language)
-            resolver(result)
-        }
+        let result = AppLanguageManager.shared.changeAppLanguage(language)
+        resolver(result)
     }
 
     // MARK: - FireworkVideoSDKDelegate
@@ -228,6 +236,14 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
                 ]
             ])
     }
+
+    @objc func onAppLanguageChanged() {
+        sendEvent(
+            withName: FWEventName.nativeAppLanguageUpdated.rawValue,
+            body: [
+                "appLanguage": AppLanguageManager.shared.appLanguage ?? ""
+            ])
+    }
 }
 
 extension FireworkSDKModule {

package/ios/Modules/FireworkSDKModule/SDKInitOptions.swift

@@ -9,7 +9,6 @@ import FireworkVideo
 
 struct SDKInitOptions: Codable {
     var userId: String?
-    var shareBaseURL: String?
     var videoLaunchBehavior: VideoLaunchBehavior?
 }
 

package/ios/Modules/LiveStream/LiveStreamModule.swift

@@ -27,6 +27,7 @@ class LiveStreamModule: RCTEventEmitter, FireworkLiveStreamEventDelegate {
     func initialize() {
         FireworkVideoSDK.eventTracking.liveStreamEventDelegate = self
     }
+
     func fireworkLiveStreamUserDidJoin(_ liveStream: LiveStreamEventDetails) {
         sendEvent(
             withName: LiveStreamEventName.livestream.rawValue,

package/ios/Modules/Shopping/ProductInfoViewConfiguration.swift

@@ -8,17 +8,9 @@
 import Foundation
 
 struct ProductInfoViewConfiguration: Codable {
-    var addToCartButton: AddToCartButtonConfiguration?
     var ctaButton: CTAButtonConfiguration?
     var linkButton: LinkButtonConfiguration?
 
-    struct AddToCartButtonConfiguration: Codable {
-        var backgroundColor: String?
-        var textColor: String?
-        var fontSize: Double?
-        var iOSFontInfo: FontInfo?
-    }
-
     struct CTAButtonConfiguration: Codable {
         var text: CTAButtonText?
         var backgroundColor: String?

package/ios/Modules/Shopping/ShoppingModule.swift

@@ -335,7 +335,6 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
 }
 
 extension ShoppingModule {
-    // swiftlint:disable:next cyclomatic_complexity
     fileprivate static func hydrateProductViewConfig(
         _ config: ProductInfoViewConfiguration,
         _ productInfoViewConfigurator: ProductInfoViewConfigurable
@@ -365,23 +364,6 @@ extension ShoppingModule {
                 let iOSFontInfo = ctaButtonConfiguration.iOSFontInfo ?? FontInfo()
                 productDetailsConfiguration.ctaButton.buttonConfiguration.font = iOSFontInfo.getFont(fontSize)
             }
-        } else if let addToCartButtonConfiguration = config.addToCartButton {
-            productDetailsConfiguration.ctaButton.text = .addToCart
-
-            if let backgroundColor = addToCartButtonConfiguration.backgroundColor,
-                backgroundColor.count > 0 {
-                productDetailsConfiguration.ctaButton.buttonConfiguration.backgroundColor = backgroundColor.uicolor()
-            }
-
-            if let textColor = addToCartButtonConfiguration.textColor,
-                textColor.count > 0 {
-                productDetailsConfiguration.ctaButton.buttonConfiguration.textColor = textColor.uicolor()
-            }
-
-            if let fontSize = addToCartButtonConfiguration.fontSize {
-                let iOSFontInfo = addToCartButtonConfiguration.iOSFontInfo ?? FontInfo()
-                productDetailsConfiguration.ctaButton.buttonConfiguration.font = iOSFontInfo.getFont(fontSize)
-            }
         }
 
         if let linkButtonConfiguration = config.linkButton {

package/ios/Support/MultiHostStreaming/FWMultiHostStreaming.podspec

@@ -5,20 +5,18 @@ package = JSON.parse(File.read(packageJsonPath))
 
 Pod::Spec.new do |s|
   s.name         = 'FWMultiHostStreaming'
-  s.version      = package['version']
+  s.version      = '0.1.0'
   s.summary      = 'Firework Multi Host Streaming'
   s.homepage     = package['homepage']
   s.license      = 'Apache License, Version 2.0'
   s.authors      = package['author']
 
-  s.platforms    = { ios: '13.0' }
+  s.platforms    = { ios: '12.0' }
   s.source       = { git: 'https://github.com/loopsocial/bogano.git', tag: "#{s.version}" }
 
   s.swift_version = '5.0'
-  s.source_files = 'src/*.{h,m,mm,swift}', 'src/**/*.{h,m,mm,swift}'
+  s.source_files = 'Sources/*.{h,m,mm,swift}', 'Sources/**/*.{h,m,mm,swift}'
 
-  s.dependency 'AgoraRtcEngine_iOS', '~> 4.1.1'
-  s.dependency 'SwiftProtobuf', '~> 1.21.0'
-  s.dependency 'FireworkVideoAgoraSupport', '~> 0.2.0'
+  s.dependency 'FireworkVideoAgoraSupport'
   s.dependency 'FireworkVideo'
 end

package/ios/Utils/Extensions/Swizzle/UINavigationController+FWSwizzle.swift

@@ -5,10 +5,13 @@
 //
 
 import UIKit
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 extension UINavigationController {
     static func swizzleMethodsForNavigationController() {
-        FWSwizzleUtil.swizzleSelector(
+        Swizzle.swizzleSelector(
             cls: self,
             originalSelector: #selector(UINavigationController.pushViewController(_:animated:)),
             customSelector: #selector(UINavigationController.fw_pushViewController(_:animated:))

package/ios/scripts/react_native_firework_sdk_pods.rb

@@ -1,31 +1,27 @@
-# enable multi host streaming
-def enable_multi_host_streaming
-  multi_host_streaming_dir = File.expand_path("#{__dir__}/../Support/MultiHostStreaming")
-  # puts "multiHostStreamingDir: #{multi_host_streaming_dir}"
-  pod 'FWMultiHostStreaming', path: multi_host_streaming_dir, :modular_headers => true
-end
+# set up react native firework sdk
+def set_up_react_native_firework_sdk!(options = {})
+  # puts "set_up_react_native_firework_sdk #{options}"
 
-# def force_static_library(pod)
-#   static_library_list = ['react-native-firework-sdk']
-#   if static_library_list.include?(pod.name)
-#     def pod.build_type
-#       Pod::BuildType.static_library
-#     end
-#   end
-# end
+  # multi_host_streaming_enabled = options[:multi_host_streaming_enabled] ||= false
+  # puts "multi_host_streaming_enabled #{multi_host_streaming_enabled}"
+
+  enable_app_level_language_setting!
 
-def force_dynamic_framework(pod)
-  dynamic_framework_list = ['SwiftProtobuf']
-  if dynamic_framework_list.include?(pod.name)
-    def pod.build_type
-      Pod::BuildType.dynamic_framework
-    end
-  end
+  # if multi_host_streaming_enabled
+  #   enable_multi_host_streaming!
+  # end
 end
 
-def react_native_firework_sdk_pre_install(installer)
-  installer.pod_targets.each do |pod|
-    # force_static_library(pod)
-    force_dynamic_framework(pod)
-  end
+# enable multi host streaming
+# def enable_multi_host_streaming!
+#   multi_host_streaming_dir = File.expand_path("#{__dir__}/../Support/MultiHostStreaming")
+#   # puts "multiHostStreamingDir: #{multi_host_streaming_dir}"
+#   pod 'FWMultiHostStreaming', path: multi_host_streaming_dir, :modular_headers => true
+# end
+
+# enable multi host streaming
+def enable_app_level_language_setting!
+  firework_video_ui_dir = File.expand_path("#{__dir__}/../Support/FireworkVideoUI")
+  # puts "firework_video_ui_dir: #{firework_video_ui_dir}"
+  pod 'FireworkVideoUI', path: firework_video_ui_dir
 end