Bug fixes

- fixed navigation bar color bug
- added some light gradients to now playing screen
- telephone call pause bug
- more bugs
This commit is contained in:
Karim Abou Zeid 2015-04-01 17:41:11 +02:00
commit 6a2c3e565d
9 changed files with 41 additions and 19 deletions

View file

@ -102,6 +102,7 @@ public class AlbumSongAdapter extends RecyclerView.Adapter<AlbumSongAdapter.View
return true; return true;
case R.id.action_add_to_current_playing: case R.id.action_add_to_current_playing:
MusicPlayerRemote.enqueue(dataSet.get(getAdapterPosition())); MusicPlayerRemote.enqueue(dataSet.get(getAdapterPosition()));
return true;
case R.id.action_tag_editor: case R.id.action_tag_editor:
Intent intent = new Intent(activity, SongTagEditorActivity.class); Intent intent = new Intent(activity, SongTagEditorActivity.class);
intent.putExtra(AppKeys.E_ID, dataSet.get(getAdapterPosition()).id); intent.putExtra(AppKeys.E_ID, dataSet.get(getAdapterPosition()).id);

View file

@ -22,7 +22,7 @@ public class DeleteSongsDialogHelper {
public static MaterialDialog getDialog(final Context context, final List<Song> songs) { public static MaterialDialog getDialog(final Context context, final List<Song> songs) {
String title = context.getResources().getString(R.string.delete_songs_1); 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) return new MaterialDialog.Builder(context)
.title(title) .title(title)
.content(context.getResources().getString(R.string.delete_warning)) .content(context.getResources().getString(R.string.delete_warning))

View file

@ -58,6 +58,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (intent.getAction().compareTo(AudioManager.ACTION_AUDIO_BECOMING_NOISY) == 0) { if (intent.getAction().compareTo(AudioManager.ACTION_AUDIO_BECOMING_NOISY) == 0) {
wasPlayingBeforeFocusLoss = false;
pausePlaying(); pausePlaying();
} }
} }

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.ui.activities;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;

View file

@ -4,5 +4,5 @@
<gradient <gradient
android:angle="90" android:angle="90"
android:endColor="#34000000" android:endColor="#34000000"
android:startColor="@android:color/transparent" /> android:startColor="#00000000" />
</shape> </shape>

View file

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:angle="90" android:angle="270"
android:endColor="@android:color/transparent" android:endColor="#34000000"
android:startColor="#34000000"/> android:startColor="#00000000" />
</shape> </shape>

View file

@ -54,12 +54,11 @@
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="bottom|left" android:gravity="bottom|left"
android:singleLine="true" android:singleLine="true"
android:textSize="14dp"
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="16sp"/>
<TextView <TextView
android:textSize="14dp"
android:id="@+id/song_total_time" android:id="@+id/song_total_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -68,7 +67,8 @@
android:gravity="bottom|right" android:gravity="bottom|right"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>

View file

@ -1,5 +1,4 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -16,19 +15,39 @@
android:src="@drawable/default_album_art" android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_cover"/> 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 <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@+id/footer" android:layout_above="@+id/footer"
android:background="@drawable/shadow_up"/> android:background="@drawable/shadow_up"
android:layout_alignTop="@+id/progress_container"/>
<LinearLayout <LinearLayout
android:id="@+id/progress_container" android:id="@+id/progress_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/footer" android:layout_above="@+id/footer"
android:layout_margin="16dp" android:orientation="horizontal"
android:orientation="horizontal"> android:padding="16dp">
<TextView <TextView
android:id="@+id/song_current_progress" android:id="@+id/song_current_progress"
@ -40,7 +59,7 @@
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14dp" android:textSize="16sp"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView <TextView
@ -51,9 +70,9 @@
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:gravity="bottom|right" android:gravity="bottom|right"
android:singleLine="true" android:singleLine="true"
android:textSize="14dp"
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
@ -91,12 +110,12 @@
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_margin="16dp"
android:id="@+id/media_controller_container" android:id="@+id/media_controller_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="88dp" android:layout_height="88dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_margin="16dp"
android:background="?music_controller_container_color"> android:background="?music_controller_container_color">
<ImageButton <ImageButton
@ -161,9 +180,9 @@
android:elevation="2dp"/> android:elevation="2dp"/>
<LinearLayout <LinearLayout
android:layout_alignParentTop="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView

View file

@ -12,7 +12,7 @@
<color name="materialmusic_music_controller_container_color">@color/grey_300</color> <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_navigation_drawer_background_color">@color/grey_300</color>
<color name="materialmusic_separator_color">#0C000000</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_color">#8A000000</color>
<color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color> <color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color>
<color name="list_item_selector_activated">#D0D0D0</color> <color name="list_item_selector_activated">#D0D0D0</color>