Added the ability to sort items in the artist catalogue

This commit is contained in:
antonio 2022-03-24 22:21:57 +01:00
parent 3c617570de
commit e6b997bc35
5 changed files with 70 additions and 0 deletions

View file

@ -18,11 +18,14 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.cappielloantonio.play.R;
import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.util.MusicUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
@ -160,4 +163,17 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
return true;
}
}
public void sort(String order) {
switch (order) {
case Artist.ORDER_BY_NAME:
artists.sort(Comparator.comparing(Artist::getName));
break;
case Artist.ORDER_BY_RANDOM:
Collections.shuffle(artists);
break;
}
notifyDataSetChanged();
}
}

View file

@ -20,6 +20,9 @@ public class Artist implements Parcelable {
public static final String DOWNLOADED = "DOWNLOADED";
public static final String STARRED = "STARRED";
public static final String ORDER_BY_NAME = "ORDER_BY_NAME";
public static final String ORDER_BY_RANDOM = "ORDER_BY_RANDOM";
private List<Album> albums;
private List<Artist> similarArtists;

View file

@ -11,6 +11,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.PopupMenu;
import android.widget.SearchView;
import androidx.annotation.NonNull;
@ -25,6 +26,8 @@ import com.cappielloantonio.play.R;
import com.cappielloantonio.play.adapter.ArtistCatalogueAdapter;
import com.cappielloantonio.play.databinding.FragmentArtistCatalogueBinding;
import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration;
import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.viewmodel.ArtistCatalogueViewModel;
@ -113,6 +116,8 @@ public class ArtistCatalogueFragment extends Fragment {
hideKeyboard(v);
return false;
});
bind.artistListSortImageView.setOnClickListener(view -> showPopupMenu(view, R.menu.sort_artist_popup_menu));
}
@Override
@ -144,4 +149,23 @@ public class ArtistCatalogueFragment extends Fragment {
InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
private void showPopupMenu(View view, int menuResource) {
PopupMenu popup = new PopupMenu(requireContext(), view);
popup.getMenuInflater().inflate(menuResource, popup.getMenu());
popup.setOnMenuItemClickListener(menuItem -> {
if (menuItem.getItemId() == R.id.menu_artist_sort_name) {
artistAdapter.sort(Artist.ORDER_BY_NAME);
return true;
} else if (menuItem.getItemId() == R.id.menu_artist_sort_random) {
artistAdapter.sort(Artist.ORDER_BY_RANDOM);
return true;
}
return false;
});
popup.show();
}
}