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

Add sort by year section thumb text (#659)

This commit is contained in:
wbarnard 2019-07-11 01:57:14 +08:00 committed by Synced Synapse
parent 3b2447607b
commit fd2d1359ac
4 changed files with 81 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java
View File

@ -30,6 +30,11 @@ abstract public class RecyclerViewCursorAdapter
private int rowIDColumn;
protected Cursor cursor;
// Section types
public static final int SECTION_TYPE_ALPHANUMERIC = 0,
SECTION_TYPE_YEAR_INTEGER = 1,
SECTION_TYPE_DATE_STRING = 2;
@Override
public void onBindViewHolder(CursorViewHolder holder, int position) {
if (!dataValid) {
@ -71,7 +76,21 @@ abstract public class RecyclerViewCursorAdapter
throw new IllegalStateException("Could not move cursor to position " + position);
}
return cursor.getString(getSectionColumnIdx()).substring(0, 1).toUpperCase();
int sectionType = getSectionType();
int sectionColumnIdx = getSectionColumnIdx();
String sectionName = "";
if (sectionType == SECTION_TYPE_YEAR_INTEGER) {
sectionName = String.format("%02d", cursor.getInt(sectionColumnIdx) % 100);
} else if (sectionType == SECTION_TYPE_DATE_STRING) {
String dateStr = cursor.getString(sectionColumnIdx);
if (dateStr.length() >= 4) {
sectionName = dateStr.substring(2, 4);
}
} else {
sectionName = cursor.getString(sectionColumnIdx).substring(0, 1).toUpperCase();
}
return sectionName;
}
/**
@ -82,6 +101,10 @@ abstract public class RecyclerViewCursorAdapter
*/
abstract protected int getSectionColumnIdx();
protected int getSectionType() {
return SECTION_TYPE_ALPHANUMERIC;
}
public void swapCursor(Cursor newCursor) {
if (newCursor == cursor) {
return;

20
app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
View File

@ -333,7 +333,25 @@ public class AlbumListFragment extends AbstractCursorListFragment {
}
};
protected int getSectionColumnIdx() { return AlbumListQuery.TITLE; }
protected int getSectionColumnIdx() {
int sortOrder = PreferenceManager.getDefaultSharedPreferences(fragment.getContext())
.getInt(Settings.KEY_PREF_ALBUMS_SORT_ORDER, Settings.DEFAULT_PREF_ALBUMS_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_YEAR) {
return AlbumListQuery.YEAR;
} else {
return AlbumListQuery.TITLE;
}
}
protected int getSectionType() {
int sortOrder = PreferenceManager.getDefaultSharedPreferences(fragment.getContext())
.getInt(Settings.KEY_PREF_ALBUMS_SORT_ORDER, Settings.DEFAULT_PREF_ALBUMS_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_YEAR) {
return RecyclerViewCursorAdapter.SECTION_TYPE_YEAR_INTEGER;
} else {
return RecyclerViewCursorAdapter.SECTION_TYPE_ALPHANUMERIC;
}
}
}
/**

20
app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
View File

@ -362,7 +362,25 @@ public class MovieListFragment extends AbstractCursorListFragment {
return new ViewHolder(view, getContext(), themeAccentColor, dimmedNeutralColor, hostManager, artWidth, artHeight);
}
protected int getSectionColumnIdx() { return MovieListQuery.TITLE; }
protected int getSectionColumnIdx() {
int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
.getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_YEAR) {
return MovieListQuery.YEAR;
} else {
return MovieListQuery.TITLE;
}
}
protected int getSectionType() {
int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
.getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_YEAR) {
return RecyclerViewCursorAdapter.SECTION_TYPE_YEAR_INTEGER;
} else {
return RecyclerViewCursorAdapter.SECTION_TYPE_ALPHANUMERIC;
}
}
}
/**

20
app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
View File

@ -354,7 +354,25 @@ public class TVShowListFragment extends AbstractCursorListFragment {
return viewHolder;
}
protected int getSectionColumnIdx() { return TVShowListQuery.TITLE; }
protected int getSectionColumnIdx() {
int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
.getInt(Settings.KEY_PREF_TVSHOWS_SORT_ORDER, Settings.DEFAULT_PREF_TVSHOWS_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_YEAR) {
return TVShowListQuery.PREMIERED;
} else {
return TVShowListQuery.TITLE;
}
}
protected int getSectionType() {
int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
.getInt(Settings.KEY_PREF_TVSHOWS_SORT_ORDER, Settings.DEFAULT_PREF_TVSHOWS_SORT_ORDER);
if (sortOrder == Settings.SORT_BY_YEAR) {
return RecyclerViewCursorAdapter.SECTION_TYPE_DATE_STRING;
} else {
return RecyclerViewCursorAdapter.SECTION_TYPE_ALPHANUMERIC;
}
}
}
/**