From 3e3d749f62335b6aef70133e5a0d0cd0b1e11f30 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 3 Feb 2024 22:29:32 +0100
Subject: [PATCH] refactor: remove back button in locked controls

---
 .../dev/jdtech/jellyfin/PlayerActivity.kt     |  4 --
 .../main/res/layout/exo_locked_controls.xml   | 57 +++----------------
 2 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
index 5171533a..72db24bc 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
@@ -112,10 +112,6 @@ class PlayerActivity : BasePlayerActivity() {
             finish()
         }
 
-        binding.playerView.findViewById<View>(R.id.back_button_alt).setOnClickListener {
-            finish()
-        }
-
         val videoNameTextView = binding.playerView.findViewById<TextView>(R.id.video_name)
 
         val audioButton = binding.playerView.findViewById<ImageButton>(R.id.btn_audio_track)
diff --git a/app/phone/src/main/res/layout/exo_locked_controls.xml b/app/phone/src/main/res/layout/exo_locked_controls.xml
index b743d6dd..774d7646 100644
--- a/app/phone/src/main/res/layout/exo_locked_controls.xml
+++ b/app/phone/src/main/res/layout/exo_locked_controls.xml
@@ -8,55 +8,16 @@
     android:visibility="gone"
     tools:visibility="visible">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <ImageButton
+        android:id="@+id/btn_unlock"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="@drawable/rounded_corner"
+        android:contentDescription="@string/select_playback_speed"
+        android:padding="16dp"
         android:layout_margin="8dp"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toStartOf="@id/extra_buttons_alt"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageButton
-                android:id="@+id/back_button_alt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/rounded_corner"
-                android:contentDescription="@string/player_controls_exit"
-                android:padding="16dp"
-                android:src="@drawable/ic_arrow_left" />
-
-            <Space
-                android:layout_width="16dp"
-                android:layout_height="0dp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/extra_buttons_alt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageButton
-                android:id="@+id/btn_unlock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:background="@drawable/rounded_corner"
-                android:contentDescription="@string/select_playback_speed"
-                android:padding="16dp"
-                android:src="@drawable/ic_unlock"
-                app:tint="@android:color/white" />
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        android:src="@drawable/ic_unlock"
+        app:tint="@android:color/white" />
 
 </FrameLayout>
\ No newline at end of file