Merge branch 'master' into fix-memleak

This commit is contained in:
Olivier Bouillet
2023-08-03 20:53:12 +02:00
committed by GitHub
10 changed files with 80 additions and 72 deletions

View File

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

View File

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