diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java
index 4e4bb79b..c35e1813 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java
@@ -25,6 +25,9 @@ public class IntroActivity extends AppIntro {
int color = ContextCompat.getColor(this, R.color.blue_grey_700);
setStatusBarColor(ColorUtil.shiftColorDown(color));
setTaskColor(color);
+ setSkipText(getString(R.string.action_skip).toUpperCase());
+ setDoneText(getString(R.string.action_done).toUpperCase());
+ setGrantText(getString(R.string.action_grant).toUpperCase());
addSlide(AppIntroFragment.newInstance(getString(R.string.app_name), getString(R.string.welcome_to_phonograph), R.drawable.icon_web, color));
if (!hasExternalStoragePermission()) {
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 00000000..41c7e958
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png
new file mode 100644
index 00000000..d40efdea
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png differ
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 00000000..87bff32f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png differ
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 00000000..a053747c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..e62bf080
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png
new file mode 100644
index 00000000..75c3ada0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..01171f54
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png
new file mode 100644
index 00000000..35c4edcc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png differ
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 00000000..d812acb0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png
new file mode 100644
index 00000000..715aaa18
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png differ
diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml
index 5b689127..48664d49 100644
--- a/app/src/main/res/menu/menu_drawer.xml
+++ b/app/src/main/res/menu/menu_drawer.xml
@@ -5,21 +5,14 @@
android:id="@+id/navigation_drawer_menu_category_sections"
android:checkableBehavior="single">