Added the ability to sort items in the playlist catalogue

This commit is contained in:
antonio 2022-03-24 22:22:53 +01:00
parent 3eee78ad4e
commit f3f3c696f3
5 changed files with 69 additions and 0 deletions

View file

@ -15,12 +15,15 @@ import androidx.navigation.Navigation;
import androidx.recyclerview.widget.RecyclerView;
import com.cappielloantonio.play.R;
import com.cappielloantonio.play.model.Genre;
import com.cappielloantonio.play.model.Playlist;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.ui.dialog.PlaylistEditorDialog;
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;
@ -158,4 +161,17 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
return true;
}
}
public void sort(String order) {
switch (order) {
case Playlist.ORDER_BY_NAME:
playlists.sort(Comparator.comparing(Playlist::getName));
break;
case Playlist.ORDER_BY_RANDOM:
Collections.shuffle(playlists);
break;
}
notifyDataSetChanged();
}
}

View file

@ -14,6 +14,9 @@ public class Playlist implements Parcelable {
public static final String ALL = "ALL";
public static final String DOWNLOADED = "DOWNLOADED";
public static final String ORDER_BY_NAME = "ORDER_BY_NAME";
public static final String ORDER_BY_RANDOM = "ORDER_BY_RANDOM";
@NonNull
@PrimaryKey
@ColumnInfo(name = "id")

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;
@ -23,6 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.cappielloantonio.play.R;
import com.cappielloantonio.play.adapter.PlaylistHorizontalAdapter;
import com.cappielloantonio.play.databinding.FragmentPlaylistCatalogueBinding;
import com.cappielloantonio.play.model.Genre;
import com.cappielloantonio.play.model.Playlist;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.viewmodel.PlaylistCatalogueViewModel;
@ -144,6 +146,8 @@ public class PlaylistCatalogueFragment extends Fragment {
hideKeyboard(v);
return false;
});
bind.playlistListSortImageView.setOnClickListener(view -> showPopupMenu(view, R.menu.sort_playlist_popup_menu));
}
@Override
@ -175,4 +179,23 @@ public class PlaylistCatalogueFragment 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_playlist_sort_name) {
playlistHorizontalAdapter.sort(Genre.ORDER_BY_NAME);
return true;
} else if (menuItem.getItemId() == R.id.menu_playlist_sort_random) {
playlistHorizontalAdapter.sort(Genre.ORDER_BY_RANDOM);
return true;
}
return false;
});
popup.show();
}
}

View file

@ -41,6 +41,24 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="parent" />
<Button
android:id="@+id/playlist_list_sort_image_view"
style="@style/Widget.Material3.Button.TonalButton.Icon"
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="12dp"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
app:cornerRadius="30dp"
app:icon="@drawable/ic_sort_list"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.AppBarLayout>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_playlist_sort_name"
android:title="@string/menu_sort_name" />
<item
android:id="@+id/menu_playlist_sort_random"
android:title="@string/menu_sort_random" />
</menu>