feat: added sorting by newest album added

This commit is contained in:
CappielloAntonio 2024-03-16 16:28:33 +01:00
parent 302458e76b
commit 2712b73dac
7 changed files with 47 additions and 0 deletions

View file

@ -161,6 +161,10 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
case Constants.ALBUM_ORDER_BY_RANDOM:
Collections.shuffle(albums);
break;
case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
albums.sort(Comparator.comparing(AlbumID3::getCreated));
Collections.reverse(albums);
break;
}
notifyDataSetChanged();

View file

@ -67,6 +67,7 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
initAppBar();
initAlbumCatalogueView();
initProgressLoader();
return view;
}
@ -124,6 +125,18 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
bind.albumListSortImageView.setOnClickListener(view -> showPopupMenu(view, R.menu.sort_album_popup_menu));
}
private void initProgressLoader() {
albumCatalogueViewModel.getLoadingStatus().observe(getViewLifecycleOwner(), isLoading -> {
if (isLoading) {
bind.albumListSortImageView.setEnabled(false);
bind.albumListProgressLoader.setVisibility(View.VISIBLE);
} else {
bind.albumListSortImageView.setEnabled(true);
bind.albumListProgressLoader.setVisibility(View.GONE);
}
});
}
@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
inflater.inflate(R.menu.toolbar_menu, menu);
@ -171,6 +184,9 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
} else if (menuItem.getItemId() == R.id.menu_album_sort_random) {
albumAdapter.sort(Constants.ALBUM_ORDER_BY_RANDOM);
return true;
} else if (menuItem.getItemId() == R.id.menu_album_sort_recently_added) {
albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_ADDED);
return true;
}
return false;

View file

@ -30,6 +30,7 @@ object Constants {
const val ALBUM_ORDER_BY_ARTIST = "ALBUM_ORDER_BY_ARTIST"
const val ALBUM_ORDER_BY_YEAR = "ALBUM_ORDER_BY_YEAR"
const val ALBUM_ORDER_BY_RANDOM = "ALBUM_ORDER_BY_RANDOM"
const val ALBUM_ORDER_BY_RECENTLY_ADDED = "ALBUM_ORDER_BY_RECENTLY_ADDED"
const val ARTIST_DOWNLOADED = "ARTIST_DOWNLOADED"
const val ARTIST_STARRED = "ARTIST_STARRED"

View file

@ -20,6 +20,7 @@ import retrofit2.Callback;
public class AlbumCatalogueViewModel extends AndroidViewModel {
private final MutableLiveData<List<AlbumID3>> albumList = new MutableLiveData<>(new ArrayList<>());
private final MutableLiveData<Boolean> loading = new MutableLiveData<>(true);
private int page = 0;
private Status status = Status.STOPPED;
@ -32,6 +33,10 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
return albumList;
}
public LiveData<Boolean> getLoadingStatus() {
return loading;
}
public void loadAlbums() {
page = 0;
status = Status.RUNNING;
@ -52,6 +57,7 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
@Override
public void onLoadMedia(List<?> media) {
if (status == Status.STOPPED) {
loading.setValue(false);
return;
}
@ -62,8 +68,10 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
if (media.size() == size) {
loadAlbums(size);
loading.setValue(true);
} else {
status = Status.STOPPED;
loading.setValue(false);
}
}
}, size, size * page++);