Merge commit '23a39e8f5fffbbdcfc72a4c0d7777763e273cd6d' into feature/ios-fix

* commit '23a39e8f5fffbbdcfc72a4c0d7777763e273cd6d':
  chore: fix build issue
  Update issue templates
  feat: RN 0.73 support
  Fix ids in exo_player_control_view
  fix: remove dummy nativeOnly
This commit is contained in:
Cedric Guinoiseau 2023-07-09 20:46:01 +02:00
commit 6190fff4e4
5 changed files with 21 additions and 45 deletions

View File

@ -10,37 +10,24 @@ assignees: ''
# Bug # Bug
<!-- <!--
Before opening a ticket Very important, before opening a ticket:
* Ensure the issue has not been already reported 1) Ensure the issue has not been already reported
* Please test using the latest release of the library, as maybe said bug has been already fixed. 2) lease test using the latest release (including 6.0.0 preRelease) of the library, as maybe the bug has been already fixed.
* Provide a clear and concise description of what the bug is. 3) please don't use emulator to reproduce issues. if you have strange or sporadic error check if this is not devices specific (understand that this library is just a binding to player).
* If the library has multiple install methods, describe installation method (e.g., pod, not pod, with jetifier etc) 4) ensure you cannot solve the issue by yourself using following guide: https://github.com/react-native-video/react-native-video/blob/master/docs/DEBUGGING.md
* Include screenshots if needed.
--> -->
## Platform ## Platform
<!--
Platform where your bug is happening.
-->
Which player are you experiencing the problem on: Which player are you experiencing the problem on:
* iOS * iOS
* Android * Android
* Windows UWP * Windows
* Windows WPF
## Environment info ## Environment info
<!-- <!-- This fields are mandatory -->
Run `react-native info` in your terminal and copy the results here. Also, include the *precise* version number of this library that you are using in the project
-->
React native info output:
```bash
// paste it here
```
Library version: x.x.x Library version: x.x.x
Device:
## Steps To Reproduce ## Steps To Reproduce

View File

@ -416,13 +416,6 @@ Video.propTypes = {
FilterType.SEPIA, FilterType.SEPIA,
]), ]),
filterEnabled: PropTypes.bool, filterEnabled: PropTypes.bool,
/* Native only */
src: PropTypes.object,
seek: PropTypes.oneOfType([
PropTypes.number,
PropTypes.object,
]),
fullscreen: PropTypes.bool,
onVideoLoadStart: PropTypes.func, onVideoLoadStart: PropTypes.func,
onVideoLoad: PropTypes.func, onVideoLoad: PropTypes.func,
onVideoBuffer: PropTypes.func, onVideoBuffer: PropTypes.func,
@ -566,10 +559,4 @@ Video.propTypes = {
...ViewPropTypes, ...ViewPropTypes,
}; };
const RCTVideo = requireNativeComponent('RCTVideo', Video, { const RCTVideo = requireNativeComponent('RCTVideo');
nativeOnly: {
src: true,
seek: true,
fullscreen: true,
},
});

View File

@ -17,6 +17,7 @@ def configStringPath = (
).md5() ).md5()
android { android {
namespace 'com.brentvatne.react'
compileSdkVersion safeExtGet('compileSdkVersion', 31) compileSdkVersion safeExtGet('compileSdkVersion', 31)
buildToolsVersion safeExtGet('buildToolsVersion', '30.0.2') buildToolsVersion safeExtGet('buildToolsVersion', '30.0.2')

View File

@ -14,27 +14,27 @@
android:paddingTop="4dp" android:paddingTop="4dp"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton android:id="@id/exo_prev" <ImageButton android:id="@+id/exo_prev"
style="@style/ExoMediaButton.Previous"/> style="@style/ExoMediaButton.Previous"/>
<ImageButton android:id="@id/exo_rew" <ImageButton android:id="@+id/exo_rew"
style="@style/ExoMediaButton.Rewind"/> style="@style/ExoMediaButton.Rewind"/>
<FrameLayout <FrameLayout
android:id="@+id/exo_play_pause_container" android:id="@+id/exo_play_pause_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"> android:layout_gravity="center">
<ImageButton android:id="@id/exo_play" <ImageButton android:id="@+id/exo_play"
style="@style/ExoMediaButton.Play"/> style="@style/ExoMediaButton.Play"/>
<ImageButton android:id="@id/exo_pause" <ImageButton android:id="@+id/exo_pause"
style="@style/ExoMediaButton.Pause"/> style="@style/ExoMediaButton.Pause"/>
</FrameLayout> </FrameLayout>
<ImageButton android:id="@id/exo_ffwd" <ImageButton android:id="@+id/exo_ffwd"
style="@style/ExoMediaButton.FastForward"/> style="@style/ExoMediaButton.FastForward"/>
<ImageButton android:id="@id/exo_next" <ImageButton android:id="@+id/exo_next"
style="@style/ExoMediaButton.Next"/> style="@style/ExoMediaButton.Next"/>
</LinearLayout> </LinearLayout>
@ -46,7 +46,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@id/exo_position" <TextView android:id="@+id/exo_position"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
@ -57,12 +57,12 @@
android:textColor="#FFBEBEBE"/> android:textColor="#FFBEBEBE"/>
<com.google.android.exoplayer2.ui.DefaultTimeBar <com.google.android.exoplayer2.ui.DefaultTimeBar
android:id="@id/exo_progress" android:id="@+id/exo_progress"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="26dp"/> android:layout_height="26dp"/>
<TextView android:id="@id/exo_duration" <TextView android:id="@+id/exo_duration"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
@ -73,7 +73,7 @@
android:textColor="#FFBEBEBE"/> android:textColor="#FFBEBEBE"/>
<ImageButton <ImageButton
android:id="@id/exo_fullscreen" android:id="@+id/exo_fullscreen"
style="@style/ExoMediaButton.FullScreen" style="@style/ExoMediaButton.FullScreen"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"

View File

@ -1,5 +1,6 @@
#import <React/RCTViewManager.h> #import <React/RCTViewManager.h>
#import "RCTVideoSwiftLog.h" #import "RCTVideoSwiftLog.h"
#import "RCTEventDispatcher.h"
#if __has_include(<react-native-video/RCTVideoCache.h>) #if __has_include(<react-native-video/RCTVideoCache.h>)
#import "RCTVideoCache.h" #import "RCTVideoCache.h"