Added folder spoiler
|
|
@ -169,23 +169,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
tabs.setTabTextColors(ColorUtil.getSecondaryTextColorForBackground(this, getThemeColorPrimary()), ColorUtil.getPrimaryTextColorForBackground(this, getThemeColorPrimary()));
|
tabs.setTabTextColors(ColorUtil.getSecondaryTextColorForBackground(this, getThemeColorPrimary()), ColorUtil.getPrimaryTextColorForBackground(this, getThemeColorPrimary()));
|
||||||
tabs.setSelectedTabIndicatorColor(getThemeColorAccent() == Color.WHITE && !ColorUtil.useDarkTextColorOnBackground(getThemeColorPrimary()) ? Color.WHITE : ThemeSingleton.get().positiveColor.getDefaultColor());
|
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);
|
pager.setCurrentItem(startPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -201,6 +184,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setUpNavigationView() {
|
private void setUpNavigationView() {
|
||||||
|
navigationView.setCheckedItem(R.id.nav_library);
|
||||||
final int colorAccent = ThemeSingleton.get().positiveColor.getDefaultColor();
|
final int colorAccent = ThemeSingleton.get().positiveColor.getDefaultColor();
|
||||||
navigationView.setItemTextColor(new ColorStateList(
|
navigationView.setItemTextColor(new ColorStateList(
|
||||||
new int[][]{
|
new int[][]{
|
||||||
|
|
@ -231,21 +215,11 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
|
||||||
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
|
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
|
||||||
drawerLayout.closeDrawers();
|
drawerLayout.closeDrawers();
|
||||||
switch (menuItem.getItemId()) {
|
switch (menuItem.getItemId()) {
|
||||||
case R.id.nav_songs:
|
case R.id.nav_library:
|
||||||
menuItem.setChecked(true);
|
// TODO
|
||||||
pager.setCurrentItem(PagerAdapter.MusicFragments.SONG.ordinal(), true);
|
|
||||||
break;
|
break;
|
||||||
case R.id.nav_albums:
|
case R.id.nav_folders:
|
||||||
menuItem.setChecked(true);
|
// TODO
|
||||||
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);
|
|
||||||
break;
|
break;
|
||||||
case R.id.support_development:
|
case R.id.support_development:
|
||||||
new Handler().postDelayed(new Runnable() {
|
new Handler().postDelayed(new Runnable() {
|
||||||
|
|
|
||||||
BIN
app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
Normal file
|
After Width: | Height: | Size: 164 B |
|
After Width: | Height: | Size: 274 B |
BIN
app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
Normal file
|
After Width: | Height: | Size: 140 B |
|
After Width: | Height: | Size: 199 B |
BIN
app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
Normal file
|
After Width: | Height: | Size: 226 B |
|
After Width: | Height: | Size: 308 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
Normal file
|
After Width: | Height: | Size: 332 B |
|
After Width: | Height: | Size: 482 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
Normal file
|
After Width: | Height: | Size: 445 B |
|
After Width: | Height: | Size: 619 B |
|
|
@ -5,21 +5,14 @@
|
||||||
android:id="@+id/navigation_drawer_menu_category_sections"
|
android:id="@+id/navigation_drawer_menu_category_sections"
|
||||||
android:checkableBehavior="single">
|
android:checkableBehavior="single">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_songs"
|
android:id="@+id/nav_library"
|
||||||
android:icon="@drawable/ic_audiotrack_white_24dp"
|
android:icon="@drawable/ic_my_library_music_white_24dp"
|
||||||
android:title="@string/songs" />
|
android:title="@string/library" />
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_albums"
|
android:enabled="false"
|
||||||
android:icon="@drawable/ic_album_white_24dp"
|
android:id="@+id/nav_folders"
|
||||||
android:title="@string/albums" />
|
android:icon="@drawable/ic_folder_white_24dp"
|
||||||
<item
|
android:title="Folders (soon)" />
|
||||||
android:id="@+id/nav_artists"
|
|
||||||
android:icon="@drawable/ic_person_white_24dp"
|
|
||||||
android:title="@string/artists" />
|
|
||||||
<item
|
|
||||||
android:id="@+id/nav_playlists"
|
|
||||||
android:icon="@drawable/ic_queue_music_white_24dp"
|
|
||||||
android:title="@string/playlists" />
|
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<group
|
<group
|
||||||
|
|
|
||||||
|
|
@ -222,4 +222,6 @@
|
||||||
<string name="open_playing_queue_instruction">Swipe the card in the now playing screen up to reveal the full playing queue.</string>
|
<string name="open_playing_queue_instruction">Swipe the card in the now playing screen up to reveal the full playing queue.</string>
|
||||||
<string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
|
<string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
|
||||||
<string name="storage_permission_explaination">The storage permission is required for Phonograph to read your music library.</string>
|
<string name="storage_permission_explaination">The storage permission is required for Phonograph to read your music library.</string>
|
||||||
|
<string name="library">Library</string>
|
||||||
|
<string name="folders">Folders</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||