From d6f9aace8cd5b982eb686089e7d30583db40a3e4 Mon Sep 17 00:00:00 2001
From: krlvm <51774833+krlvm@users.noreply.github.com>
Date: Sun, 28 Mar 2021 21:38:15 +0300
Subject: [PATCH] Fix White text in Play Queue in Light Theme, remove shade

---
 .../res/layout-land/activity_player_queue_control.xml    | 1 -
 app/src/main/res/layout-large-land/player.xml            | 1 +
 .../main/res/layout/activity_player_queue_control.xml    | 1 -
 app/src/main/res/layout/item_stream_segment.xml          | 4 ++--
 app/src/main/res/layout/play_queue_item.xml              | 4 ++--
 app/src/main/res/layout/player.xml                       | 1 +
 app/src/main/res/values/styles_misc.xml                  | 9 +++++++--
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index b0b18101c..4b79d92f6 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -264,7 +264,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/player_controls_background"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index ddb80d56a..8736a470f 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -556,6 +556,7 @@
             android:layout_height="match_parent"
             android:layout_below="@id/itemsListControl"
             android:scrollbars="vertical"
+            android:theme="@style/PlayQueueItemTextTheme"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/play_queue_item" />
 
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index 2c969f83c..ec47992bb 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -105,7 +105,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/player_controls_background"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingLeft="12dp"
diff --git a/app/src/main/res/layout/item_stream_segment.xml b/app/src/main/res/layout/item_stream_segment.xml
index 9f3ea1d0e..a9eba0e85 100644
--- a/app/src/main/res/layout/item_stream_segment.xml
+++ b/app/src/main/res/layout/item_stream_segment.xml
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textAppearance="@style/ItemStreamSegmentTitle"
+            android:textAppearance="@style/PlayQueueItemTitle"
             android:textSize="@dimen/video_item_search_title_text_size"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -53,7 +53,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
-            android:textAppearance="@style/ItemStreamSegmentSubtitle"
+            android:textAppearance="@style/PlayQueueItemSubtitle"
             android:textSize="@dimen/video_item_search_upload_date_text_size"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/textViewTitle"
diff --git a/app/src/main/res/layout/play_queue_item.xml b/app/src/main/res/layout/play_queue_item.xml
index 0438c3312..a5be55c94 100644
--- a/app/src/main/res/layout/play_queue_item.xml
+++ b/app/src/main/res/layout/play_queue_item.xml
@@ -80,7 +80,7 @@
         android:layout_toRightOf="@id/itemThumbnailView"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textAppearance="@style/ItemStreamSegmentTitle"
+        android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_search_title_text_size"
         tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. " />
 
@@ -95,7 +95,7 @@
         android:layout_toRightOf="@id/itemThumbnailView"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textAppearance="@style/ItemStreamSegmentSubtitle"
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_upload_date_text_size"
         tools:text="Uploader" />
 
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 7e9a0bad2..978913289 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -553,6 +553,7 @@
             android:layout_height="match_parent"
             android:layout_below="@id/itemsListControl"
             android:scrollbars="vertical"
+            android:theme="@style/PlayQueueItemTextTheme"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/play_queue_item" />
 
diff --git a/app/src/main/res/values/styles_misc.xml b/app/src/main/res/values/styles_misc.xml
index 74a173abc..a5b115f96 100644
--- a/app/src/main/res/values/styles_misc.xml
+++ b/app/src/main/res/values/styles_misc.xml
@@ -42,10 +42,15 @@
         <item name="colorAccent">@color/dark_settings_accent_color</item>
     </style>
 
-    <style name="ItemStreamSegmentTitle" parent="TextAppearance.AppCompat.Large">
+    <style name="PlayQueueItemTextTheme">
+        <item name="android:textAppearanceLarge">@style/PlayQueueItemTitle</item>
+        <item name="android:textAppearanceSmall">@style/PlayQueueItemSubtitle</item>
+    </style>
+
+    <style name="PlayQueueItemTitle" parent="TextAppearance.AppCompat.Large">
         <item name="android:textColor">@color/white</item>
     </style>
-    <style name="ItemStreamSegmentSubtitle" parent="TextAppearance.AppCompat.Small">
+    <style name="PlayQueueItemSubtitle" parent="TextAppearance.AppCompat.Small">
         <item name="android:textColor">@color/white_secondary</item>
     </style>