From 713cbf2b2981171d1fa002ec54fc1b8a22b2eea4 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Mon, 20 Apr 2015 20:31:55 +0200
Subject: [PATCH] Materialized the seekBar for devices below Lollipop, seekBar
 visible again in landscape and fixed a common FC

---
 .../java/com/kabouzeid/gramophone/service/MusicService.java  | 4 ++--
 app/src/main/res/drawable/slider_progress.xml                | 4 ----
 app/src/main/res/drawable/slider_thumb.xml                   | 4 ++--
 app/src/main/res/layout-land/activity_music_controller.xml   | 2 +-
 app/src/main/res/values/styles.xml                           | 5 ++++-
 5 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 app/src/main/res/drawable/slider_progress.xml

diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 99b0dc53..00486fa3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -644,7 +644,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
     public void resumePlaying() {
         if (!isPlaying()) {
             if (requestFocus()) {
-                if (isPlayerPrepared) {
+                if (isPlayerPrepared()) {
                     player.start();
                     playingNotificationHelper.updatePlayState(isPlaying());
                     MusicPlayerWidget.updateWidgetsPlayState(this, isPlaying());
@@ -669,7 +669,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
 
     public void back(boolean force) {
         if (position != -1) {
-            if (getSongProgressMillis() > 2000) {
+            if (isPlayerPrepared() && getSongProgressMillis() > 2000) {
                 seekTo(0);
             } else {
                 playPreviousSong(force);
diff --git a/app/src/main/res/drawable/slider_progress.xml b/app/src/main/res/drawable/slider_progress.xml
deleted file mode 100644
index fa57a4a8..00000000
--- a/app/src/main/res/drawable/slider_progress.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#00000000"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/slider_thumb.xml b/app/src/main/res/drawable/slider_thumb.xml
index c7cbd433..a69f10ab 100644
--- a/app/src/main/res/drawable/slider_thumb.xml
+++ b/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="16dp"
-        android:width="16dp"/>
+        android:height="12dp"
+        android:width="12dp"/>
     <solid
         android:color="@color/materialmusic_accent_color"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_music_controller.xml b/app/src/main/res/layout-land/activity_music_controller.xml
index b86f9b9f..c9e51420 100644
--- a/app/src/main/res/layout-land/activity_music_controller.xml
+++ b/app/src/main/res/layout-land/activity_music_controller.xml
@@ -207,7 +207,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_above="@+id/footer"
-                android:elevation="1dp"
+                android:elevation="2dp"
                 android:padding="0dp"
                 android:progressTint="@color/materialmusic_accent_color"
                 android:thumbTint="@color/materialmusic_accent_color_darker"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 759a325b..3e606a12 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,7 +35,10 @@
         <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 
-    <style name="MusicProgressSlider" parent="MusicProgressSliderParent" />
+    <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
+        <item name="android:thumbOffset">0dp</item>
+        <item name="android:thumb">@drawable/slider_thumb</item>
+    </style>
 
     <style name="Toolbar">
         <item name="android:layout_width">match_parent</item>