From 6a2c3e565df6be5fad557701c5232fa71fef672c Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Wed, 1 Apr 2015 17:41:11 +0200
Subject: [PATCH] Bug fixes

- fixed navigation bar color bug
- added some light gradients to now playing screen
- telephone call pause bug
- more bugs
---
 .../adapter/songadapter/AlbumSongAdapter.java |  1 +
 .../helper/DeleteSongsDialogHelper.java       |  2 +-
 .../gramophone/service/MusicService.java      |  1 +
 .../activities/MusicControllerActivity.java   |  1 +
 app/src/main/res/drawable/shadow_down.xml     |  2 +-
 app/src/main/res/drawable/shadow_up.xml       |  6 +--
 .../layout-land/activity_music_controller.xml |  8 ++--
 .../res/layout/activity_music_controller.xml  | 37 ++++++++++++++-----
 app/src/main/res/values/colors.xml            |  2 +-
 9 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java
index f2f1f32f..52619467 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java
@@ -102,6 +102,7 @@ public class AlbumSongAdapter extends RecyclerView.Adapter<AlbumSongAdapter.View
                             return true;
                         case R.id.action_add_to_current_playing:
                             MusicPlayerRemote.enqueue(dataSet.get(getAdapterPosition()));
+                            return true;
                         case R.id.action_tag_editor:
                             Intent intent = new Intent(activity, SongTagEditorActivity.class);
                             intent.putExtra(AppKeys.E_ID, dataSet.get(getAdapterPosition()).id);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
index 3a812d67..7742d695 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
@@ -22,7 +22,7 @@ public class DeleteSongsDialogHelper {
 
     public static MaterialDialog getDialog(final Context context, final List<Song> songs) {
         String title = context.getResources().getString(R.string.delete_songs_1);
-        title = songs.size() > 1 ? title + songs.size() + context.getResources().getString(R.string.delete_songs_2) : title + songs.get(0).title + "?";
+        title = songs.size() > 1 ? title + songs.size() + context.getResources().getString(R.string.delete_songs_2) : title + "'" + songs.get(0).title + "' " + "?";
         return new MaterialDialog.Builder(context)
                 .title(title)
                 .content(context.getResources().getString(R.string.delete_warning))
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 14d29602..d31746ed 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -58,6 +58,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().compareTo(AudioManager.ACTION_AUDIO_BECOMING_NOISY) == 0) {
+                wasPlayingBeforeFocusLoss = false;
                 pausePlaying();
             }
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
index 2e931787..6b5bfc85 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
@@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.ui.activities;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
diff --git a/app/src/main/res/drawable/shadow_down.xml b/app/src/main/res/drawable/shadow_down.xml
index 1e29601d..c8cc6b77 100644
--- a/app/src/main/res/drawable/shadow_down.xml
+++ b/app/src/main/res/drawable/shadow_down.xml
@@ -4,5 +4,5 @@
     <gradient
         android:angle="90"
         android:endColor="#34000000"
-        android:startColor="@android:color/transparent" />
+        android:startColor="#00000000" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up.xml b/app/src/main/res/drawable/shadow_up.xml
index 8f8fd2ae..64f90aaa 100644
--- a/app/src/main/res/drawable/shadow_up.xml
+++ b/app/src/main/res/drawable/shadow_up.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <gradient
-        android:angle="90"
-        android:endColor="@android:color/transparent"
-        android:startColor="#34000000"/>
+        android:angle="270"
+        android:endColor="#34000000"
+        android:startColor="#00000000" />
 </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 7800386b..76747329 100644
--- a/app/src/main/res/layout-land/activity_music_controller.xml
+++ b/app/src/main/res/layout-land/activity_music_controller.xml
@@ -54,12 +54,11 @@
                     android:fontFamily="sans-serif-medium"
                     android:gravity="bottom|left"
                     android:singleLine="true"
-                    android:textSize="14dp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="@color/white"/>
+                    android:textColor="@color/white"
+                    android:textSize="16sp"/>
 
                 <TextView
-                    android:textSize="14dp"
                     android:id="@+id/song_total_time"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -68,7 +67,8 @@
                     android:gravity="bottom|right"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    android:textColor="@color/white"/>
+                    android:textColor="@color/white"
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml
index 81cd6a0b..a27d13b8 100644
--- a/app/src/main/res/layout/activity_music_controller.xml
+++ b/app/src/main/res/layout/activity_music_controller.xml
@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -16,19 +15,39 @@
         android:src="@drawable/default_album_art"
         android:transitionName="@string/transition_album_cover"/>
 
+    <LinearLayout
+        android:orientation="vertical"
+        android:id="@+id/dummy_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/statusMargin"/>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_down"
+        android:layout_alignBottom="@+id/dummy_toolbar"/>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/footer"
-        android:background="@drawable/shadow_up"/>
+        android:background="@drawable/shadow_up"
+        android:layout_alignTop="@+id/progress_container"/>
 
     <LinearLayout
         android:id="@+id/progress_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/footer"
-        android:layout_margin="16dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:padding="16dp">
 
         <TextView
             android:id="@+id/song_current_progress"
@@ -40,7 +59,7 @@
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/white"
-            android:textSize="14dp"
+            android:textSize="16sp"
             android:textStyle="bold"/>
 
         <TextView
@@ -51,9 +70,9 @@
             android:fontFamily="sans-serif"
             android:gravity="bottom|right"
             android:singleLine="true"
-            android:textSize="14dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/white"/>
+            android:textColor="@color/white"
+            android:textSize="16sp"/>
 
     </LinearLayout>
 
@@ -91,12 +110,12 @@
     </LinearLayout>
 
     <RelativeLayout
-        android:layout_margin="16dp"
         android:id="@+id/media_controller_container"
         android:layout_width="match_parent"
         android:layout_height="88dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:layout_margin="16dp"
         android:background="?music_controller_container_color">
 
         <ImageButton
@@ -161,9 +180,9 @@
         android:elevation="2dp"/>
 
     <LinearLayout
-        android:layout_alignParentTop="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:orientation="vertical">
 
         <ImageView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ee91b998..5744de58 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,7 +12,7 @@
     <color name="materialmusic_music_controller_container_color">@color/grey_300</color>
     <color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
     <color name="materialmusic_separator_color">#0C000000</color>
-    <color name="materialmusic_default_bar_color">@color/white</color>
+    <color name="materialmusic_default_bar_color">@color/grey_300</color>
     <color name="materialmusic_themed_drawable_color">#8A000000</color>
     <color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color>
     <color name="list_item_selector_activated">#D0D0D0</color>