react-native-firework-sdk 2.2.5 → 2.3.1

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

@@ -2,119 +2,116 @@ package com.fireworksdk.bridge.utils
 
 import android.app.Activity
 import android.content.Context
-import java.util.*
+import androidx.fragment.app.FragmentActivity
+import com.fireworksdk.bridge.components.base.FWBaseFragment
+import java.util.Locale
 
-object FWLanguageUtil {
+class FWLanguageUtil private constructor(context: Context) {
 
-  private var locale: String? = null
-  private const val LOCALE_SP = "fw_locale_sp"
-  private const val LOCALE_KEY = "fw_locale_key"
-
-  private var systemLocale: Locale? = null
-
-  private fun readLocaleFromSp(context: Context) {
-    locale = context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
-      .getString(LOCALE_KEY, null)
+  private val sharedPreferences by lazy {
+    context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
   }
 
-  fun changeLanguage(context: Context, l: String?): Boolean {
-    readLocaleFromSp(context)
-    val sharedPreferences =
-      context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
-    if (l.isNullOrBlank()) {
-      if (locale.isNullOrBlank()) {
-        return true
-      }
+  private val initAppLocale: Locale = Locale.getDefault()
 
-      locale = null
-      sharedPreferences.edit().apply {
-        remove(LOCALE_KEY)
-      }.commit()
+  private var localeString: String? = null
 
-      // 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}")
-//      }
+  init {
+    localeString = sharedPreferences.getString(LOCALE_KEY, null)
+  }
 
-      restartActivity(context)
-      return true
-    }
+  fun updateBaseContextLocale(baseContext: Context): Context {
+    val currentLocaleString = localeString
 
-    if (!isValidLocale(l)) {
-      return false
+    if (currentLocaleString.isNullOrBlank()) {
+      Locale.setDefault(initAppLocale)
+      return updateResourcesLocale(baseContext, initAppLocale)
     }
 
-    if (locale == l) {
-      return true
+    val localeStrings = currentLocaleString.split("-")
+    val locale = if (localeStrings.size > 1) {
+      Locale(localeStrings[0], localeStrings[1])
+    } else {
+      Locale(currentLocaleString)
     }
+    Locale.setDefault(locale)
+    return updateResourcesLocale(baseContext, locale)
+  }
 
-    locale = l
-
-    // save to sp
-    sharedPreferences.edit().apply {
-        putString(LOCALE_KEY, l)
-      }.apply()
-
-    restartActivity(context)
-
-    return true
+  private fun updateResourcesLocale(context: Context, locale: Locale): Context {
+    val resources = context.resources
+    val configuration = resources.configuration
+    configuration.setLocale(locale)
+    configuration.setLayoutDirection(locale)
+    return context.createConfigurationContext(configuration)
   }
 
-  fun updateBaseContextLocale(context: Context): Context {
-    if (systemLocale == null) {
-      systemLocale = Locale.getDefault()
+  fun changeLanguage(inputLocaleString: String?, activity: Activity?): Boolean {
+    // no change
+    if ((inputLocaleString.isNullOrBlank() && localeString.isNullOrBlank())
+      || localeString == inputLocaleString
+    ) {
+      return true
     }
 
-    if (locale.isNullOrBlank()) {
-      readLocaleFromSp(context)
+    // clear local if empty input locale
+    if (inputLocaleString.isNullOrBlank()) {
+      localeString = null
+      updateSpLanguage(inputLocaleString)
+      restartActivity(activity)
+      return true
     }
-    locale?.let {
-      val locale = getLocale(it)
-      Locale.setDefault(locale)
 
-      return updateResourcesLocale(context, locale)
+    // invalid input locale
+    if (!isValidLocale(inputLocaleString)) {
+      return false
     }
 
-    val l = getSystemLocale()
-    Locale.setDefault(l)
-    return updateResourcesLocale(context, l)
+    // update locale
+    localeString = inputLocaleString
+    updateSpLanguage(inputLocaleString)
+    restartActivity(activity)
+    return true
   }
 
-  private fun updateResourcesLocale(context: Context, locale: Locale): Context {
-    val resources = context.resources
-    val configuration = resources.configuration
-    configuration.setLocale(locale)
-    configuration.setLayoutDirection(locale)
-    return context.createConfigurationContext(configuration)
+  private fun updateSpLanguage(l: String?) {
+    if (l.isNullOrBlank()) {
+      sharedPreferences.edit().apply {
+        remove(LOCALE_KEY)
+      }.apply()
+    } else {
+      sharedPreferences.edit().apply {
+        putString(LOCALE_KEY, l)
+      }.apply()
+    }
+  }
+
+  private fun restartActivity(activity: Activity?) {
+    if (activity is FragmentActivity) {
+      val fragments = activity.supportFragmentManager.fragments
+      for (f in fragments) {
+        if (f is FWBaseFragment && f.removeWhenRecreateActivity()) {
+          FWFragmentUtil.removeFragment(activity, f)
+        }
+      }
+    }
+    activity?.recreate()
   }
 
   private fun isValidLocale(locale: String?) : Boolean {
     locale ?: return false
     val list = Locale.getAvailableLocales()
-    return list.contains(getLocale(locale))
-  }
-
-  private fun getLocale(locale: String): Locale {
     if (locale.contains("-")) {
       val locales = locale.split("-")
       if (locales.size > 1) {
-        return Locale(locales[0], locales[1])
+        return list.contains(Locale(locales[0], locales[1]))
       }
     }
-    return Locale(locale)
-  }
-
-  private fun restartActivity(context: Context) {
-    if (context is Activity) {
-      context.recreate()
-    }
+    return list.contains(Locale(locale))
   }
 
-  private fun getSystemLocale(): Locale {
-    return systemLocale ?: Locale.getDefault()
+  companion object : FWSingletonHolder<FWLanguageUtil, Context>(::FWLanguageUtil) {
+    private const val LOCALE_SP = "fw_locale_sp"
+    private const val LOCALE_KEY = "fw_locale_key"
   }
-
 }

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

@@ -0,0 +1,17 @@
+package com.fireworksdk.bridge.utils
+
+import com.firework.livestream.LivestreamPlayerInitializer
+
+object FWLiveStreamUtil {
+
+  private val livestreamPlayerInitializerList: MutableList<LivestreamPlayerInitializer> = mutableListOf()
+
+  fun addLivestreamPlayerInitializer(initializer: LivestreamPlayerInitializer?) {
+    initializer ?: return
+    livestreamPlayerInitializerList.add(initializer)
+  }
+
+  fun livestreamPlayerInitializers(): List<LivestreamPlayerInitializer> {
+    return livestreamPlayerInitializerList
+  }
+}

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

@@ -0,0 +1,25 @@
+package com.fireworksdk.bridge.utils
+
+open class FWSingletonHolder<out T, in A>(creator: (A) -> T) {
+  private var creator: ((A) -> T)? = creator
+  @Volatile private var instance: T? = null
+
+  fun getInstance(arg: A): T {
+    val i = instance
+    if (i != null) {
+      return i
+    }
+
+    return synchronized(this) {
+      val i2 = instance
+      if (i2 != null) {
+        i2
+      } else {
+        val created = creator!!(arg)
+        instance = created
+        creator = null
+        created
+      }
+    }
+  }
+}

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

@@ -0,0 +1,28 @@
+package com.fireworksdk.bridge.utils
+
+import android.app.Activity
+import android.view.WindowManager
+
+
+object FWStatusBarUtil {
+
+  private var windowAttrs: WindowManager.LayoutParams? = null
+
+  private fun saveFlags(activity: Activity) {
+    val attr = WindowManager.LayoutParams()
+    attr.copyFrom(activity.window.attributes)
+    windowAttrs = attr
+  }
+
+  fun hideSystemNavigationUI(activity: Activity) {
+    saveFlags(activity)
+    @Suppress("DEPRECATION")
+    activity.window.addFlags(
+      WindowManager.LayoutParams.FLAG_FULLSCREEN
+    )
+  }
+
+  fun restoreSystemNavigationUI(activity: Activity) {
+    activity.window.attributes = windowAttrs
+  }
+}

package/android/src/main/res/layout/fw_bridge_story_block.xml

@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:layout_gravity="center"
-  android:layout_marginVertical="16dp">
+  android:layout_height="match_parent">
 
   <FrameLayout
     android:id="@+id/story_block_container"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.firework.storyblock.FwStoryBlockView
       android:id="@+id/story_block"
@@ -21,4 +14,4 @@
       android:layout_height="match_parent" />
 
   </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

package/ios/Components/VideoFeed.swift

@@ -23,7 +23,7 @@ public enum VideFeedSourceType: Int {
     case discover, channel, playlist, playlistGroup, dynamicContent, hashtagPlaylist
 }
 
-public protocol VideoFeedViewDelegate: AnyObject {
+public protocol VideoFeedDelegate: AnyObject {
     /// Called once after a video feed has been successfully loaded
     func videoFeedDidLoadFeed(_ view: VideoFeed)
     /// Called if the video feed failed to load
@@ -64,7 +64,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     @objc var onVideoFeedLoadFinished: RCTBubblingEventBlock?
     //    @objc var onVideoFeedClick: RCTBubblingEventBlock?
 
-    public weak var delegate: VideoFeedViewDelegate?
+    public weak var delegate: VideoFeedDelegate?
 
     private var feedVC: VideoFeedViewController?
     private var source: VideoFeedContentSource {
@@ -190,7 +190,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             feedVC.viewConfiguration = viewConfiguration
         }
 
-        if self.enablePictureInPicture || feedViewConfig?.enablePictureInPicture == true {
+        if self.enablePictureInPicture {
             feedVC.isPictureInPictureEnabled = true
         }
 
@@ -237,7 +237,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 }
 
 extension VideoFeed {
-    // swiftlint:disable:next cyclomatic_complexity
+    // swiftlint:disable:next cyclomatic_complexity function_body_length
     private static func convertToVideoFeedItemContentConfiguration(
         _ config: VideoFeedConfiguration?
     ) -> VideoFeedItemContentConfiguration? {
@@ -260,19 +260,15 @@ extension VideoFeed {
             if let textcolor = title.textColor {
                 vfcConfig.title.textColor = textcolor.uicolor()
             }
+            if let numberOfLines = title.numberOfLines {
+                vfcConfig.title.numberOfLines = numberOfLines
+            }
             if let fontSize = title.fontSize {
                 let iOSFontInfo = title.iOSFontInfo ?? FontInfo()
                 vfcConfig.title.font = iOSFontInfo.getFont(fontSize)
             }
         }
-        if let playIcon = config.playIcon {
-            if let hidden = playIcon.hidden {
-                vfcConfig.playIcon.isHidden = hidden
-            }
-            if let iconWidth = playIcon.iconWidth {
-                vfcConfig.playIcon.iconWidth = iconWidth
-            }
-        }
+
         if let position = config.titlePosition {
             switch position {
             case .stacked:
@@ -281,9 +277,31 @@ extension VideoFeed {
                 vfcConfig.titleLayoutConfiguration.titlePosition = .nested
             }
         }
-        if let showSponsored = config.showSponsored {
-            vfcConfig.sponsored.isHidden = !showSponsored
+
+        if let titlePadding = config.titlePadding {
+            if let top = titlePadding.top {
+                vfcConfig.titleLayoutConfiguration.insets.top = top
+            }
+            if let right = titlePadding.right {
+                vfcConfig.titleLayoutConfiguration.insets.right = right
+            }
+            if let bottom = titlePadding.bottom {
+                vfcConfig.titleLayoutConfiguration.insets.bottom = bottom
+            }
+            if let left = titlePadding.left {
+                vfcConfig.titleLayoutConfiguration.insets.left = left
+            }
+        }
+
+        if let playIcon = config.playIcon {
+            if let hidden = playIcon.hidden {
+                vfcConfig.playIcon.isHidden = hidden
+            }
+            if let iconWidth = playIcon.iconWidth {
+                vfcConfig.playIcon.iconWidth = iconWidth
+            }
         }
+
         if let showAdBadge = config.showAdBadge {
             vfcConfig.sponsored.isHidden = !showAdBadge
         }
@@ -377,14 +395,15 @@ extension VideoFeed {
             }
         }
 
+        if let ctaWidth = config.ctaWidth {
+            vpcConfig.ctaButton.width = ctaWidth.width()
+        }
+
         return vpcConfig
     }
 
     private func convertToVideoFeedContentConfiguration() -> VideoFeedContentConfiguration {
         var videoConfig = VideoFeedContentConfiguration()
-        // default value so that behavior will the same with Android
-        videoConfig.itemView.title.isHidden = false
-        videoConfig.itemView.titleLayoutConfiguration.titlePosition = .nested
 
         let vfcConfig = VideoFeed.convertToVideoFeedItemContentConfiguration(feedViewConfig)
         let vpcConfig = VideoFeed.convertToVideoPlayerContentConfiguration(playerViewConfig)
@@ -404,8 +423,9 @@ extension VideoFeed {
         }
 
         // set a value different from default value to compatible with FireworkVideo SDK misalign bug
-        videoConfig.itemView.titleLayoutConfiguration.insets = UIEdgeInsets(
-            top: 7, left: 7, bottom: 7, right: 7)
+        if videoConfig.itemView.titleLayoutConfiguration.insets == UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8) {
+            videoConfig.itemView.titleLayoutConfiguration.insets = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7)
+        }
 
         return videoConfig
     }

package/ios/Components/VideoFeedConfiguration.swift

@@ -13,21 +13,20 @@ public class VideoFeedConfiguration: NSObject, Codable {
     var cornerRadius: Double?
     var title: VideoFeedTitleConfiguration?
     var titlePosition: VideoFeedTitlePosition?
+    var titlePadding: VideoFeedPadding?
     var playIcon: VideoFeedPlayIconConfiguration?
-    var showSponsored: Bool?
     var showAdBadge: Bool?
     var aspectRatio: Double?
-    var contentPadding: VideoFeedContentPadding?
+    var contentPadding: VideoFeedPadding?
     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 numberOfLines: Int?
         public var iOSFontInfo: FontInfo?
     }
 
@@ -36,7 +35,7 @@ public class VideoFeedConfiguration: NSObject, Codable {
         public var iconWidth: Double?
     }
 
-    class VideoFeedContentPadding: NSObject, Codable {
+    class VideoFeedPadding: NSObject, Codable {
         public var top: Double?
         public var right: Double?
         public var bottom: Double?

package/ios/Components/VideoFeedManager.swift

@@ -13,7 +13,7 @@ import FireworkVideoUI
 #endif
 
 @objc(VideoFeedManager)
-class VideoFeedManager: RCTViewManager, VideoFeedViewDelegate {
+class VideoFeedManager: RCTViewManager, VideoFeedDelegate {
 
     override func view() -> UIView! {
         _ = AppLanguageManager.shared

package/ios/Components/VideoPlayerConfiguration.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import FireworkVideo
 
 @objc
 public class VideoPlayerConfiguration: NSObject, Codable {
@@ -19,6 +20,7 @@ public class VideoPlayerConfiguration: NSObject, Codable {
     var ctaDelay: VideoPlayerCTADelay?
     var ctaHighlightDelay: VideoPlayerCTADelay?
     var shareBaseURL: String?
+    var ctaWidth: VideoPlayerCTAWidth?
 
     public enum VideoPlayerStyle: String, Codable {
         case full, fit
@@ -43,4 +45,19 @@ public class VideoPlayerConfiguration: NSObject, Codable {
         var type: VideoPlayerCTADelayType?
         var value: Double?
     }
+
+    public enum VideoPlayerCTAWidth: String, Codable {
+        case fullWidth, compact, sizeToFit
+
+        func width() -> VideoPlayerCTAConfiguration.VideoPlayerCTAWidth {
+            switch self {
+            case .fullWidth:
+                return .fullWidth
+            case .compact:
+                return .compact
+            case .sizeToFit:
+                return .sizeToFit
+            }
+        }
+    }
 }