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

Support song ordering; add/fix album year sort

Browse source
This commit is contained in:
Nicholas Narsing 2018-04-28 11:47:05 -04:00
commit 60cb868beb
No known key found for this signature in database
GPG key ID: 6C867A2AC16B645A
8 changed files with 69 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
View file

@ -198,8 +198,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
sectionName = dataSet.get(position).getArtistName();
break;
case SortOrder.AlbumSortOrder.ALBUM_YEAR:
sectionName = Integer.toString(dataSet.get(position).getYear());
break;
return Integer.toString(dataSet.get(position).getYear());
}
return MusicUtil.getSectionName(sectionName);

32
app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
View file

@ -190,24 +190,22 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
return "";
}
// @Nullable String sectionName = null;
// switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
// case SortOrder.SongSortOrder.SONG_A_Z:
// case SortOrder.SongSortOrder.SONG_Z_A:
// sectionName = dataSet.get(position).title;
// break;
// case SortOrder.SongSortOrder.SONG_ALBUM:
// sectionName = dataSet.get(position).albumName;
// break;
// case SortOrder.SongSortOrder.SONG_ARTIST:
// sectionName = dataSet.get(position).artistName;
// break;
// case SortOrder.SongSortOrder.SONG_YEAR:
// sectionName = Integer.toString(dataSet.get(position).year);
// break;
// }
@Nullable String sectionName = null;
switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
case SortOrder.SongSortOrder.SONG_A_Z:
case SortOrder.SongSortOrder.SONG_Z_A:
sectionName = dataSet.get(position).title;
break;
case SortOrder.SongSortOrder.SONG_ALBUM:
sectionName = dataSet.get(position).albumName;
break;
case SortOrder.SongSortOrder.SONG_ARTIST:
sectionName = dataSet.get(position).artistName;
break;
case SortOrder.SongSortOrder.SONG_YEAR:
return Integer.toString(dataSet.get(position).year);
}
String sectionName = dataSet.get(position).title;
return MusicUtil.getSectionName(sectionName);
}