From d21752e7928ec1af07accb9eb6bab92b5a5cdd6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20Civano=C4=9Flu?= <onur.civanoglu@outlook.com>
Date: Thu, 19 Feb 2026 10:17:51 +0300
Subject: [PATCH 1/2] fix(player): keep TV landscape lock and show rotate
 button

Ensure the rotate control remains visible on TV/emulator layouts by relying only on `playerRotateEnabled`, instead of forcibly hiding it.
---
 .../ui/player/FullScreenPlayer.kt             |    6 +-
 .../res/layout/player_custom_layout_tv.xml    | 2008 ++++++++---------
 2 files changed, 994 insertions(+), 1020 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 2ba4c691ca..b5c1109f3e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -2385,8 +2385,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             playerBinding?.apply {
                 playerSpeedBtt.isVisible = playBackSpeedEnabled
                 playerResizeBtt.isVisible = playerResizeEnabled
-                playerRotateBtt.isVisible =
-                    if (isLayout(TV or EMULATOR)) false else playerRotateEnabled
+                playerRotateBtt.isVisible = playerRotateEnabled
                 if (hideControlsNames) {
                     hideControlsNames()
                 }
@@ -2602,6 +2601,9 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     private fun dynamicOrientation(): Int {
+        if (isLayout(TV or EMULATOR)) {
+            return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        }
         return if (autoPlayerRotateEnabled) {
             if (isVerticalOrientation) {
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 450b77c709..f886f881e7 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -1,33 +1,33 @@
-<FrameLayout 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/player_holder"
+<FrameLayout
+  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/player_holder"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  android:tag="television"
+  tools:orientation="vertical"
+>
+  <ImageView
+    android:visibility="gone"
+    android:id="@+id/video_outline"
+    android:src="@drawable/video_outline"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:tag="television"
-    tools:orientation="vertical">
-
-    <ImageView
-        android:visibility="gone"
-        android:id="@+id/video_outline"
-        android:src="@drawable/video_outline"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </ImageView>
-
-
-    <FrameLayout
-        android:id="@+id/piphide"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <View
-            android:id="@+id/shadow_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/player_gradient_tv" />
-        <!--
+  ></ImageView>
+  <FrameLayout
+    android:id="@+id/piphide"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+  >
+    <View
+      android:id="@+id/shadow_overlay"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="@drawable/player_gradient_tv"
+    />
+    <!--
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
                           android:gravity="end"
@@ -61,293 +61,290 @@
 
         </LinearLayout>
     -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:id="@+id/player_progressbar_left_holder"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="start"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:alpha="1"
-                tools:visibility="visible">
-                <!--VERY hacky layout -->
-                <ImageView
-                    android:id="@+id/player_progressbar_left_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="220dp"
-                    android:src="@drawable/ic_baseline_volume_up_24"
-                    app:tint="@android:color/white"
-                    tools:ignore="ContentDescription">
-
-                </ImageView>
-
-                <ProgressBar
-                    android:id="@+id/player_progressbar_left_level1"
-                    android:layout_width="5dp"
-                    android:layout_height="150dp"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    android:progressTint="@color/white"
-                    android:progressTintMode="src_in"
-                    tools:progress="30"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
-
-                <ProgressBar
-                    android:id="@+id/player_progressbar_left_level2"
-                    android:layout_width="5dp"
-                    android:layout_height="150dp"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="0"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    android:progressTint="@color/colorPrimaryOrange"
-                    android:progressTintMode="src_in"
-                    tools:progress="0"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/player_progressbar_right_holder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="right"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:alpha="1"
-                tools:ignore="RtlHardcoded"
-                tools:visibility="visible">
-
-                <ImageView
-                    android:id="@+id/player_progressbar_right_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="220dp"
-                    android:src="@drawable/ic_baseline_brightness_7_24"
-                    app:tint="@android:color/white"
-                    tools:ignore="ContentDescription">
-
-                </ImageView>
-
-                <ProgressBar
-                    android:id="@+id/player_progressbar_right_level1"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="5dp"
-                    android:layout_height="150dp"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    android:progressTint="@color/white"
-                    android:progressTintMode="src_in" />
-
-                <ProgressBar
-                    android:id="@+id/player_progressbar_right_level2"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="5dp"
-                    android:layout_height="150dp"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="40dp"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="0"
-                    android:progressDrawable="@drawable/progress_drawable_vertical"
-                    android:progressTint="@color/colorPrimaryOrange"
-                    android:progressTintMode="src_in" />
-            </RelativeLayout>
-        </LinearLayout>
-
-
-        <TextView
-            android:id="@+id/player_time_text"
-            android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:gravity="center"
-            android:shadowColor="@android:color/black"
-            android:shadowRadius="10.0"
-            android:textColor="@android:color/white"
-            android:textSize="30sp"
-            android:visibility="gone"
-            tools:text="+100"
-            tools:visibility="visible" />
-
-        <FrameLayout
-            android:id="@+id/player_pause_play_holder_holder"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <FrameLayout
-            android:id="@+id/player_intro_play"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone" />
-
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layoutDirection="ltr"
+      android:orientation="horizontal"
+    >
+      <RelativeLayout
+        android:id="@+id/player_progressbar_left_holder"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="start"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:alpha="1"
+        tools:visibility="visible"
+      >
+        <!--VERY hacky layout -->
         <ImageView
-            android:id="@+id/player_open_source"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:clickable="false"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:importantForAccessibility="no"
-            android:visibility="gone" />
-
-        <!-- atm this is useless, however it might be used for PIP one day? -->
+          android:id="@+id/player_progressbar_left_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerHorizontal="true"
+          android:layout_marginBottom="220dp"
+          android:src="@drawable/ic_baseline_volume_up_24"
+          app:tint="@android:color/white"
+          tools:ignore="ContentDescription"
+        ></ImageView>
+        <ProgressBar
+          android:id="@+id/player_progressbar_left_level1"
+          android:layout_width="5dp"
+          android:layout_height="150dp"
+          android:layout_centerInParent="true"
+          android:layout_gravity="end|center_vertical"
+          android:layout_marginStart="40dp"
+          android:indeterminate="false"
+          android:max="100"
+          android:progress="100"
+          android:progressDrawable="@drawable/progress_drawable_vertical"
+          android:progressTint="@color/white"
+          android:progressTintMode="src_in"
+          tools:progress="30"
+          style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        />
+        <ProgressBar
+          android:id="@+id/player_progressbar_left_level2"
+          android:layout_width="5dp"
+          android:layout_height="150dp"
+          android:layout_centerInParent="true"
+          android:layout_gravity="end|center_vertical"
+          android:layout_marginStart="40dp"
+          android:indeterminate="false"
+          android:max="100"
+          android:progress="0"
+          android:progressDrawable="@drawable/progress_drawable_vertical"
+          android:progressTint="@color/colorPrimaryOrange"
+          android:progressTintMode="src_in"
+          tools:progress="0"
+          style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        />
+      </RelativeLayout>
+      <RelativeLayout
+        android:id="@+id/player_progressbar_right_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="right"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:alpha="1"
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible"
+      >
         <ImageView
-            android:id="@+id/player_fullscreen"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="20dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/baseline_fullscreen_24"
+          android:id="@+id/player_progressbar_right_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerHorizontal="true"
+          android:layout_marginBottom="220dp"
+          android:src="@drawable/ic_baseline_brightness_7_24"
+          app:tint="@android:color/white"
+          tools:ignore="ContentDescription"
+        ></ImageView>
+        <ProgressBar
+          android:id="@+id/player_progressbar_right_level1"
+          style="@android:style/Widget.Material.ProgressBar.Horizontal"
+          android:layout_width="5dp"
+          android:layout_height="150dp"
+          android:layout_centerInParent="true"
+          android:layout_gravity="end|center_vertical"
+          android:layout_marginEnd="40dp"
+          android:indeterminate="false"
+          android:max="100"
+          android:progress="100"
+          android:progressDrawable="@drawable/progress_drawable_vertical"
+          android:progressTint="@color/white"
+          android:progressTintMode="src_in"
+        />
+        <ProgressBar
+          android:id="@+id/player_progressbar_right_level2"
+          style="@android:style/Widget.Material.ProgressBar.Horizontal"
+          android:layout_width="5dp"
+          android:layout_height="150dp"
+          android:layout_centerInParent="true"
+          android:layout_gravity="end|center_vertical"
+          android:layout_marginEnd="40dp"
+          android:indeterminate="false"
+          android:max="100"
+          android:progress="0"
+          android:progressDrawable="@drawable/progress_drawable_vertical"
+          android:progressTint="@color/colorPrimaryOrange"
+          android:progressTintMode="src_in"
+        />
+      </RelativeLayout>
+    </LinearLayout>
+    <TextView
+      android:id="@+id/player_time_text"
+      android:layout_width="match_parent"
+      android:layout_height="200dp"
+      android:gravity="center"
+      android:shadowColor="@android:color/black"
+      android:shadowRadius="10.0"
+      android:textColor="@android:color/white"
+      android:textSize="30sp"
+      android:visibility="gone"
+      tools:text="+100"
+      tools:visibility="visible"
+    />
+    <FrameLayout
+      android:id="@+id/player_pause_play_holder_holder"
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:visibility="gone"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+    />
+    <FrameLayout
+      android:id="@+id/player_intro_play"
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:visibility="gone"
+    />
+    <ImageView
+      android:id="@+id/player_open_source"
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:clickable="false"
+      android:focusable="false"
+      android:focusableInTouchMode="false"
+      android:importantForAccessibility="no"
+      android:visibility="gone"
+    />
+    <!-- atm this is useless, however it might be used for PIP one day? -->
+    <ImageView
+      android:id="@+id/player_fullscreen"
+      android:layout_width="30dp"
+      android:layout_height="30dp"
+      android:layout_gravity="center_vertical"
+      android:layout_marginEnd="20dp"
+      android:background="?android:attr/selectableItemBackgroundBorderless"
+      android:src="@drawable/baseline_fullscreen_24"
+      android:visibility="gone"
+      app:tint="@color/white"
+    />
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:id="@+id/player_video_holder"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:padding="16dp"
+    >
+      <com.google.android.material.button.MaterialButton
+        android:id="@+id/skip_chapter_button"
+        style="@style/NiceButton"
+        android:layout_width="150dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="100dp"
+        android:backgroundTint="@color/skipOpTransparent"
+        android:maxLines="1"
+        android:nextFocusLeft="@id/player_pause_play"
+        android:nextFocusUp="@id/player_restart"
+        android:nextFocusDown="@id/player_pause_play"
+        android:padding="10dp"
+        android:textColor="@color/white"
+        android:visibility="gone"
+        app:cornerRadius="@dimen/rounded_button_radius"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:strokeColor="@color/white"
+        app:strokeWidth="1dp"
+        tools:text="Skip Opening"
+        tools:visibility="visible"
+      />
+      <FrameLayout
+        android:id="@+id/player_top_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+      >
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="32dp"
+          android:layout_marginTop="20dp"
+          android:layout_marginEnd="32dp"
+          android:orientation="vertical"
+        >
+          <LinearLayout
+            android:id="@+id/player_video_title_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+          >
+            <TextView
+              android:maxLines="2"
+              android:id="@+id/player_video_title"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="end"
+              android:gravity="end"
+              android:maxWidth="600dp"
+              android:textAlignment="viewEnd"
+              android:textColor="@color/white"
+              android:textSize="16sp"
+              android:textStyle="bold"
+              tools:text="Hello world"
+            />
+            <ImageView
+              android:id="@+id/offline_pin"
+              android:layout_width="18dp"
+              android:layout_height="18dp"
+              android:layout_marginStart="2dp"
+              android:src="@drawable/ic_offline_pin_24"
+              android:visibility="gone"
+              tools:visibility="visible"
+              android:layout_gravity="start"
+            />
+          </LinearLayout>
+          <TextView
+            android:id="@+id/player_video_title_rez"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="end"
+            android:maxWidth="600dp"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            tools:text="1920x1080"
+          />
+          <TextView
+            android:id="@+id/player_video_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginBottom="2.5dp"
+            android:textColor="@color/white"
+            android:textSize="16sp"
             android:visibility="gone"
-            app:tint="@color/white" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/player_video_holder"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="16dp">
-
+            android:layout_gravity="end"
+            tools:text="HDR10 • HEVC"
+          />
+          <FrameLayout
+            android:id="@+id/player_episode_filler_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginTop="2dp"
+          >
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/skip_chapter_button"
-                style="@style/NiceButton"
-                android:layout_width="150dp"
-                android:layout_height="40dp"
-                android:layout_marginEnd="100dp"
-                android:backgroundTint="@color/skipOpTransparent"
-                android:maxLines="1"
-                android:nextFocusLeft="@id/player_pause_play"
-                android:nextFocusUp="@id/player_restart"
-                android:nextFocusDown="@id/player_pause_play"
-                android:padding="10dp"
-                android:textColor="@color/white"
-                android:visibility="gone"
-                app:cornerRadius="@dimen/rounded_button_radius"
-                app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:strokeColor="@color/white"
-                app:strokeWidth="1dp"
-                tools:text="Skip Opening"
-                tools:visibility="visible" />
-
-            <FrameLayout
-                android:id="@+id/player_top_holder"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginEnd="32dp"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:id="@+id/player_video_title_holder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end">
-                        <TextView
-                            android:maxLines="2"
-                            android:id="@+id/player_video_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end"
-                            android:gravity="end"
-                            android:maxWidth="600dp"
-                            android:textAlignment="viewEnd"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
-                            tools:text="Hello world" />
-                        <ImageView
-                            android:id="@+id/offline_pin"
-                            android:layout_width="18dp"
-                            android:layout_height="18dp"
-                            android:layout_marginStart="2dp"
-                            android:src="@drawable/ic_offline_pin_24"
-                            android:visibility="gone"
-                            tools:visibility="visible"
-                            android:layout_gravity="start"/>
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/player_video_title_rez"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:gravity="end"
-                        android:maxWidth="600dp"
-                        android:textAlignment="viewEnd"
-                        android:textColor="@color/white"
-                        android:textSize="16sp"
-                        tools:text="1920x1080" />
-
-                    <TextView
-                        android:id="@+id/player_video_info"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginBottom="2.5dp"
-                        android:textColor="@color/white"
-                        android:textSize="16sp"
-                        android:visibility="gone"
-                        android:layout_gravity="end"
-                        tools:text="HDR10 • HEVC" />
-
-
-                    <FrameLayout
-                        android:id="@+id/player_episode_filler_holder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:layout_marginTop="2dp">
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_episode_filler"
-                            style="@style/SmallBlackButton"
-                            android:text="@string/filler" />
-                    </FrameLayout>
-                </LinearLayout>
-
-                <!-- Removed as it has no use anymore-->
-                <!--<androidx.mediarouter.app.MediaRouteButton
+              android:id="@+id/player_episode_filler"
+              style="@style/SmallBlackButton"
+              android:text="@string/filler"
+            />
+          </FrameLayout>
+        </LinearLayout>
+        <!-- Removed as it has no use anymore-->
+        <!--<androidx.mediarouter.app.MediaRouteButton
                         android:id="@+id/player_media_route_button"
                         android:layout_width="70dp"
                         android:layout_height="70dp"
@@ -357,723 +354,698 @@
                         android:visibility="visible"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />-->
-
-                <LinearLayout
-                    android:id="@+id/player_go_back_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="17dp"
-                    android:layout_marginEnd="17dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <LinearLayout
-                        android:id="@+id/player_go_back_root"
-                        android:layout_width="60dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/player_go_back"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/video_tap_button_always_white"
-                            android:clickable="true"
-                            android:contentDescription="@string/go_back_img_des"
-                            android:focusable="true"
-                            android:nextFocusLeft="@id/player_go_back"
-                            android:nextFocusRight="@id/player_restart"
-                            android:nextFocusUp="@id/player_go_back"
-                            android:nextFocusDown="@id/player_pause_play"
-                            android:src="@drawable/ic_baseline_arrow_back_24"
-                            android:tag="@string/tv_no_focus_tag"
-                            app:tint="@android:color/white" />
-
-                        <TextView
-                            android:id="@+id/player_go_back_text"
-                            style="@style/ResultMarqueeButtonText"
-                            android:layout_marginTop="5dp"
-                            android:text="@string/go_back_img_des"
-                            android:visibility="invisible"
-                            tools:visibility="visible" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/player_restart_root"
-                        android:layout_width="60dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/player_restart"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/video_tap_button_always_white"
-                            android:clickable="true"
-                            android:contentDescription="@string/restart"
-                            android:focusable="true"
-                            android:nextFocusLeft="@id/player_go_back"
-                            android:nextFocusRight="@id/player_go_forward"
-                            android:nextFocusUp="@id/player_restart"
-                            android:nextFocusDown="@id/player_pause_play"
-                            android:src="@drawable/ic_baseline_replay_24"
-                            android:tag="@string/tv_no_focus_tag"
-                            app:tint="@android:color/white" />
-
-                        <TextView
-                            android:id="@+id/player_restart_text"
-                            style="@style/ResultMarqueeButtonText"
-                            android:layout_marginTop="5dp"
-                            android:text="@string/restart"
-                            android:visibility="invisible"
-                            tools:visibility="visible" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/player_go_forward_root"
-                        android:layout_width="60dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/player_go_forward"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/video_tap_button_always_white"
-                            android:clickable="true"
-                            android:contentDescription="@string/next_episode"
-                            android:focusable="true"
-                            android:nextFocusLeft="@id/player_restart"
-                            android:nextFocusRight="@id/download_header_toggle"
-                            android:nextFocusUp="@id/player_go_forward"
-                            android:nextFocusDown="@id/player_pause_play"
-                            android:src="@drawable/ic_baseline_skip_next_rounded_24"
-                            android:tag="@string/tv_no_focus_tag"
-                            app:tint="@android:color/white" />
-
-                        <TextView
-                            android:id="@+id/player_go_forward_text"
-                            style="@style/ResultMarqueeButtonText"
-                            android:layout_marginTop="5dp"
-                            android:text="@string/next_episode"
-                            android:visibility="invisible"
-                            tools:visibility="visible" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/download_both_header"
-                        android:layout_width="60dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginEnd="10dp"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/download_header_toggle"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/video_tap_button_always_white"
-                            android:clickable="true"
-                            android:contentDescription="@string/torrent_singular"
-                            android:focusable="true"
-                            android:nextFocusLeft="@id/player_go_forward"
-                            android:nextFocusRight="@id/player_episodes_button"
-                            android:nextFocusUp="@id/download_header_toggle"
-                            android:nextFocusDown="@id/player_pause_play"
-                            android:src="@drawable/baseline_downloading_24"
-                            android:tag="@string/tv_no_focus_tag"
-                            app:tint="@android:color/white" />
-
-                        <TextView
-                            android:id="@+id/download_header_toggle_text"
-                            style="@style/ResultMarqueeButtonText"
-                            android:layout_marginTop="5dp"
-                            android:text="@string/torrent_singular"
-                            android:visibility="invisible"
-                            tools:visibility="visible" />
-
-                    </LinearLayout>
-                    <LinearLayout
-                        android:id="@+id/player_episodes_button_root"
-                        android:layout_width="60dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/player_episodes_button"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_gravity="center"
-                            android:background="@drawable/video_tap_button_always_white"
-                            android:clickable="true"
-                            android:contentDescription="@string/episodes"
-                            android:focusable="true"
-                            android:nextFocusLeft="@id/download_header_toggle"
-                            android:nextFocusRight="@id/player_episode_overlay"
-                            android:nextFocusUp="@id/player_episodes_button"
-                            android:nextFocusDown="@id/player_pause_play"
-                            android:src="@drawable/ic_baseline_sort_24"
-                            android:tag="@string/tv_no_focus_tag"
-                            app:tint="@android:color/white" />
-
-                        <TextView
-                            android:id="@+id/player_episodes_button_text"
-                            style="@style/ResultMarqueeButtonText"
-                            android:layout_marginTop="5dp"
-                            android:text="@string/episodes"
-                            android:visibility="invisible"
-                            tools:visibility="visible" />
-
-                    </LinearLayout>
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/download_header"
-                        android:layout_width="200dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginTop="5dp"
-                        android:elevation="10dp"
-                        app:cardBackgroundColor="@color/darkBar"
-                        app:cardCornerRadius="@dimen/rounded_image_radius">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_margin="10dp"
-                            android:gravity="end|center_vertical"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/downloaded_progress_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textColor="@color/white"
-                                tools:text="10MB / 20MB" />
-
-                            <TextView
-                                android:id="@+id/downloaded_progress_speed_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textColor="@color/white"
-                                tools:text="10MB/s - 12 seeders" />
-
-                            <com.google.android.material.progressindicator.LinearProgressIndicator
-                                android:id="@+id/downloaded_progress"
-                                style="@style/RoundProgressbar"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="5dp"
-                                android:indeterminate="false"
-                                android:indeterminateTint="?attr/colorPrimary"
-                                android:progressBackgroundTint="?attr/colorPrimary"
-                                android:progressTint="?attr/colorPrimary"
-                                tools:progress="20" />
-
-                        </LinearLayout>
-                    </androidx.cardview.widget.CardView>
-
-                </LinearLayout>
-            </FrameLayout>
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/player_center_menu"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:layoutDirection="ltr"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible">
-
-                <FrameLayout
-                    android:id="@+id/player_rew_holder"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|start"
-                    android:visibility="gone"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintWidth_percent="0.5">
-
-                    <TextView
-                        android:id="@+id/exo_rew_text"
-                        android:layout_width="200dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="19sp"
-
-                        android:textStyle="bold"
-                        tools:text="10" />
-
-                    <ImageButton
-                        android:id="@id/player_rew"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
-
-                        android:background="@drawable/video_tap_button_skip"
-                        android:nextFocusLeft="@id/player_rew"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_pause_play"
-                        android:padding="10dp"
-                        android:scaleType="fitCenter"
-                        android:scaleX="-1"
-                        android:src="@drawable/netflix_skip_forward"
-                        android:tintMode="src_in"
-                        app:tint="@color/white"
-                        tools:ignore="ContentDescription" />
-                </FrameLayout>
-
-                <FrameLayout
-                    android:id="@+id/player_ffwd_holder"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:visibility="gone"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintWidth_percent="0.5">
-
-                    <TextView
-                        android:id="@+id/exo_ffwd_text"
-                        android:layout_width="200dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="19sp"
-                        android:textStyle="bold"
-                        tools:text="10" />
-
-                    <ImageButton
-                        android:id="@id/player_ffwd"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
-
-                        android:background="@drawable/video_tap_button_skip"
-                        android:nextFocusRight="@id/player_rew"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_pause_play"
-                        android:padding="10dp"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/netflix_skip_forward"
-                        android:tintMode="src_in"
-                        app:tint="@color/white"
-                        tools:ignore="ContentDescription" />
-                </FrameLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
-            <ProgressBar
-                android:id="@+id/player_buffering"
+        <LinearLayout
+          android:id="@+id/player_go_back_holder"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="17dp"
+          android:layout_marginEnd="17dp"
+          android:orientation="horizontal"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+        >
+          <LinearLayout
+            android:id="@+id/player_go_back_root"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+          >
+            <ImageView
+              android:id="@+id/player_go_back"
+              android:layout_width="30dp"
+              android:layout_height="30dp"
+              android:layout_gravity="center"
+              android:background="@drawable/video_tap_button_always_white"
+              android:clickable="true"
+              android:contentDescription="@string/go_back_img_des"
+              android:focusable="true"
+              android:nextFocusLeft="@id/player_go_back"
+              android:nextFocusRight="@id/player_restart"
+              android:nextFocusUp="@id/player_go_back"
+              android:nextFocusDown="@id/player_pause_play"
+              android:src="@drawable/ic_baseline_arrow_back_24"
+              android:tag="@string/tv_no_focus_tag"
+              app:tint="@android:color/white"
+            />
+            <TextView
+              android:id="@+id/player_go_back_text"
+              style="@style/ResultMarqueeButtonText"
+              android:layout_marginTop="5dp"
+              android:text="@string/go_back_img_des"
+              android:visibility="invisible"
+              tools:visibility="visible"
+            />
+          </LinearLayout>
+          <LinearLayout
+            android:id="@+id/player_restart_root"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+          >
+            <ImageView
+              android:id="@+id/player_restart"
+              android:layout_width="30dp"
+              android:layout_height="30dp"
+              android:layout_gravity="center"
+              android:background="@drawable/video_tap_button_always_white"
+              android:clickable="true"
+              android:contentDescription="@string/restart"
+              android:focusable="true"
+              android:nextFocusLeft="@id/player_go_back"
+              android:nextFocusRight="@id/player_go_forward"
+              android:nextFocusUp="@id/player_restart"
+              android:nextFocusDown="@id/player_pause_play"
+              android:src="@drawable/ic_baseline_replay_24"
+              android:tag="@string/tv_no_focus_tag"
+              app:tint="@android:color/white"
+            />
+            <TextView
+              android:id="@+id/player_restart_text"
+              style="@style/ResultMarqueeButtonText"
+              android:layout_marginTop="5dp"
+              android:text="@string/restart"
+              android:visibility="invisible"
+              tools:visibility="visible"
+            />
+          </LinearLayout>
+          <LinearLayout
+            android:id="@+id/player_go_forward_root"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+          >
+            <ImageView
+              android:id="@+id/player_go_forward"
+              android:layout_width="30dp"
+              android:layout_height="30dp"
+              android:layout_gravity="center"
+              android:background="@drawable/video_tap_button_always_white"
+              android:clickable="true"
+              android:contentDescription="@string/next_episode"
+              android:focusable="true"
+              android:nextFocusLeft="@id/player_restart"
+              android:nextFocusRight="@id/download_header_toggle"
+              android:nextFocusUp="@id/player_go_forward"
+              android:nextFocusDown="@id/player_pause_play"
+              android:src="@drawable/ic_baseline_skip_next_rounded_24"
+              android:tag="@string/tv_no_focus_tag"
+              app:tint="@android:color/white"
+            />
+            <TextView
+              android:id="@+id/player_go_forward_text"
+              style="@style/ResultMarqueeButtonText"
+              android:layout_marginTop="5dp"
+              android:text="@string/next_episode"
+              android:visibility="invisible"
+              tools:visibility="visible"
+            />
+          </LinearLayout>
+          <LinearLayout
+            android:id="@+id/download_both_header"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="vertical"
+          >
+            <ImageView
+              android:id="@+id/download_header_toggle"
+              android:layout_width="30dp"
+              android:layout_height="30dp"
+              android:layout_gravity="center"
+              android:background="@drawable/video_tap_button_always_white"
+              android:clickable="true"
+              android:contentDescription="@string/torrent_singular"
+              android:focusable="true"
+              android:nextFocusLeft="@id/player_go_forward"
+              android:nextFocusRight="@id/player_episodes_button"
+              android:nextFocusUp="@id/download_header_toggle"
+              android:nextFocusDown="@id/player_pause_play"
+              android:src="@drawable/baseline_downloading_24"
+              android:tag="@string/tv_no_focus_tag"
+              app:tint="@android:color/white"
+            />
+            <TextView
+              android:id="@+id/download_header_toggle_text"
+              style="@style/ResultMarqueeButtonText"
+              android:layout_marginTop="5dp"
+              android:text="@string/torrent_singular"
+              android:visibility="invisible"
+              tools:visibility="visible"
+            />
+          </LinearLayout>
+          <LinearLayout
+            android:id="@+id/player_episodes_button_root"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+          >
+            <ImageView
+              android:id="@+id/player_episodes_button"
+              android:layout_width="30dp"
+              android:layout_height="30dp"
+              android:layout_gravity="center"
+              android:background="@drawable/video_tap_button_always_white"
+              android:clickable="true"
+              android:contentDescription="@string/episodes"
+              android:focusable="true"
+              android:nextFocusLeft="@id/download_header_toggle"
+              android:nextFocusRight="@id/player_episode_overlay"
+              android:nextFocusUp="@id/player_episodes_button"
+              android:nextFocusDown="@id/player_pause_play"
+              android:src="@drawable/ic_baseline_sort_24"
+              android:tag="@string/tv_no_focus_tag"
+              app:tint="@android:color/white"
+            />
+            <TextView
+              android:id="@+id/player_episodes_button_text"
+              style="@style/ResultMarqueeButtonText"
+              android:layout_marginTop="5dp"
+              android:text="@string/episodes"
+              android:visibility="invisible"
+              tools:visibility="visible"
+            />
+          </LinearLayout>
+          <androidx.cardview.widget.CardView
+            android:id="@+id/download_header"
+            android:layout_width="200dp"
+            android:layout_height="70dp"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginTop="5dp"
+            android:elevation="10dp"
+            app:cardBackgroundColor="@color/darkBar"
+            app:cardCornerRadius="@dimen/rounded_image_radius"
+          >
+            <LinearLayout
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_margin="10dp"
+              android:gravity="end|center_vertical"
+              android:orientation="vertical"
+            >
+              <TextView
+                android:id="@+id/downloaded_progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-
-                android:clickable="false"
-                android:focusable="false"
-                android:focusableInTouchMode="false"
-
-                android:indeterminate="true"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
+                android:textColor="@color/white"
+                tools:text="10MB / 20MB"
+              />
+              <TextView
+                android:id="@+id/downloaded_progress_speed_text"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="20dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingTop="4dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent">
-
-                <ImageButton
-                    android:id="@id/exo_prev"
-                    style="@style/ExoMediaButton.Previous"
-                    android:tintMode="src_in"
-                    app:tint="?attr/colorPrimaryDark"
-                    tools:ignore="ContentDescription" />
-
-
-                <ImageButton
-                    android:id="@id/exo_repeat_toggle"
-                    style="@style/ExoMediaButton"
-                    android:tintMode="src_in"
-                    app:tint="?attr/colorPrimaryDark"
-                    tools:ignore="ContentDescription" />
-
-
-                <ImageButton
-                    android:id="@id/exo_next"
-                    style="@style/ExoMediaButton.Next"
-                    android:tintMode="src_in"
-                    app:tint="?attr/colorPrimaryDark"
-                    tools:ignore="ContentDescription" />
-
-                <ImageButton
-                    android:id="@id/exo_vr"
-                    style="@style/ExoMediaButton.VR"
-                    android:tintMode="src_in"
-                    app:tint="?attr/colorPrimaryDark"
-                    tools:ignore="ContentDescription" />
-
-                <ImageButton
-                    android:id="@id/exo_play"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:tintMode="src_in"
-                    app:tint="?attr/colorPrimaryDark"
-                    tools:ignore="ContentDescription" />
-
-                <ImageButton
-                    android:id="@id/exo_pause"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:tintMode="src_in"
-                    app:tint="?attr/colorPrimaryDark"
-                    tools:ignore="ContentDescription" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/bottom_player_bar"
+                android:textColor="@color/white"
+                tools:text="10MB/s - 12 seeders"
+              />
+              <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/downloaded_progress"
+                style="@style/RoundProgressbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="64dp"
-                android:layout_marginEnd="64dp"
-                android:layout_marginBottom="10dp"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/player_video_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layoutDirection="ltr"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/player_pause_play"
-
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:background="@drawable/video_tap_button"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:nextFocusUp="@id/skip_chapter_button"
-                        android:nextFocusDown="@id/player_lock_holder"
-                        android:src="@drawable/netflix_pause"
-
-                        android:tag="@string/tv_no_focus_tag"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:tint="@color/player_button_tv"
-                        tools:ignore="ContentDescription" />
-
-                    <TextView
-                        android:id="@id/exo_position"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
-                        android:gravity="center"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toEndOf="@id/player_pause_play"
-                        tools:text="15:30" />
-
-                    <FrameLayout
-                        android:id="@+id/previewFrameLayout"
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginBottom="16dp"
-                        android:background="@drawable/video_frame"
-                        android:visibility="invisible"
-                        app:layout_constraintBottom_toTopOf="@+id/exo_progress"
-                        app:layout_constraintDimensionRatio="16:9"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintWidth_default="percent"
-                        app:layout_constraintWidth_percent="0.25"
-                        tools:visibility="visible">
-
-                        <ImageView
-                            android:id="@+id/previewImageView"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_margin="@dimen/video_frame_width"
-                            android:importantForAccessibility="no"
-                            android:scaleType="centerCrop" />
-                    </FrameLayout>
-
-                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
-                        android:id="@id/exo_progress"
-                        android:layout_width="0dp"
-                        android:layout_height="30dp"
-                        android:layout_weight="1"
-                        app:bar_height="2dp"
-                        app:layout_constraintBottom_toBottomOf="@id/exo_position"
-                        app:layout_constraintEnd_toStartOf="@id/exo_duration"
-                        app:layout_constraintStart_toEndOf="@+id/exo_position"
-                        app:played_color="?attr/colorPrimary"
-
-                        app:scrubber_color="?attr/colorPrimary"
-                        app:scrubber_dragged_size="26dp"
-                        app:scrubber_enabled_size="24dp"
-                        app:unplayed_color="@color/videoProgress" />
-
-                    <TextView
-                        android:id="@id/exo_duration"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
-                        android:layout_gravity="center|center_vertical"
-
-                        android:layout_marginEnd="20dp"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:paddingLeft="4dp"
-                        android:paddingRight="4dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        tools:text="23:20" />
-
-                    <TextView
-                        android:id="@+id/time_left"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
-                        android:layout_gravity="center|center_vertical"
-
-                        android:layout_marginEnd="20dp"
-                        android:includeFontPadding="false"
-                        android:minWidth="50dp"
-                        android:paddingLeft="4dp"
-                        android:paddingRight="4dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="normal"
-                        android:visibility="gone"
-                        app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        tools:text="-23:20" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                <HorizontalScrollView
-                    android:id="@+id/player_controls_scroll"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center">
-
-                    <LinearLayout
-                        android:id="@+id/player_lock_holder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
-
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:visibility="gone">
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_lock"
-                                style="@style/VideoButtonTV"
-                                android:nextFocusLeft="@id/player_skip_episode"
-
-                                android:nextFocusRight="@id/player_resize_btt"
-                                android:nextFocusUp="@id/player_pause_play"
-                                android:text="@string/video_lock"
-                                android:visibility="gone"
-                                app:icon="@drawable/video_locked" />
-                        </FrameLayout>
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_rotate_btt"
-                            style="@style/VideoButton"
-                            android:visibility="gone" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_skip_op"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_pause_play"
-                            android:nextFocusRight="@id/player_skip_episode"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:nextFocusDown="@id/player_skip_episode"
-                            android:text="@string/video_skip_op"
-                            app:icon="@drawable/ic_baseline_fast_forward_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_skip_episode"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_skip_op"
-                            android:nextFocusRight="@id/player_resize_btt"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:nextFocusDown="@id/player_resize_btt"
-                            android:text="@string/next_episode"
-                            android:visibility="gone"
-                            app:icon="@drawable/ic_baseline_skip_next_24"
-                            tools:visibility="visible" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_resize_btt"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_skip_episode"
-
-                            android:nextFocusRight="@id/player_speed_btt"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:nextFocusDown="@id/player_speed_btt"
-                            android:text="@string/video_aspect_ratio_resize"
-                            app:icon="@drawable/ic_baseline_aspect_ratio_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_speed_btt"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_resize_btt"
-
-                            android:nextFocusRight="@id/player_subtitle_offset_btt"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:nextFocusDown="@id/player_subtitle_offset_btt"
-                            app:icon="@drawable/ic_baseline_speed_24"
-                            tools:text="Speed" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_subtitle_offset_btt"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_speed_btt"
-                            android:nextFocusRight="@id/player_sources_btt"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:nextFocusDown="@id/player_sources_btt"
-                            android:text="@string/subtitle_offset"
-
-                            android:visibility="gone"
-                            app:icon="@drawable/ic_outline_subtitles_24"
-                            tools:visibility="visible" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_sources_btt"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_subtitle_offset_btt"
-                            android:nextFocusRight="@id/player_tracks_btt"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:nextFocusDown="@id/player_tracks_btt"
-
-                            android:text="@string/video_source"
-                            app:icon="@drawable/ic_baseline_playlist_play_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_tracks_btt"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_sources_btt"
-                            android:nextFocusRight="@id/player_skip_op"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:text="@string/tracks"
-                            app:icon="@drawable/ic_baseline_equalizer_24" />
-                    </LinearLayout>
-                </HorizontalScrollView>
+                android:layout_marginTop="5dp"
+                android:indeterminate="false"
+                android:indeterminateTint="?attr/colorPrimary"
+                android:progressBackgroundTint="?attr/colorPrimary"
+                android:progressTint="?attr/colorPrimary"
+                tools:progress="20"
+              />
             </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/subtitle_holder"
+          </androidx.cardview.widget.CardView>
+        </LinearLayout>
+      </FrameLayout>
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/player_center_menu"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    </FrameLayout>
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/player_speedup_button"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="70dp"
-        app:iconGravity="top"
+        android:layout_height="100dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible"
+      >
+        <FrameLayout
+          android:id="@+id/player_rew_holder"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_vertical|start"
+          android:visibility="gone"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintLeft_toLeftOf="parent"
+          app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
+          app:layout_constraintTop_toTopOf="parent"
+          app:layout_constraintWidth_percent="0.5"
+        >
+          <TextView
+            android:id="@+id/exo_rew_text"
+            android:layout_width="200dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="19sp"
+            android:textStyle="bold"
+            tools:text="10"
+          />
+          <ImageButton
+            android:id="@id/player_rew"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_gravity="center"
+            android:background="@drawable/video_tap_button_skip"
+            android:nextFocusLeft="@id/player_rew"
+            android:nextFocusUp="@id/player_go_back"
+            android:nextFocusDown="@id/player_pause_play"
+            android:padding="10dp"
+            android:scaleType="fitCenter"
+            android:scaleX="-1"
+            android:src="@drawable/netflix_skip_forward"
+            android:tintMode="src_in"
+            app:tint="@color/white"
+            tools:ignore="ContentDescription"
+          />
+        </FrameLayout>
+        <FrameLayout
+          android:id="@+id/player_ffwd_holder"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_vertical|end"
+          android:visibility="gone"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
+          app:layout_constraintRight_toRightOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          app:layout_constraintWidth_percent="0.5"
+        >
+          <TextView
+            android:id="@+id/exo_ffwd_text"
+            android:layout_width="200dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="19sp"
+            android:textStyle="bold"
+            tools:text="10"
+          />
+          <ImageButton
+            android:id="@id/player_ffwd"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_gravity="center"
+            android:background="@drawable/video_tap_button_skip"
+            android:nextFocusRight="@id/player_rew"
+            android:nextFocusUp="@id/player_go_back"
+            android:nextFocusDown="@id/player_pause_play"
+            android:padding="10dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/netflix_skip_forward"
+            android:tintMode="src_in"
+            app:tint="@color/white"
+            tools:ignore="ContentDescription"
+          />
+        </FrameLayout>
+      </androidx.constraintlayout.widget.ConstraintLayout>
+      <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
+      <ProgressBar
+        android:id="@+id/player_buffering"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:clickable="false"
-        android:textAllCaps="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:indeterminate="true"
         android:visibility="gone"
-        app:icon="@drawable/speedup"
-        app:iconTint="@color/textColor"
-        app:rippleColor="?attr/colorPrimary"
-        tools:visibility="visible" />
-
-
-    <LinearLayout
-        android:id="@+id/player_episode_overlay"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible"
+      />
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="20dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingTop="4dp"
         android:visibility="gone"
-        android:padding="5dp"
-        android:background="?attr/primaryBlackBackground"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+      >
+        <ImageButton
+          android:id="@id/exo_prev"
+          style="@style/ExoMediaButton.Previous"
+          android:tintMode="src_in"
+          app:tint="?attr/colorPrimaryDark"
+          tools:ignore="ContentDescription"
+        />
+        <ImageButton
+          android:id="@id/exo_repeat_toggle"
+          style="@style/ExoMediaButton"
+          android:tintMode="src_in"
+          app:tint="?attr/colorPrimaryDark"
+          tools:ignore="ContentDescription"
+        />
+        <ImageButton
+          android:id="@id/exo_next"
+          style="@style/ExoMediaButton.Next"
+          android:tintMode="src_in"
+          app:tint="?attr/colorPrimaryDark"
+          tools:ignore="ContentDescription"
+        />
+        <ImageButton
+          android:id="@id/exo_vr"
+          style="@style/ExoMediaButton.VR"
+          android:tintMode="src_in"
+          app:tint="?attr/colorPrimaryDark"
+          tools:ignore="ContentDescription"
+        />
+        <ImageButton
+          android:id="@id/exo_play"
+          android:layout_width="0dp"
+          android:layout_height="0dp"
+          android:tintMode="src_in"
+          app:tint="?attr/colorPrimaryDark"
+          tools:ignore="ContentDescription"
+        />
+        <ImageButton
+          android:id="@id/exo_pause"
+          android:layout_width="0dp"
+          android:layout_height="0dp"
+          android:tintMode="src_in"
+          app:tint="?attr/colorPrimaryDark"
+          tools:ignore="ContentDescription"
+        />
+      </LinearLayout>
+      <LinearLayout
+        android:id="@+id/bottom_player_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="64dp"
+        android:layout_marginEnd="64dp"
+        android:layout_marginBottom="10dp"
+        android:gravity="center_vertical"
         android:orientation="vertical"
-        android:layout_gravity="end"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/player_episode_overlay_title"
-            android:padding="10dp"
-            style="@style/WatchHeaderText"
-            android:textSize="15sp"
-            android:layout_marginEnd="0dp"
-            android:text="@string/episodes"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+      >
+        <androidx.constraintlayout.widget.ConstraintLayout
+          android:id="@+id/player_video_bar"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layoutDirection="ltr"
+          android:orientation="horizontal"
+        >
+          <ImageView
+            android:id="@+id/player_pause_play"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:layout_marginStart="20dp"
+            android:background="@drawable/video_tap_button"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:nextFocusUp="@id/skip_chapter_button"
+            android:nextFocusDown="@id/player_lock_holder"
+            android:src="@drawable/netflix_pause"
+            android:tag="@string/tv_no_focus_tag"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:tint="@color/player_button_tv"
+            tools:ignore="ContentDescription"
+          />
+          <TextView
+            android:id="@id/exo_position"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:minWidth="50dp"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            android:textStyle="normal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/player_pause_play"
+            tools:text="15:30"
+          />
+          <FrameLayout
+            android:id="@+id/previewFrameLayout"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:background="@drawable/video_frame"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toTopOf="@+id/exo_progress"
+            app:layout_constraintDimensionRatio="16:9"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_default="percent"
+            app:layout_constraintWidth_percent="0.25"
+            tools:visibility="visible"
+          >
+            <ImageView
+              android:id="@+id/previewImageView"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_margin="@dimen/video_frame_width"
+              android:importantForAccessibility="no"
+              android:scaleType="centerCrop"
+            />
+          </FrameLayout>
+          <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+            android:id="@id/exo_progress"
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="1"
+            app:bar_height="2dp"
+            app:layout_constraintBottom_toBottomOf="@id/exo_position"
+            app:layout_constraintEnd_toStartOf="@id/exo_duration"
+            app:layout_constraintStart_toEndOf="@+id/exo_position"
+            app:played_color="?attr/colorPrimary"
+            app:scrubber_color="?attr/colorPrimary"
+            app:scrubber_dragged_size="26dp"
+            app:scrubber_enabled_size="24dp"
+            app:unplayed_color="@color/videoProgress"
+          />
+          <TextView
+            android:id="@id/exo_duration"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_gravity="center|center_vertical"
+            android:layout_marginEnd="20dp"
+            android:includeFontPadding="false"
+            android:minWidth="50dp"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            android:textStyle="normal"
+            app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="23:20"
+          />
+          <TextView
+            android:id="@+id/time_left"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_gravity="center|center_vertical"
+            android:layout_marginEnd="20dp"
+            android:includeFontPadding="false"
+            android:minWidth="50dp"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            android:textStyle="normal"
+            android:visibility="gone"
+            app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="-23:20"
+          />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        <HorizontalScrollView
+          android:id="@+id/player_controls_scroll"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+        >
+          <LinearLayout
+            android:id="@+id/player_lock_holder"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:requiresFadingEdge="vertical"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            android:id="@+id/player_episode_list"
-            tools:listitem="@layout/player_episodes"
-            android:nextFocusLeft="@id/player_episodes_button"
-            android:layout_width="400dp"
             android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:descendantFocusability="afterDescendants">
-
-        </androidx.recyclerview.widget.RecyclerView>
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
+            android:orientation="horizontal"
+          >
+            <FrameLayout
+              android:layout_width="0dp"
+              android:layout_height="0dp"
+              android:visibility="gone"
+            >
+              <com.google.android.material.button.MaterialButton
+                android:id="@+id/player_lock"
+                style="@style/VideoButtonTV"
+                android:nextFocusLeft="@id/player_skip_episode"
+                android:nextFocusRight="@id/player_resize_btt"
+                android:nextFocusUp="@id/player_pause_play"
+                android:text="@string/video_lock"
+                android:visibility="gone"
+                app:icon="@drawable/video_locked"
+              />
+            </FrameLayout>
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_rotate_btt"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_pause_play"
+              android:nextFocusRight="@id/player_skip_op"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_skip_op"
+              android:text="@string/rotate_video"
+              android:visibility="gone"
+              app:icon="@drawable/screen_rotation"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_skip_op"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_rotate_btt"
+              android:nextFocusRight="@id/player_skip_episode"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_skip_episode"
+              android:text="@string/video_skip_op"
+              app:icon="@drawable/ic_baseline_fast_forward_24"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_skip_episode"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_skip_op"
+              android:nextFocusRight="@id/player_resize_btt"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_resize_btt"
+              android:text="@string/next_episode"
+              android:visibility="gone"
+              app:icon="@drawable/ic_baseline_skip_next_24"
+              tools:visibility="visible"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_resize_btt"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_skip_episode"
+              android:nextFocusRight="@id/player_speed_btt"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_speed_btt"
+              android:text="@string/video_aspect_ratio_resize"
+              app:icon="@drawable/ic_baseline_aspect_ratio_24"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_speed_btt"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_resize_btt"
+              android:nextFocusRight="@id/player_subtitle_offset_btt"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_subtitle_offset_btt"
+              app:icon="@drawable/ic_baseline_speed_24"
+              tools:text="Speed"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_subtitle_offset_btt"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_speed_btt"
+              android:nextFocusRight="@id/player_sources_btt"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_sources_btt"
+              android:text="@string/subtitle_offset"
+              android:visibility="gone"
+              app:icon="@drawable/ic_outline_subtitles_24"
+              tools:visibility="visible"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_sources_btt"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_subtitle_offset_btt"
+              android:nextFocusRight="@id/player_tracks_btt"
+              android:nextFocusUp="@id/player_pause_play"
+              android:nextFocusDown="@id/player_tracks_btt"
+              android:text="@string/video_source"
+              app:icon="@drawable/ic_baseline_playlist_play_24"
+            />
+            <com.google.android.material.button.MaterialButton
+              android:id="@+id/player_tracks_btt"
+              style="@style/VideoButtonTV"
+              android:nextFocusLeft="@id/player_sources_btt"
+              android:nextFocusRight="@id/player_skip_op"
+              android:nextFocusUp="@id/player_pause_play"
+              android:text="@string/tracks"
+              app:icon="@drawable/ic_baseline_equalizer_24"
+            />
+          </LinearLayout>
+        </HorizontalScrollView>
+      </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </FrameLayout>
+  <FrameLayout
+    android:id="@+id/subtitle_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+  ></FrameLayout>
+  <com.google.android.material.button.MaterialButton
+    android:id="@+id/player_speedup_button"
+    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+    android:layout_width="45dp"
+    android:layout_height="45dp"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginTop="70dp"
+    app:iconGravity="top"
+    android:clickable="false"
+    android:textAllCaps="false"
+    android:visibility="gone"
+    app:icon="@drawable/speedup"
+    app:iconTint="@color/textColor"
+    app:rippleColor="?attr/colorPrimary"
+    tools:visibility="visible"
+  />
+  <LinearLayout
+    android:id="@+id/player_episode_overlay"
+    android:visibility="gone"
+    android:padding="5dp"
+    android:background="?attr/primaryBlackBackground"
+    android:orientation="vertical"
+    android:layout_gravity="end"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+  >
+    <TextView
+      android:id="@+id/player_episode_overlay_title"
+      android:padding="10dp"
+      style="@style/WatchHeaderText"
+      android:textSize="15sp"
+      android:layout_marginEnd="0dp"
+      android:text="@string/episodes"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+    />
+    <androidx.recyclerview.widget.RecyclerView
+      android:requiresFadingEdge="vertical"
+      app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+      android:id="@+id/player_episode_list"
+      tools:listitem="@layout/player_episodes"
+      android:nextFocusLeft="@id/player_episodes_button"
+      android:layout_width="400dp"
+      android:layout_height="match_parent"
+      android:clipToPadding="false"
+      android:descendantFocusability="afterDescendants"
+    ></androidx.recyclerview.widget.RecyclerView>
+  </LinearLayout>
+</FrameLayout>

From 80c7cabc9ddfacb9811a272186946405861395a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20Civano=C4=9Flu?= <onur.civanoglu@outlook.com>
Date: Thu, 19 Feb 2026 10:24:07 +0300
Subject: [PATCH 2/2] rollback code formatter

---
 .../res/layout/player_custom_layout_tv.xml    | 400 ++++++++++--------
 1 file changed, 217 insertions(+), 183 deletions(-)

diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index f886f881e7..944abf4290 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -1,5 +1,4 @@
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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/player_holder"
@@ -7,26 +6,27 @@
   android:layout_height="match_parent"
   android:orientation="vertical"
   android:tag="television"
-  tools:orientation="vertical"
->
+    tools:orientation="vertical">
+
   <ImageView
     android:visibility="gone"
     android:id="@+id/video_outline"
     android:src="@drawable/video_outline"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  ></ImageView>
+        android:layout_height="match_parent">
+    </ImageView>
+
+
   <FrameLayout
     android:id="@+id/piphide"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  >
+        android:layout_height="match_parent">
+
     <View
       android:id="@+id/shadow_overlay"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@drawable/player_gradient_tv"
-    />
+            android:background="@drawable/player_gradient_tv" />
     <!--
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
@@ -65,8 +65,8 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:layoutDirection="ltr"
-      android:orientation="horizontal"
-    >
+            android:orientation="horizontal">
+
       <RelativeLayout
         android:id="@+id/player_progressbar_left_holder"
         android:layout_width="100dp"
@@ -79,8 +79,7 @@
         app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
         app:layout_constraintTop_toTopOf="parent"
         tools:alpha="1"
-        tools:visibility="visible"
-      >
+                tools:visibility="visible">
         <!--VERY hacky layout -->
         <ImageView
           android:id="@+id/player_progressbar_left_icon"
@@ -90,8 +89,10 @@
           android:layout_marginBottom="220dp"
           android:src="@drawable/ic_baseline_volume_up_24"
           app:tint="@android:color/white"
-          tools:ignore="ContentDescription"
-        ></ImageView>
+                    tools:ignore="ContentDescription">
+
+                </ImageView>
+
         <ProgressBar
           android:id="@+id/player_progressbar_left_level1"
           android:layout_width="5dp"
@@ -106,8 +107,8 @@
           android:progressTint="@color/white"
           android:progressTintMode="src_in"
           tools:progress="30"
-          style="@android:style/Widget.Material.ProgressBar.Horizontal"
-        />
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
+
         <ProgressBar
           android:id="@+id/player_progressbar_left_level2"
           android:layout_width="5dp"
@@ -122,9 +123,9 @@
           android:progressTint="@color/colorPrimaryOrange"
           android:progressTintMode="src_in"
           tools:progress="0"
-          style="@android:style/Widget.Material.ProgressBar.Horizontal"
-        />
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
       </RelativeLayout>
+
       <RelativeLayout
         android:id="@+id/player_progressbar_right_holder"
         android:layout_width="match_parent"
@@ -138,8 +139,8 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:alpha="1"
         tools:ignore="RtlHardcoded"
-        tools:visibility="visible"
-      >
+                tools:visibility="visible">
+
         <ImageView
           android:id="@+id/player_progressbar_right_icon"
           android:layout_width="wrap_content"
@@ -148,8 +149,10 @@
           android:layout_marginBottom="220dp"
           android:src="@drawable/ic_baseline_brightness_7_24"
           app:tint="@android:color/white"
-          tools:ignore="ContentDescription"
-        ></ImageView>
+                    tools:ignore="ContentDescription">
+
+                </ImageView>
+
         <ProgressBar
           android:id="@+id/player_progressbar_right_level1"
           style="@android:style/Widget.Material.ProgressBar.Horizontal"
@@ -163,8 +166,8 @@
           android:progress="100"
           android:progressDrawable="@drawable/progress_drawable_vertical"
           android:progressTint="@color/white"
-          android:progressTintMode="src_in"
-        />
+                    android:progressTintMode="src_in" />
+
         <ProgressBar
           android:id="@+id/player_progressbar_right_level2"
           style="@android:style/Widget.Material.ProgressBar.Horizontal"
@@ -178,10 +181,11 @@
           android:progress="0"
           android:progressDrawable="@drawable/progress_drawable_vertical"
           android:progressTint="@color/colorPrimaryOrange"
-          android:progressTintMode="src_in"
-        />
+                    android:progressTintMode="src_in" />
       </RelativeLayout>
     </LinearLayout>
+
+
     <TextView
       android:id="@+id/player_time_text"
       android:layout_width="match_parent"
@@ -193,8 +197,8 @@
       android:textSize="30sp"
       android:visibility="gone"
       tools:text="+100"
-      tools:visibility="visible"
-    />
+            tools:visibility="visible" />
+
     <FrameLayout
       android:id="@+id/player_pause_play_holder_holder"
       android:layout_width="0dp"
@@ -203,14 +207,14 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintRight_toRightOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-    />
+            app:layout_constraintTop_toTopOf="parent" />
+
     <FrameLayout
       android:id="@+id/player_intro_play"
       android:layout_width="0dp"
       android:layout_height="0dp"
-      android:visibility="gone"
-    />
+            android:visibility="gone" />
+
     <ImageView
       android:id="@+id/player_open_source"
       android:layout_width="0dp"
@@ -219,8 +223,8 @@
       android:focusable="false"
       android:focusableInTouchMode="false"
       android:importantForAccessibility="no"
-      android:visibility="gone"
-    />
+            android:visibility="gone" />
+
     <!-- atm this is useless, however it might be used for PIP one day? -->
     <ImageView
       android:id="@+id/player_fullscreen"
@@ -231,14 +235,14 @@
       android:background="?android:attr/selectableItemBackgroundBorderless"
       android:src="@drawable/baseline_fullscreen_24"
       android:visibility="gone"
-      app:tint="@color/white"
-    />
+            app:tint="@color/white" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
       android:id="@+id/player_video_holder"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:padding="16dp"
-    >
+            android:padding="16dp">
+
       <com.google.android.material.button.MaterialButton
         android:id="@+id/skip_chapter_button"
         style="@style/NiceButton"
@@ -259,27 +263,26 @@
         app:strokeColor="@color/white"
         app:strokeWidth="1dp"
         tools:text="Skip Opening"
-        tools:visibility="visible"
-      />
+                tools:visibility="visible" />
+
       <FrameLayout
         android:id="@+id/player_top_holder"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-      >
+                android:layout_height="match_parent">
+
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginStart="32dp"
           android:layout_marginTop="20dp"
           android:layout_marginEnd="32dp"
-          android:orientation="vertical"
-        >
+                    android:orientation="vertical">
+
           <LinearLayout
             android:id="@+id/player_video_title_holder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-          >
+                        android:layout_gravity="end">
             <TextView
               android:maxLines="2"
               android:id="@+id/player_video_title"
@@ -292,8 +295,7 @@
               android:textColor="@color/white"
               android:textSize="16sp"
               android:textStyle="bold"
-              tools:text="Hello world"
-            />
+                            tools:text="Hello world" />
             <ImageView
               android:id="@+id/offline_pin"
               android:layout_width="18dp"
@@ -302,9 +304,9 @@
               android:src="@drawable/ic_offline_pin_24"
               android:visibility="gone"
               tools:visibility="visible"
-              android:layout_gravity="start"
-            />
+                            android:layout_gravity="start"/>
           </LinearLayout>
+
           <TextView
             android:id="@+id/player_video_title_rez"
             android:layout_width="wrap_content"
@@ -315,8 +317,8 @@
             android:textAlignment="viewEnd"
             android:textColor="@color/white"
             android:textSize="16sp"
-            tools:text="1920x1080"
-          />
+                        tools:text="1920x1080" />
+
           <TextView
             android:id="@+id/player_video_info"
             android:layout_width="wrap_content"
@@ -327,22 +329,23 @@
             android:textSize="16sp"
             android:visibility="gone"
             android:layout_gravity="end"
-            tools:text="HDR10 • HEVC"
-          />
+                        tools:text="HDR10 • HEVC" />
+
+
           <FrameLayout
             android:id="@+id/player_episode_filler_holder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_marginTop="2dp"
-          >
+                        android:layout_marginTop="2dp">
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_episode_filler"
               style="@style/SmallBlackButton"
-              android:text="@string/filler"
-            />
+                            android:text="@string/filler" />
           </FrameLayout>
         </LinearLayout>
+
         <!-- Removed as it has no use anymore-->
         <!--<androidx.mediarouter.app.MediaRouteButton
                         android:id="@+id/player_media_route_button"
@@ -354,6 +357,7 @@
                         android:visibility="visible"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />-->
+
         <LinearLayout
           android:id="@+id/player_go_back_holder"
           android:layout_width="wrap_content"
@@ -362,15 +366,15 @@
           android:layout_marginEnd="17dp"
           android:orientation="horizontal"
           app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent"
-        >
+                    app:layout_constraintTop_toTopOf="parent">
+
           <LinearLayout
             android:id="@+id/player_go_back_root"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:orientation="vertical"
-          >
+                        android:orientation="vertical">
+
             <ImageView
               android:id="@+id/player_go_back"
               android:layout_width="30dp"
@@ -386,24 +390,25 @@
               android:nextFocusDown="@id/player_pause_play"
               android:src="@drawable/ic_baseline_arrow_back_24"
               android:tag="@string/tv_no_focus_tag"
-              app:tint="@android:color/white"
-            />
+                            app:tint="@android:color/white" />
+
             <TextView
               android:id="@+id/player_go_back_text"
               style="@style/ResultMarqueeButtonText"
               android:layout_marginTop="5dp"
               android:text="@string/go_back_img_des"
               android:visibility="invisible"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
           </LinearLayout>
+
           <LinearLayout
             android:id="@+id/player_restart_root"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:orientation="vertical"
-          >
+                        android:orientation="vertical">
+
             <ImageView
               android:id="@+id/player_restart"
               android:layout_width="30dp"
@@ -419,24 +424,25 @@
               android:nextFocusDown="@id/player_pause_play"
               android:src="@drawable/ic_baseline_replay_24"
               android:tag="@string/tv_no_focus_tag"
-              app:tint="@android:color/white"
-            />
+                            app:tint="@android:color/white" />
+
             <TextView
               android:id="@+id/player_restart_text"
               style="@style/ResultMarqueeButtonText"
               android:layout_marginTop="5dp"
               android:text="@string/restart"
               android:visibility="invisible"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
           </LinearLayout>
+
           <LinearLayout
             android:id="@+id/player_go_forward_root"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:orientation="vertical"
-          >
+                        android:orientation="vertical">
+
             <ImageView
               android:id="@+id/player_go_forward"
               android:layout_width="30dp"
@@ -452,25 +458,26 @@
               android:nextFocusDown="@id/player_pause_play"
               android:src="@drawable/ic_baseline_skip_next_rounded_24"
               android:tag="@string/tv_no_focus_tag"
-              app:tint="@android:color/white"
-            />
+                            app:tint="@android:color/white" />
+
             <TextView
               android:id="@+id/player_go_forward_text"
               style="@style/ResultMarqueeButtonText"
               android:layout_marginTop="5dp"
               android:text="@string/next_episode"
               android:visibility="invisible"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
           </LinearLayout>
+
           <LinearLayout
             android:id="@+id/download_both_header"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="10dp"
-            android:orientation="vertical"
-          >
+                        android:orientation="vertical">
+
             <ImageView
               android:id="@+id/download_header_toggle"
               android:layout_width="30dp"
@@ -486,24 +493,24 @@
               android:nextFocusDown="@id/player_pause_play"
               android:src="@drawable/baseline_downloading_24"
               android:tag="@string/tv_no_focus_tag"
-              app:tint="@android:color/white"
-            />
+                            app:tint="@android:color/white" />
+
             <TextView
               android:id="@+id/download_header_toggle_text"
               style="@style/ResultMarqueeButtonText"
               android:layout_marginTop="5dp"
               android:text="@string/torrent_singular"
               android:visibility="invisible"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
           </LinearLayout>
           <LinearLayout
             android:id="@+id/player_episodes_button_root"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:orientation="vertical"
-          >
+                        android:orientation="vertical">
+
             <ImageView
               android:id="@+id/player_episodes_button"
               android:layout_width="30dp"
@@ -519,17 +526,18 @@
               android:nextFocusDown="@id/player_pause_play"
               android:src="@drawable/ic_baseline_sort_24"
               android:tag="@string/tv_no_focus_tag"
-              app:tint="@android:color/white"
-            />
+                            app:tint="@android:color/white" />
+
             <TextView
               android:id="@+id/player_episodes_button_text"
               style="@style/ResultMarqueeButtonText"
               android:layout_marginTop="5dp"
               android:text="@string/episodes"
               android:visibility="invisible"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
           </LinearLayout>
+
           <androidx.cardview.widget.CardView
             android:id="@+id/download_header"
             android:layout_width="200dp"
@@ -538,29 +546,29 @@
             android:layout_marginTop="5dp"
             android:elevation="10dp"
             app:cardBackgroundColor="@color/darkBar"
-            app:cardCornerRadius="@dimen/rounded_image_radius"
-          >
+                        app:cardCornerRadius="@dimen/rounded_image_radius">
+
             <LinearLayout
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:layout_margin="10dp"
               android:gravity="end|center_vertical"
-              android:orientation="vertical"
-            >
+                            android:orientation="vertical">
+
               <TextView
                 android:id="@+id/downloaded_progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                tools:text="10MB / 20MB"
-              />
+                                tools:text="10MB / 20MB" />
+
               <TextView
                 android:id="@+id/downloaded_progress_speed_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                tools:text="10MB/s - 12 seeders"
-              />
+                                tools:text="10MB/s - 12 seeders" />
+
               <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/downloaded_progress"
                 style="@style/RoundProgressbar"
@@ -571,12 +579,15 @@
                 android:indeterminateTint="?attr/colorPrimary"
                 android:progressBackgroundTint="?attr/colorPrimary"
                 android:progressTint="?attr/colorPrimary"
-                tools:progress="20"
-              />
+                                tools:progress="20" />
+
             </LinearLayout>
           </androidx.cardview.widget.CardView>
+
         </LinearLayout>
       </FrameLayout>
+
+
       <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/player_center_menu"
         android:layout_width="match_parent"
@@ -590,8 +601,8 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible"
-      >
+                tools:visibility="visible">
+
         <FrameLayout
           android:id="@+id/player_rew_holder"
           android:layout_width="0dp"
@@ -602,24 +613,27 @@
           app:layout_constraintLeft_toLeftOf="parent"
           app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
           app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintWidth_percent="0.5"
-        >
+                    app:layout_constraintWidth_percent="0.5">
+
           <TextView
             android:id="@+id/exo_rew_text"
             android:layout_width="200dp"
             android:layout_height="40dp"
             android:layout_gravity="center"
+
             android:gravity="center"
             android:textColor="@color/white"
             android:textSize="19sp"
+
             android:textStyle="bold"
-            tools:text="10"
-          />
+                        tools:text="10" />
+
           <ImageButton
             android:id="@id/player_rew"
             android:layout_width="70dp"
             android:layout_height="70dp"
             android:layout_gravity="center"
+
             android:background="@drawable/video_tap_button_skip"
             android:nextFocusLeft="@id/player_rew"
             android:nextFocusUp="@id/player_go_back"
@@ -630,9 +644,9 @@
             android:src="@drawable/netflix_skip_forward"
             android:tintMode="src_in"
             app:tint="@color/white"
-            tools:ignore="ContentDescription"
-          />
+                        tools:ignore="ContentDescription" />
         </FrameLayout>
+
         <FrameLayout
           android:id="@+id/player_ffwd_holder"
           android:layout_width="0dp"
@@ -643,8 +657,8 @@
           app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
           app:layout_constraintRight_toRightOf="parent"
           app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintWidth_percent="0.5"
-        >
+                    app:layout_constraintWidth_percent="0.5">
+
           <TextView
             android:id="@+id/exo_ffwd_text"
             android:layout_width="200dp"
@@ -654,13 +668,14 @@
             android:textColor="@color/white"
             android:textSize="19sp"
             android:textStyle="bold"
-            tools:text="10"
-          />
+                        tools:text="10" />
+
           <ImageButton
             android:id="@id/player_ffwd"
             android:layout_width="70dp"
             android:layout_height="70dp"
             android:layout_gravity="center"
+
             android:background="@drawable/video_tap_button_skip"
             android:nextFocusRight="@id/player_rew"
             android:nextFocusUp="@id/player_go_back"
@@ -670,27 +685,29 @@
             android:src="@drawable/netflix_skip_forward"
             android:tintMode="src_in"
             app:tint="@color/white"
-            tools:ignore="ContentDescription"
-          />
+                        tools:ignore="ContentDescription" />
         </FrameLayout>
       </androidx.constraintlayout.widget.ConstraintLayout>
+
       <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
       <ProgressBar
         android:id="@+id/player_buffering"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+
         android:clickable="false"
         android:focusable="false"
         android:focusableInTouchMode="false"
+
         android:indeterminate="true"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible"
-      />
+                tools:visibility="visible" />
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -701,53 +718,55 @@
         android:paddingTop="4dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-      >
+                app:layout_constraintEnd_toEndOf="parent">
+
         <ImageButton
           android:id="@id/exo_prev"
           style="@style/ExoMediaButton.Previous"
           android:tintMode="src_in"
           app:tint="?attr/colorPrimaryDark"
-          tools:ignore="ContentDescription"
-        />
+                    tools:ignore="ContentDescription" />
+
+
         <ImageButton
           android:id="@id/exo_repeat_toggle"
           style="@style/ExoMediaButton"
           android:tintMode="src_in"
           app:tint="?attr/colorPrimaryDark"
-          tools:ignore="ContentDescription"
-        />
+                    tools:ignore="ContentDescription" />
+
+
         <ImageButton
           android:id="@id/exo_next"
           style="@style/ExoMediaButton.Next"
           android:tintMode="src_in"
           app:tint="?attr/colorPrimaryDark"
-          tools:ignore="ContentDescription"
-        />
+                    tools:ignore="ContentDescription" />
+
         <ImageButton
           android:id="@id/exo_vr"
           style="@style/ExoMediaButton.VR"
           android:tintMode="src_in"
           app:tint="?attr/colorPrimaryDark"
-          tools:ignore="ContentDescription"
-        />
+                    tools:ignore="ContentDescription" />
+
         <ImageButton
           android:id="@id/exo_play"
           android:layout_width="0dp"
           android:layout_height="0dp"
           android:tintMode="src_in"
           app:tint="?attr/colorPrimaryDark"
-          tools:ignore="ContentDescription"
-        />
+                    tools:ignore="ContentDescription" />
+
         <ImageButton
           android:id="@id/exo_pause"
           android:layout_width="0dp"
           android:layout_height="0dp"
           android:tintMode="src_in"
           app:tint="?attr/colorPrimaryDark"
-          tools:ignore="ContentDescription"
-        />
+                    tools:ignore="ContentDescription" />
       </LinearLayout>
+
       <LinearLayout
         android:id="@+id/bottom_player_bar"
         android:layout_width="match_parent"
@@ -759,17 +778,18 @@
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-      >
+                app:layout_constraintStart_toStartOf="parent">
+
         <androidx.constraintlayout.widget.ConstraintLayout
           android:id="@+id/player_video_bar"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layoutDirection="ltr"
-          android:orientation="horizontal"
-        >
+                    android:orientation="horizontal">
+
           <ImageView
             android:id="@+id/player_pause_play"
+
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_gravity="center"
@@ -780,12 +800,13 @@
             android:nextFocusUp="@id/skip_chapter_button"
             android:nextFocusDown="@id/player_lock_holder"
             android:src="@drawable/netflix_pause"
+
             android:tag="@string/tv_no_focus_tag"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:tint="@color/player_button_tv"
-            tools:ignore="ContentDescription"
-          />
+                        tools:ignore="ContentDescription" />
+
           <TextView
             android:id="@id/exo_position"
             android:layout_width="wrap_content"
@@ -798,8 +819,8 @@
             android:textStyle="normal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/player_pause_play"
-            tools:text="15:30"
-          />
+                        tools:text="15:30" />
+
           <FrameLayout
             android:id="@+id/previewFrameLayout"
             android:layout_width="0dp"
@@ -816,17 +837,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintWidth_default="percent"
             app:layout_constraintWidth_percent="0.25"
-            tools:visibility="visible"
-          >
+                        tools:visibility="visible">
+
             <ImageView
               android:id="@+id/previewImageView"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:layout_margin="@dimen/video_frame_width"
               android:importantForAccessibility="no"
-              android:scaleType="centerCrop"
-            />
+                            android:scaleType="centerCrop" />
           </FrameLayout>
+
           <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
             android:id="@id/exo_progress"
             android:layout_width="0dp"
@@ -837,16 +858,18 @@
             app:layout_constraintEnd_toStartOf="@id/exo_duration"
             app:layout_constraintStart_toEndOf="@+id/exo_position"
             app:played_color="?attr/colorPrimary"
+
             app:scrubber_color="?attr/colorPrimary"
             app:scrubber_dragged_size="26dp"
             app:scrubber_enabled_size="24dp"
-            app:unplayed_color="@color/videoProgress"
-          />
+                        app:unplayed_color="@color/videoProgress" />
+
           <TextView
             android:id="@id/exo_duration"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
             android:layout_gravity="center|center_vertical"
+
             android:layout_marginEnd="20dp"
             android:includeFontPadding="false"
             android:minWidth="50dp"
@@ -857,13 +880,14 @@
             android:textStyle="normal"
             app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:text="23:20"
-          />
+                        tools:text="23:20" />
+
           <TextView
             android:id="@+id/time_left"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
             android:layout_gravity="center|center_vertical"
+
             android:layout_marginEnd="20dp"
             android:includeFontPadding="false"
             android:minWidth="50dp"
@@ -875,37 +899,39 @@
             android:visibility="gone"
             app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:text="-23:20"
-          />
+                        tools:text="-23:20" />
         </androidx.constraintlayout.widget.ConstraintLayout>
+
+
         <HorizontalScrollView
           android:id="@+id/player_controls_scroll"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_gravity="center"
-        >
+                    android:layout_gravity="center">
+
           <LinearLayout
             android:id="@+id/player_lock_holder"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-          >
+                        android:orientation="horizontal">
+
             <FrameLayout
               android:layout_width="0dp"
               android:layout_height="0dp"
-              android:visibility="gone"
-            >
+                            android:visibility="gone">
+
               <com.google.android.material.button.MaterialButton
                 android:id="@+id/player_lock"
                 style="@style/VideoButtonTV"
                 android:nextFocusLeft="@id/player_skip_episode"
+
                 android:nextFocusRight="@id/player_resize_btt"
                 android:nextFocusUp="@id/player_pause_play"
                 android:text="@string/video_lock"
                 android:visibility="gone"
-                app:icon="@drawable/video_locked"
-              />
+                                app:icon="@drawable/video_locked" />
             </FrameLayout>
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_rotate_btt"
               style="@style/VideoButtonTV"
@@ -925,8 +951,8 @@
               android:nextFocusUp="@id/player_pause_play"
               android:nextFocusDown="@id/player_skip_episode"
               android:text="@string/video_skip_op"
-              app:icon="@drawable/ic_baseline_fast_forward_24"
-            />
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_skip_episode"
               style="@style/VideoButtonTV"
@@ -937,28 +963,30 @@
               android:text="@string/next_episode"
               android:visibility="gone"
               app:icon="@drawable/ic_baseline_skip_next_24"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_resize_btt"
               style="@style/VideoButtonTV"
               android:nextFocusLeft="@id/player_skip_episode"
+
               android:nextFocusRight="@id/player_speed_btt"
               android:nextFocusUp="@id/player_pause_play"
               android:nextFocusDown="@id/player_speed_btt"
               android:text="@string/video_aspect_ratio_resize"
-              app:icon="@drawable/ic_baseline_aspect_ratio_24"
-            />
+                            app:icon="@drawable/ic_baseline_aspect_ratio_24" />
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_speed_btt"
               style="@style/VideoButtonTV"
               android:nextFocusLeft="@id/player_resize_btt"
+
               android:nextFocusRight="@id/player_subtitle_offset_btt"
               android:nextFocusUp="@id/player_pause_play"
               android:nextFocusDown="@id/player_subtitle_offset_btt"
               app:icon="@drawable/ic_baseline_speed_24"
-              tools:text="Speed"
-            />
+                            tools:text="Speed" />
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_subtitle_offset_btt"
               style="@style/VideoButtonTV"
@@ -967,10 +995,11 @@
               android:nextFocusUp="@id/player_pause_play"
               android:nextFocusDown="@id/player_sources_btt"
               android:text="@string/subtitle_offset"
+
               android:visibility="gone"
               app:icon="@drawable/ic_outline_subtitles_24"
-              tools:visibility="visible"
-            />
+                            tools:visibility="visible" />
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_sources_btt"
               style="@style/VideoButtonTV"
@@ -978,9 +1007,10 @@
               android:nextFocusRight="@id/player_tracks_btt"
               android:nextFocusUp="@id/player_pause_play"
               android:nextFocusDown="@id/player_tracks_btt"
+
               android:text="@string/video_source"
-              app:icon="@drawable/ic_baseline_playlist_play_24"
-            />
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
+
             <com.google.android.material.button.MaterialButton
               android:id="@+id/player_tracks_btt"
               style="@style/VideoButtonTV"
@@ -988,18 +1018,19 @@
               android:nextFocusRight="@id/player_skip_op"
               android:nextFocusUp="@id/player_pause_play"
               android:text="@string/tracks"
-              app:icon="@drawable/ic_baseline_equalizer_24"
-            />
+                            app:icon="@drawable/ic_baseline_equalizer_24" />
           </LinearLayout>
         </HorizontalScrollView>
       </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
   </FrameLayout>
+
   <FrameLayout
     android:id="@+id/subtitle_holder"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  ></FrameLayout>
+        android:layout_height="match_parent">
+
+    </FrameLayout>
   <com.google.android.material.button.MaterialButton
     android:id="@+id/player_speedup_button"
     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -1014,8 +1045,9 @@
     app:icon="@drawable/speedup"
     app:iconTint="@color/textColor"
     app:rippleColor="?attr/colorPrimary"
-    tools:visibility="visible"
-  />
+    tools:visibility="visible" />
+
+
   <LinearLayout
     android:id="@+id/player_episode_overlay"
     android:visibility="gone"
@@ -1024,8 +1056,8 @@
     android:orientation="vertical"
     android:layout_gravity="end"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-  >
+    android:layout_height="match_parent">
+
     <TextView
       android:id="@+id/player_episode_overlay_title"
       android:padding="10dp"
@@ -1034,8 +1066,8 @@
       android:layout_marginEnd="0dp"
       android:text="@string/episodes"
       android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-    />
+            android:layout_height="wrap_content"/>
+
     <androidx.recyclerview.widget.RecyclerView
       android:requiresFadingEdge="vertical"
       app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -1045,7 +1077,9 @@
       android:layout_width="400dp"
       android:layout_height="match_parent"
       android:clipToPadding="false"
-      android:descendantFocusability="afterDescendants"
-    ></androidx.recyclerview.widget.RecyclerView>
+            android:descendantFocusability="afterDescendants">
+
+        </androidx.recyclerview.widget.RecyclerView>
   </LinearLayout>
-</FrameLayout>
+
+</FrameLayout>
\ No newline at end of file