tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into glide

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-31 15:36:08 +01:00
commit 717ebf480a
23 changed files with 147 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java
View file

@ -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()) {

36
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -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() {