tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use enums for sort method and order

Browse source
This commit is contained in:
dkanada 2021-05-23 21:52:01 +09:00
commit 85704bb95b
15 changed files with 107 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
View file

@ -21,7 +21,6 @@ import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder;
import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.CustomPaletteTarget;
import com.dkanada.gramophone.helper.menu.SongsMenuHelper;
import com.dkanada.gramophone.helper.sort.SortMethod;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.util.MusicUtil;
@ -187,17 +186,17 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
public String getSectionName(int position) {
@Nullable String sectionName = null;
switch (PreferenceUtil.getInstance(activity).getAlbumSortMethod()) {
case SortMethod.NAME:
case NAME:
sectionName = dataSet.get(position).title;
break;
case SortMethod.ARTIST:
case ARTIST:
sectionName = dataSet.get(position).artistName;
break;
case SortMethod.YEAR:
case YEAR:
return MusicUtil.getYearString(dataSet.get(position).year);
case SortMethod.ADDED:
case ADDED:
return "";
case SortMethod.RANDOM:
case RANDOM:
return activity.getResources().getString(R.string.random);
}

13
app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
View file

@ -23,7 +23,6 @@ import com.dkanada.gramophone.glide.CustomPaletteTarget;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.SongMenuHelper;
import com.dkanada.gramophone.helper.menu.SongsMenuHelper;
import com.dkanada.gramophone.helper.sort.SortMethod;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Song;
@ -191,20 +190,20 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
@Nullable String sectionName = null;
switch (PreferenceUtil.getInstance(activity).getSongSortMethod()) {
case SortMethod.NAME:
case NAME:
sectionName = dataSet.get(position).title;
break;
case SortMethod.ALBUM:
case ALBUM:
sectionName = dataSet.get(position).albumName;
break;
case SortMethod.ARTIST:
case ARTIST:
sectionName = dataSet.get(position).artistName;
break;
case SortMethod.YEAR:
case YEAR:
return MusicUtil.getYearString(dataSet.get(position).year);
case SortMethod.ADDED:
case ADDED:
return "";
case SortMethod.RANDOM:
case RANDOM:
return activity.getResources().getString(R.string.random);
}