antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: corrected folder navigation, now displaying correct subfolders

Browse source
This commit is contained in:
antonio 2023-08-31 16:20:05 +02:00
parent 1a75369591
commit 2a74f51f8d
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicIndexAdapter.java
View file

@ -60,7 +60,7 @@ public class MusicIndexAdapter extends RecyclerView.Adapter<MusicIndexAdapter.Vi
@Override @Override
public String getTextToShowInBubble(int pos) { public String getTextToShowInBubble(int pos) {
return Character.toString(Objects.requireNonNull(artists.get(pos).getName().toUpperCase()).charAt(0)); return artists != null && !artists.isEmpty() ? Character.toString(Objects.requireNonNull(artists.get(pos).getName().toUpperCase()).charAt(0)) : null;
} }
public class ViewHolder extends RecyclerView.ViewHolder { public class ViewHolder extends RecyclerView.ViewHolder {

4
app/src/main/java/com/cappielloantonio/tempo/ui/fragment/IndexFragment.java
View file

@ -85,13 +85,15 @@ public class IndexFragment extends Fragment implements ClickCallback {
} }
private void initDirectoryListView() { private void initDirectoryListView() {
MusicFolder musicFolder = getArguments().getParcelable(Constants.MUSIC_FOLDER_OBJECT);
bind.indexRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.indexRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
bind.indexRecyclerView.setHasFixedSize(true); bind.indexRecyclerView.setHasFixedSize(true);
musicIndexAdapter = new MusicIndexAdapter(this); musicIndexAdapter = new MusicIndexAdapter(this);
bind.indexRecyclerView.setAdapter(musicIndexAdapter); bind.indexRecyclerView.setAdapter(musicIndexAdapter);
indexViewModel.getIndexes().observe(getViewLifecycleOwner(), indexes -> { indexViewModel.getIndexes(musicFolder != null ? musicFolder.getId() : null).observe(getViewLifecycleOwner(), indexes -> {
if (indexes != null) { if (indexes != null) {
musicIndexAdapter.setItems(IndexUtil.getArtist(indexes)); musicIndexAdapter.setItems(IndexUtil.getArtist(indexes));
} }

4
app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
View file

@ -23,8 +23,8 @@ public class IndexViewModel extends AndroidViewModel {
directoryRepository = new DirectoryRepository(); directoryRepository = new DirectoryRepository();
} }
public MutableLiveData<Indexes> getIndexes() { public MutableLiveData<Indexes> getIndexes(String musicFolderId) {
return directoryRepository.getIndexes(null, null); return directoryRepository.getIndexes(musicFolderId, null);
} }
public String getMusicFolderName() { public String getMusicFolderName() {