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

allow sorting by date added

Browse source
This commit is contained in:
Benoît Dardenne 2020-07-10 23:11:28 +02:00 • committed by dkanada
commit e8ef0b972d
10 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,6 +197,8 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
break;
case SortMethod.YEAR:
return MusicUtil.getYearString(dataSet.get(position).year);
case SortMethod.ADDED:
return "";
case SortMethod.RANDOM:
return activity.getResources().getString(R.string.random);
}

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

@ -202,6 +202,8 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
break;
case SortMethod.YEAR:
return MusicUtil.getYearString(dataSet.get(position).year);
case SortMethod.ADDED:
return "";
case SortMethod.RANDOM:
return activity.getResources().getString(R.string.random);
}

1
app/src/main/java/com/dkanada/gramophone/helper/sort/SortMethod.java
View file

@ -5,5 +5,6 @@ public class SortMethod {
public static final String ALBUM = "ALBUM";
public static final String ARTIST = "ARTIST";
public static final String YEAR = "YEAR";
public static final String ADDED = "ADDED";
public static final String RANDOM = "RANDOM";
}

11
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
View file

@ -368,7 +368,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
.setChecked(currentSortMethod.equals(SortMethod.ARTIST));
sortMethodMenu.add(0, R.id.action_sort_method_year, 2, R.string.sort_method_year)
.setChecked(currentSortMethod.equals(SortMethod.YEAR));
sortMethodMenu.add(0, R.id.action_sort_method_random, 3, R.string.sort_method_random)
sortMethodMenu.add(0, R.id.action_sort_method_added, 3, R.string.sort_method_added)
.setChecked(currentSortMethod.equals(SortMethod.ADDED));
sortMethodMenu.add(0, R.id.action_sort_method_random, 4, R.string.sort_method_random)
.setChecked(currentSortMethod.equals(SortMethod.RANDOM));
} else if (fragment instanceof SongsFragment) {
sortMethodMenu.add(0, R.id.action_sort_method_name, 0, R.string.sort_method_name)
@ -379,7 +381,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
.setChecked(currentSortMethod.equals(SortMethod.ARTIST));
sortMethodMenu.add(0, R.id.action_sort_method_year, 3, R.string.sort_method_year)
.setChecked(currentSortMethod.equals(SortMethod.YEAR));
sortMethodMenu.add(0, R.id.action_sort_method_random, 4, R.string.sort_method_random)
sortMethodMenu.add(0, R.id.action_sort_method_added, 4, R.string.sort_method_added)
.setChecked(currentSortMethod.equals(SortMethod.ADDED));
sortMethodMenu.add(0, R.id.action_sort_method_random, 5, R.string.sort_method_random)
.setChecked(currentSortMethod.equals(SortMethod.RANDOM));
}
@ -413,6 +417,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
case R.id.action_sort_method_year:
sortMethod = SortMethod.YEAR;
break;
case R.id.action_sort_method_added:
sortMethod = SortMethod.ADDED;
break;
case R.id.action_sort_method_random:
sortMethod = SortMethod.RANDOM;
break;

1
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
View file

@ -82,6 +82,7 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
this.sortMethod = sortMethod;
saveSortMethod(sortMethod);
setSortMethod(sortMethod);
invalidateAdapter();
}
public boolean canUsePalette() {

1
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
View file

@ -38,6 +38,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
QueryUtil.getAlbums(new ItemQuery(), new MediaCallback() {
@Override
public void onLoadMedia(List<?> media) {
dataSet.clear();
dataSet.addAll((Collection<Album>) media);
adapter.notifyDataSetChanged();
}

1
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
View file

@ -58,6 +58,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
QueryUtil.getSongs(new ItemQuery(), new MediaCallback() {
@Override
public void onLoadMedia(List<?> media) {
dataSet.clear();
dataSet.addAll((Collection<Song>) media);
adapter.notifyDataSetChanged();
}

4
app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
View file

@ -12,6 +12,7 @@ import com.dkanada.gramophone.model.Song;
import org.jellyfin.apiclient.interaction.Response;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.BaseItemType;
import org.jellyfin.apiclient.model.entities.SortOrder;
import org.jellyfin.apiclient.model.querying.ArtistsQuery;
import org.jellyfin.apiclient.model.querying.ItemFields;
import org.jellyfin.apiclient.model.querying.ItemQuery;
@ -221,6 +222,9 @@ public class QueryUtil {
case SortMethod.YEAR:
query.setSortBy(new String[]{"ProductionYear"});
break;
case SortMethod.ADDED:
query.setSortBy(new String[]{"DateCreated"});
break;
case SortMethod.RANDOM:
query.setSortBy(new String[]{"Random"});
break;

3
app/src/main/res/values/ids.xml
View file

@ -10,8 +10,9 @@
<item name="action_sort_method_album" type="id" />
<item name="action_sort_method_artist" type="id" />
<item name="action_sort_method_year" type="id" />
<item name="action_sort_method_added" type="id" />
<item name="action_sort_method_random" type="id" />
<item name="action_multi_select_adapter_check_all" type="id" />
</resources>
</resources>

1
app/src/main/res/values/strings.xml
View file

@ -208,6 +208,7 @@
<string name="sort_method_artist">Artist</string>
<string name="sort_method_album">Album</string>
<string name="sort_method_year">Year</string>
<string name="sort_method_added">Added</string>
<string name="sort_method_random">Random</string>
<string name="finish_current_music_sleep_timer">Finish last song</string>