react-native-firework-sdk 2.0.0 → 2.2.0-beta.1

package/ios/Components/StoryBlockManager.swift

@@ -7,10 +7,14 @@
 
 import FireworkVideo
 import Foundation
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc(StoryBlockManager)
 class StoryBlockManager: RCTViewManager, StoryBlockViewDelegate {
     override func view() -> UIView! {
+        _ = AppLanguageManager.shared
         let storyBlock = StoryBlock()
         storyBlock.delegate = self
 

package/ios/Components/VideoFeed.swift

@@ -9,6 +9,9 @@
 
 import FireworkVideo
 import UIKit
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc
 public enum VideoFeedMode: Int {
@@ -17,7 +20,7 @@ public enum VideoFeedMode: Int {
 
 @objc
 public enum VideFeedSourceType: Int {
-    case discover, channel, playlist, playlistGroup, dynamicContent
+    case discover, channel, playlist, playlistGroup, dynamicContent, hashtagPlaylist
 }
 
 public protocol VideoFeedViewDelegate: AnyObject {
@@ -36,6 +39,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     @objc public var playlist: String = ""
     @objc public var playlistGroup: String = ""
     @objc public var dynamicContentParameters: NSDictionary = NSDictionary()
+    @objc public var hashtagFilterExpression: String = ""
     @objc public var mode: VideoFeedMode = .row
     @objc public var feedViewConfig: VideoFeedConfiguration? {
         didSet {
@@ -76,6 +80,8 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         case .dynamicContent:
             let parameters = dynamicContentParameters as? [String: [String]]
             return .dynamicContent(channelID: channel, parameters: parameters ?? [:])
+        case .hashtagPlaylist:
+            return .hashtagPlaylist(channelID: channel, filterExpression: hashtagFilterExpression)
         }
     }
 
@@ -130,29 +136,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         return resultLayout ?? VideoFeedHorizontalLayout()
     }
 
-    private var fireworkVideoAdConfiguration: FireworkVideo.AdConfiguration? {
-        guard let feedAdConfiguration = adConfiguration else {
-            return nil
-        }
-
-        var resultAdConfiguration = FireworkVideo.AdConfiguration()
-        if let requiresAds = feedAdConfiguration.requiresAds {
-            resultAdConfiguration.requiresAds = requiresAds
-        }
-
-        if let adsFetchTimeout = feedAdConfiguration.adsFetchTimeout {
-            resultAdConfiguration.adsFetchTimeout = adsFetchTimeout
-        }
-
-        if let vastAttributes = feedAdConfiguration.vastAttributes {
-            resultAdConfiguration.vastAttributes = vastAttributes.map({ attribute in
-                return URLQueryItem(name: attribute.name ?? "", value: attribute.value ?? "")
-            })
-        }
-
-        return resultAdConfiguration
-    }
-
     public override func layoutSubviews() {
         super.layoutSubviews()
 
@@ -160,12 +143,15 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     }
 
     private func embed() {
-        guard let parentVC = parentViewController, self.feedVC == nil else {
+        guard let parentVC = parentViewController else {
+            return
+        }
+        guard self.feedVC == nil else {
             return
         }
 
         var resultFeedVC: VideoFeedViewController?
-        if let fireworkVideoAdConfiguration = fireworkVideoAdConfiguration {
+        if let fireworkVideoAdConfiguration = RCTConvert.getFireworkVideoAdConfiguration(adConfiguration) {
             resultFeedVC = VideoFeedViewController(
                 layout: videoFeedLayout,
                 source: source,
@@ -204,8 +190,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             feedVC.viewConfiguration = viewConfiguration
         }
 
-        // swiftlint:disable:next notification_center_detachment
-        NotificationCenter.default.removeObserver(self)
         if self.enablePictureInPicture || feedViewConfig?.enablePictureInPicture == true {
             feedVC.isPictureInPictureEnabled = true
         }
@@ -217,8 +201,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 
     public override func removeFromSuperview() {
         super.removeFromSuperview()
-        // swiftlint:disable:next notification_center_detachment
-        NotificationCenter.default.removeObserver(self)
 
         guard let feedVC = self.feedVC else {
             return
@@ -367,8 +349,10 @@ extension VideoFeed {
             vpcConfig.videoDetail.fireworkAttribution.isHidden = !showBranding
         }
 
-        if let shareBaseUrl = gShareBaseURL {
-            vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseUrl)
+        if let shareBaseURL = config.shareBaseURL {
+            vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseURL)
+        } else if let shareBaseURL = gShareBaseURL {
+            vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseURL)
         }
 
         if let ctaDelay = config.ctaDelay,

package/ios/Components/VideoFeedManager.m

@@ -9,7 +9,12 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
+
+#if __has_include(<react_native_firework_sdk/react_native_firework_sdk-Swift.h>)
+#import <react_native_firework_sdk/react_native_firework_sdk-Swift.h>
+#else
 #import "react_native_firework_sdk-Swift.h"
+#endif
 
 @interface RCT_EXTERN_REMAP_MODULE(FWVideoFeed, VideoFeedManager, NSObject)
 
@@ -23,6 +28,7 @@ RCT_EXPORT_VIEW_PROPERTY(channel, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlist, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlistGroup, NSString)
 RCT_EXPORT_VIEW_PROPERTY(dynamicContentParameters, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(hashtagFilterExpression, NSString)
 
 RCT_CUSTOM_VIEW_PROPERTY(mode, VideoFeedMode, VideoFeed) {
     if (json) {
@@ -51,12 +57,12 @@ RCT_EXPORT_VIEW_PROPERTY(onVideoFeedLoadFinished, RCTBubblingEventBlock)
 
 RCT_EXPORT_METHOD(refresh:(nonnull NSNumber *)reactTag) {
     [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
-            VideoFeed *view = (VideoFeed *)(viewRegistry[reactTag]);
-            if (!view || ![view isKindOfClass:[VideoFeed class]]) {
-                RCTLogError(@"Cannot find NativeView with tag #%@", reactTag);
-                return;
-            }
-            [view refresh];
+        VideoFeed *view = (VideoFeed *)(viewRegistry[reactTag]);
+        if (!view || ![view isKindOfClass:[VideoFeed class]]) {
+            RCTLogError(@"Cannot find NativeView with tag #%@", reactTag);
+            return;
+        }
+        [view refresh];
     }];
 }
 

package/ios/Components/VideoFeedManager.swift

@@ -8,11 +8,15 @@
 
 import FireworkVideo
 import Foundation
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc(VideoFeedManager)
 class VideoFeedManager: RCTViewManager, VideoFeedViewDelegate {
 
     override func view() -> UIView! {
+        _ = AppLanguageManager.shared
         let videFeed = VideoFeed()
         videFeed.delegate = self
 

package/ios/Components/VideoPlayerConfiguration.swift

@@ -18,6 +18,7 @@ public class VideoPlayerConfiguration: NSObject, Codable {
     var showBranding: Bool?
     var ctaDelay: VideoPlayerCTADelay?
     var ctaHighlightDelay: VideoPlayerCTADelay?
+    var shareBaseURL: String?
 
     public enum VideoPlayerStyle: String, Codable {
         case full, fit