react-native-firework-sdk 1.9.0-beta.3 → 1.10.0-beta.1

package/android/build.gradle

@@ -167,7 +167,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 
 dependencies {
 
-  def firework_sdk_version = 'v5.14.14'
+  def firework_sdk_version = 'v5.14.15'
   implementation "com.github.loopsocial:firework_sdk:$firework_sdk_version"
 
   // noinspection GradleDynamicVersion

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

@@ -11,17 +11,44 @@ object FWLanguageUtil {
   private const val LOCALE_SP = "fw_locale_sp"
   private const val LOCALE_KEY = "fw_locale_key"
 
-  private fun init(context: Context) {
+  private var systemLocale: Locale? = null
+
+  private fun readLocaleFromSp(context: Context) {
     locale = context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
       .getString(LOCALE_KEY, null)
   }
 
   fun changeLanguage(context: Context, l: String?): Boolean {
-    if (l.isNullOrBlank() || !isValidLocale(l)) {
+    readLocaleFromSp(context)
+    val sharedPreferences =
+      context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
+    if (l.isNullOrBlank()) {
+      if (locale.isNullOrBlank()) {
+        return true
+      }
+
+      locale = null
+      sharedPreferences.edit().apply {
+        remove(LOCALE_KEY)
+      }.commit()
+
+      // change sdk locale to system locale
+      val sysLocale = getSystemLocale()
+      if (sysLocale.country.isNullOrBlank()) {
+        FwSDK.changeAppLocale(context, sysLocale.language)
+      } else {
+        FwSDK.changeAppLocale(context, "${sysLocale.language}-${sysLocale.country}")
+      }
+
+      restartActivity(context)
+      return true
+    }
+
+    if (!isValidLocale(l)) {
       return false
     }
 
-    if (isSame(context, l)) {
+    if (locale == l) {
       return true
     }
 
@@ -29,22 +56,22 @@ object FWLanguageUtil {
     FwSDK.changeAppLocale(context, l)
 
     // save to sp
-    val sharedPreferences =
-      context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
     sharedPreferences.edit().apply {
         putString(LOCALE_KEY, l)
       }.apply()
 
-    if (context is Activity) {
-      context.recreate()
-    }
+    restartActivity(context)
 
     return true
   }
 
   fun updateBaseContextLocale(context: Context): Context {
+    if (systemLocale == null) {
+      systemLocale = Locale.getDefault()
+    }
+
     if (locale.isNullOrBlank()) {
-      init(context)
+      readLocaleFromSp(context)
     }
     locale?.let {
       val localeStrings = it.split("-")
@@ -57,7 +84,10 @@ object FWLanguageUtil {
 
       return updateResourcesLocale(context, locale)
     }
-    return updateResourcesLocale(context, Locale.getDefault())
+
+    val l = getSystemLocale()
+    Locale.setDefault(l)
+    return updateResourcesLocale(context, l)
   }
 
   private fun updateResourcesLocale(context: Context, locale: Locale): Context {
@@ -80,11 +110,14 @@ object FWLanguageUtil {
     return list.contains(Locale(locale))
   }
 
-  private fun isSame(context: Context, l: String?) : Boolean {
-    if (locale.isNullOrBlank()) {
-      init(context)
+  private fun restartActivity(context: Context) {
+    if (context is Activity) {
+      context.recreate()
     }
-    return locale.equals(l)
+  }
+
+  private fun getSystemLocale(): Locale {
+    return systemLocale ?: Locale.getDefault()
   }
 
 }

package/ios/Components/StoryBlock.swift

@@ -10,7 +10,7 @@ import UIKit
 
 @objc
 public enum StoryBlockSourceType: Int {
-    case discover, channel, playlist, dynamicContent
+    case discover, channel, playlist, dynamicContent, hashtagPlaylist
 }
 
 public protocol StoryBlockViewDelegate: AnyObject {
@@ -24,7 +24,9 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
     @objc public var channel: String = ""
     @objc public var playlist: String = ""
     @objc public var dynamicContentParameters: [String: [String]] = [:]
+    @objc public var hashtagFilterExpression: String = ""
     @objc public var enablePictureInPicture: Bool = false
+    @objc public var adConfiguration: AdConfiguration?
 
     public weak var delegate: StoryBlockViewDelegate?
 
@@ -42,6 +44,8 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
             return .channelPlaylist(channelID: channel, playlistID: playlist)
         case .dynamicContent:
             return .dynamicContent(channelID: channel, parameters: dynamicContentParameters)
+        case .hashtagPlaylist:
+            return .hashtagPlaylist(channelID: channel, filterExpression: hashtagFilterExpression)
         }
     }
 
@@ -61,20 +65,26 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
     }
 
     private func embed() {
-        guard let parentVC = fwParentViewController else {
+        guard let parentVC = parentViewController else {
             return
         }
         guard self.storyBlockVC == nil else {
             return
         }
 
-        let storyBlockVC = StoryBlockViewController(source: source)
-        if self.enablePictureInPicture {
-            storyBlockVC.isPictureInPictureEnabled = true
+        var resultStoryBlockVC: StoryBlockViewController?
+        if let fireworkVideoAdConfiguration = RCTConvert.getFireworkVideoAdConfiguration(adConfiguration) {
+            resultStoryBlockVC = StoryBlockViewController(source: source, adConfiguration: fireworkVideoAdConfiguration)
+        } else {
+            resultStoryBlockVC = StoryBlockViewController(source: source)
         }
 
-        if FWAppLanguageManager.shared.shouldHorizontalFlip {
-            storyBlockVC.view.fwrtl_viewType = FWRTLViewTypeFlip
+        guard let storyBlockVC = resultStoryBlockVC else {
+            return
+        }
+
+        if self.enablePictureInPicture {
+            storyBlockVC.isPictureInPictureEnabled = true
         }
 
         storyBlockVC.delegate = self
@@ -93,6 +103,22 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
         self.storyBlockVC = nil
     }
 
+    @objc
+    public func play() {
+        guard let storyBlockVC = self.storyBlockVC else {
+            return
+        }
+        storyBlockVC.play()
+    }
+
+    @objc
+    public func pause() {
+        guard let storyBlockVC = self.storyBlockVC else {
+            return
+        }
+        storyBlockVC.pause()
+    }
+
     public func storyBlockDidLoadFeed(_ viewController: StoryBlockViewController) {
         guard let delegate = self.delegate else {
             return

package/ios/Components/StoryBlockManager.m

@@ -8,7 +8,13 @@
 #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(FWStoryBlock, StoryBlockManager, NSObject)
 
@@ -21,10 +27,37 @@ RCT_CUSTOM_VIEW_PROPERTY(source, StoryBlockSource, StoryBlock) {
 RCT_EXPORT_VIEW_PROPERTY(channel, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlist, NSString)
 RCT_EXPORT_VIEW_PROPERTY(dynamicContentParameters, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(hashtagFilterExpression, NSString)
 RCT_EXPORT_VIEW_PROPERTY(enablePictureInPicture, BOOL)
 
+RCT_CUSTOM_VIEW_PROPERTY(adConfiguration, AdConfiguration, StoryBlock) {
+    AdConfiguration *config = [RCTConvert adConfiguration:json];
+    view.adConfiguration = config;
+}
 
 RCT_EXPORT_VIEW_PROPERTY(onStoryBlockLoadFinished, RCTBubblingEventBlock)
 
+RCT_EXPORT_METHOD(play:(nonnull NSNumber *)reactTag) {
+    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
+        StoryBlock *view = (StoryBlock *)(viewRegistry[reactTag]);
+        if (!view || ![view isKindOfClass:[StoryBlock class]]) {
+            RCTLogError(@"Cannot find NativeView with tag #%@", reactTag);
+            return;
+        }
+        [view play];
+    }];
+}
+
+RCT_EXPORT_METHOD(pause:(nonnull NSNumber *)reactTag) {
+    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
+        StoryBlock *view = (StoryBlock *)(viewRegistry[reactTag]);
+        if (!view || ![view isKindOfClass:[StoryBlock class]]) {
+            RCTLogError(@"Cannot find NativeView with tag #%@", reactTag);
+            return;
+        }
+        [view pause];
+    }];
+}
+
 @end
 

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

@@ -7,6 +7,9 @@
 
 import FireworkVideo
 import UIKit
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc
 public enum VideoFeedMode: Int {
@@ -15,7 +18,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 {
@@ -34,6 +37,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 {
@@ -74,6 +78,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)
         }
     }
 
@@ -128,38 +134,14 @@ 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()
 
         embed()
     }
 
-    // swiftlint:disable:next function_body_length
     private func embed() {
-        guard let parentVC = fwParentViewController else {
+        guard let parentVC = parentViewController else {
             return
         }
         guard self.feedVC == nil else {
@@ -167,7 +149,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         }
 
         var resultFeedVC: VideoFeedViewController?
-        if let fireworkVideoAdConfiguration = fireworkVideoAdConfiguration {
+        if let fireworkVideoAdConfiguration = RCTConvert.getFireworkVideoAdConfiguration(adConfiguration) {
             resultFeedVC = VideoFeedViewController(
                 layout: videoFeedLayout,
                 source: source,
@@ -210,10 +192,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             feedVC.isPictureInPictureEnabled = true
         }
 
-        if FWAppLanguageManager.shared.shouldHorizontalFlip {
-            feedVC.view.fwrtl_viewType = FWRTLViewTypeFlip
-        }
-
         feedVC.delegate = self
         self.feedVC = feedVC
         parentVC.attachChild(feedVC, to: self)

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/FireworkSdk-Bridging-Header.h

@@ -6,9 +6,3 @@
 #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"