Cleaned up resources and design fixes

app/build.gradle

@@ -17,7 +17,7 @@ repositories {
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "com.kabouzeid.materialmusic"

app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java

@@ -180,7 +180,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements OnMusicRemote
 
     private void setUpObservableListViewParams() {
         albumArtViewHeight = getResources().getDimensionPixelSize(R.dimen.header_image_height);
-        toolbarColor = Util.resolveColor(this, R.attr.colorPrimary);
+        toolbarColor = getResources().getColor(R.color.materialmusic_default_bar_color);
         toolbarHeight = Util.getActionBarSize(this);
         titleViewHeight = getResources().getDimensionPixelSize(R.dimen.title_view_height);
         headerOffset = toolbarHeight;

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

@@ -1,4 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/seekbar_thumb_pressed" android:state_pressed="false"/>
-    <item android:drawable="@drawable/seekbar_thumb_normal"/>
-</selector>

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

@@ -1,10 +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="10dp"
-        android:width="10dp"/>
-    <solid
-        android:color="@color/materialmusic_accent_color"/>
-    <corners
-        android:radius="18dp"/>
-</shape>

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

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

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

@@ -100,12 +100,6 @@
         android:background="?attr/music_controller_container_color"
         android:elevation="2dp">
 
-        <com.melnykov.fab.FloatingActionButton
-            android:id="@+id/fab"
-            style="@style/PlayPauseFab"
-            android:layout_centerInParent="true"
-            />
-
         <ImageButton
             android:id="@+id/prev_button"
             android:layout_width="72dp"
@@ -115,7 +109,8 @@
             android:background="?round_selector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_previous_white_48dp"/>
+            android:src="@drawable/ic_skip_previous_white_48dp"
+            android:layout_marginRight="-8dp"/>
 
         <ImageButton
             android:id="@+id/next_button"
@@ -126,7 +121,8 @@
             android:background="?round_selector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_next_white_48dp"/>
+            android:src="@drawable/ic_skip_next_white_48dp"
+            android:layout_marginLeft="-8dp"/>
 
         <ImageButton
             android:id="@+id/repeat_button"
@@ -152,6 +148,12 @@
             android:scaleType="fitCenter"
             android:src="@drawable/ic_shuffle_grey600_48dp"/>
 
+        <com.melnykov.fab.FloatingActionButton
+            android:id="@+id/fab"
+            style="@style/PlayPauseFab"
+            android:layout_centerInParent="true"
+            />
+
     </RelativeLayout>
 
     <SeekBar

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

@@ -38,7 +38,7 @@
     <string name="audio_focus_denied">We were not able to gain audio focus.</string>
     <string name="title_activity_tag_editor">TagEditorActivity</string>
     <string name="hello_world">Hello world!</string>
-    <string name="tag_editor">Tag Editor [beta]</string>
+    <string name="tag_editor">Tag Editor</string>
     <string name="song">Song</string>
     <string name="album">Album</string>
     <string name="artist">Artist</string>

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

@@ -39,8 +39,8 @@
     </style>
 
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
-        <item name="android:progressDrawable">@drawable/seekbar_progress</item>
+        <item name="android:progressDrawable">@drawable/slider_progress</item>
-        <item name="android:thumb">@drawable/seekbar_thumb</item>
+        <item name="android:thumb">@drawable/slider_thumb</item>
     </style>
 
 </resources>