From 7fdee51fe890154a2ed097d8a471cb9e959492fb Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 31 Dec 2015 13:07:38 +0100 Subject: [PATCH] Added folder spoiler --- .../ui/activities/MainActivity.java | 36 +++--------------- .../drawable-hdpi/ic_folder_white_24dp.png | Bin 0 -> 164 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 274 bytes .../drawable-mdpi/ic_folder_white_24dp.png | Bin 0 -> 140 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 199 bytes .../drawable-xhdpi/ic_folder_white_24dp.png | Bin 0 -> 226 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 308 bytes .../drawable-xxhdpi/ic_folder_white_24dp.png | Bin 0 -> 332 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 482 bytes .../drawable-xxxhdpi/ic_folder_white_24dp.png | Bin 0 -> 445 bytes .../ic_my_library_music_white_24dp.png | Bin 0 -> 619 bytes app/src/main/res/menu/menu_drawer.xml | 21 ++++------ app/src/main/res/values/strings.xml | 2 + 13 files changed, 14 insertions(+), 45 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 3b6c1874..45ca5021 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -169,23 +169,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity tabs.setTabTextColors(ColorUtil.getSecondaryTextColorForBackground(this, getThemeColorPrimary()), ColorUtil.getPrimaryTextColorForBackground(this, getThemeColorPrimary())); tabs.setSelectedTabIndicatorColor(getThemeColorAccent() == Color.WHITE && !ColorUtil.useDarkTextColorOnBackground(getThemeColorPrimary()) ? Color.WHITE : ThemeSingleton.get().positiveColor.getDefaultColor()); - pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { - navigationView.getMenu().getItem(position).setChecked(true); - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - }); - pager.setCurrentItem(startPosition); } @@ -201,6 +184,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity } private void setUpNavigationView() { + navigationView.setCheckedItem(R.id.nav_library); final int colorAccent = ThemeSingleton.get().positiveColor.getDefaultColor(); navigationView.setItemTextColor(new ColorStateList( new int[][]{ @@ -231,21 +215,11 @@ public class MainActivity extends AbsSlidingMusicPanelActivity public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { drawerLayout.closeDrawers(); switch (menuItem.getItemId()) { - case R.id.nav_songs: - menuItem.setChecked(true); - pager.setCurrentItem(PagerAdapter.MusicFragments.SONG.ordinal(), true); + case R.id.nav_library: + // TODO break; - case R.id.nav_albums: - menuItem.setChecked(true); - pager.setCurrentItem(PagerAdapter.MusicFragments.ALBUM.ordinal(), true); - break; - case R.id.nav_artists: - menuItem.setChecked(true); - pager.setCurrentItem(PagerAdapter.MusicFragments.ARTIST.ordinal(), true); - break; - case R.id.nav_playlists: - menuItem.setChecked(true); - pager.setCurrentItem(PagerAdapter.MusicFragments.PLAYLIST.ordinal(), true); + case R.id.nav_folders: + // TODO break; case R.id.support_development: new Handler().postDelayed(new Runnable() { diff --git a/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..41c7e95806680a03a0fdff90cb6a7d67b3ee0302 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?WP7?ehE&{od)<)lfC7*6 z#h49Fdj*f@?rb@IVI#8(qwA~fPgE~UZ@QrpxlBsIp`Kyx-tEVN!<*9#9J4mJh`hKCF@W-u@?-1KyD45_&F_J$$fAp;)P z3p}A#rEfBKZTMijjW3X(d$l9?eqD2A1@ zG0NwF%Y@Zau78mUVA#tg6A;4U%IC5BileZg@rB*5Cn#iHoX_x9Wt)$XiD%6f(J$f) zB#oa~uRJcJ=fi!RG& zxluD}y|)^!YMykJ!@JR>{f{vF6VZ8&hRHVUDc=ItEYJ=3b?sxFsE8MH=A32y4qyKV cd|Y6?O?Rqe)aJvE3=9kmp00i_>zopr05@A{x&QzG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..87bff32f7ee0364847bded17034bb00af43332b9 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJof<0XvLn>}1|M>sko>|xM z@Cw!?5ds`X^#4C*DBXa-{R0`4>mF|h;FzqSh-$vF#`hwgQu&X%Q~loCIB)!GR6P^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a053747c9580c6126ba94e6f1045c0c014c823ca GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo`aE46Ln>}1|M>sko>|xM zutSsp#}WPillkHpH`*JDO-Q!j*`sod$&2x*m_Sf}BIB-Oj){z(jwXL}ckmt&b2!6u z~)z3Iqx$Uvm! z;hbg9W>`)LczZA;XZqETqPyNGWj%fR(B9y8%>-XH&!Db5EDRt}$7m7Ze{J_Y|Bq}X z*H-WI{>UP;)xS&p!J@xGHVm6@ol22ivs3It!0es5ib{;r<}7AD_JV=2gQ0?nfq|hx z+W}+*7|&;3_M-pS!bFF7<`b_wu0%~cxjFdho_W^=GjpEY`V!qPZf^oo_u+ekxW~B~ T$GFYQUxWCbu6{1-oD!M~)z3Ir+Y#_iI zF#VCE7yrVybGcgOyjDF+a9#5|Q|G1Msu?qV7S%tpTxg%=VYj1Onzg(Z5o4{;DrK)Ep_kq<@m`o$S*4HH#xE; z^BLQF=8j)Y%nS@RjLAOISH&7UWfyEcx0%st{bwbHJ6D(sL=Lb!>~(VU+_pdx~)z3t6)$Uwv` z(Y=(vv@__9&?c*c+ce&Ku{c@p6Ie;XL4X*WDx)p zj4T)CHyEwGz<0~F&Rm!|VBOr5T{9;%zL{J+1P>#b8Y#)?dDQ}4~Z&~VP^zmJE5 zd1vw7YZ*(o$uXBq|8YH2y5UZCySfp~!+W6y z1||*#OyWi8e1X2}AE&D+E;z-$!iQtU2gXhADZ5z;-o%Qmcb;Qb?Xs;`Mt%Ck>kHpZ zPVsNNcKEnX8-J1Mp0Jq(3;U$oq5g0I)7`H*&CXr#xVPP{mVtqR!PC{xWt~$(69A+* Bc6f=7-kF0$;gc;Xg#GI0{;qz8wN+p0`(h~%BSbneVHz13^>KS)2Z?(@aV zGqWyTR$RpQsk(tdfq{|3;atP7Ifm&6BPZ|UN?v6t`rJe6Mbl@uvaF+))0tjLAHI2Y z(&fnvQj_miO<{*%J9CF#Y6c`v^+-F$%VF!*+*o6-u)ah2Ob2Cshx0QXg8k1shU*sQCEtGd%=4G>I!)gK zKg)Qhvl~{$y_sBmIpNuqBZ2qNw%>l%S}dP_C2>#Rqgk7meoC#g=Wt*s;(PMWe@<>= z)?o)@&IP9oE;O?QSV(L#>iFz6(_QcuQ)^4JqIa@I`jpBUs_Yr&lMmf&uZ;O)qIY6* zMfBHiwey7>^7yVWayT$B2{ec>N4{I@!L))cKxze3fYgbsd{wrTjoXFTH(iMSYbg+y i*Teu)IN{tM28S)78XM=^uVr9hVDNPHb6Mw<&;$UNY{DJ@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d812acb08526ec6a609a04005eb52bd1c21d171e GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RWTRdGHLn>~)z3cCH$U%lR zp{ze6S zL4<*UmBE3LAppj7=PI~dcCYMmnfT%5j34fv-qxS{z3`vOR^}xi=P%BgHH%R$NhULk zWrtSD&6P|GPq*hK*JNffRdg0ETgm#s^w{iWYz?_5@^8w{>%6r2VhKmX++J(-yK8j# zw!dZIO1mk_c%Wb=vqrt;EGCWF)eNbd&oO>TJAUsblZHG47%VV9u$z~WL4bjQ#bGLg zycr9F0|SEqLnu?tEdd4wMg|9l5Y7$T6&V2!SOTSRgVC6O5TEg7?*L+OuNs z#^m>FiWttkyj67W&Ln>~)y&Lbv6ex1M zP+lmT`|rl6hL-4wcbo;TBx!v)D6ZMVl*z8B>vVDI3+H*~4)ngty^{HEX7xVyI{n5g zbIupMKQs4ZnD9iYPVrd`3=Av`3>*v$0_qI8zVVwctXcAFs_fyI%a>y!*eovasJxA8 zpPYSP%Hi4{{*S?v_i&^#@*Ii(x`tuP(e$;S&v2$Pd^wtL8^I7^!8Rk3A;OX^B8uTd z90M3g$Ncj9&+AHrVUrJ%<%CKXw=CL+qc*LMn-1n2=&t*pbrMK3f z43S&F>=4tS#!$%kieU-!1qOw80wsJ7cRY7+A9(gPLg4^M!`r+geOwuJ!H;TE%{rHM zOlM*^CbWD~WY6w<3xApmt)CRtcaQC%S&djj)2qz5jT9nwVlX(=JobH2opl zYQc4%cYpdmQH9|gH^>7Aj2WcOT-jz=v(1QNcwx!5V>82q+`Bu0 z{N?7Uj48K&_{o_5x4koSHscSs7wUF0YY)%7f8zFZBgVS(oHzS6Z7!HO?a?+W5~Y68MZs}n-j + android:id="@+id/nav_library" + android:icon="@drawable/ic_my_library_music_white_24dp" + android:title="@string/library" /> - - + android:enabled="false" + android:id="@+id/nav_folders" + android:icon="@drawable/ic_folder_white_24dp" + android:title="Folders (soon)" /> Swipe the card in the now playing screen up to reveal the full playing queue. Rearrange the playing queue by dragging a song from its track number. The storage permission is required for Phonograph to read your music library. + Library + Folders