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

apply sort method on new queries

Browse source
This commit is contained in:
dkanada 2020-08-11 04:51:07 +09:00
commit f4ae4645d4
6 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
query.setStartIndex(getAdapter().getItemCount()); query.setStartIndex(getAdapter().getItemCount());
query.setParentId(QueryUtil.currentLibrary.getId()); query.setParentId(QueryUtil.currentLibrary.getId());
QueryUtil.applySortMethod(query, PreferenceUtil.getInstance(App.getInstance()).getAlbumSortMethod());
return query; return query;
} }

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

@ -51,11 +51,11 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
ArtistsQuery query = new ArtistsQuery(); ArtistsQuery query = new ArtistsQuery();
query.setFields(new ItemFields[]{ItemFields.Genres}); query.setFields(new ItemFields[]{ItemFields.Genres});
query.setParentId(QueryUtil.currentLibrary.getId());
query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
query.setStartIndex(getAdapter().getItemCount());
query.setUserId(App.getApiClient().getCurrentUserId()); query.setUserId(App.getApiClient().getCurrentUserId());
query.setRecursive(true); query.setRecursive(true);
query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
query.setStartIndex(getAdapter().getItemCount());
query.setParentId(QueryUtil.currentLibrary.getId());
return query; return query;
} }

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

@ -43,11 +43,11 @@ public class GenresFragment extends AbsLibraryPagerRecyclerViewFragment<GenreAda
protected ItemsByNameQuery createQuery() { protected ItemsByNameQuery createQuery() {
ItemsByNameQuery query = new ItemsByNameQuery(); ItemsByNameQuery query = new ItemsByNameQuery();
query.setParentId(QueryUtil.currentLibrary.getId());
query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
query.setUserId(App.getApiClient().getCurrentUserId()); query.setUserId(App.getApiClient().getCurrentUserId());
query.setStartIndex(getAdapter().getItemCount());
query.setRecursive(true); query.setRecursive(true);
query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
query.setStartIndex(getAdapter().getItemCount());
query.setParentId(QueryUtil.currentLibrary.getId());
return query; return query;
} }

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

@ -45,11 +45,11 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment<Playl
ItemQuery query = new ItemQuery(); ItemQuery query = new ItemQuery();
query.setIncludeItemTypes(new String[]{"Playlist"}); query.setIncludeItemTypes(new String[]{"Playlist"});
query.setParentId(QueryUtil.currentLibrary.getId());
query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
query.setStartIndex(getAdapter().getItemCount());
query.setUserId(App.getApiClient().getCurrentUserId()); query.setUserId(App.getApiClient().getCurrentUserId());
query.setRecursive(true); query.setRecursive(true);
query.setLimit(PreferenceUtil.getInstance(App.getInstance()).getMaximumListSize());
query.setStartIndex(getAdapter().getItemCount());
query.setParentId(QueryUtil.currentLibrary.getId());
return query; return query;
} }

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

@ -73,6 +73,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
query.setStartIndex(getAdapter().getItemCount()); query.setStartIndex(getAdapter().getItemCount());
query.setParentId(QueryUtil.currentLibrary.getId()); query.setParentId(QueryUtil.currentLibrary.getId());
QueryUtil.applySortMethod(query, PreferenceUtil.getInstance(App.getInstance()).getAlbumSortMethod());
return query; return query;
} }

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

@ -183,7 +183,7 @@ public class QueryUtil {
}); });
} }
private static void applyProperties(ItemQuery query) { public static void applyProperties(ItemQuery query) {
query.setUserId(App.getApiClient().getCurrentUserId()); query.setUserId(App.getApiClient().getCurrentUserId());
query.setRecursive(true); query.setRecursive(true);
if (query.getParentId() == null && query.getArtistIds().length == 0) { if (query.getParentId() == null && query.getArtistIds().length == 0) {
@ -194,7 +194,7 @@ public class QueryUtil {
if (query.getArtistIds().length == 0) query.setParentId(currentLibrary.getId()); if (query.getArtistIds().length == 0) query.setParentId(currentLibrary.getId());
} }
private static void applyProperties(ItemsByNameQuery query) { public static void applyProperties(ItemsByNameQuery query) {
query.setUserId(App.getApiClient().getCurrentUserId()); query.setUserId(App.getApiClient().getCurrentUserId());
query.setRecursive(true); query.setRecursive(true);
if (query.getParentId() == null) { if (query.getParentId() == null) {
@ -205,7 +205,7 @@ public class QueryUtil {
query.setParentId(currentLibrary.getId()); query.setParentId(currentLibrary.getId());
} }
private static void applySortMethod(ItemQuery query, String method) { public static void applySortMethod(ItemQuery query, String method) {
// album activity will always sort by track number // album activity will always sort by track number
if (query.getSortBy().length != 0) return; if (query.getSortBy().length != 0) return;