Add ability to sort by year, rating and length in the Movie fragment
This commit is contained in:
parent
fce521a9bb
commit
63c32467d4
|
@ -35,7 +35,10 @@ public interface Settings {
|
||||||
|
|
||||||
// Sort orders
|
// Sort orders
|
||||||
public static final int SORT_BY_NAME = 0,
|
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.
|
* Preferences keys.
|
||||||
|
|
|
@ -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);
|
int sortOrder = preferences.getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
|
||||||
if (sortOrder == Settings.SORT_BY_DATE_ADDED) {
|
if (sortOrder == Settings.SORT_BY_DATE_ADDED) {
|
||||||
sortOrderStr = MovieListQuery.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 {
|
} else {
|
||||||
// Sort by name
|
// Sort by name
|
||||||
if (preferences.getBoolean(Settings.KEY_PREF_MOVIES_IGNORE_PREFIXES, Settings.DEFAULT_PREF_MOVIES_IGNORE_PREFIXES)) {
|
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),
|
MenuItem hideWatched = menu.findItem(R.id.action_hide_watched),
|
||||||
ignoreArticles = menu.findItem(R.id.action_ignore_prefixes),
|
ignoreArticles = menu.findItem(R.id.action_ignore_prefixes),
|
||||||
sortByName = menu.findItem(R.id.action_sort_by_name),
|
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());
|
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
||||||
hideWatched.setChecked(preferences.getBoolean(Settings.KEY_PREF_MOVIES_FILTER_HIDE_WATCHED, Settings.DEFAULT_PREF_MOVIES_FILTER_HIDE_WATCHED));
|
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);
|
int sortOrder = preferences.getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
|
||||||
switch (sortOrder) {
|
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:
|
case Settings.SORT_BY_DATE_ADDED:
|
||||||
sortByDateAdded.setChecked(true);
|
sortByDateAdded.setChecked(true);
|
||||||
break;
|
break;
|
||||||
|
case Settings.SORT_BY_LENGTH:
|
||||||
|
sortByLength.setChecked(true);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
sortByName.setChecked(true);
|
sortByName.setChecked(true);
|
||||||
break;
|
break;
|
||||||
|
@ -202,6 +221,20 @@ public class MovieListFragment extends AbstractListFragment {
|
||||||
.apply();
|
.apply();
|
||||||
refreshList();
|
refreshList();
|
||||||
break;
|
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:
|
case R.id.action_sort_by_date_added:
|
||||||
item.setChecked(true);
|
item.setChecked(true);
|
||||||
preferences.edit()
|
preferences.edit()
|
||||||
|
@ -209,6 +242,13 @@ public class MovieListFragment extends AbstractListFragment {
|
||||||
.apply();
|
.apply();
|
||||||
refreshList();
|
refreshList();
|
||||||
break;
|
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:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -232,8 +272,12 @@ public class MovieListFragment extends AbstractListFragment {
|
||||||
MediaContract.Movies.TAGLINE,
|
MediaContract.Movies.TAGLINE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
String SORT_BY_NAME = MediaContract.Movies.TITLE + " ASC";
|
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_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";
|
String SORT_BY_NAME_IGNORE_ARTICLES = MediaDatabase.sortCommonTokens(MediaContract.Movies.TITLE) + " ASC";
|
||||||
|
|
||||||
final int ID = 0;
|
final int ID = 0;
|
||||||
|
|
|
@ -34,10 +34,22 @@
|
||||||
android:id="@+id/action_sort_by_name"
|
android:id="@+id/action_sort_by_name"
|
||||||
android:title="@string/sort_by_name"
|
android:title="@string/sort_by_name"
|
||||||
app:showAsAction="never"/>
|
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
|
<item
|
||||||
android:id="@+id/action_sort_by_date_added"
|
android:id="@+id/action_sort_by_date_added"
|
||||||
android:title="@string/sort_by_date_added"
|
android:title="@string/sort_by_date_added"
|
||||||
app:showAsAction="never"/>
|
app:showAsAction="never"/>
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_sort_by_length"
|
||||||
|
android:title="@string/sort_by_length"
|
||||||
|
app:showAsAction="never"/>
|
||||||
</group>
|
</group>
|
||||||
<group
|
<group
|
||||||
android:checkableBehavior="all">
|
android:checkableBehavior="all">
|
||||||
|
|
|
@ -301,6 +301,9 @@
|
||||||
<string name="hide_watched">Hide watched</string>
|
<string name="hide_watched">Hide watched</string>
|
||||||
<string name="sort_order">Sort</string>
|
<string name="sort_order">Sort</string>
|
||||||
<string name="sort_by_name">By name</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="sort_by_date_added">By date added</string>
|
||||||
<string name="ignore_prefixes">Ignore prefixes</string>
|
<string name="ignore_prefixes">Ignore prefixes</string>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue