From d3d37ccab3a02f838077a0badc57e161666a5d73 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 24 Mar 2015 21:56:21 +0100 Subject: [PATCH] Small fixes --- app/build.gradle | 4 +-- .../adapter/songadapter/SongAdapter.java | 3 +- .../helper/PlayingNotificationHelper.java | 2 +- .../service/MediaButtonIntentReceiver.java | 4 ++- .../gramophone/service/MusicService.java | 26 +++++++++++------- .../ic_audiotrack_white_24dp.png | Bin 0 -> 333 bytes .../ic_audiotrack_white_24dp.png | Bin 0 -> 236 bytes .../ic_audiotrack_white_24dp.png | Bin 0 -> 328 bytes .../ic_audiotrack_white_24dp.png | Bin 0 -> 509 bytes .../ic_audiotrack_white_24dp.png | Bin 0 -> 625 bytes .../drawable-xxxhdpi/notification_icon.png | Bin 1549 -> 0 bytes app/src/main/res/values/strings.xml | 4 +-- 12 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/notification_icon.png diff --git a/app/build.gradle b/app/build.gradle index 9e9b16b8..17bcda56 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.kabouzeid.gramophone" minSdkVersion 16 targetSdkVersion 22 - versionCode 4 - versionName "0.9.2b" + versionCode 5 + versionName "0.9.3b" } compileOptions { diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java index 2031fd06..c54c7832 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java @@ -83,7 +83,8 @@ public class SongAdapter extends RecyclerView.Adapter { holder.songTitle.setTextColor(accentColor); holder.songInfo.setVisibility(View.GONE); holder.overflowButton.setVisibility(View.GONE); - holder.albumArt.setPadding(48, 48, 48, 48); + final int padding = activity.getResources().getDimensionPixelSize(R.dimen.default_item_margin); + holder.albumArt.setPadding(padding, padding, padding, padding); holder.albumArt.setColorFilter(accentColor); holder.albumArt.setImageResource(R.drawable.ic_shuffle_white_48dp); holder.separator.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java index 8d08507e..96db26f0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java @@ -46,7 +46,7 @@ public class PlayingNotificationHelper { R.layout.notification_playing_expanded); notification = new NotificationCompat.Builder(service) - .setSmallIcon(R.drawable.notification_icon) + .setSmallIcon(R.drawable.ic_audiotrack_white_24dp) .setContentIntent(getOpenMusicControllerPendingIntent()) .setCategory(NotificationCompat.CATEGORY_PROGRESS) .setPriority(NotificationCompat.PRIORITY_MAX) diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java b/app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java index 5d4bd3f4..b8fe931b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java @@ -28,9 +28,11 @@ public class MediaButtonIntentReceiver extends BroadcastReceiver { break; case KeyEvent.KEYCODE_HEADSETHOOK: case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: - case KeyEvent.KEYCODE_MEDIA_PLAY: command = MusicService.ACTION_TOGGLE_PLAYBACK; break; + case KeyEvent.KEYCODE_MEDIA_PLAY: + command = MusicService.ACTION_RESUME; + break; case KeyEvent.KEYCODE_MEDIA_NEXT: command = MusicService.ACTION_SKIP; break; 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 284f735e..4d7d466f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java @@ -41,6 +41,7 @@ import java.util.List; public class MusicService extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener, AudioManager.OnAudioFocusChangeListener { public static final String ACTION_TOGGLE_PLAYBACK = "com.kabouzeid.gramophone.action.TOGGLE_PLAYBACK"; public static final String ACTION_PLAY = "com.kabouzeid.gramophone.action.PLAY"; + public static final String ACTION_RESUME = "com.kabouzeid.gramophone.action.RESUME"; public static final String ACTION_PAUSE = "com.kabouzeid.gramophone.action.PAUSE"; public static final String ACTION_STOP = "com.kabouzeid.gramophone.action.STOP"; public static final String ACTION_SKIP = "com.kabouzeid.gramophone.action.SKIP"; @@ -56,7 +57,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe private final BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(AudioManager.ACTION_AUDIO_BECOMING_NOISY)) { + if (intent.getAction().compareTo(AudioManager.ACTION_AUDIO_BECOMING_NOISY) == 0) { pausePlaying(); } } @@ -145,6 +146,9 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe case ACTION_PLAY: playSong(); break; + case ACTION_RESUME: + resumePlaying(); + break; case ACTION_REWIND: back(); break; @@ -594,17 +598,19 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe } public void resumePlaying() { - if (requestFocus()) { - if (isPlayerPrepared) { - player.start(); - playingNotificationHelper.updatePlayState(isPlaying()); - remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING); - notifyOnMusicRemoteEventListeners(MusicRemoteEvent.RESUME); + if(!isPlaying()) { + if (requestFocus()) { + if (isPlayerPrepared) { + player.start(); + playingNotificationHelper.updatePlayState(isPlaying()); + remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING); + notifyOnMusicRemoteEventListeners(MusicRemoteEvent.RESUME); + } else { + playSong(); + } } else { - playSong(); + Toast.makeText(this, getResources().getString(R.string.audio_focus_denied), Toast.LENGTH_SHORT).show(); } - } else { - Toast.makeText(this, getResources().getString(R.string.audio_focus_denied), Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..07db49ef86f80695941b9a049fdbbbf334fc810b GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^){JIEfexWt=vK&gy@!_$mo_9C~C$L_p`)>U3v5ZL@8 zeS)5|T{Cwx&tdbn%{+Whq(j(S&a`Y|O>BPE5GBF!T;GZ9rQw{zkED!vW*wf;<80c= zW}7f!d7oo_K}AnWvz_sW2LZ7s3>rn6`HXKo2*^EI&?M4qB(W?xw7T7~_o2Ne+eXI4 z@zUK<^=-aO!X{|({BE4dY&+3xa`5FY=4R8LM$S{!Cj!oFnD$32y6s@6qu7kh^UTfv g-)C%YD`H?!yPL$wK0}X#fq{X+)78&qol`;+0B=TdZvX%Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3882039222519be9da4b98f3f933d1a8b63619d3 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8DV{ElAr_~fUN+=wP~d4zG~=CfKwzZD^xQ#Gd3|WFfe$!`njxgN@xNAF5OHG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..30119cdbe535afb76afb79e2edaba34611828563 GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*J~228IKkE{-7)hu>be=Q?B{a{S{L6+XYE;sv_0Q{>J^3S{a(e5Uf~0pp*` z(jCow+xX(ew_jSKSm~#q|G!p2g};tX+1ibf^;fbrm&ODB4*OtMkpPFr`zlken3U95 zZ0_Psk@>rAxqQHfPqF9i9G-RXvk1L@>cZePfi)|0!9+Hz%mq`~^3MGTmI$zHOqJMB zz_j_o{F)8N@(=%ZJXLJ)@0^Mo<4N|8<2znUZeADsZSN1+%R5A~&b4XhN9nE6+>)yG dA^!pQT-^ox6@9!8F)%PNc)I$ztaD0e0su;6b9Vp$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4590b76e87254063907be1c6ea018f0e951e3df2 GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?$Q&&$Oy(qI?gzwvevvN~*1mFHVcV@az&HTqEwN<9JpU-^1Jj4Ie z)}AJjB?_#6B`4HQ2%OL)vSh)3E~8BAm7+@&ST#Kyxq>D%iA<5uIBb%fBDtWMEi`ZE zqEFEZ{YsWmi_e`aY^?DrIcj+3IHS>&h)F5C+1_?poO850eko_VLjQrP_bNo@pX|p+o@s^wcD~Q4*BeIU_AVi>FP@#@fXcvwNAd*ZIvHAk#@V==r>bT{r%<_ zd?x;pb8JqwS_kO+ADX7AUKZ8-9-*O)V0|SGn LtDnm{r-UW|gz48( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..93ad3387ef8e776ffdc07190845b99c1dc68b013 GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?OAX zE(s_3po&AXdKVmYvmBfr^7}J-X(azTe%*>=m+EoWfFo+3)J_&kI7xmdK II;Vst04at382|tP literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/notification_icon.png b/app/src/main/res/drawable-xxxhdpi/notification_icon.png deleted file mode 100644 index e1bce0ccd790643e53d59ff7b6838e6374fdd9b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1549 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RWBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztu&(!XaSW-r^(H1WM>JGqp9GVbXaG}S^tP_45w20H zW-A#}1zC^S=FL!(^6_{h-#l%Dgm5xfVqxOi56sRyf=w*KcM3YWmGX4hl7$zGadGl) z)e$@`H1GN8Im;efe7?8Gy!ic@*_QF2o}Qh3?v8o!{+-X~RKJ_~?L>-^mw>F^Bs~E} z7luX-1tty`20;e}rVa)sK?fFr4hAI$r$Y6OM~^)Xj1TA+Np+T2TBpdj;q7acJOw*t zWe59TR#x&mW>mD!P%z%{U}L?}$5KHDd%vnT`=|I`;1YC@ms8j`@#%X5SAXHzE)2E} zZ}ra>^0-JSF}-kXKmRz(_jj`i2gB#hH=b{tzR^BHnW?2+=+Oq7zIM%30*r^Mf5q!P z*fYCxwQIwJ9W54n4tPc{pjRq^L|aZy=UT%5SA0Yo;J;U?VgnB zhlibt;;vF#@j0Ber)tweXE%p$=i*mx{4CnP%1xG6{P(O6u`+6L*$=kQa_(9ql-zXT z=V?>>pJiLRIbR)1IXss?W;vJl8`V=RzM)~2Cv)4Z_jB(TUhlb@bJnsoS66-FSpP6Z zs`fz1BayzcQ=x|h(iu0*Fq&Ag{ZziIxB9uI2iX;7ma*IaY)&rAJ>GHp&>Z0-z6>S* zvX5+%=s)AEb>!339WxfRcbXn??+ibFC#QYZw2ml-5(}{d=>qF{cD`jk@^#z$6R+

9onzB z@BD3fp?aPRVsZ^L_r#v$cQ<>ZelMhl$!6git>%BM^Zu)T6uwv2zr+8qsnYlVI{D!n zGD{wHoQh4CvKDSx&h_)xzREeDHSJ%U+nTkK}FGD<^%QtG+KNM~!3d z{Uhd6xa9@wALLqGxS#Yu{kOpLTTU02B?&Ri{l9EeT+@j*{*LOO&!R%Q7F=erb&5Ie zKSBJS(zc@G@}F+LlXzrt@868Mi#Q%UDhQk%{3tog{(k!G?OLnrTWMIMe_tqFxLj;9gVi(@!_|9E zZOm`J6mjd|iiezWuiOtLe*NDfwQ2T=*ZQ9Y`;@-@pSiuTZ~mFb>vNjQ1hy}^%emc> z<;FQ-0~eRQxqMf+yLUP>>YValet z+#fv_ik*QIguj2%IKf^oxnteAC2b4O?K$tQ^V{nPw1*L6L4H3;(*%vi_R_KQ$s&Xiq-|T#ho*I*fKvjOmVgF=MLUewY3Sm6`#Lu3qDdl z*^K|j$&Z!#$N#bZ>0HICa$y%&ocN}jnE`3p&9^GP==Qi&{b1;gae8y6V(~wCyf)W(?0R~ w_fKSqIJ??AT0+Y>5o>|i;9&nxG=ZW0d}!dVGyDHAFfcH9y85}Sb4q9e0B6C->Hq)$ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0214d3a7..d1bcace3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,7 +26,7 @@ Unknown Album Untitled Song Nothing is playing - fling to open current playing + Fling to toggle the now playing screen fling to return Press once again to exit! Sorry - an error occurred while attempting to play this song @@ -63,7 +63,7 @@ Playing queue Close Save as playlist - Gramophone is a completely free material designed music player by Karim Abou Zeid.\n\nIcon by Cookicons\n\nGoogle+   Twitter + Gramophone is a completely free material designed music player by Karim Abou Zeid.\n\nGoogle+   Twitter\n\nIcon by Cookicons SearchActivity more No results