SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ability to sort by year, rating and length in the Movie fragment

This commit is contained in:
Raafat Akkad 2015-10-11 14:20:59 +01:00 committed by Daniel Levin
parent fce521a9bb
commit 63c32467d4
4 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/xbmc/kore/Settings.java
View File

@ -35,7 +35,10 @@ public interface Settings {
// Sort orders
public static final int SORT_BY_NAME = 0,
SORT_BY_DATE_ADDED = 1;
SORT_BY_DATE_ADDED = 1,
SORT_BY_RATING = 2,
SORT_BY_YEAR = 3,
SORT_BY_LENGTH = 4;
/**
* Preferences keys.

46
app/src/main/java/org/xbmc/kore/ui/MovieListFragment.java
View File

@ -109,6 +109,12 @@ public class MovieListFragment extends AbstractListFragment {
int sortOrder = preferences.getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_DATE_ADDED) {
sortOrderStr = MovieListQuery.SORT_BY_DATE_ADDED;
} else if (sortOrder == Settings.SORT_BY_RATING) {
sortOrderStr = MovieListQuery.SORT_BY_RATING;
} else if (sortOrder == Settings.SORT_BY_YEAR) {
sortOrderStr = MovieListQuery.SORT_BY_YEAR;
} else if (sortOrder == Settings.SORT_BY_LENGTH) {
sortOrderStr = MovieListQuery.SORT_BY_LENGTH;
} else {
// Sort by name
if (preferences.getBoolean(Settings.KEY_PREF_MOVIES_IGNORE_PREFIXES, Settings.DEFAULT_PREF_MOVIES_IGNORE_PREFIXES)) {
@ -158,7 +164,11 @@ public class MovieListFragment extends AbstractListFragment {
MenuItem hideWatched = menu.findItem(R.id.action_hide_watched),
ignoreArticles = menu.findItem(R.id.action_ignore_prefixes),
sortByName = menu.findItem(R.id.action_sort_by_name),
sortByDateAdded = menu.findItem(R.id.action_sort_by_date_added);
sortByYear = menu.findItem(R.id.action_sort_by_year),
sortByRating = menu.findItem(R.id.action_sort_by_rating),
sortByDateAdded = menu.findItem(R.id.action_sort_by_date_added),
sortByLength = menu.findItem(R.id.action_sort_by_length);
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
hideWatched.setChecked(preferences.getBoolean(Settings.KEY_PREF_MOVIES_FILTER_HIDE_WATCHED, Settings.DEFAULT_PREF_MOVIES_FILTER_HIDE_WATCHED));
@ -166,9 +176,18 @@ public class MovieListFragment extends AbstractListFragment {
int sortOrder = preferences.getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
switch (sortOrder) {
case Settings.SORT_BY_YEAR:
sortByYear.setChecked(true);
break;
case Settings.SORT_BY_RATING:
sortByRating.setChecked(true);
break;
case Settings.SORT_BY_DATE_ADDED:
sortByDateAdded.setChecked(true);
break;
case Settings.SORT_BY_LENGTH:
sortByLength.setChecked(true);
break;
default:
sortByName.setChecked(true);
break;
@ -202,6 +221,20 @@ public class MovieListFragment extends AbstractListFragment {
.apply();
refreshList();
break;
case R.id.action_sort_by_year:
item.setChecked(true);
preferences.edit()
.putInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.SORT_BY_YEAR)
.apply();
refreshList();
break;
case R.id.action_sort_by_rating:
item.setChecked(true);
preferences.edit()
.putInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.SORT_BY_RATING)
.apply();
refreshList();
break;
case R.id.action_sort_by_date_added:
item.setChecked(true);
preferences.edit()
@ -209,6 +242,13 @@ public class MovieListFragment extends AbstractListFragment {
.apply();
refreshList();
break;
case R.id.action_sort_by_length:
item.setChecked(true);
preferences.edit()
.putInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.SORT_BY_LENGTH)
.apply();
refreshList();
break;
default:
break;
}
@ -232,8 +272,12 @@ public class MovieListFragment extends AbstractListFragment {
MediaContract.Movies.TAGLINE,
};
String SORT_BY_NAME = MediaContract.Movies.TITLE + " ASC";
String SORT_BY_YEAR = MediaContract.Movies.YEAR + " ASC";
String SORT_BY_RATING = MediaContract.Movies.RATING + " DESC";
String SORT_BY_DATE_ADDED = MediaContract.Movies.DATEADDED + " DESC";
String SORT_BY_LENGTH = MediaContract.Movies.RUNTIME + " DESC";
String SORT_BY_NAME_IGNORE_ARTICLES = MediaDatabase.sortCommonTokens(MediaContract.Movies.TITLE) + " ASC";
final int ID = 0;

12
app/src/main/res/menu/movie_list.xml
View File

@ -34,10 +34,22 @@
android:id="@+id/action_sort_by_name"
android:title="@string/sort_by_name"
app:showAsAction="never"/>
<item
android:id="@+id/action_sort_by_year"
android:title="@string/sort_by_year"
app:showAsAction="never"/>
<item
android:id="@+id/action_sort_by_rating"
android:title="@string/sort_by_rating"
app:showAsAction="never"/>
<item
android:id="@+id/action_sort_by_date_added"
android:title="@string/sort_by_date_added"
app:showAsAction="never"/>
<item
android:id="@+id/action_sort_by_length"
android:title="@string/sort_by_length"
app:showAsAction="never"/>
</group>
<group
android:checkableBehavior="all">

3
app/src/main/res/values/strings.xml
View File

@ -301,6 +301,9 @@
<string name="hide_watched">Hide watched</string>
<string name="sort_order">Sort</string>
<string name="sort_by_name">By name</string>
<string name="sort_by_year">By year</string>
<string name="sort_by_rating">By rating</string>
<string name="sort_by_length">By length</string>
<string name="sort_by_date_added">By date added</string>
<string name="ignore_prefixes">Ignore prefixes</string>