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

fix highlight bug in navigation bar

Browse source
This commit is contained in:
dkanada 2020-05-01 00:50:23 +09:00
commit b779004a2c
3 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java
View file

@ -12,11 +12,6 @@ public class PlaylistSong extends Song {
this.playlistId = playlistId;
}
public PlaylistSong(String id, String title, int trackNumber, int year, long duration, String albumId, String albumName, String artistId, String artistName, final String playlistId) {
super("", title, trackNumber, year, duration, "", albumName, "", artistName);
this.playlistId = playlistId;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);

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

@ -82,7 +82,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
}
if (itemDto.getCollectionType() == null || !itemDto.getCollectionType().equals("music")) continue;
int test = itemDto.getId().hashCode();
menu.add(R.id.navigation_drawer_menu_category_sections, itemDto.getId().hashCode(), menu.size(), itemDto.getName());
menu.getItem(menu.size() - 1).setIcon(R.drawable.ic_album_white_24dp);
}
@ -130,11 +129,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
navigationView.setNavigationItemSelectedListener(menuItem -> {
drawerLayout.closeDrawers();
switch (menuItem.getItemId()) {
case R.id.nav_library:
QueryUtil.currentLibrary = null;
navigationView.setCheckedItem(R.id.nav_library);
setCurrentFragment(LibraryFragment.newInstance());
break;
case R.id.nav_settings:
new Handler().postDelayed(() -> startActivity(new Intent(MainActivity.this, SettingsActivity.class)), 200);
break;
@ -143,17 +137,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
break;
}
// setCheckable must be applied to the items on creation
// it also applies a tacky background color for the checked item
// this is a hack to check the current item without that
for (int i = 0; i < navigationView.getMenu().size(); i++) {
if (navigationView.getMenu().getItem(i) == menuItem) {
navigationView.getMenu().getItem(i).setChecked(true);
} else {
navigationView.getMenu().getItem(i).setChecked(false);
}
}
for (BaseItemDto itemDto : libraries) {
if (menuItem.getItemId() == itemDto.getId().hashCode()) {
QueryUtil.currentLibrary = itemDto;
@ -162,6 +145,18 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
}
}
// setCheckable must be applied to the items on creation
// it also applies a tacky background color for the checked item
// this is a hack to check the current item without that
if (menuItem.getItemId() == R.id.nav_settings || menuItem.getItemId() == R.id.nav_about) return true;
for (int i = 0; i < navigationView.getMenu().size(); i++) {
if (navigationView.getMenu().getItem(i) == menuItem) {
navigationView.getMenu().getItem(i).setChecked(true);
} else {
navigationView.getMenu().getItem(i).setChecked(false);
}
}
return true;
});
}

9
app/src/main/res/menu/menu_drawer.xml
View file

@ -3,14 +3,7 @@
<group
android:id="@+id/navigation_drawer_menu_category_sections"
android:checkableBehavior="single">
<item
android:id="@+id/nav_library"
android:icon="@drawable/ic_library_music_white_24dp"
android:title="@string/all" />
</group>
android:checkableBehavior="single" />
<group
android:id="@+id/navigation_drawer_menu_category_other"