From 1014dd563f2a2369c80a4326ff852ae6c187dcc1 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Fri, 17 Oct 2025 19:08:49 +0200
Subject: [PATCH] Correctly format player.xml

Otherwise it constantly switches the attributes which makes (re) viewing changes next to impossible
---
 app/src/main/res/layout/player.xml | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 4e5cd8533..9c70732f2 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -109,13 +109,13 @@
                         android:layout_marginEnd="8dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/close"
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
                         android:src="@drawable/ic_close"
                         android:visibility="gone"
                         app:tint="@color/white"
-                        android:contentDescription="@string/close"
                         tools:ignore="RtlHardcoded" />
 
                     <LinearLayout
@@ -165,17 +165,17 @@
                         android:layout_marginEnd="8dp"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
+                        android:ellipsize="end"
                         android:gravity="center"
                         android:minWidth="0dp"
-                        android:singleLine="true"
-                        android:ellipsize="end"
                         android:padding="@dimen/player_main_buttons_padding"
+                        android:singleLine="true"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
                         android:visibility="gone"
                         tools:ignore="HardcodedText,RtlHardcoded"
-                        tools:visibility="visible"
-                        tools:text="English (Original)" />
+                        tools:text="English (Original)"
+                        tools:visibility="visible" />
 
                     <org.schabi.newpipe.views.NewPipeTextView
                         android:id="@+id/qualityTextView"
@@ -212,6 +212,7 @@
                         android:layout_marginEnd="8dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/open_play_queue"
                         android:focusable="true"
                         android:paddingStart="3dp"
                         android:paddingTop="5dp"
@@ -221,7 +222,6 @@
                         android:src="@drawable/ic_list"
                         android:visibility="gone"
                         app:tint="@color/white"
-                        android:contentDescription="@string/open_play_queue"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -231,16 +231,16 @@
                         android:layout_marginEnd="8dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/chapters"
                         android:focusable="true"
                         android:paddingStart="6dp"
+                        android:paddingTop="3dp"
                         android:paddingEnd="6dp"
                         android:paddingBottom="3dp"
-                        android:paddingTop="3dp"
                         android:scaleType="fitCenter"
                         android:src="@drawable/ic_menu_book"
                         android:visibility="gone"
                         app:tint="@color/white"
-                        android:contentDescription="@string/chapters"
                         tools:ignore="RtlHardcoded" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
@@ -249,12 +249,12 @@
                         android:layout_height="wrap_content"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/more_options"
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
                         android:src="@drawable/ic_expand_more"
                         app:tint="@color/white"
-                        android:contentDescription="@string/more_options"
                         tools:ignore="RtlHardcoded" />
 
                 </LinearLayout>
@@ -371,11 +371,11 @@
                         android:layout_height="40dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/toggle_fullscreen"
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitCenter"
                         android:src="@drawable/ic_fullscreen"
-                        android:contentDescription="@string/toggle_fullscreen"
                         android:visibility="gone"
                         app:tint="@color/white"
                         tools:ignore="RtlHardcoded"
@@ -495,13 +495,13 @@
                     android:layout_marginStart="4dp"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
+                    android:contentDescription="@string/toggle_screen_orientation"
                     android:focusable="true"
                     android:nextFocusUp="@id/playbackSeekBar"
                     android:padding="@dimen/player_main_buttons_padding"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_fullscreen"
                     android:visibility="gone"
-                    android:contentDescription="@string/toggle_screen_orientation"
                     app:tint="@color/white"
                     tools:ignore="RtlHardcoded"
                     tools:visibility="visible" />
@@ -523,10 +523,10 @@
                 android:layout_weight="1"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
+                android:contentDescription="@string/previous_stream"
                 android:focusable="true"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_previous"
-                android:contentDescription="@string/previous_stream"
                 app:tint="@color/white" />
 
 
@@ -536,9 +536,9 @@
                 android:layout_height="60dp"
                 android:layout_weight="1"
                 android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/pause"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_pause"
-                android:contentDescription="@string/pause"
                 app:tint="@color/white" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -549,10 +549,10 @@
                 android:layout_weight="1"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
+                android:contentDescription="@string/next_stream"
                 android:focusable="true"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_next"
-                android:contentDescription="@string/next_stream"
                 app:tint="@color/white" />
 
         </LinearLayout>
@@ -599,12 +599,12 @@
                 android:layout_marginLeft="40dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
+                android:contentDescription="@string/notification_action_repeat"
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
                 android:src="@drawable/exo_controls_repeat_off"
                 android:tint="?attr/colorAccent"
-                android:contentDescription="@string/notification_action_repeat"
                 tools:ignore="RtlHardcoded" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -615,12 +615,12 @@
                 android:layout_toRightOf="@id/repeatButton"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
+                android:contentDescription="@string/notification_action_shuffle"
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
                 android:src="@drawable/ic_shuffle"
                 android:tint="?attr/colorAccent"
-                android:contentDescription="@string/notification_action_shuffle"
                 tools:ignore="RtlHardcoded" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -642,12 +642,12 @@
                 android:layout_toLeftOf="@+id/itemsListClose"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
+                android:contentDescription="@string/add_to_playlist"
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
                 android:src="@drawable/ic_playlist_add"
                 android:tint="?attr/colorAccent"
-                android:contentDescription="@string/add_to_playlist"
                 tools:ignore="RtlHardcoded" />
 
             <androidx.appcompat.widget.AppCompatImageButton