From f6629fef7a529d1f91df0c0c17dbea336ca2f401 Mon Sep 17 00:00:00 2001
From: Adolfo Santiago <epoch@nixnetmail.com>
Date: Fri, 1 Oct 2021 18:35:23 +0200
Subject: [PATCH] Show video controls always at the bottom

---
 .../tusky/fragment/ViewVideoFragment.kt       |  6 +-
 .../main/res/layout/fragment_view_video.xml   | 88 +++++++++++--------
 2 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/husky/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
index b19433f..bb297c9 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
@@ -44,6 +44,7 @@ import com.keylesspalace.tusky.util.visible
 import kotlinx.android.synthetic.main.activity_view_media.toolbar
 import kotlinx.android.synthetic.main.fragment_view_video.mediaDescription
 import kotlinx.android.synthetic.main.fragment_view_video.progressBar
+import kotlinx.android.synthetic.main.fragment_view_video.videoControls
 import kotlinx.android.synthetic.main.fragment_view_video.videoView
 import timber.log.Timber
 
@@ -141,7 +142,8 @@ class ViewVideoFragment : ViewMediaFragment() {
                 player.prepare()
             }
 
-        videoView.requestFocus()
+        videoControls.player = videoView.player
+        //videoView.requestFocus()
 
         if(arguments!!.getBoolean(ARG_START_POSTPONED_TRANSITION)) {
             mediaActivity.onBringUp()
@@ -237,6 +239,8 @@ class ViewVideoFragment : ViewMediaFragment() {
                 Player.STATE_READY,
                 Player.STATE_ENDED -> {
                     progressBar.visibility = View.GONE
+                    videoControls.show()
+                    videoControls.visibility = View.VISIBLE
                 }
                 else -> {
                 }
diff --git a/husky/app/src/main/res/layout/fragment_view_video.xml b/husky/app/src/main/res/layout/fragment_view_video.xml
index fac0534..7ca4410 100644
--- a/husky/app/src/main/res/layout/fragment_view_video.xml
+++ b/husky/app/src/main/res/layout/fragment_view_video.xml
@@ -1,44 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/videoContainer"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:clickable="true"
-	android:focusable="true">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/videoContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clickable="true"
+    android:focusable="true">
 
-	<TextView
-		android:id="@+id/mediaDescription"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="?attr/actionBarSize"
-		android:background="#60000000"
-		android:hyphenationFrequency="full"
-		android:lineSpacingMultiplier="1.1"
-		android:padding="8dp"
-		android:textAlignment="center"
-		android:textColor="#eee"
-		android:textSize="?attr/status_text_medium"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Some media description" />
+    <TextView
+        android:id="@+id/mediaDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:background="#60000000"
+        android:hyphenationFrequency="full"
+        android:lineSpacingMultiplier="1.1"
+        android:padding="8dp"
+        android:textAlignment="center"
+        android:textColor="#eee"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Some media description" />
 
-	<com.google.android.exoplayer2.ui.PlayerView
-		android:id="@+id/videoView"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintLeft_toLeftOf="parent"
-		app:layout_constraintRight_toRightOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+    <com.google.android.exoplayer2.ui.PlayerView
+        android:id="@+id/videoView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/videoControls"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/mediaDescription"
+        app:resize_mode="fixed_width"
+        app:surface_type="surface_view"
+        app:use_controller="false" />
 
-	<ProgressBar
-		android:id="@+id/progressBar"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintLeft_toLeftOf="parent"
-		app:layout_constraintRight_toRightOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+    <com.google.android.exoplayer2.ui.PlayerControlView
+        android:id="@+id/videoControls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:show_timeout="0"
+        tools:visibility="visible" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>