Switch to StyledPlayerView

app/build.gradle

@@ -70,7 +70,7 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:4.12.0"
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
 
-    def exoplayer_version = "2.17.0"
+    def exoplayer_version = "2.17.1"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
 

app/src/main/java/sushi/hardcore/droidfs/file_viewers/MediaPlayer.kt

@@ -31,7 +31,7 @@ abstract class MediaPlayer: FileViewerActivity() {
     }
 
     private fun initializePlayer(){
-        player = ExoPlayer.Builder(this).build()
+        player = ExoPlayer.Builder(this).setSeekForwardIncrementMs(5000).build()
         bindPlayer(player)
         createPlaylist()
         for (e in mappedPlaylist) {

app/src/main/java/sushi/hardcore/droidfs/widgets/DoubleTapPlayerView.kt

@@ -2,20 +2,29 @@ package sushi.hardcore.droidfs.widgets
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.Configuration
 import android.media.session.PlaybackState
 import android.os.Handler
 import android.os.Looper
 import android.util.AttributeSet
 import android.view.GestureDetector
 import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
 import androidx.core.view.GestureDetectorCompat
-import com.google.android.exoplayer2.ui.PlayerView
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import com.google.android.exoplayer2.ui.StyledPlayerView
+import sushi.hardcore.droidfs.R
 
 class DoubleTapPlayerView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-): PlayerView(context, attrs, defStyleAttr) {
+) : StyledPlayerView(context, attrs, defStyleAttr) {
 
     companion object {
         const val SEEK_SECONDS = 10
@@ -67,6 +76,21 @@ class DoubleTapPlayerView @JvmOverloads constructor(
         }
     }
     private val gestureDetector = GestureDetectorCompat(context, gestureListener)
+    private val density by lazy {
+        context.resources.displayMetrics.density
+    }
+    private val originalExoIconPaddingBottom by lazy {
+        resources.getDimension(R.dimen.exo_icon_padding_bottom)
+    }
+    private val originalExoIconSize by lazy {
+        resources.getDimension(R.dimen.exo_icon_size)
+    }
+
+    init {
+        if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            updateButtonSize(Configuration.ORIENTATION_LANDSCAPE)
+        }
+    }
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -111,4 +135,32 @@ class DoubleTapPlayerView @JvmOverloads constructor(
             }
         }
     }
+
+    private fun updateButtonSize(orientation: Int) {
+        val size = (if (orientation == Configuration.ORIENTATION_LANDSCAPE) 45*density else originalExoIconSize).toInt()
+        listOf(R.id.exo_prev, R.id.exo_rew_with_amount, R.id.exo_play_pause, R.id.exo_ffwd_with_amount, R.id.exo_next).forEach {
+            findViewById<View>(it).updateLayoutParams {
+                width = size
+                height = size
+            }
+        }
+        // fix text vertical alignment inside icons
+        val paddingBottom = (if (orientation == Configuration.ORIENTATION_LANDSCAPE) 15*density else originalExoIconPaddingBottom).toInt()
+        listOf(R.id.exo_rew_with_amount, R.id.exo_ffwd_with_amount).forEach {
+            findViewById<Button>(it).updatePadding(bottom = paddingBottom)
+        }
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val centerControls = findViewById<LinearLayout>(R.id.exo_center_controls)
+        (centerControls.parent as ViewGroup).removeView(centerControls)
+        findViewById<FrameLayout>(
+            if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
+                R.id.center_controls_bar
+            else
+                R.id.center_controls_external
+        ).addView(centerControls)
+        updateButtonSize(newConfig.orientation)
+    }
 }

app/src/main/res/layout/activity_audio_player.xml

@@ -15,10 +15,11 @@
             android:textSize="@dimen/title_text_size"
             android:padding="10dp"/>
 
-        <com.google.android.exoplayer2.ui.PlayerControlView
+        <com.google.android.exoplayer2.ui.StyledPlayerControlView
             android:id="@+id/audio_controller"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:controller_layout_id="@layout/audio_exo_styled_player_control_view"
             app:show_timeout="0"
             app:show_shuffle_button="true"
             app:repeat_toggle_modes="all|one"/>

app/src/main/res/layout/activity_video_player.xml

@@ -14,6 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:show_shuffle_button="true"
+            app:show_buffering="always"
             app:repeat_toggle_modes="all|one" />
 
         <sushi.hardcore.droidfs.widgets.DoubleTapOverlay

app/src/main/res/layout/audio_exo_styled_player_control_view.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@id/exo_center_controls"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="@android:color/transparent"
+        android:gravity="center"
+        android:padding="@dimen/exo_styled_controls_padding"
+        android:layout_marginBottom="-40dp"
+        android:clipToPadding="false">
+
+        <ImageButton android:id="@id/exo_prev"
+            style="@style/ExoStyledControls.Button.Center.Previous"/>
+
+        <include layout="@layout/exo_styled_player_control_rewind_button" />
+
+        <ImageButton android:id="@id/exo_play_pause"
+            style="@style/ExoStyledControls.Button.Center.PlayPause"/>
+
+        <include layout="@layout/exo_styled_player_control_ffwd_button" />
+
+        <ImageButton android:id="@id/exo_next"
+            style="@style/ExoStyledControls.Button.Center.Next"/>
+
+    </LinearLayout>
+
+    <View android:id="@id/exo_progress_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/exo_styled_progress_layout_height"/>
+
+    <FrameLayout android:id="@id/exo_bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/exo_styled_bottom_bar_height"
+        android:background="@color/exo_bottom_bar_background"
+        android:layoutDirection="ltr">
+
+        <LinearLayout android:id="@id/exo_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
+            android:layout_gravity="center_vertical|start"
+            android:layoutDirection="ltr">
+
+            <TextView android:id="@id/exo_position"
+                style="@style/ExoStyledControls.TimeText.Position"/>
+
+            <TextView
+                style="@style/ExoStyledControls.TimeText.Separator"/>
+
+            <TextView android:id="@id/exo_duration"
+                style="@style/ExoStyledControls.TimeText.Duration"/>
+
+        </LinearLayout>
+
+        <LinearLayout android:id="@id/exo_basic_controls"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:layoutDirection="ltr">
+
+            <ImageButton android:id="@id/exo_shuffle"
+                style="@style/ExoStyledControls.Button.Bottom.Shuffle"/>
+
+            <ImageButton android:id="@id/exo_repeat_toggle"
+                style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/>
+
+            <ImageButton android:id="@id/exo_subtitle"
+                style="@style/ExoStyledControls.Button.Bottom.CC"/>
+
+            <ImageButton android:id="@id/exo_settings"
+                style="@style/ExoStyledControls.Button.Bottom.Settings"/>
+
+            <ImageButton android:id="@id/exo_overflow_show"
+                style="@style/ExoStyledControls.Button.Bottom.OverflowShow"/>
+
+        </LinearLayout>
+
+        <HorizontalScrollView android:id="@id/exo_extra_controls_scroll_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:visibility="invisible">
+
+            <LinearLayout android:id="@id/exo_extra_controls"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layoutDirection="ltr">
+
+                <ImageButton android:id="@id/exo_overflow_hide"
+                    style="@style/ExoStyledControls.Button.Bottom.OverflowHide"/>
+
+            </LinearLayout>
+
+        </HorizontalScrollView>
+
+    </FrameLayout>
+
+</LinearLayout>

app/src/main/res/layout/exo_center_controls.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@id/exo_center_controls"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@android:color/transparent"
+        android:gravity="center"
+        android:clipToPadding="false">
+
+        <ImageButton android:id="@id/exo_prev"
+            style="@style/ExoStyledControls.Button.Center.Previous"/>
+
+        <include layout="@layout/exo_styled_player_control_rewind_button" />
+
+        <ImageButton android:id="@id/exo_play_pause"
+            style="@style/ExoStyledControls.Button.Center.PlayPause"/>
+
+        <include layout="@layout/exo_styled_player_control_ffwd_button" />
+
+        <ImageButton android:id="@id/exo_next"
+            style="@style/ExoStyledControls.Button.Center.Next"/>
+
+    </LinearLayout>
+
+</merge>

app/src/main/res/layout/exo_player_control_view.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:layoutDirection="ltr"
-    android:background="#CC000000"
-    android:orientation="vertical"
-    tools:targetApi="28">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingTop="4dp"
-        android:orientation="horizontal">
-
-        <ImageButton android:id="@id/exo_shuffle"
-            style="@style/ExoMediaButton"/>
-
-        <ImageButton android:id="@id/exo_prev"
-            style="@style/ExoMediaButton.Previous"/>
-
-        <ImageButton android:id="@id/exo_play"
-            style="@style/ExoMediaButton.Play"/>
-
-        <ImageButton android:id="@id/exo_pause"
-            style="@style/ExoMediaButton.Pause"/>
-
-        <ImageButton android:id="@id/exo_next"
-            style="@style/ExoMediaButton.Next"/>
-
-        <ImageButton android:id="@id/exo_repeat_toggle"
-            style="@style/ExoMediaButton"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <TextView android:id="@id/exo_position"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            android:includeFontPadding="false"
-            android:textColor="#FFBEBEBE"/>
-
-        <View android:id="@id/exo_progress_placeholder"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="26dp"/>
-
-        <TextView android:id="@id/exo_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            android:includeFontPadding="false"
-            android:textColor="#FFBEBEBE"/>
-
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/layout/exo_styled_player_control_view.xml

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- 0dp dimensions are used to prevent this view from influencing the size of
+         the parent view if it uses "wrap_content". It is expanded to occupy the
+         entirety of the parent in code, after the parent's size has been
+         determined. See: https://github.com/google/ExoPlayer/issues/8726.
+    -->
+    <View android:id="@id/exo_controls_background"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/exo_black_opacity_60"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/center_controls_external"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal">
+
+            <include layout="@layout/exo_center_controls"/>
+
+        </FrameLayout>
+
+        <FrameLayout android:id="@id/exo_bottom_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/exo_styled_bottom_bar_height"
+            android:layout_marginTop="@dimen/exo_styled_bottom_bar_margin_top"
+            android:background="@color/exo_bottom_bar_background"
+            android:layoutDirection="ltr">
+
+            <LinearLayout android:id="@id/exo_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
+                android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
+                android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
+                android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
+                android:layout_gravity="center_vertical|start"
+                android:layoutDirection="ltr">
+
+                <TextView android:id="@id/exo_position"
+                    style="@style/ExoStyledControls.TimeText.Position"/>
+
+                <TextView
+                    style="@style/ExoStyledControls.TimeText.Separator"/>
+
+                <TextView android:id="@id/exo_duration"
+                    style="@style/ExoStyledControls.TimeText.Duration"/>
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/center_controls_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"/>
+
+            <LinearLayout android:id="@id/exo_basic_controls"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:layoutDirection="ltr">
+
+                <ImageButton android:id="@id/exo_vr"
+                    style="@style/ExoStyledControls.Button.Bottom.VR"/>
+
+                <ImageButton android:id="@id/exo_shuffle"
+                    style="@style/ExoStyledControls.Button.Bottom.Shuffle"/>
+
+                <ImageButton android:id="@id/exo_repeat_toggle"
+                    style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/>
+
+                <ImageButton android:id="@id/exo_subtitle"
+                    style="@style/ExoStyledControls.Button.Bottom.CC"/>
+
+                <ImageButton android:id="@id/exo_settings"
+                    style="@style/ExoStyledControls.Button.Bottom.Settings"/>
+
+                <ImageButton android:id="@id/exo_fullscreen"
+                    style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
+
+                <ImageButton android:id="@id/exo_overflow_show"
+                    style="@style/ExoStyledControls.Button.Bottom.OverflowShow"/>
+
+            </LinearLayout>
+
+            <HorizontalScrollView android:id="@id/exo_extra_controls_scroll_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:visibility="invisible">
+
+                <LinearLayout android:id="@id/exo_extra_controls"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layoutDirection="ltr">
+
+                    <ImageButton android:id="@id/exo_overflow_hide"
+                        style="@style/ExoStyledControls.Button.Bottom.OverflowHide"/>
+
+                </LinearLayout>
+
+            </HorizontalScrollView>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <View android:id="@id/exo_progress_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/exo_styled_progress_layout_height"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="@dimen/exo_styled_progress_margin_bottom"/>
+
+    <LinearLayout android:id="@id/exo_minimal_controls"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginBottom="@dimen/exo_styled_minimal_controls_margin_bottom"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layoutDirection="ltr">
+
+        <ImageButton android:id="@id/exo_minimal_fullscreen"
+            style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
+
+    </LinearLayout>
+
+</merge>

app/src/main/res/values/colors.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <color name="primary">#262626</color>
     <color name="secondary">#6CC341</color>
     <color name="black">#000000</color>
@@ -17,4 +17,5 @@
     <color name="playerDoubleTapTouch">#18FFFFFF</color>
     <color name="playerDoubleTapBackground">#20EEEEEE</color>
     <color name="dialogDarkBackground">#333333</color>
+    <color name="exo_black_opacity_60" tools:override="true">#38000000</color>
 </resources>