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

Merge pull request #150 from GallowsDove/album-catalogue-fixes

Browse source 
fix: fix loading and filtering issues with AlbumCatalogue
This commit is contained in:
CappielloAntonio 2024-01-28 19:08:35 +01:00 • committed by GitHub
commit d690df86d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
View file

@ -23,6 +23,8 @@ import java.util.List;
public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> implements Filterable {
private final ClickCallback click;
private String currentFilter;
private final Filter filtering = new Filter() {
@Override
protected FilterResults performFiltering(CharSequence constraint) {
@ -32,6 +34,7 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
filteredList.addAll(albumsFull);
} else {
String filterPattern = constraint.toString().toLowerCase().trim();
currentFilter = filterPattern;
for (AlbumID3 item : albumsFull) {
if (item.getName().toLowerCase().contains(filterPattern)) {
@ -48,8 +51,7 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
@Override
protected void publishResults(CharSequence constraint, FilterResults results) {
albums.clear();
albums.addAll((List) results.values);
albums = (List) results.values;
notifyDataSetChanged();
}
};
@ -60,6 +62,8 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
public AlbumCatalogueAdapter(ClickCallback click) {
this.click = click;
this.albums = Collections.emptyList();
this.albumsFull = Collections.emptyList();
this.currentFilter = "";
}
@NonNull
@ -92,9 +96,8 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
}
public void setItems(List<AlbumID3> albums) {
this.albums = albums;
this.albumsFull = new ArrayList<>(albums);
notifyDataSetChanged();
filtering.filter(currentFilter);
}
@Override

8
app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java
View file

@ -52,6 +52,12 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
initData();
}
@Override
public void onDestroy() {
super.onDestroy();
albumCatalogueViewModel.stopLoading();
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
activity = (MainActivity) getActivity();
@ -73,7 +79,7 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
private void initData() {
albumCatalogueViewModel = new ViewModelProvider(requireActivity()).get(AlbumCatalogueViewModel.class);
albumCatalogueViewModel.loadAlbums(500);
albumCatalogueViewModel.loadAlbums();
}
private void initAppBar() {

26
app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumCatalogueViewModel.java
View file

@ -1,6 +1,7 @@
package com.cappielloantonio.tempo.viewmodel;
import android.app.Application;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
@ -22,6 +23,7 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
private final MutableLiveData<List<AlbumID3>> albumList = new MutableLiveData<>(new ArrayList<>());
private int page = 0;
private Status status = Status.STOPPED;
public AlbumCatalogueViewModel(@NonNull Application application) {
super(application);
@ -31,7 +33,18 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
return albumList;
}
public void loadAlbums(int size) {
public void loadAlbums() {
page = 0;
albumList.setValue(new ArrayList<>());
status = Status.RUNNING;
loadAlbums(500);
}
public void stopLoading() {
status = Status.STOPPED;
}
private void loadAlbums(int size) {
retrieveAlbums(new MediaCallback() {
@Override
public void onError(Exception exception) {
@ -39,9 +52,11 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
@Override
public void onLoadMedia(List<?> media) {
List<AlbumID3> liveAlbum = albumList.getValue();
if (status == Status.STOPPED) {
return;
}
if (liveAlbum == null) liveAlbum = new ArrayList<>();
List<AlbumID3> liveAlbum = albumList.getValue();
liveAlbum.addAll((List<AlbumID3>) media);
albumList.setValue(liveAlbum);
@ -73,4 +88,9 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
}
});
}
private enum Status {
RUNNING,
STOPPED
}
}