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

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
@@ -63,7 +61,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
     }
 
     private func embed() {
-        guard let parentVC = parentViewController else {
+        guard let parentVC = fwParentViewController else {
             return
         }
         guard self.storyBlockVC == nil else {
@@ -72,7 +70,11 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
 
         let storyBlockVC = StoryBlockViewController(source: source)
         if self.enablePictureInPicture {
-            self.pipController = PictureInPictureController(storyBlock: storyBlockVC)
+            storyBlockVC.isPictureInPictureEnabled = true
+        }
+
+        if FWAppLanguageManager.shared.shouldHorizontalFlip {
+            storyBlockVC.view.fwrtl_viewType = FWRTLViewTypeFlip
         }
 
         storyBlockVC.delegate = self
@@ -83,11 +85,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,16 +151,15 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         return resultAdConfiguration
     }
 
-    private var pipController: PictureInPictureController?
-
     public override func layoutSubviews() {
         super.layoutSubviews()
 
         embed()
     }
 
+    // swiftlint:disable:next function_body_length
     private func embed() {
-        guard let parentVC = parentViewController else {
+        guard let parentVC = fwParentViewController else {
             return
         }
         guard self.feedVC == nil else {
@@ -205,10 +206,12 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             feedVC.viewConfiguration = viewConfiguration
         }
 
-        // 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
+        }
+
+        if FWAppLanguageManager.shared.shouldHorizontalFlip {
+            feedVC.view.fwrtl_viewType = FWRTLViewTypeFlip
         }
 
         feedVC.delegate = self
@@ -218,12 +221,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 
     public override func removeFromSuperview() {
         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 +281,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 +351,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-Bridging-Header.h

@@ -6,3 +6,9 @@
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTBridge+Private.h>
+#import "FWSwizzleLoader.h"
+#import "FWRTLManager.h"
+#import "UIView+FWRTL.h"
+#import "UIWindow+FWRTL.h"
+#import "UIView+FWRTL.h"
+#import "UIImage+FWRTL.h"