From 7317737e90ef096fd72b3d1df1e16d04ff2d1d06 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 19 Sep 2020 13:44:07 +0200
Subject: [PATCH] Fix invisible queue close button

---
 app/src/main/res/layout-large-land/player.xml | 15 +++++++--------
 app/src/main/res/layout/player.xml            | 17 ++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 3fa187906..af8ca085e 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -469,17 +469,16 @@
                 android:id="@+id/playQueueClose"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="40dp"
-                android:padding="10dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:scaleType="fitXY"
-                android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_close_white_24dp"
                 android:background="?android:selectableItemBackground"
-                tools:ignore="ContentDescription"/>
+                android:clickable="true"
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:padding="10dp"
+                android:scaleType="fitXY"
+                app:srcCompat="@drawable/ic_close_white_24dp" />
 
             <ImageButton
                 android:id="@+id/repeatButton"
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 8851c0818..24490f3dd 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -461,21 +461,20 @@
             android:layout_height="60dp"
             android:id="@+id/playQueueControl">
 
-            <ImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/playQueueClose"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="40dp"
-                android:padding="10dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:scaleType="fitXY"
-                android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_close_white_24dp"
                 android:background="?android:selectableItemBackground"
-                tools:ignore="ContentDescription"/>
+                android:clickable="true"
+                android:contentDescription="@string/close"
+                android:focusable="true"
+                android:padding="10dp"
+                android:scaleType="fitXY"
+                app:srcCompat="@drawable/ic_close_white_24dp" />
 
             <ImageButton
                 android:id="@+id/repeatButton"