From b50b7b985f09ad4f73c209722fb5080ba564e6c4 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester
 <32322857+jarnedemeulemeester@users.noreply.github.com>
Date: Mon, 9 May 2022 21:22:59 +0200
Subject: [PATCH] Upgrade ExoPlayer to 2.17.1 (#116)

* Upgrade ExoPlayer to 2.17.1

* Upgrade ExoPlayer FFmpeg extension to 2.17.1

* Revert subtitle and audio track buttons changes

* Clean up layout files and code

* Clean up activity_player.xml

* Fix warnings about exo drawables overrides
---
 app/build.gradle.kts                          |   2 +-
 app/libs/extension-ffmpeg-release.aar         | Bin 3177533 -> 3178232 bytes
 .../dev/jdtech/jellyfin/PlayerActivity.kt     |  18 ++---
 .../jellyfin/utils/PlayerGestureHelper.kt     |   6 +-
 app/src/main/res/layout/activity_player.xml   |  21 +++---
 app/src/main/res/layout/exo_player_view.xml   |  63 ----------------
 ...xml => exo_styled_player_control_view.xml} |   6 +-
 .../res/layout/exo_styled_player_view.xml     |  71 ++++++++++++++++++
 app/src/main/res/values/drawables.xml         |   6 +-
 9 files changed, 103 insertions(+), 90 deletions(-)
 delete mode 100644 app/src/main/res/layout/exo_player_view.xml
 rename app/src/main/res/layout/{exo_player_control_view.xml => exo_styled_player_control_view.xml} (97%)
 create mode 100644 app/src/main/res/layout/exo_styled_player_view.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0b3a74be..b73c08e3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -113,7 +113,7 @@ dependencies {
     kapt("com.google.dagger:hilt-compiler:$hiltVersion")
 
     // ExoPlayer
-    val exoplayerVersion = "2.16.1"
+    val exoplayerVersion = "2.17.1"
     implementation("com.google.android.exoplayer:exoplayer-core:$exoplayerVersion")
     implementation("com.google.android.exoplayer:exoplayer-ui:$exoplayerVersion")
     implementation(files("libs/extension-ffmpeg-release.aar"))
diff --git a/app/libs/extension-ffmpeg-release.aar b/app/libs/extension-ffmpeg-release.aar
index cbcf99aad8d0578634a4c68e023d7954d08aab31..019feffa6bfe036bdf8b34e446025d039db8f3be 100644
GIT binary patch
delta 10573
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
MKtO!I>mVTi1F1N@n*aa+

delta 9870
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

diff --git a/app/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
index 19815b8a..95520971 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
@@ -10,7 +10,7 @@ import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.navigation.navArgs
 import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.SimpleExoPlayer
+import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import dev.jdtech.jellyfin.databinding.ActivityPlayerBinding
@@ -64,9 +64,9 @@ class PlayerActivity : BasePlayerActivity() {
 
         val videoNameTextView = binding.playerView.findViewById<TextView>(R.id.video_name)
 
-        viewModel.currentItemTitle.observe(this, { title ->
+        viewModel.currentItemTitle.observe(this) { title ->
             videoNameTextView.text = title
-        })
+        }
 
         val audioButton = binding.playerView.findViewById<ImageButton>(R.id.btn_audio_track)
         val subtitleButton = binding.playerView.findViewById<ImageButton>(R.id.btn_subtitle)
@@ -89,7 +89,7 @@ class PlayerActivity : BasePlayerActivity() {
                         "trackselectiondialog"
                     )
                 }
-                is SimpleExoPlayer -> {
+                is ExoPlayer -> {
                     val mappedTrackInfo =
                         viewModel.trackSelector.currentMappedTrackInfo ?: return@setOnClickListener
 
@@ -120,7 +120,7 @@ class PlayerActivity : BasePlayerActivity() {
                         "trackselectiondialog"
                     )
                 }
-                is SimpleExoPlayer -> {
+                is ExoPlayer -> {
                     val mappedTrackInfo =
                         viewModel.trackSelector.currentMappedTrackInfo ?: return@setOnClickListener
 
@@ -152,7 +152,7 @@ class PlayerActivity : BasePlayerActivity() {
             )
         }
 
-        viewModel.fileLoaded.observe(this, {
+        viewModel.fileLoaded.observe(this) {
             if (it) {
                 audioButton.isEnabled = true
                 audioButton.imageAlpha = 255
@@ -161,13 +161,13 @@ class PlayerActivity : BasePlayerActivity() {
                 speedButton.isEnabled = true
                 speedButton.imageAlpha = 255
             }
-        })
+        }
 
-        viewModel.navigateBack.observe(this, {
+        viewModel.navigateBack.observe(this) {
             if (it) {
                 onBackPressed()
             }
-        })
+        }
 
         viewModel.initializePlayer(args.items)
         hideSystemUI()
diff --git a/app/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt b/app/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
index ff4bb00a..9b7b830e 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
@@ -9,7 +9,7 @@ import android.view.View
 import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL
 import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_OFF
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import com.google.android.exoplayer2.ui.PlayerView
+import com.google.android.exoplayer2.ui.StyledPlayerView
 import dev.jdtech.jellyfin.PlayerActivity
 import timber.log.Timber
 import kotlin.math.abs
@@ -17,7 +17,7 @@ import kotlin.math.abs
 class PlayerGestureHelper(
     private val appPreferences: AppPreferences,
     private val activity: PlayerActivity,
-    private val playerView: PlayerView,
+    private val playerView: StyledPlayerView,
     private val audioManager: AudioManager
 )  {
 
@@ -44,7 +44,7 @@ class PlayerGestureHelper(
 
         override fun onSingleTapUp(e: MotionEvent?): Boolean {
             playerView.apply {
-                if (!isControllerVisible) showController() else hideController()
+                if (!isControllerFullyVisible) showController() else hideController()
             }
             return true
         }
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
index 65efc487..8546d4f5 100644
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -6,11 +6,12 @@
     android:layout_height="match_parent"
     tools:context=".PlayerActivity">
 
-    <com.google.android.exoplayer2.ui.PlayerView
+    <com.google.android.exoplayer2.ui.StyledPlayerView
         android:id="@+id/player_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/black"
+        app:animation_enabled="false"
         app:show_buffering="always" />
 
     <LinearLayout
@@ -18,12 +19,13 @@
         android:layout_width="64dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|start"
+        android:layout_margin="16dp"
+        android:background="@drawable/overlay_background"
         android:clickable="false"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:layout_margin="16dp"
         android:visibility="gone"
-        android:background="@drawable/overlay_background">
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/gesture_volume_text"
@@ -31,7 +33,7 @@
             android:layout_height="24dp"
             android:layout_marginVertical="16dp"
             android:gravity="center"
-            android:textColor="@color/white"/>
+            android:textColor="@color/white" />
 
         <ProgressBar
             android:id="@+id/gesture_volume_progress_bar"
@@ -39,7 +41,7 @@
             android:layout_width="8dp"
             android:layout_height="125dp"
             android:progressDrawable="@drawable/progress_scale_drawable"
-            android:progress="58"/>
+            tools:progress="58" />
 
         <ImageView
             android:id="@+id/gesture_volume_image"
@@ -55,12 +57,13 @@
         android:layout_width="64dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|end"
+        android:layout_margin="16dp"
+        android:background="@drawable/overlay_background"
         android:clickable="false"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:layout_margin="16dp"
         android:visibility="gone"
-        android:background="@drawable/overlay_background">
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/gesture_brightness_text"
@@ -68,7 +71,7 @@
             android:layout_height="24dp"
             android:layout_marginVertical="16dp"
             android:gravity="center"
-            android:textColor="@color/white"/>
+            android:textColor="@color/white" />
 
         <ProgressBar
             android:id="@+id/gesture_brightness_progress_bar"
@@ -76,7 +79,7 @@
             android:layout_width="8dp"
             android:layout_height="125dp"
             android:progressDrawable="@drawable/progress_scale_drawable"
-            android:progress="58"/>
+            tools:progress="58" />
 
         <ImageView
             android:id="@+id/gesture_brightness_image"
diff --git a/app/src/main/res/layout/exo_player_view.xml b/app/src/main/res/layout/exo_player_view.xml
deleted file mode 100644
index 3b16637e..00000000
--- a/app/src/main/res/layout/exo_player_view.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:keep="@layout/exo_styled_player_view">
-
-    <com.google.android.exoplayer2.ui.AspectRatioFrameLayout android:id="@id/exo_content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center">
-
-        <!-- Video surface will be inserted as the first child of the content frame. -->
-
-        <View android:id="@id/exo_shutter"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/black"/>
-
-        <ImageView android:id="@id/exo_artwork"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitXY"/>
-
-        <ProgressBar android:id="@id/exo_buffering"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            android:layout_gravity="center"/>
-
-        <TextView android:id="@id/exo_error_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/exo_error_message_margin_bottom"
-            android:gravity="center"
-            android:textColor="@color/exo_white"
-            android:textSize="@dimen/exo_error_message_text_size"
-            android:lineSpacingMultiplier="1.1"
-            android:background="@drawable/exo_rounded_rectangle"
-            android:paddingLeft="@dimen/exo_error_message_text_padding_horizontal"
-            android:paddingRight="@dimen/exo_error_message_text_padding_horizontal"
-            android:paddingTop="@dimen/exo_error_message_text_padding_vertical"
-            android:paddingBottom="@dimen/exo_error_message_text_padding_vertical"/>
-
-    </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
-
-    <com.google.android.exoplayer2.ui.SubtitleView android:id="@id/exo_subtitles"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <FrameLayout android:id="@id/exo_ad_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <FrameLayout android:id="@id/exo_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <View android:id="@id/exo_controller_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/exo_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
similarity index 97%
rename from app/src/main/res/layout/exo_player_control_view.xml
rename to app/src/main/res/layout/exo_styled_player_control_view.xml
index 4667c681..f2baaef7 100644
--- a/app/src/main/res/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -62,6 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:background="@drawable/transparent_circle_background"
+                android:contentDescription="@string/select_playback_speed"
                 android:padding="16dp"
                 android:src="@drawable/ic_gauge"
                 app:tint="@color/white" />
@@ -126,7 +127,7 @@
             android:src="@drawable/ic_rewind" />
 
         <ImageButton
-            android:id="@+id/exo_play"
+            android:id="@+id/exo_play_pause"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/circle_background"
@@ -177,7 +178,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
-            android:paddingStart="8dp">
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp">
 
             <TextView
                 android:id="@+id/exo_position"
diff --git a/app/src/main/res/layout/exo_styled_player_view.xml b/app/src/main/res/layout/exo_styled_player_view.xml
new file mode 100644
index 00000000..e97e7806
--- /dev/null
+++ b/app/src/main/res/layout/exo_styled_player_view.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+        android:id="@id/exo_content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center">
+
+        <!-- Video surface will be inserted as the first child of the content frame. -->
+
+        <View
+            android:id="@id/exo_shutter"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black" />
+
+        <ImageView
+            android:id="@id/exo_artwork"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            tools:ignore="ContentDescription" />
+
+        <ProgressBar
+            android:id="@id/exo_buffering"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true" />
+
+        <TextView
+            android:id="@id/exo_error_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="64dp"
+            android:background="@drawable/overlay_background"
+            android:gravity="center"
+            android:lineSpacingMultiplier="1.1"
+            android:paddingLeft="12dp"
+            android:paddingTop="4dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="4dp"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+
+    </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
+
+    <com.google.android.exoplayer2.ui.SubtitleView
+        android:id="@id/exo_subtitles"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <FrameLayout
+        android:id="@id/exo_ad_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <FrameLayout
+        android:id="@id/exo_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <View
+        android:id="@id/exo_controller_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
index 131b14cb..f50bbce9 100644
--- a/app/src/main/res/values/drawables.xml
+++ b/app/src/main/res/values/drawables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <drawable name="exo_styled_controls_play">@drawable/ic_play</drawable>
-    <drawable name="exo_styled_controls_pause">@drawable/ic_pause</drawable>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <drawable name="exo_styled_controls_play" tools:ignore="PrivateResource">@drawable/ic_play</drawable>
+    <drawable name="exo_styled_controls_pause" tools:ignore="PrivateResource">@drawable/ic_pause</drawable>
 </resources>
\ No newline at end of file