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

move library query to activity creation method

Browse source
This commit is contained in:
dkanada 2020-04-30 13:26:45 +09:00
commit 656cb8df9e
1 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,13 +69,39 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
navigationView.setFitsSystemWindows(false); navigationView.setFitsSystemWindows(false);
} }
setUpDrawerLayout(); Menu menu = navigationView.getMenu();
QueryUtil.getLibraries(new MediaCallback() {
@Override
public void onLoadMedia(List<?> media) {
libraries = (List<BaseItemDto>) media;
menu.clear();
if (savedInstanceState == null) { for (BaseItemDto itemDto : libraries) {
setCurrentFragment(LibraryFragment.newInstance()); if (menu.size() == 0) {
} else { QueryUtil.currentLibrary = itemDto;
restoreCurrentFragment(); }
}
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);
}
menu.add(R.id.navigation_drawer_menu_category_other, R.id.nav_settings, menu.size(), R.string.action_settings);
menu.getItem(menu.size() - 1).setIcon(R.drawable.ic_settings_white_24dp);
menu.add(R.id.navigation_drawer_menu_category_other, R.id.nav_about, menu.size(), R.string.action_about);
menu.getItem(menu.size() - 1).setIcon(R.drawable.ic_help_white_24dp);
setUpDrawerLayout();
menu.getItem(0).setChecked(true);
if (savedInstanceState == null) {
setCurrentFragment(LibraryFragment.newInstance());
} else {
restoreCurrentFragment();
}
}
});
} }
private void setCurrentFragment(@SuppressWarnings("NullableProblems") Fragment fragment) { private void setCurrentFragment(@SuppressWarnings("NullableProblems") Fragment fragment) {
@ -117,10 +143,20 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
break; 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) { for (BaseItemDto itemDto : libraries) {
if (menuItem.getItemId() == itemDto.getId().hashCode()) { if (menuItem.getItemId() == itemDto.getId().hashCode()) {
QueryUtil.currentLibrary = itemDto; QueryUtil.currentLibrary = itemDto;
navigationView.setCheckedItem(itemDto.getId().hashCode());
setCurrentFragment(LibraryFragment.newInstance()); setCurrentFragment(LibraryFragment.newInstance());
break; break;
} }
@ -145,26 +181,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
expandPanel(); expandPanel();
} }
}); });
Menu menu = navigationView.getMenu();
QueryUtil.getLibraries(new MediaCallback() {
@Override
public void onLoadMedia(List<?> media) {
libraries = (List<BaseItemDto>) media;
menu.clear();
for (BaseItemDto itemDto : libraries) {
if (itemDto.getCollectionType() == null || !itemDto.getCollectionType().equals("music")) continue;
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);
}
menu.add(R.id.navigation_drawer_menu_category_other, R.id.nav_settings, menu.size(), R.string.action_settings);
menu.getItem(menu.size() - 1).setIcon(R.drawable.ic_settings_white_24dp);
menu.add(R.id.navigation_drawer_menu_category_other, R.id.nav_about, menu.size(), R.string.action_about);
menu.getItem(menu.size() - 1).setIcon(R.drawable.ic_help_white_24dp);
}
});
} }
((TextView) navigationDrawerHeader.findViewById(R.id.title)).setText(song.title); ((TextView) navigationDrawerHeader.findViewById(R.id.title)).setText(song.title);