react-native-firework-sdk 2.2.5 → 2.3.1

package/src/modules/ShoppingModule.ts

@@ -17,7 +17,7 @@ const ShoppingModule = NativeModules.ShoppingModule
     );
 
 interface IShoppingModule extends NativeModule {
-  init(): void;
+  init(): Promise<any>;
   updateVideoProducts(products: Product[], callbackId: number | string): void;
   updateShoppingCTAResult(
     result: ShoppingCTAResult,
@@ -25,10 +25,9 @@ interface IShoppingModule extends NativeModule {
   ): void;
   setCartIconVisible(visible: boolean): void;
   setCartItemCount(count: number): void;
-  setCustomClickCartIconEnabled(enabled: boolean): Promise<void>; // Only supported on iOS
   clearCallbackId(callbackId: number | string, eventName: string): void; // Only supported on iOS
   setProductInfoViewConfiguration(config: ProductInfoViewConfiguration): void;
-  setCustomClickLinkButtonEnabled(enabled: boolean): Promise<void>;
+  setCustomClickLinkButtonEnabled(enabled: boolean): Promise<any>;
 }
 
 const ShoppingModuleEventEmitter = new NativeEventEmitter(ShoppingModule);

package/src/utils/FWGlobalState.ts

@@ -0,0 +1,31 @@
+class FWGlobalState {
+  private static _instance?: FWGlobalState;
+  private sdkInitCalledResolveFunc?: () => void;
+  sdkInitCalledPromise: Promise<void>;
+  sdkInitCalled: boolean = false;
+
+  static getInstance() {
+    if (!FWGlobalState._instance) {
+      FWGlobalState._instance = new FWGlobalState();
+    }
+
+    return FWGlobalState._instance!;
+  }
+
+  private constructor() {
+    this.sdkInitCalledPromise = new Promise((resolve) => {
+      this.sdkInitCalledResolveFunc = resolve;
+    });
+  }
+
+  resolveSdkInitCalled() {
+    if (this.sdkInitCalledResolveFunc) {
+      // only call once
+      this.sdkInitCalledResolveFunc();
+      this.sdkInitCalledResolveFunc = undefined;
+    }
+    this.sdkInitCalled = true;
+  }
+}
+
+export default FWGlobalState;

package/android/publish.gradle

@@ -1,66 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//./gradlew publish
-apply plugin: 'maven-publish'
-
-afterEvaluate {
-  publishing {
-    repositories {
-      maven {
-        url = project.findProperty('mavenRepo') ?: "${buildDir}/repo"
-//        credentials {
-//          username = ""
-//          password = ""
-//        }
-      }
-    }
-    publications {
-      release(MavenPublication) {
-        from components.release
-        artifact androidSourcesJar
-        groupId = 'com.github.loopsocial'
-        artifactId = 'fireworksdk_bridge_rn'
-        version android.defaultConfig.versionName
-        pom {
-          name = 'fireworksdk_bridge_rn'
-          description = 'The firework bridge library (all modules).'
-          licenses {
-            license {
-              name = 'The Apache Software License, Version 2.0'
-              url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-              distribution = 'repo'
-            }
-          }
-          developers {
-            developer {
-              name = 'The Android Open Source Project'
-            }
-          }
-          scm {
-            connection = 'scm:git:git@github.com:loopsocial/bogano.git'
-            developerConnection = 'scm:git:git@github.com:loopsocial/bogano.git'
-            url = 'https://github.com/loopsocial/bogano'
-          }
-        }
-      }
-    }
-  }
-}
-tasks.withType(PublishToMavenRepository) {  }
-
-task androidSourcesJar(type: Jar) {
-  archiveClassifier.set('sources')
-  from android.sourceSets.main.java.srcDirs
-}

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

@@ -1,129 +0,0 @@
-package com.fireworksdk.bridge.components.videofeed
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.Fragment
-import com.firework.storyblock.FeedLoadListener
-import com.firework.storyblock.FwStoryBlockView
-import com.fireworksdk.bridge.databinding.FwBridgeStoryBlockBinding
-import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
-import com.fireworksdk.bridge.utils.FWConfigUtil
-
-class StoryBlockFragment : Fragment() {
-
-  private var _binding: FwBridgeStoryBlockBinding? = null
-  private val binding: FwBridgeStoryBlockBinding get() = _binding!!
-
-  private var feedLoadListener: FeedLoadListener? = null
-  private var fullScreenStateChangeListener: FwStoryBlockView.OnFullscreenStateChangeListener? = null
-  private var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
-
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View {
-    _binding = FwBridgeStoryBlockBinding.inflate(inflater)
-    return binding.root
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    afterUpdateTransaction()
-    // need to call it after init()
-    binding.storyBlock.setFeedLoadListener(feedLoadListener)
-    binding.storyBlock.setOnFullscreenStateChangeListener(fullScreenStateChangeListener)
-//    addBackPressedCallback()
-//    Handler(Looper.getMainLooper()).postDelayed({
-//      addBackPressedCallback()
-//    }, 10000)
-  }
-
-
-  override fun onDestroyView() {
-//    removeBackPressedCallback()
-    _binding = null
-    super.onDestroyView()
-  }
-
-  private fun afterUpdateTransaction() {
-    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(videoFeedPropsModel)
-    binding.storyBlock.init(
-      childFragmentManager,
-      requireActivity().lifecycle,
-      viewOptionsBuilder.build(),
-      binding.storyBlockContainer,
-    )
-  }
-
-  fun setProps(props: FWVideoFeedPropsModel?) {
-    props ?: return
-    videoFeedPropsModel = props
-  }
-
-  fun play() {
-    binding.storyBlock.play()
-  }
-
-  fun pause() {
-    binding.storyBlock.pause()
-  }
-
-  fun toggleFullScreen() {
-    binding.storyBlock.toggleFullscreen()
-  }
-
-  fun setFeedLoadListener(feedLoadListener: FeedLoadListener?) {
-    this.feedLoadListener = feedLoadListener
-  }
-
-  fun setOnFullScreenStateChangedListener(listener: FwStoryBlockView.OnFullscreenStateChangeListener?) {
-    this.fullScreenStateChangeListener = listener
-  }
-
-  fun isFullScreen(): Boolean {
-    return binding.storyBlock.isFullscreen()
-  }
-
-  private val mBackPressedCallback: OnBackPressedCallback by lazy  {
-    object : OnBackPressedCallback(true) {
-      override fun handleOnBackPressed() {
-        if (binding.storyBlock.isFullscreen()) {
-          binding.storyBlock.toggleFullscreen()
-        } else {
-          isEnabled = false
-          requireActivity().onBackPressed()
-        }
-      }
-    }
-  }
-
-  private fun addBackPressedCallback() {
-    requireActivity()
-      .onBackPressedDispatcher
-      .addCallback(
-        viewLifecycleOwner,
-        mBackPressedCallback
-      )
-  }
-
-  private fun removeBackPressedCallback() {
-    mBackPressedCallback.remove()
-  }
-
-  override fun onPause() {
-    super.onPause()
-  }
-
-  override fun onResume() {
-    super.onResume()
-  }
-
-  override fun onDestroy() {
-    super.onDestroy()
-  }
-
-}

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

@@ -1,90 +0,0 @@
-package com.fireworksdk.bridge.components.videofeed
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.FrameLayout
-import com.fireworksdk.bridge.models.*
-
-class StoryBlockFrameLayout(
-  context: Context,
-  attrs: AttributeSet?
-) : FrameLayout(context, attrs) {
-
-  constructor(context: Context) : this(context, null)
-
-  private var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
-  private var storyBlockFragment by weakProperty<StoryBlockFragment?>()
-
-  fun setSource(source: String?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      source = source
-    )
-  }
-
-  fun setChannel(channel: String?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      channel = channel
-    )
-  }
-
-  fun setPlaylist(playlist: String?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      playlist = playlist
-    )
-  }
-
-  fun setHashtagFilterExpressionProps(hashtagFilterExpression: String?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      hashtagFilterExpression = hashtagFilterExpression
-    )
-  }
-
-  fun setDynamicContentParameters(parametersMap: HashMap<String, List<String>>?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      dynamicContentParameters = parametersMap
-    )
-  }
-
-  fun setEnablePictureInPicture(enablePictureInPicture: Boolean?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      enablePictureInPicture = enablePictureInPicture
-    )
-  }
-
-  fun setVideoFeedConfig(config: FWVideoFeedConfigModel?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      videoFeedConfiguration = config
-    )
-  }
-
-  fun setVideoPlayerConfig(config: FWVideoPlayerConfigModel?) {
-    videoFeedPropsModel = videoFeedPropsModel.copy(
-      videoPlayerConfiguration = config
-    )
-  }
-
-  fun setFragment(fragment: StoryBlockFragment) {
-    this.storyBlockFragment = fragment
-    fragment.setProps(videoFeedPropsModel)
-  }
-
-  fun getFragment(): StoryBlockFragment? {
-    return storyBlockFragment
-  }
-
-  fun play() {
-    storyBlockFragment?.play()
-  }
-
-  fun pause() {
-    storyBlockFragment?.pause()
-  }
-
-  fun toggleFullScreen() {
-    storyBlockFragment?.toggleFullScreen()
-  }
-
-  fun destroy() {
-    storyBlockFragment = null
-  }
-}

package/android/src/main/java/com/fireworksdk/bridge/constants/FWVideoPlayerConstant.kt

@@ -1,39 +0,0 @@
-package com.fireworksdk.bridge.constants
-
-object FWVideoPlayerConstant {
-
-  /**
-   * When advanceToNext, player will play the next video,
-   * When the current video finishes playing.
-   * When loop, playing video will loop until user explicitly
-   * swipes away
-   * Default value is advanceToNext.
-   */
-  const val FW_VIDEO_COMPLETE_ACTION_LOOP = "loop"
-  const val FW_VIDEO_COMPLETE_ACTION_ADVANCE_TO_NEXT = "advanceToNext"
-
-  /**
-   * launch video player in full bleed ( full screen ) mode or fit bleed mode
-   */
-  const val FW_PLAYER_STYLE_FULL = "full"
-  const val FW_PLAYER_STYLE_FIT = "fit"
-
-  /**
-   * Ad label
-   */
-  const val FW_AD_BADGE_LABEL_AD = "ad"
-  const val FW_AD_BADGE_LABEL_SPONSORED = "sponsored"
-
-  /**
-   * mute or default when open player
-   */
-  const val FW_PLAYER_LAUNCH_BEHAVIOR_DEFAULT = "default"
-  const val FW_PLAYER_LAUNCH_BEHAVIOR_MUTE_ON_FIRST_LAUNCH = "muteOnFirstLaunch"
-
-  /**
-   * cta delay type
-   */
-  const val FW_CTA_DELAY_TYPE_CONSTANT = "constant"
-  const val FW_CTA_DELAY_TYPE_PERCENTAGE = "percentage"
-
-}

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

@@ -1,9 +0,0 @@
-package com.fireworksdk.bridge.models
-
-enum class FWSystemTypeface(val rawValue: String) {
-  Default("DEFAULT"),
-  DefaultBold("DEFAULT_BOLD"),
-  SansSerif("SANS_SERIF"),
-  Serif("SERIF"),
-  Monospace("MONOSPACE"),
-}

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

@@ -1,7 +0,0 @@
-package com.fireworksdk.bridge.models
-
-enum class FWVideoFeedModel(val rawValue: String) {
-  Row("row"),
-  Column("column"),
-  Grid("grid"),
-}

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

@@ -1,10 +0,0 @@
-package com.fireworksdk.bridge.models
-
-enum class FWVideoFeedSource(val rawValue: String) {
-  Discover("discover"),
-  Channel("channel"),
-  Playlist("playlist"),
-  DynamicContent("dynamicContent"),
-  PlaylistGroup("playlistGroup"),
-  HashtagPlaylist("hashtagPlaylist"),
-}

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

@@ -1,7 +0,0 @@
-package com.fireworksdk.bridge.models
-
-enum class FWVideoFeedTitlePosition(val intValue: Int, val rawValue: String) {
-  Nested(1, "nested"),
-  Stacked(2, "stacked"),
-}
-

package/android/src/main/java/com/fireworksdk/bridge/reactnative/pages/FWContainerActivity.kt

@@ -1,53 +0,0 @@
-package com.fireworksdk.bridge.reactnative.pages
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import com.facebook.react.ReactFragment
-import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
-import com.fireworksdk.bridge.R
-import com.fireworksdk.bridge.utils.FWBundleUtils
-
-
-class FWContainerActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler {
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.fw_bridge_fragment_container)
-
-    val componentName = intent.getStringExtra(KEY_COMPONENT_NAME)
-    val params = intent.getSerializableExtra(KEY_PARAMS) as HashMap<String, Any?>?
-
-    val reactNativeFragment: Fragment = ReactFragment.Builder()
-      .setComponentName(componentName)
-      // https://github.com/facebook/react-native/issues/16026
-      .setLaunchOptions(FWBundleUtils.mapToBundle(params))
-      .build()
-
-    supportFragmentManager
-      .beginTransaction()
-      .add(R.id.fw_bridge_container, reactNativeFragment)
-      .commit()
-  }
-
-  companion object {
-
-    private const val KEY_PARAMS = "params"
-    private const val KEY_COMPONENT_NAME = "componentName"
-
-    fun createIntent(activity: Activity, componentName: String?, params: HashMap<String, Any?>?): Intent {
-      val intent = Intent(activity, FWContainerActivity::class.java)
-      intent.putExtra(KEY_COMPONENT_NAME, componentName)
-      intent.putExtra(KEY_PARAMS, params)
-      intent.flags = Intent.FLAG_ACTIVITY_NO_ANIMATION
-      activity.overridePendingTransition(0, 0)
-      return intent
-    }
-  }
-
-  override fun invokeDefaultOnBackPressed() {
-    super.onBackPressed();
-  }
-}

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/fw_bridge_container"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-</FrameLayout>

package/ios/Modules/FWNavigatorModule/FWNavigatorContainerViewController.swift

@@ -1,33 +0,0 @@
-//
-//  FWNavigatorContainerViewController.swift
-//  react-native-firework-sdk
-//
-//  Created by Big Bear Xiong on 2022/4/22.
-//
-
-import UIKit
-
-class FWNavigatorContainerViewController: UIViewController {
-    var moduleName: String = ""
-    var properties: [String: Any] = [:]
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        loadContent()
-    }
-
-    private func loadContent() {
-        let rctRootView = RCTRootView.init(
-            bridge: RCTBridge.current(), moduleName: moduleName, initialProperties: properties)
-        view.addSubview(rctRootView)
-        rctRootView.translatesAutoresizingMaskIntoConstraints = false
-
-        NSLayoutConstraint.activate([
-            rctRootView.leftAnchor.constraint(equalTo: view.leftAnchor),
-            rctRootView.topAnchor.constraint(equalTo: view.topAnchor),
-            rctRootView.rightAnchor.constraint(equalTo: view.rightAnchor),
-            rctRootView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-        ])
-    }
-
-}

package/ios/Modules/FWNavigatorModule/FWNavigatorProtocol.swift

@@ -1,18 +0,0 @@
-//
-//  FWNavigatorProtocol.swift
-//  react-native-firework-sdk
-//
-//  Created by Big Bear Xiong on 2022/4/21.
-//
-
-import Foundation
-
-protocol FWNavigator {
-    func pushNativeContainer(
-        _ props: NSDictionary?, resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock)
-    func popNativeContainer(
-        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
-    func canPopNativeContainer(
-        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock)
-}