react-native-firework-sdk 1.7.1 → 1.8.0

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/FWVideoFeed.kt

@@ -203,7 +203,6 @@ class FWVideoFeed(
       LayoutInflater.from(context).inflate(R.layout.fw_bridge_fragment_videofeed, this, false) as ConstraintLayout?
     videoFeedView = videoFeedViewContainer?.findViewById(R.id.fw_bridge_videofeed)
     if (videoFeedView != null) {
-      Log.e("videoFeedView", "layoutDirection: " + videoFeedView?.layoutDirection.toString())
       videoFeedView?.layoutDirection = LAYOUT_DIRECTION_LOCALE
       addView(videoFeedViewContainer)
     }

package/android/src/main/java/com/fireworksdk/bridge/models/FWEventName.kt

@@ -35,6 +35,7 @@ enum class FWVideoShoppingEventName(val rawValue: String) {
   ClickCartIcon("fw:shopping:click-cart-icon"),
   UpdateProductDetails("fw:shopping:update-product-details"),
   WillDisplayProduct("fw:shopping:will-display-product"),
+  CustomLinkButtonClick("fw:shopping:custom-link-button-click"),
 }
 
 enum class FWLiveStreamEventName(val rawValue: String) {

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FWVideoShoppingInterface.kt

@@ -13,4 +13,5 @@ interface FWVideoShoppingInterface {
   fun jumpToCartPage(callbackId: Int?, props: ReadableMap?)
   fun setCartIconVisible(visible: Boolean?)
   fun setCartItemCount(count: Int?)
+  fun setCustomClickLinkButtonEnabled(value: Boolean?, promise: Promise)
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FWVideoShoppingModule.kt

@@ -8,6 +8,7 @@ import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWDateUtils
 import com.fireworksdk.bridge.utils.FWGsonUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.fireworksdk.bridge.utils.FWVideoPlayerUtils
 import com.google.gson.reflect.TypeToken
 import com.loopnow.fireworklibrary.baya.Baya
 import com.loopnow.fireworklibrary.baya.UpdateCartStatus
@@ -214,11 +215,20 @@ class FWVideoShoppingModule(
         unitId: String,
         productWebUrl: String?
       ): Boolean {
-        return false
+        if (FWVideoPlayerUtils.customClickLinkButtonEnabled) {
+          FWEventUtils.sendCustomLinkButtonClickEvent(reactApplicationContext, productWebUrl, productId, unitId, callbackId)
+        }
+        return FWVideoPlayerUtils.customClickLinkButtonEnabled
       }
     }
   }
 
+  @ReactMethod
+  override fun setCustomClickLinkButtonEnabled(value: Boolean?, promise: Promise) {
+    FWVideoPlayerUtils.customClickLinkButtonEnabled = value?:false
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun addListener(eventName: String?) {
     // Set up any upstream listeners or background tasks as necessary

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWEventUtils.kt

@@ -263,4 +263,13 @@ object FWEventUtils {
 
     sendEvent(reactContext, FWEventName.LiveStreamChat.rawValue, eventMap)
   }
+
+  fun sendCustomLinkButtonClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, callbackId: Int?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("url", url ?: "")
+    eventMap.putString("productId", productId)
+    eventMap.putString("unitId", unitId)
+    eventMap.putInt("callbackId", callbackId?:0)
+    sendEvent(reactContext, FWVideoShoppingEventName.CustomLinkButtonClick.rawValue, eventMap)
+  }
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWLanguageUtil.kt

@@ -2,8 +2,6 @@ package com.fireworksdk.bridge.utils
 
 import android.app.Activity
 import android.content.Context
-import android.os.Handler
-import android.os.Looper
 import com.loopnow.fireworklibrary.FwSDK
 import java.util.*
 

package/android/src/main/java/com/fireworksdk/bridge/utils/FWVideoPlayerUtils.kt

@@ -18,6 +18,7 @@ object FWVideoPlayerUtils {
 
   var customCTAClickEnabled: Boolean = false
   var videoPlaybackEventEnabled: Boolean = false
+  var customClickLinkButtonEnabled: Boolean = false
 
   private var hasAssignedLaunchAppWithMute = false
   /**

package/ios/Components/StoryBlock.swift

@@ -45,8 +45,6 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
         }
     }
 
-    private var pipController: PictureInPictureController?
-
     public override init(frame: CGRect) {
         super.init(frame: frame)
         self.clipsToBounds = true
@@ -72,7 +70,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
 
         let storyBlockVC = StoryBlockViewController(source: source)
         if self.enablePictureInPicture {
-            self.pipController = PictureInPictureController(storyBlock: storyBlockVC)
+            storyBlockVC.isPictureInPictureEnabled = true
         }
 
         storyBlockVC.delegate = self
@@ -83,11 +81,6 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
     public override func removeFromSuperview() {
         super.removeFromSuperview()
 
-        if let pipController = pipController {
-            FWPiPManager.shared.addPiPController(pipController)
-            self.pipController = nil
-        }
-
         guard let storyBlockVC = self.storyBlockVC else {
             return
         }

package/ios/Components/StoryBlockManager.swift

@@ -21,6 +21,10 @@ class StoryBlockManager: RCTViewManager, StoryBlockViewDelegate {
         return true
     }
 
+    override var methodQueue: DispatchQueue {
+        return DispatchQueue.main
+    }
+
     func storyBlockDidLoadFeed(_ view: StoryBlock) {
         view.onStoryBlockLoadFinished?(nil)
     }

package/ios/Components/VideoFeed.swift

@@ -53,6 +53,8 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         }
     }
     @objc public var adConfiguration: AdConfiguration?
+    @objc public var enablePictureInPicture: Bool = false
+
     @objc var onVideoFeedLoadFinished: RCTBubblingEventBlock?
     //    @objc var onVideoFeedClick: RCTBubblingEventBlock?
 
@@ -149,8 +151,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         return resultAdConfiguration
     }
 
-    private var pipController: PictureInPictureController?
-
     public override func layoutSubviews() {
         super.layoutSubviews()
 
@@ -158,10 +158,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     }
 
     private func embed() {
-        guard let parentVC = parentViewController else {
-            return
-        }
-        guard self.feedVC == nil else {
+        guard let parentVC = parentViewController, self.feedVC == nil else {
             return
         }
 
@@ -207,8 +204,8 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 
         // swiftlint:disable:next notification_center_detachment
         NotificationCenter.default.removeObserver(self)
-        if feedViewConfig?.enablePictureInPicture == true {
-            self.pipController = PictureInPictureController(videoFeed: feedVC)
+        if self.enablePictureInPicture || feedViewConfig?.enablePictureInPicture == true {
+            feedVC.isPictureInPictureEnabled = true
         }
 
         feedVC.delegate = self
@@ -220,10 +217,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         super.removeFromSuperview()
         // swiftlint:disable:next notification_center_detachment
         NotificationCenter.default.removeObserver(self)
-        if let pipController = pipController {
-            FWPiPManager.shared.addPiPController(pipController)
-            self.pipController = nil
-        }
 
         guard let feedVC = self.feedVC else {
             return
@@ -284,7 +277,8 @@ extension VideoFeed {
                 vfcConfig.title.textColor = textcolor.uicolor()
             }
             if let fontSize = title.fontSize {
-                vfcConfig.title.font = UIFont.systemFont(ofSize: fontSize)
+                let iOSFontInfo = title.iOSFontInfo ?? FontInfo()
+                vfcConfig.title.font = iOSFontInfo.getFont(fontSize)
             }
         }
         if let playIcon = config.playIcon {
@@ -353,7 +347,8 @@ extension VideoFeed {
                 vpcConfig.ctaButton.contentConfiguration.textColor = textcolor.uicolor()
             }
             if let fontSize = ctaButtonStyle.fontSize {
-                vpcConfig.ctaButton.contentConfiguration.font = UIFont.systemFont(ofSize: fontSize)
+                let iOSFontInfo = ctaButtonStyle.iOSFontInfo ?? FontInfo()
+                vpcConfig.ctaButton.contentConfiguration.font = iOSFontInfo.getFont(fontSize)
             }
         }
         if let showPlaybackButton = config.showPlaybackButton {

package/ios/Components/VideoFeedConfiguration.swift

@@ -21,12 +21,14 @@ public class VideoFeedConfiguration: NSObject, Codable {
     var itemSpacing: Double?
     var enableAutoplay: Bool?
     var gridColumns: Int?
+    // legacy property
     var enablePictureInPicture: Bool?
 
     class VideoFeedTitleConfiguration: NSObject, Codable {
         public var hidden: Bool?
         public var textColor: String?
         public var fontSize: Double?
+        public var iOSFontInfo: FontInfo?
     }
 
     class VideoFeedPlayIconConfiguration: NSObject, Codable {

package/ios/Components/VideoFeedManager.m

@@ -44,6 +44,8 @@ RCT_CUSTOM_VIEW_PROPERTY(adConfiguration, AdConfiguration, VideoFeed) {
     view.adConfiguration = config;
 }
 
+RCT_EXPORT_VIEW_PROPERTY(enablePictureInPicture, BOOL)
+
 RCT_EXPORT_VIEW_PROPERTY(onVideoFeedLoadFinished, RCTBubblingEventBlock)
 //RCT_EXPORT_VIEW_PROPERTY(onVideoFeedClick, RCTBubblingEventBlock)
 

package/ios/Components/VideoFeedManager.swift

@@ -23,6 +23,10 @@ class VideoFeedManager: RCTViewManager, VideoFeedViewDelegate {
         return true
     }
 
+    override var methodQueue: DispatchQueue {
+        return DispatchQueue.main
+    }
+
     // MARK: - FWVideoFeedViewDelegate
     func videoFeedDidLoadFeed(_ view: VideoFeed) {
         view.onVideoFeedLoadFinished?(nil)

package/ios/Components/VideoPlayerConfiguration.swift

@@ -32,6 +32,7 @@ public class VideoPlayerConfiguration: NSObject, Codable {
         var backgroundColor: String?
         var textColor: String?
         var fontSize: Double?
+        var iOSFontInfo: FontInfo?
     }
 
     public enum VideoLaunchBehavior: String, Codable {

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -11,8 +11,6 @@
 		8953CF5E2993E0D200F7413E /* UINavigationController+FWSwizzle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF5D2993E0D200F7413E /* UINavigationController+FWSwizzle.swift */; };
 		8953CF602993E3B200F7413E /* FWSwizzleUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF5F2993E3B200F7413E /* FWSwizzleUtil.swift */; };
 		8953CF622993E44E00F7413E /* DispatchQueue+FWOnce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF612993E44E00F7413E /* DispatchQueue+FWOnce.swift */; };
-		8953CF642993EF8200F7413E /* UIButton+FWSwizzle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF632993EF8200F7413E /* UIButton+FWSwizzle.swift */; };
-		8953CF662993F13800F7413E /* FWPiPManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF652993F13800F7413E /* FWPiPManager.swift */; };
 		8953CF6C2993FAAB00F7413E /* FWSwizzleLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF6B2993FAAB00F7413E /* FWSwizzleLoader.m */; };
 		896A8EB928E3DCCA007E51F8 /* AdConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896A8EB828E3DCCA007E51F8 /* AdConfiguration.swift */; };
 		8975235E2817DEEE0070EBB6 /* VideoFeedManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523592817DEEE0070EBB6 /* VideoFeedManager.swift */; };
@@ -45,6 +43,7 @@
 		8975239E2817DEF80070EBB6 /* FireworkSDKModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 897523832817DEF80070EBB6 /* FireworkSDKModule.m */; };
 		8975239F2817DEF80070EBB6 /* LiveStreamModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523852817DEF80070EBB6 /* LiveStreamModule.swift */; };
 		897523A02817DEF80070EBB6 /* LiveStreamModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 897523862817DEF80070EBB6 /* LiveStreamModule.m */; };
+		89D6BBF929ACE2DC00C8AA2A /* FontInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89D6BBF829ACE2DC00C8AA2A /* FontInfo.swift */; };
 		89DF27DD28A53A77003F3CCB /* StoryBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DF27DA28A53A77003F3CCB /* StoryBlock.swift */; };
 		89DF27DE28A53A77003F3CCB /* StoryBlockManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DF27DB28A53A77003F3CCB /* StoryBlockManager.swift */; };
 		89DF27DF28A53A77003F3CCB /* StoryBlockManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89DF27DC28A53A77003F3CCB /* StoryBlockManager.m */; };
@@ -70,8 +69,6 @@
 		8953CF5D2993E0D200F7413E /* UINavigationController+FWSwizzle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+FWSwizzle.swift"; sourceTree = "<group>"; };
 		8953CF5F2993E3B200F7413E /* FWSwizzleUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FWSwizzleUtil.swift; sourceTree = "<group>"; };
 		8953CF612993E44E00F7413E /* DispatchQueue+FWOnce.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DispatchQueue+FWOnce.swift"; sourceTree = "<group>"; };
-		8953CF632993EF8200F7413E /* UIButton+FWSwizzle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+FWSwizzle.swift"; sourceTree = "<group>"; };
-		8953CF652993F13800F7413E /* FWPiPManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWPiPManager.swift; sourceTree = "<group>"; };
 		8953CF6A2993FAAB00F7413E /* FWSwizzleLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FWSwizzleLoader.h; sourceTree = "<group>"; };
 		8953CF6B2993FAAB00F7413E /* FWSwizzleLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FWSwizzleLoader.m; sourceTree = "<group>"; };
 		896A8EB828E3DCCA007E51F8 /* AdConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdConfiguration.swift; sourceTree = "<group>"; };
@@ -106,6 +103,7 @@
 		897523832817DEF80070EBB6 /* FireworkSDKModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FireworkSDKModule.m; sourceTree = "<group>"; };
 		897523852817DEF80070EBB6 /* LiveStreamModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveStreamModule.swift; sourceTree = "<group>"; };
 		897523862817DEF80070EBB6 /* LiveStreamModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveStreamModule.m; sourceTree = "<group>"; };
+		89D6BBF829ACE2DC00C8AA2A /* FontInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontInfo.swift; sourceTree = "<group>"; };
 		89DF27DA28A53A77003F3CCB /* StoryBlock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryBlock.swift; sourceTree = "<group>"; };
 		89DF27DB28A53A77003F3CCB /* StoryBlockManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryBlockManager.swift; sourceTree = "<group>"; };
 		89DF27DC28A53A77003F3CCB /* StoryBlockManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoryBlockManager.m; sourceTree = "<group>"; };
@@ -170,8 +168,6 @@
 				897523672817DEF80070EBB6 /* String+Color.swift */,
 				897523682817DEF80070EBB6 /* UIView+ParentViewController.swift */,
 				8953CF5D2993E0D200F7413E /* UINavigationController+FWSwizzle.swift */,
-				8953CF632993EF8200F7413E /* UIButton+FWSwizzle.swift */,
-				8953CF652993F13800F7413E /* FWPiPManager.swift */,
 				8953CF6A2993FAAB00F7413E /* FWSwizzleLoader.h */,
 				8953CF6B2993FAAB00F7413E /* FWSwizzleLoader.m */,
 			);
@@ -181,6 +177,7 @@
 		897523692817DEF80070EBB6 /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				89D6BBF729ACE28300C8AA2A /* Common */,
 				8975236A2817DEF80070EBB6 /* RNToNative */,
 				8975236E2817DEF80070EBB6 /* NativeToRN */,
 			);
@@ -263,6 +260,14 @@
 			path = LiveStream;
 			sourceTree = "<group>";
 		};
+		89D6BBF729ACE28300C8AA2A /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				89D6BBF829ACE2DC00C8AA2A /* FontInfo.swift */,
+			);
+			path = Common;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -330,15 +335,14 @@
 				89DF27E128A53A89003F3CCB /* RCTConvert+StoryBlock.swift in Sources */,
 				8953CF6C2993FAAB00F7413E /* FWSwizzleLoader.m in Sources */,
 				8975235F2817DEEE0070EBB6 /* VideoFeedConfiguration.swift in Sources */,
+				89D6BBF929ACE2DC00C8AA2A /* FontInfo.swift in Sources */,
 				897523612817DEEE0070EBB6 /* VideoPlayerConfiguration.swift in Sources */,
 				897523972817DEF80070EBB6 /* Product.swift in Sources */,
 				89DF27DD28A53A77003F3CCB /* StoryBlock.swift in Sources */,
 				89DF27DF28A53A77003F3CCB /* StoryBlockManager.m in Sources */,
-				8953CF642993EF8200F7413E /* UIButton+FWSwizzle.swift in Sources */,
 				897523932817DEF80070EBB6 /* FWNavigatorModule.m in Sources */,
 				897523922817DEF80070EBB6 /* FWNavigatorModule.swift in Sources */,
 				897523872817DEF80070EBB6 /* UIViewController+AttachChild.swift in Sources */,
-				8953CF662993F13800F7413E /* FWPiPManager.swift in Sources */,
 				897523902817DEF80070EBB6 /* FWNavigatorProtocol.swift in Sources */,
 				897523882817DEF80070EBB6 /* UIView+Constraints.swift in Sources */,
 				897523982817DEF80070EBB6 /* ShoppingModule.swift in Sources */,

package/ios/Models/Common/FontInfo.swift

@@ -0,0 +1,57 @@
+//
+//  FontInfo.swift
+//
+//  Created by linjie jiang on 2023/2/27.
+//
+
+import UIKit
+
+@objc
+public class FontInfo: NSObject, Codable {
+    var fontName: String?
+    var systemFontStyle: SystemFontStyle?
+    var systemFontWeight: SystemFontWeight?
+
+    public enum SystemFontStyle: String, Codable {
+        case normal, italic
+    }
+
+    public enum SystemFontWeight: String, Codable {
+        case ultraLight, thin, light, regular, medium, semibold, bold, heavy, black
+
+        func getFontWeight() -> UIFont.Weight {
+            switch self {
+            case .ultraLight:
+                return .ultraLight
+            case .thin:
+                return .thin
+            case .light:
+                return .light
+            case .regular:
+                return .regular
+            case .medium:
+                return .medium
+            case .semibold:
+                return .semibold
+            case .bold:
+                return .bold
+            case .heavy:
+                return .heavy
+            case .black:
+                return .black
+            }
+        }
+    }
+
+    public func getFont(_ fontSize: Double) -> UIFont {
+        if let fontName = fontName, let font = UIFont(name: fontName, size: fontSize) {
+            return font
+        } else if let fontStyle = systemFontStyle, fontStyle == .italic {
+            return UIFont.italicSystemFont(ofSize: fontSize)
+        } else if let systemFontWeight = systemFontWeight?.getFontWeight() {
+            return UIFont.systemFont(ofSize: fontSize, weight: systemFontWeight)
+        } else {
+            return UIFont.systemFont(ofSize: fontSize)
+        }
+    }
+}

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.m

@@ -14,5 +14,7 @@
 RCT_EXTERN_METHOD(pushNativeContainer:(NSDictionary *)props resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(popNativeContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(canPopNativeContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(startFloatingPlayer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(stopFloatingPlayer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
 @end