Update a ton of drawables to modern material versions

4 files changed, 34 insertions, 6 deletions

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7e43206a..2b9b7f50 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,6 +5,8 @@
     <attr name="media_button_forward" format="reference"/>
     <attr name="media_button_pause" format="reference"/>
     <attr name="media_button_repeat_off" format="reference"/>
+	<attr name="media_button_repeat_single" format="reference"/>
+	<attr name="media_button_repeat_all" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
 	<attr name="actionbar_backward" format="reference"/>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a9e59202..b002ac9f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<dimen name="Button">54dip</dimen>
+	<dimen name="Button.Large">64dip</dimen>
 	<dimen name="Button.Small">46dip</dimen>
 	<dimen name="AlbumArt.Small">78dip</dimen>
 	<dimen name="AlbumArt.Header">120dip</dimen>
-	<dimen name="BottomBar.Text.Major">13sp</dimen>
-	<dimen name="BottomBar.Text.Minor">12sp</dimen>
 	<dimen name="Star.Small">20dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f5173619..a2a2d208 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,6 +5,21 @@
 	</style>
 	<style name="NotificationButton">
 		<item name="android:background">?android:selectableItemBackground</item>
+		<item name="android:layout_width">46dip</item>
+		<item name="android:layout_height">fill_parent</item>
+		<item name="android:layout_gravity">center</item>
+		<item name="android:scaleType">fitCenter</item>
+		<item name="android:padding">2dip</item>
+	</style>
+
+	<style name="NotificationButton.Expanded">
+		<item name="android:background">?android:selectableItemBackground</item>
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_height">fill_parent</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:layout_gravity">center</item>
+		<item name="android:scaleType">fitCenter</item>
+		<item name="android:padding">10dip</item>
 	</style>
 
 	<style name="MoreButton" parent="BasicButton">
@@ -13,7 +28,6 @@
 
     <style name="PlaybackControl" parent="@style/BasicButton">
         <item name="android:scaleType">fitCenter</item>
-        <item name="android:padding">6dip</item>
         <item name="android:layout_marginLeft">4dip</item>
         <item name="android:layout_marginRight">4dip</item>
         <item name="android:layout_width">@dimen/Button</item>
@@ -22,15 +36,24 @@
     </style>
 	
 	<style name="PlaybackControl.Small" parent="@style/PlaybackControl">
-		<item name="android:padding">4dip</item>
         <item name="android:layout_width">@dimen/Button.Small</item>
         <item name="android:layout_height">@dimen/Button.Small</item>
     </style>
 
+	<style name="PlaybackControl.Large" parent="@style/PlaybackControl">
+		<item name="android:layout_width">@dimen/Button.Large</item>
+		<item name="android:layout_height">@dimen/Button.Large</item>
+	</style>
+
 	<style name="PlaybackControl.Match" parent="@style/PlaybackControl">
-		<item name="android:padding">4dip</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">wrap_content</item>
+		<item name="android:scaleType">fitCenter</item>
+	</style>
+
+	<style name="PlaybackControl.BottomBar" parent="@style/PlaybackControl.Match">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_weight">1</item>
 	</style>
 
 	<style name="DownloadActionButton" parent="@style/BasicButton">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 511d630f..b1269581 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,6 +6,8 @@
 		<item name="media_button_forward">@drawable/media_forward_light</item>
 		<item name="media_button_pause">@drawable/media_pause_light</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
+		<item name="media_button_repeat_single">@drawable/media_repeat_single_light</item>
+		<item name="media_button_repeat_all">@drawable/media_repeat_all_light</item>
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
 		<item name="actionbar_backward">@drawable/media_backward_dark</item>
@@ -60,7 +62,9 @@
 		<item name="media_button_backward">@drawable/media_backward_dark</item>
 		<item name="media_button_forward">@drawable/media_forward_dark</item>
 		<item name="media_button_pause">@drawable/media_pause_dark</item>
-		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
+		<item name="media_button_repeat_off">@drawable/media_repeat_off_dark</item>
+		<item name="media_button_repeat_single">@drawable/media_repeat_single_dark</item>
+		<item name="media_button_repeat_all">@drawable/media_repeat_all_dark</item>
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
 		<item name="actionbar_backward">@drawable/media_backward_dark</item>