From ce4c1631bd735ccfb37027f0c4dadbc012195aef Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Mon, 10 Jan 2022 12:37:56 +0100
Subject: [PATCH] Removed fixed colors from adapters

---
 .../res/layout/item_home_discover_song.xml    |  1 -
 app/src/main/res/layout/item_home_year.xml    |  6 ++--
 .../layout/item_library_catalogue_genre.xml   |  3 +-
 .../item_library_catalogue_playlist.xml       |  1 -
 .../main/res/layout/item_library_genre.xml    |  3 +-
 .../main/res/layout/item_library_playlist.xml |  1 -
 app/src/main/res/layout/item_login_server.xml |  1 -
 .../res/layout/item_placehoder_discovery.xml  | 11 +++----
 .../res/layout/item_placeholder_album.xml     | 29 ++++++------------
 .../res/layout/item_placeholder_genre.xml     | 30 +++++++------------
 .../layout/item_placeholder_horizontal.xml    | 26 ++--------------
 .../main/res/layout/item_placeholder_year.xml | 16 ++++------
 .../res/layout/item_player_queue_song.xml     |  1 -
 .../res/layout/player_body_bottom_sheet.xml   |  2 +-
 .../res/layout/player_header_bottom_sheet.xml |  6 ++--
 app/src/main/res/menu/album_page_menu.xml     |  1 -
 app/src/main/res/menu/playlist_page_menu.xml  |  3 --
 app/src/main/res/menu/toolbar_menu.xml        |  1 -
 18 files changed, 39 insertions(+), 103 deletions(-)

diff --git a/app/src/main/res/layout/item_home_discover_song.xml b/app/src/main/res/layout/item_home_discover_song.xml
index 37d250f9..7551b6bc 100644
--- a/app/src/main/res/layout/item_home_discover_song.xml
+++ b/app/src/main/res/layout/item_home_discover_song.xml
@@ -7,7 +7,6 @@
     android:layout_marginTop="8dp"
     android:layout_marginEnd="16dp"
     android:layout_marginBottom="16dp"
-    android:backgroundTint="@color/cardColor"
     app:cardCornerRadius="4dp">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_home_year.xml b/app/src/main/res/layout/item_home_year.xml
index b4db722d..4545a85b 100644
--- a/app/src/main/res/layout/item_home_year.xml
+++ b/app/src/main/res/layout/item_home_year.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingEnd="12dp"
     android:paddingBottom="8dp">
 
-    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <androidx.cardview.widget.CardView
         android:id="@+id/card_view"
         android:layout_width="172dp"
         android:layout_height="72dp"
         android:layout_gravity="center"
-        android:backgroundTint="@color/cardColor"
         card_view:cardCornerRadius="4dp"
         card_view:cardElevation="2dp"
         card_view:cardPreventCornerOverlap="false"
@@ -25,7 +25,7 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="@color/colorAccent" />
+                android:background="?attr/colorPrimary"/>
 
             <TextView
                 android:id="@+id/year_label"
diff --git a/app/src/main/res/layout/item_library_catalogue_genre.xml b/app/src/main/res/layout/item_library_catalogue_genre.xml
index 7529f7f7..f6e3d27a 100644
--- a/app/src/main/res/layout/item_library_catalogue_genre.xml
+++ b/app/src/main/res/layout/item_library_catalogue_genre.xml
@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:backgroundTint="@color/cardColor"
         card_view:cardCornerRadius="4dp"
         card_view:cardElevation="2dp"
         card_view:cardPreventCornerOverlap="false"
@@ -23,7 +22,7 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="@color/colorAccent" />
+                android:background="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/genre_label"
diff --git a/app/src/main/res/layout/item_library_catalogue_playlist.xml b/app/src/main/res/layout/item_library_catalogue_playlist.xml
index 5dbd57e6..01c6daf8 100644
--- a/app/src/main/res/layout/item_library_catalogue_playlist.xml
+++ b/app/src/main/res/layout/item_library_catalogue_playlist.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
-    android:backgroundTint="@color/cardColor"
     app:cardCornerRadius="4dp">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_library_genre.xml b/app/src/main/res/layout/item_library_genre.xml
index f630bca2..ffe02b49 100644
--- a/app/src/main/res/layout/item_library_genre.xml
+++ b/app/src/main/res/layout/item_library_genre.xml
@@ -11,7 +11,6 @@
         android:layout_width="196dp"
         android:layout_height="54dp"
         android:layout_gravity="center"
-        android:backgroundTint="@color/cardColor"
         card_view:cardCornerRadius="4dp"
         card_view:cardElevation="2dp"
         card_view:cardPreventCornerOverlap="false"
@@ -25,7 +24,7 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="@color/colorAccent" />
+                android:background="?attr/colorPrimary"/>
 
             <TextView
                 android:id="@+id/genre_label"
diff --git a/app/src/main/res/layout/item_library_playlist.xml b/app/src/main/res/layout/item_library_playlist.xml
index 835f0fb5..a926c467 100644
--- a/app/src/main/res/layout/item_library_playlist.xml
+++ b/app/src/main/res/layout/item_library_playlist.xml
@@ -7,7 +7,6 @@
     android:layout_marginStart="16dp"
     android:layout_marginTop="8dp"
     android:layout_marginEnd="16dp"
-    android:backgroundTint="@color/cardColor"
     app:cardCornerRadius="4dp">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_login_server.xml b/app/src/main/res/layout/item_login_server.xml
index d154235f..abb1ea6f 100644
--- a/app/src/main/res/layout/item_login_server.xml
+++ b/app/src/main/res/layout/item_login_server.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/cardColor"
     android:clipChildren="false"
     android:foreground="?attr/selectableItemBackground">
 
diff --git a/app/src/main/res/layout/item_placehoder_discovery.xml b/app/src/main/res/layout/item_placehoder_discovery.xml
index 9d888b73..fd8ddfce 100644
--- a/app/src/main/res/layout/item_placehoder_discovery.xml
+++ b/app/src/main/res/layout/item_placehoder_discovery.xml
@@ -19,8 +19,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="9"
-            android:background="@color/placeholderColor" />
+            android:layout_weight="9" />
 
         <ImageView
             android:layout_width="12dp"
@@ -28,16 +27,14 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="1"
-            android:background="@color/placeholderColor" />
+            android:layout_weight="1" />
     </LinearLayout>
 
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="190dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="8dp"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@color/placeholderColor" />
+        android:layout_marginBottom="8dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_placeholder_album.xml b/app/src/main/res/layout/item_placeholder_album.xml
index 696e495a..af6ef9b1 100644
--- a/app/src/main/res/layout/item_placeholder_album.xml
+++ b/app/src/main/res/layout/item_placeholder_album.xml
@@ -19,8 +19,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="8"
-            android:background="@color/placeholderColor" />
+            android:layout_weight="8" />
 
         <ImageView
             android:layout_width="12dp"
@@ -28,8 +27,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="22dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="2"
-            android:background="@color/placeholderColor" />
+            android:layout_weight="2" />
     </LinearLayout>
 
     <LinearLayout
@@ -45,51 +43,45 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:paddingStart="16dp"
-            android:paddingEnd="8dp"
-            android:orientation="vertical">
+            android:paddingEnd="8dp">
 
             <ImageView
                 android:layout_width="172dp"
                 android:layout_height="172dp"
-                android:layout_gravity="center"
-                android:background="@color/placeholderColor" />
+                android:layout_gravity="center" />
 
             <ImageView
                 android:layout_width="124dp"
                 android:layout_height="14dp"
-                android:background="@color/placeholderColor"
                 android:layout_marginTop="8dp" />
 
             <ImageView
                 android:layout_width="112dp"
                 android:layout_height="12dp"
-                android:background="@color/placeholderColor"
                 android:layout_marginTop="4dp" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingEnd="8dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingEnd="8dp">
 
             <ImageView
                 android:layout_width="172dp"
                 android:layout_height="172dp"
-                android:layout_gravity="center"
-                android:background="@color/placeholderColor" />
+                android:layout_gravity="center" />
 
             <ImageView
                 android:layout_width="124dp"
                 android:layout_height="14dp"
-                android:background="@color/placeholderColor"
                 android:layout_marginTop="8dp" />
 
             <ImageView
                 android:layout_width="112dp"
                 android:layout_height="12dp"
-                android:background="@color/placeholderColor"
                 android:layout_marginTop="4dp" />
         </LinearLayout>
 
@@ -101,19 +93,16 @@
             <ImageView
                 android:layout_width="172dp"
                 android:layout_height="172dp"
-                android:layout_gravity="center"
-                android:background="@color/placeholderColor" />
+                android:layout_gravity="center" />
 
             <ImageView
                 android:layout_width="124dp"
                 android:layout_height="14dp"
-                android:background="@color/placeholderColor"
                 android:layout_marginTop="8dp" />
 
             <ImageView
                 android:layout_width="112dp"
                 android:layout_height="12dp"
-                android:background="@color/placeholderColor"
                 android:layout_marginTop="4dp" />
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_placeholder_genre.xml b/app/src/main/res/layout/item_placeholder_genre.xml
index 035bda96..bc27c404 100644
--- a/app/src/main/res/layout/item_placeholder_genre.xml
+++ b/app/src/main/res/layout/item_placeholder_genre.xml
@@ -11,8 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/placeholderColor" />
+        android:layout_marginBottom="8dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,24 +32,21 @@
             android:layout_gravity="center"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="196dp"
             android:layout_height="54dp"
             android:layout_gravity="center"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="196dp"
             android:layout_height="54dp"
             android:layout_gravity="center"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
     </LinearLayout>
 
     <LinearLayout
@@ -64,24 +60,21 @@
             android:layout_gravity="center"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="196dp"
             android:layout_height="54dp"
             android:layout_gravity="center"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="196dp"
             android:layout_height="54dp"
             android:layout_gravity="center"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
     </LinearLayout>
 
     <LinearLayout
@@ -95,23 +88,20 @@
             android:layout_gravity="center"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="196dp"
             android:layout_height="54dp"
             android:layout_gravity="center"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="196dp"
             android:layout_height="54dp"
             android:layout_gravity="center"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"
-            android:background="@color/placeholderColor" />
+            android:layout_marginBottom="8dp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_placeholder_horizontal.xml b/app/src/main/res/layout/item_placeholder_horizontal.xml
index ef007b11..9f842c6d 100644
--- a/app/src/main/res/layout/item_placeholder_horizontal.xml
+++ b/app/src/main/res/layout/item_placeholder_horizontal.xml
@@ -21,8 +21,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="8"
-            android:background="@color/placeholderColor" />
+            android:layout_weight="8"/>
 
         <ImageView
             android:layout_width="12dp"
@@ -30,8 +29,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="22dp"
             android:layout_marginEnd="8dp"
-            android:layout_weight="2"
-            android:background="@color/placeholderColor" />
+            android:layout_weight="2" />
     </LinearLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -47,7 +45,6 @@
             android:layout_height="52dp"
             android:layout_gravity="center"
             android:layout_margin="2dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -59,7 +56,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_1"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -70,7 +66,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_1"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_1" />
 
@@ -79,7 +74,6 @@
             android:layout_height="18dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -100,7 +94,6 @@
             android:layout_height="52dp"
             android:layout_gravity="center"
             android:layout_margin="2dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -112,7 +105,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_2"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -123,7 +115,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_2"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_2" />
 
@@ -132,7 +123,6 @@
             android:layout_height="18dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -153,7 +143,6 @@
             android:layout_height="52dp"
             android:layout_gravity="center"
             android:layout_margin="2dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -165,7 +154,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_3"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -176,7 +164,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_3"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_3" />
 
@@ -185,7 +172,6 @@
             android:layout_height="18dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -206,7 +192,6 @@
             android:layout_height="52dp"
             android:layout_gravity="center"
             android:layout_margin="2dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -218,7 +203,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_4"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -229,7 +213,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_4"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_4" />
 
@@ -238,7 +221,6 @@
             android:layout_height="18dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -259,7 +241,6 @@
             android:layout_height="52dp"
             android:layout_gravity="center"
             android:layout_margin="2dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -271,7 +252,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginTop="10dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_5"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -282,7 +262,6 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="4dp"
-            android:background="@color/placeholderColor"
             app:layout_constraintStart_toEndOf="@+id/album_cover_placeholder_5"
             app:layout_constraintTop_toBottomOf="@+id/album_title_placeholder_5" />
 
@@ -291,7 +270,6 @@
             android:layout_height="18dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
-            android:background="@color/placeholderColor"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_placeholder_year.xml b/app/src/main/res/layout/item_placeholder_year.xml
index 7a8ec0a3..396c4674 100644
--- a/app/src/main/res/layout/item_placeholder_year.xml
+++ b/app/src/main/res/layout/item_placeholder_year.xml
@@ -11,38 +11,34 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/placeholderColor" />
+        android:layout_marginBottom="8dp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="8dp">
+        android:layout_marginTop="8dp"
+        android:orientation="horizontal">
 
         <ImageView
             android:layout_width="172dp"
             android:layout_height="72dp"
             android:layout_gravity="center"
-            android:background="@color/placeholderColor"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="172dp"
             android:layout_height="72dp"
             android:layout_gravity="center"
-            android:background="@color/placeholderColor"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="8dp" />
 
         <ImageView
             android:layout_width="172dp"
             android:layout_height="72dp"
             android:layout_gravity="center"
-            android:background="@color/placeholderColor"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="8dp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_player_queue_song.xml b/app/src/main/res/layout/item_player_queue_song.xml
index c79d5f3d..6d1d3e46 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -2,7 +2,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
     android:clipChildren="false"
     android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/player_body_bottom_sheet.xml b/app/src/main/res/layout/player_body_bottom_sheet.xml
index c3a60af6..1eaa74af 100644
--- a/app/src/main/res/layout/player_body_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_body_bottom_sheet.xml
@@ -3,4 +3,4 @@
     android:id="@+id/player_body_bottom_sheet_view_pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary" />
\ No newline at end of file
+    android:background="?attr/colorSurface"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_header_bottom_sheet.xml b/app/src/main/res/layout/player_header_bottom_sheet.xml
index a672d014..9125fa84 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -3,9 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/bottom_sheet_peek_height"
-    android:background="@color/almostCardColor"
-    android:clipChildren="false"
-    android:elevation="2dp">
+    android:background="?attr/colorSurface"
+    android:clipChildren="false">
 
     <ImageView
         android:id="@+id/player_header_song_cover_image"
@@ -80,7 +79,6 @@
         android:clickable="false"
         android:paddingStart="0dp"
         android:paddingEnd="0dp"
-        android:progressBackgroundTint="@color/colorAccentLight"
         android:thumb="@android:color/transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/menu/album_page_menu.xml b/app/src/main/res/menu/album_page_menu.xml
index 7ea2a509..5a5e6f26 100644
--- a/app/src/main/res/menu/album_page_menu.xml
+++ b/app/src/main/res/menu/album_page_menu.xml
@@ -4,7 +4,6 @@
     <item
         android:id="@+id/action_download_album"
         android:icon="@drawable/ic_file_download"
-        android:iconTint="@color/titleTextColor"
         android:title="@string/menu_download_all_button"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/playlist_page_menu.xml b/app/src/main/res/menu/playlist_page_menu.xml
index 0e8046eb..a6c97476 100644
--- a/app/src/main/res/menu/playlist_page_menu.xml
+++ b/app/src/main/res/menu/playlist_page_menu.xml
@@ -4,19 +4,16 @@
     <item
         android:id="@+id/action_download_playlist"
         android:icon="@drawable/ic_file_download"
-        android:iconTint="@color/titleTextColor"
         android:title="@string/menu_download_all_button"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_pin_playlist"
         android:icon="@drawable/ic_pin_in"
-        android:iconTint="@color/titleTextColor"
         android:title="@string/menu_pin_button"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_unpin_playlist"
         android:icon="@drawable/ic_pin_out"
-        android:iconTint="@color/titleTextColor"
         android:title="@string/menu_unpin_button"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/toolbar_menu.xml b/app/src/main/res/menu/toolbar_menu.xml
index 535c5c52..1e93efd1 100644
--- a/app/src/main/res/menu/toolbar_menu.xml
+++ b/app/src/main/res/menu/toolbar_menu.xml
@@ -5,7 +5,6 @@
     <item
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search"
-        android:iconTint="@color/titleTextColor"
         android:title="@string/menu_search_button"
         app:actionViewClass="android.widget.SearchView"
         app:showAsAction="ifRoom" />