Add sort by year option for albums (#649)
This commit is contained in:
parent
87a18cfe51
commit
4043883a8a
|
@ -101,7 +101,8 @@ public class AlbumListFragment extends AbstractCursorListFragment {
|
||||||
|
|
||||||
MenuItem sortByAlbum = menu.findItem(R.id.action_sort_by_album),
|
MenuItem sortByAlbum = menu.findItem(R.id.action_sort_by_album),
|
||||||
sortByArtist = menu.findItem(R.id.action_sort_by_artist),
|
sortByArtist = menu.findItem(R.id.action_sort_by_artist),
|
||||||
sortByArtistYear = menu.findItem(R.id.action_sort_by_artist_year);
|
sortByArtistYear = menu.findItem(R.id.action_sort_by_artist_year),
|
||||||
|
sortByYear = menu.findItem(R.id.action_sort_by_year);
|
||||||
|
|
||||||
|
|
||||||
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
||||||
|
@ -117,6 +118,9 @@ public class AlbumListFragment extends AbstractCursorListFragment {
|
||||||
case Settings.SORT_BY_ARTIST_YEAR:
|
case Settings.SORT_BY_ARTIST_YEAR:
|
||||||
sortByArtistYear.setChecked(true);
|
sortByArtistYear.setChecked(true);
|
||||||
break;
|
break;
|
||||||
|
case Settings.SORT_BY_YEAR:
|
||||||
|
sortByYear.setChecked(true);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
}
|
}
|
||||||
|
@ -146,6 +150,13 @@ public class AlbumListFragment extends AbstractCursorListFragment {
|
||||||
.apply();
|
.apply();
|
||||||
refreshList();
|
refreshList();
|
||||||
break;
|
break;
|
||||||
|
case R.id.action_sort_by_year:
|
||||||
|
item.setChecked(!item.isChecked());
|
||||||
|
preferences.edit()
|
||||||
|
.putInt(Settings.KEY_PREF_ALBUMS_SORT_ORDER, Settings.SORT_BY_YEAR)
|
||||||
|
.apply();
|
||||||
|
refreshList();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -196,6 +207,8 @@ public class AlbumListFragment extends AbstractCursorListFragment {
|
||||||
sortOrderStr = AlbumListQuery.SORT_BY_ARTIST;
|
sortOrderStr = AlbumListQuery.SORT_BY_ARTIST;
|
||||||
} else if (sortOrder == Settings.SORT_BY_ARTIST_YEAR) {
|
} else if (sortOrder == Settings.SORT_BY_ARTIST_YEAR) {
|
||||||
sortOrderStr = AlbumListQuery.SORT_BY_ARTIST_YEAR;
|
sortOrderStr = AlbumListQuery.SORT_BY_ARTIST_YEAR;
|
||||||
|
} else if (sortOrder == Settings.SORT_BY_YEAR) {
|
||||||
|
sortOrderStr = AlbumListQuery.SORT_BY_YEAR;
|
||||||
} else {
|
} else {
|
||||||
sortOrderStr = AlbumListQuery.SORT_BY_ALBUM;
|
sortOrderStr = AlbumListQuery.SORT_BY_ALBUM;
|
||||||
}
|
}
|
||||||
|
@ -252,6 +265,8 @@ public class AlbumListFragment extends AbstractCursorListFragment {
|
||||||
String SORT_BY_ARTIST = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST) + " COLLATE NOCASE ASC";
|
String SORT_BY_ARTIST = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST) + " COLLATE NOCASE ASC";
|
||||||
String SORT_BY_ARTIST_YEAR = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST)
|
String SORT_BY_ARTIST_YEAR = MediaDatabase.sortCommonTokens(MediaContract.Albums.DISPLAYARTIST)
|
||||||
+ " COLLATE NOCASE ASC, " + MediaContract.Albums.YEAR + " ASC";
|
+ " COLLATE NOCASE ASC, " + MediaContract.Albums.YEAR + " ASC";
|
||||||
|
String SORT_BY_YEAR = MediaContract.Albums.YEAR + " ASC, "
|
||||||
|
+ MediaDatabase.sortCommonTokens(MediaContract.Albums.TITLE) + " COLLATE NOCASE ASC";
|
||||||
|
|
||||||
int ID = 0;
|
int ID = 0;
|
||||||
int ALBUMID = 1;
|
int ALBUMID = 1;
|
||||||
|
|
|
@ -29,6 +29,8 @@
|
||||||
android:title="@string/by_artist"/>
|
android:title="@string/by_artist"/>
|
||||||
<item android:id="@+id/action_sort_by_artist_year"
|
<item android:id="@+id/action_sort_by_artist_year"
|
||||||
android:title="@string/by_artist_and_year"/>
|
android:title="@string/by_artist_and_year"/>
|
||||||
|
<item android:id="@+id/action_sort_by_year"
|
||||||
|
android:title="@string/sort_by_year"/>
|
||||||
</group>
|
</group>
|
||||||
</menu>
|
</menu>
|
||||||
</item>
|
</item>
|
||||||
|
|
Loading…
Reference in New Issue