norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

cleanup some old sorting code

Browse Source 
* No need to call loadSortOrder()
* All adapters are now sortable
This commit is contained in:
Adrian Ulrich 2017-04-08 11:32:57 +02:00
parent 10878de963
commit 9e929ebb08
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/about.html
View File

@ -29,6 +29,9 @@ function show(n) {
<b>Changelog</b> [<a href='javascript:show("changelog")'>show</a>]
<pre id='changelog'>
<b>1.0.52</b>
- <b>NEW</b> Files can now be sorted
<b>1.0.51</b>
- <b>FIX</b> Read MIDI files
- <b>FIX</b> Fix tabs on Android 7.0

1
src/ch/blinkenlights/android/vanilla/LibraryActivity.java
View File

@ -759,7 +759,6 @@ public class LibraryActivity
LibraryAdapter adapter = mCurrentAdapter;
menu.findItem(MENU_GO_HOME).setVisible(
adapter != null && adapter.getMediaType() == MediaUtils.TYPE_FILE);
menu.findItem(MENU_SORT).setEnabled(adapter != null);
return super.onPrepareOptionsMenu(menu);
}

17
src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
View File

@ -347,8 +347,8 @@ public class LibraryPagerAdapter
mHeaderViews.add(header);
}
view.setAdapter(adapter);
if (adapter instanceof SortableAdapter)
loadSortOrder((SortableAdapter)adapter);
loadSortOrder((SortableAdapter)adapter);
adapter.setFilter(mFilter);
@ -473,35 +473,30 @@ public class LibraryPagerAdapter
mPendingArtistLimiter = null;
} else {
mArtistAdapter.setLimiter(null);
loadSortOrder(mArtistAdapter);
requestRequery(mArtistAdapter);
}
if (mAlbArtAdapter == null) {
mPendingAlbArtLimiter = null;
} else {
mAlbArtAdapter.setLimiter(null);
loadSortOrder(mAlbArtAdapter);
requestRequery(mAlbArtAdapter);
}
if (mComposerAdapter == null) {
mPendingComposerLimiter = null;
} else {
mComposerAdapter.setLimiter(null);
loadSortOrder(mComposerAdapter);
requestRequery(mComposerAdapter);
}
if (mAlbumAdapter == null) {
mPendingAlbumLimiter = null;
} else {
mAlbumAdapter.setLimiter(null);
loadSortOrder(mAlbumAdapter);
requestRequery(mAlbumAdapter);
}
if (mSongAdapter == null) {
mPendingSongLimiter = null;
} else {
mSongAdapter.setLimiter(null);
loadSortOrder(mSongAdapter);
requestRequery(mSongAdapter);
}
}
@ -525,7 +520,6 @@ public class LibraryPagerAdapter
mPendingSongLimiter = limiter;
} else {
mSongAdapter.setLimiter(limiter);
loadSortOrder(mSongAdapter);
requestRequery(mSongAdapter);
}
tab = getMediaTypePosition(MediaUtils.TYPE_SONG);
@ -537,14 +531,12 @@ public class LibraryPagerAdapter
mPendingAlbumLimiter = limiter;
} else {
mAlbumAdapter.setLimiter(limiter);
loadSortOrder(mAlbumAdapter);
requestRequery(mAlbumAdapter);
}
if (mSongAdapter == null) {
mPendingSongLimiter = limiter;
} else {
mSongAdapter.setLimiter(limiter);
loadSortOrder(mSongAdapter);
requestRequery(mSongAdapter);
}
tab = getMediaTypePosition(MediaUtils.TYPE_ALBUM);
@ -556,35 +548,30 @@ public class LibraryPagerAdapter
mPendingArtistLimiter = limiter;
} else {
mArtistAdapter.setLimiter(limiter);
loadSortOrder(mArtistAdapter);
requestRequery(mArtistAdapter);
}
if (mAlbArtAdapter == null) {
mPendingAlbArtLimiter = limiter;
} else {
mAlbArtAdapter.setLimiter(limiter);
loadSortOrder(mAlbArtAdapter);
requestRequery(mAlbArtAdapter);
}
if (mComposerAdapter == null) {
mPendingComposerLimiter = limiter;
} else {
mComposerAdapter.setLimiter(limiter);
loadSortOrder(mComposerAdapter);
requestRequery(mComposerAdapter);
}
if (mAlbumAdapter == null) {
mPendingAlbumLimiter = limiter;
} else {
mAlbumAdapter.setLimiter(limiter);
loadSortOrder(mAlbumAdapter);
requestRequery(mAlbumAdapter);
}
if (mSongAdapter == null) {
mPendingSongLimiter = limiter;
} else {
mSongAdapter.setLimiter(limiter);
loadSortOrder(mSongAdapter);
requestRequery(mSongAdapter);
}
tab = getMediaTypePosition(MediaUtils.TYPE_ARTIST);