chore: move sample to expo (#3880)

* perf: ensure we do not provide callback to native if no callback provided from app * chore: rework bufferConfig to make it more generic and reduce ReactExoplayerView code size * chore: improve issue template * fix(android): avoid video view flickering at playback startup * fix: ensure player doesn't start when view is unmounted * chore: move basic sample to expo * Update examples/basic/package.json Co-authored-by: Krzysztof Moch <[email protected]> * chore: use last expo version * chore: fix podfile --------- Co-authored-by: Krzysztof Moch <[email protected]>
TheWidlarzGroup · Jun 20, 2024 · c1c7a05 · c1c7a05
1 parent 856b1dd
commit c1c7a05
Show file tree

Hide file tree

Showing 15 changed files with 3,409 additions and 438 deletions.
diff --git a/examples/basic/.gitignore b/examples/basic/.gitignore
@@ -70,3 +70,8 @@ buck-out/
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+# Expo
+.expo
+dist/
+web-build/
diff --git a/examples/basic/android/app/build.gradle b/examples/basic/android/app/build.gradle
@@ -49,6 +49,11 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+    //
+    // Added by install-expo-modules
+    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
+    cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
+    bundleCommand = "export:embed"
 }
 
 /**

diff --git a/examples/basic/android/app/src/main/java/com/videoplayer/MainActivity.kt b/examples/basic/android/app/src/main/java/com/videoplayer/MainActivity.kt
@@ -1,4 +1,5 @@
 package com.videoplayer
+import expo.modules.ReactActivityDelegateWrapper
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
@@ -18,5 +19,5 @@ class MainActivity : ReactActivity() {
    * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
-      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+      ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
 }
diff --git a/examples/basic/android/app/src/main/java/com/videoplayer/MainApplication.kt b/examples/basic/android/app/src/main/java/com/videoplayer/MainApplication.kt
@@ -1,4 +1,7 @@
 package com.videoplayer
+import android.content.res.Configuration
+import expo.modules.ApplicationLifecycleDispatcher
+import expo.modules.ReactNativeHostWrapper
 
 import android.app.Application
 import com.facebook.react.PackageList
@@ -15,7 +18,7 @@ import com.brentvatne.react.ReactVideoPackage
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
-      object : DefaultReactNativeHost(this) {
+      ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
         override fun getPackages(): List<ReactPackage> =
             PackageList(this).packages.apply {
               // Packages that cannot be autolinked yet can be added manually here, for example:
@@ -29,10 +32,10 @@ class MainApplication : Application(), ReactApplication {
 
         override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-      }
+      })
 
   override val reactHost: ReactHost
-    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+    get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
 
   override fun onCreate() {
     super.onCreate()
@@ -41,5 +44,11 @@ class MainApplication : Application(), ReactApplication {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()
     }
+    ApplicationLifecycleDispatcher.onApplicationCreate(this)
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration) {
+    super.onConfigurationChanged(newConfig)
+    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
   }
 }
diff --git a/examples/basic/android/settings.gradle b/examples/basic/android/settings.gradle
@@ -6,3 +6,6 @@ include ':react-native-video'
 project (':react-native-video').projectDir = new File(rootProject.projectDir, '../../../android')
 
 includeBuild('../node_modules/@react-native/gradle-plugin')
+
+apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
+useExpoModules()
diff --git a/examples/basic/babel.config.js b/examples/basic/babel.config.js
@@ -9,6 +9,7 @@ module.exports = {
       {
         alias: {
           [pak.name]: path.join(__dirname, '../..', pak.source),
+          extensions: ['.tsx', '.ts', '.js', '.json'],
         },
       },
     ],

diff --git a/examples/basic/ios/Podfile b/examples/basic/ios/Podfile
@@ -1,3 +1,4 @@
+require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 # Resolve react_native_pods.rb with node to allow for hoisting
 require Pod::Executable.execute_command('node', ['-p',
   'require.resolve(
@@ -16,6 +17,14 @@ if linkage != nil
 end
 
 target 'videoplayer' do
+  use_expo_modules!
+  post_integrate do |installer|
+    begin
+      expo_patch_react_imports!(installer)
+    rescue => e
+      Pod::UI.warn e
+    end
+  end
   config = use_native_modules!
 
   use_frameworks! :linkage => :static
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ module.exports = { @@
           {
             alias: {
               [pak.name]: path.join(__dirname, '../..', pak.source),
+              extensions: ['.tsx', '.ts', '.js', '.json'],
             },
           },
         ],
@@ Expand Down @@