Massive clean up of attrs, colors and styles. Also icon and divider colors matching better the guidelines now.

app/src/main/res/drawable/notification_selector.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
-    <item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
-    <item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
 </selector>

app/src/main/res/drawable/rect_selector.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_light" />
-    <item android:state_activated="true" android:drawable="@color/ripple_material_light" />
-    <item android:state_pressed="true" android:drawable="@color/ripple_material_light" />
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_light" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
 </selector>

app/src/main/res/drawable/rect_selector_dark.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
-    <item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
-    <item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 
 </selector>

app/src/main/res/drawable/slider_thumb.xml

@@ -2,8 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <size
-        android:height="20dp"
-        android:width="3dp" />
-    <solid
-        android:color="@color/black" />
+        android:width="3dp"
+        android:height="20dp" />
+    <solid android:color="@android:color/black" />
 </shape>

app/src/main/res/drawable/traditional_slider_thumb.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:height="16dp"
-        android:width="16dp" />
-    <solid android:color="@color/black" />
+        android:width="16dp"
+        android:height="16dp" />
+    <solid android:color="@android:color/black" />
 </shape>

app/src/main/res/drawable/traditional_slider_thumb_dark.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size
-        android:height="16dp"
-        android:width="16dp" />
-    <solid android:color="@color/white" />
-</shape>

app/src/main/res/layout/activity_album_detail.xml

@@ -60,7 +60,6 @@
             android:paddingRight="72dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?attr/title_text_color"
             tools:ignore="UnusedAttribute" />
 
         <View

app/src/main/res/layout/activity_album_tag_editor.xml

@@ -16,12 +16,12 @@
             android:layout_height="match_parent">
 
             <com.kabouzeid.gramophone.views.WidthFitSquareImageView
-                android:transitionName="@string/transition_album_art"
                 android:id="@+id/image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
                 android:src="@drawable/default_album_art"
+                android:transitionName="@string/transition_album_art"
                 tools:ignore="UnusedAttribute" />
 
             <LinearLayout
@@ -52,7 +52,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/primary_text_default_material_dark" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -81,8 +81,7 @@
                         android:hint="@string/album_artist"
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -100,8 +99,7 @@
                         android:hint="@string/genre"
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -119,8 +117,7 @@
                         android:hint="@string/year"
                         android:inputType="text|number"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 

app/src/main/res/layout/activity_artist_detail.xml

@@ -60,7 +60,6 @@
             android:paddingRight="72dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?attr/title_text_color"
             tools:ignore="UnusedAttribute" />
 
         <View

app/src/main/res/layout/activity_song_tag_editor.xml

@@ -50,7 +50,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/primary_text_default_material_dark" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -68,7 +68,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/primary_text_default_material_dark" />
                 </android.support.design.widget.TextInputLayout>
 
             </LinearLayout>
@@ -97,11 +97,10 @@
                         android:hint="@string/artist"
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
-
                 <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -115,8 +114,7 @@
                         android:gravity="center_vertical"
                         android:hint="@string/genre"
                         android:singleLine="true"
-
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -135,8 +133,7 @@
                         android:hint="@string/year"
                         android:inputType="text|number"
                         android:singleLine="true"
-
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -155,7 +152,7 @@
                         android:hint="@string/track_hint"
                         android:inputType="text|number"
                         android:singleLine="true"
-                        android:textColor="?attr/title_text_color" />
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
                 </android.support.design.widget.TextInputLayout>
 

app/src/main/res/layout/artist_detail_header.xml

@@ -11,9 +11,9 @@
         android:scrollbars="none" />
 
     <View
-        android:layout_marginTop="-8dp"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?separator_color" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-8dp"
+        android:background="?dividerHorizontal" />
 
 </LinearLayout>

app/src/main/res/layout/dialog_sleep_timer.xml

@@ -16,7 +16,7 @@
         seekarc:rotation="180"
         seekarc:startAngle="30"
         seekarc:sweepAngle="300"
-        seekarc:thumb="?seek_arc_thumb_drawable" />
+        seekarc:thumb="@drawable/traditional_slider_thumb" />
 
     <TextView
         android:id="@+id/timer_display"

app/src/main/res/layout/item_grid.xml

@@ -19,12 +19,10 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop" />
 
-
         <LinearLayout
             android:id="@+id/palette_color_container"
             android:layout_width="match_parent"
             android:layout_height="68dp"
-            android:background="?default_bar_color"
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:paddingLeft="16dp"
@@ -36,16 +34,14 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-medium"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
             <TextView
                 android:id="@+id/text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="?caption_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 
         </LinearLayout>
 
@@ -58,7 +54,8 @@
         android:layout_gravity="center"
         android:paddingBottom="68dp"
         android:src="@drawable/ic_check_white_96dp"
-        android:tint="?check_mark_color"
-        android:visibility="gone" />
+        android:tint="?android:textColorPrimary"
+        android:visibility="gone"
+        tools:ignore="ContentDescription" />
 
 </FrameLayout>

app/src/main/res/layout/item_grid_card_horizontal.xml

@@ -6,7 +6,7 @@
     android:layout_marginEnd="8dp"
     android:layout_marginRight="8dp"
     android:foreground="?rect_selector"
-    app:cardBackgroundColor="?card_color"
+    app:cardBackgroundColor="?cardBackgroundColor"
     app:elevation="@dimen/card_elevation">
 
     <LinearLayout
@@ -40,7 +40,6 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="?title_text_color"
                     android:textSize="14sp" />
 
                 <TextView
@@ -49,7 +48,6 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:textColor="?caption_text_color"
                     android:textSize="12sp" />
 
             </LinearLayout>

app/src/main/res/layout/item_list.xml

@@ -36,7 +36,6 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color"
                 android:visibility="gone" />
 
         </FrameLayout>
@@ -58,8 +57,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
             <TextView
                 android:id="@+id/text"
@@ -68,7 +66,7 @@
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                android:textColor="?caption_text_color" />
+                android:textColor="?android:textColorSecondary" />
         </LinearLayout>
 
         <ImageView
@@ -88,7 +86,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?separator_color"
+        android:background="?dividerHorizontal"
         android:visibility="gone" />
 
     <View
@@ -98,6 +96,6 @@
         android:layout_gravity="bottom"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
-        android:background="?separator_color" />
+        android:background="?dividerHorizontal" />
 
 </FrameLayout>

app/src/main/res/layout/item_list_single_row.xml

@@ -37,7 +37,6 @@
                 android:gravity="center"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="?title_text_color"
                 android:visibility="gone" />
 
         </FrameLayout>
@@ -54,8 +53,7 @@
             android:layout_weight="1"
             android:fontFamily="sans-serif"
             android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="?title_text_color" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <ImageView
             android:id="@+id/menu"
@@ -74,7 +72,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?separator_color"
+        android:background="?dividerHorizontal"
         android:visibility="gone" />
 
     <View
@@ -84,6 +82,6 @@
         android:layout_gravity="bottom"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
-        android:background="?separator_color" />
+        android:background="?dividerHorizontal" />
 
 </FrameLayout>

app/src/main/res/layout/notification.xml

@@ -24,10 +24,10 @@
     internal:layout_minHeight="64dp">
 
     <LinearLayout
-        android:id="@+id/root"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:internal="http://schemas.android.com/apk/prv/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/root"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#00000000"
@@ -36,9 +36,9 @@
         tools:ignore="UselessParent">
 
         <FrameLayout
-            android:id="@+id/icon_group"
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+            android:id="@+id/icon_group"
             android:layout_width="@dimen/notification_large_icon_width"
             android:layout_height="@dimen/notification_large_icon_height"
             android:layout_weight="0">
@@ -73,7 +73,6 @@
                 android:gravity="bottom"
                 android:singleLine="true"
                 android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-                android:textColor="@color/notification_content_color"
                 tools:ignore="NestedWeights" />
 
             <TextView
@@ -85,8 +84,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification"
-                android:textColor="@color/notification_secondary_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification" />
         </LinearLayout>
 
         <LinearLayout
@@ -100,10 +98,9 @@
             android:orientation="horizontal"
             tools:ignore="UnusedAttribute">
             <!-- media buttons will be added here -->
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_prev"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -116,10 +113,9 @@
                 android:src="@drawable/ic_skip_previous_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_play_pause"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -132,10 +128,9 @@
                 android:src="@drawable/ic_play_arrow_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_next"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"

app/src/main/res/layout/notification_big.xml

@@ -36,10 +36,9 @@
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription" />
 
-        <ImageButton
+        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/action_quit"
             style="@style/Widget.AppCompat.Button.Borderless"
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_alignParentEnd="true"
@@ -74,8 +73,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-                android:textColor="@color/notification_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" />
 
             <TextView
                 android:id="@+id/text"
@@ -87,8 +85,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification"
-                android:textColor="@color/notification_secondary_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification" />
 
             <TextView
                 android:id="@+id/text2"
@@ -99,8 +96,7 @@
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
                 android:singleLine="true"
-                android:textAppearance="@style/Theme.MaterialMusic.Notification"
-                android:textColor="@color/notification_secondary_content_color" />
+                android:textAppearance="@style/Theme.MaterialMusic.Notification" />
         </LinearLayout>
 
         <LinearLayout
@@ -116,10 +112,9 @@
             android:orientation="horizontal"
             tools:ignore="UnusedAttribute">
             <!-- media buttons will be added here -->
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_prev"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -132,10 +127,9 @@
                 android:src="@drawable/ic_skip_previous_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_play_pause"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -148,10 +142,9 @@
                 android:src="@drawable/ic_play_arrow_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton
+            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/action_next"
                 style="@style/Widget.AppCompat.Button.Borderless"
-                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"

app/src/main/res/layout/player.xml

@@ -33,7 +33,7 @@
                 android:paddingLeft="8dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?themed_drawable_color"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="10sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
 
@@ -47,7 +47,7 @@
                 android:paddingRight="8dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?themed_drawable_color"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="10sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
 
@@ -80,8 +80,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-medium"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?attr/title_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
             <TextView
                 android:id="@+id/player_text"
@@ -89,8 +88,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="?attr/caption_text_color" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 
         </LinearLayout>
 
@@ -188,7 +186,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/player_footer_frame"
-        android:background="@color/black">
+        android:background="@android:color/black">
 
         <ImageView
             android:id="@+id/player_album_art_background"

app/src/main/res/layout/widget_medium.xml

@@ -30,7 +30,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_skip_previous_black_36dp" />
+                android:src="@drawable/ic_skip_previous_dark_36dp" />
 
             <ImageButton
                 android:id="@+id/button_toggle_play_pause"
@@ -38,7 +38,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_play_arrow_black_36dp" />
+                android:src="@drawable/ic_play_arrow_dark_36dp" />
 
             <ImageButton
                 android:id="@+id/button_next"
@@ -46,7 +46,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_skip_next_black_36dp" />
+                android:src="@drawable/ic_skip_next_dark_36dp" />
 
         </LinearLayout>
 

app/src/main/res/values-v21/styles.xml

@@ -33,4 +33,8 @@
         <item name="android:progressBackgroundTint">@android:color/transparent</item>
     </style>
 
+    <style name="OverFlowButton" parent="OverFlowButtonParent">
+        <item name="android:tintMode">src_in</item>
+    </style>
+
 </resources>

app/src/main/res/values/attrs.xml

@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="title_text_color" format="color" />
-    <attr name="caption_text_color" format="color" />
 
     <attr name="music_controller_container_color" format="color" />
 
     <attr name="round_selector" format="reference" />
     <attr name="rect_selector" format="reference" />
 
-    <attr name="separator_color" format="color" />
-
-    <attr name="themed_drawable_color" format="color" />
-
-    <attr name="check_mark_color" format="color" />
-
     <attr name="default_bar_color" format="color" />
-    <attr name="card_color" format="color" />
 
     <attr name="toolbarPopupTheme" format="reference" />
 
-    <attr name="seek_arc_thumb_drawable" format="reference" />
-
 </resources>

app/src/main/res/values/colors.xml

@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--general-->
-    <color name="ripple_material_dark" type="color">#4dffffff</color>
-    <color name="ripple_material_light" type="color">#1f000000</color>
-
-    <color name="activated_selected_dark" type="color">#9affffff</color>
-    <color name="activated_selected_light" type="color">#3e000000</color>
 
     <!--light theme-->
-    <color name="materialmusic_music_controller_container_color">@color/grey_300</color>
-    <color name="materialmusic_navigation_drawer_background_color">#fff</color>
-    <color name="materialmusic_separator_color">#0C000000</color>
-    <color name="materialmusic_default_bar_color">@color/grey_400</color>
-    <color name="materialmusic_themed_drawable_color">#8A000000</color>
+    <color name="music_controller_container_color">@android:color/white</color>
+    <color name="default_bar_color">@color/grey_700</color>
 
     <!--dark theme-->
-    <color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
-    <color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
-    <color name="materialmusic_dark_separator_color">#0CFFFFFF</color>
-    <color name="materialmusic_dark_default_bar_color">@color/grey_900</color>
-    <color name="materialmusic_dark_themed_drawable_color">@color/white</color>
-
-    <color name="sliding_tabs_activated">#FFFFFF</color>
-    <color name="sliding_tabs_deactivated">#99FFFFFF</color>
-
-    <!--notification-->
-    <color name="notification_content_color">#deFFFFFF</color>
-    <color name="notification_secondary_content_color">#aaFFFFFF</color>
-
-    <color name="notification_dark_text_content_color">#de000000</color>
-    <color name="notification_dark_text_secondary_content_color">#aa000000</color>
+    <color name="music_controller_container_color_dark">@color/grey_800</color>
+    <color name="default_bar_color_dark">@color/grey_900</color>
 
 </resources>

app/src/main/res/values/materialcolors.xml

@@ -2,15 +2,9 @@
 <resources>
 
     <color name="pink_A200">#ff4081</color>
-
     <color name="indigo_500">#3f51b5</color>
 
-    <color name="black">#000</color>
-    <color name="white">#fff</color>
-
-    <color name="grey_300">#e0e0e0</color>
-    <color name="grey_400">#bdbdbd</color>
-    <color name="grey_500">#9e9e9e</color>
+    <color name="grey_700">#616161</color>
     <color name="grey_800">#424242</color>
     <color name="grey_900">#212121</color>
 

app/src/main/res/values/styles.xml

@@ -8,18 +8,7 @@
 
     <style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
 
-    <style name="OverFlowButton">
-        <item name="android:tint">?themed_drawable_color</item>
-        <item name="android:src">@drawable/ic_more_vert_white_24dp</item>
-        <item name="android:padding">12dp</item>
-        <item name="android:layout_width">48dp</item>
-        <item name="android:layout_height">48dp</item>
-        <item name="android:scaleType">fitXY</item>
-        <item name="android:background">?round_selector</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:focusableInTouchMode">false</item>
-        <item name="android:focusable">false</item>
-    </style>
+    <style name="OverFlowButton" parent="OverFlowButtonParent" />
 
     <style name="PlayingIndicator">
         <item name="android:layout_width">36dp</item>
@@ -41,8 +30,7 @@
     </style>
 
     <style name="Toolbar">
-
-    <item name="titleMarginStart">16dp</item>
+        <item name="titleMarginStart">16dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?attr/actionBarSize</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>

app/src/main/res/values/styles_parents.xml

@@ -2,69 +2,48 @@
 <resources>
 
     <style name="Theme.MaterialMusic.Base" parent="Theme.AppCompat.NoActionBar">
-        <!-- FIX FOR DESIGN LIB 22.2.0 NAVDRAWER ITEM FONT-->
-        <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Body2</item>
 
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
         <item name="md_dark_theme">true</item>
 
-        <item name="title_text_color">@color/primary_text_default_material_dark</item>
-        <item name="caption_text_color">@color/secondary_text_default_material_dark</item>
-
-        <item name="music_controller_container_color">
-            @color/materialmusic_dark_music_controller_container_color
+        <item name="music_controller_container_color">@color/music_controller_container_color_dark
         </item>
 
         <item name="round_selector">@drawable/round_selector_dark</item>
         <item name="rect_selector">@drawable/rect_selector_dark</item>
-        <item name="separator_color">@color/materialmusic_dark_separator_color</item>
-        <item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb_dark</item>
 
-        <item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
-        <item name="check_mark_color">@color/grey_900</item>
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
 
-        <item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
-        <item name="card_color">@color/grey_800</item>
+        <item name="default_bar_color">@color/default_bar_color_dark</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
         <!-- FOR EVERYWHERE WE CANT OVERRIDE THE ACCENT COLOR-->
-        <item name="colorAccent">@color/white</item>
+        <item name="colorAccent">@android:color/white</item>
     </style>
 
     <style name="Theme.MaterialMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- FIX FOR DESIGN LIB 22.2.0 NAVDRAWER ITEM FONT-->
-        <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Body2</item>
 
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
         <item name="md_dark_theme">false</item>
 
-        <item name="title_text_color">@color/primary_text_default_material_light</item>
-        <item name="caption_text_color">@color/secondary_text_default_material_light</item>
-
-        <item name="music_controller_container_color">
-            @color/materialmusic_music_controller_container_color
-        </item>
+        <item name="music_controller_container_color">@color/music_controller_container_color</item>
 
         <item name="round_selector">@drawable/round_selector</item>
         <item name="rect_selector">@drawable/rect_selector</item>
-        <item name="separator_color">@color/materialmusic_separator_color</item>
-        <item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb</item>
 
-        <item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
-        <item name="check_mark_color">@color/white</item>
+        <item name="cardBackgroundColor">@color/cardview_light_background</item>
 
-        <item name="default_bar_color">@color/materialmusic_default_bar_color</item>
-        <item name="card_color">@color/white</item>
+        <item name="default_bar_color">@color/default_bar_color</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
         <!-- FOR EVERYWHERE WE CANT OVERRIDE THE ACCENT COLOR-->
-        <item name="colorAccent">@color/black</item>
+        <item name="colorAccent">@android:color/black</item>
     </style>
 
     <style name="PlayPauseFabParent">
@@ -86,4 +65,17 @@
         <item name="android:layout_marginLeft">@dimen/seek_bar_margin_left_right</item>
         <item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
     </style>
+
+    <style name="OverFlowButtonParent">
+        <item name="android:tint">?android:textColorSecondary</item>
+        <item name="android:src">@drawable/abc_ic_menu_moreoverflow_mtrl_alpha</item>
+        <item name="android:padding">12dp</item>
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:scaleType">fitXY</item>
+        <item name="android:background">?round_selector</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:focusableInTouchMode">false</item>
+        <item name="android:focusable">false</item>
+    </style>
 </resources>