Change default sorting method

This commit is contained in:
len 2016-05-26 14:46:31 +02:00
parent a08cea9df8
commit b5dbdd1774
2 changed files with 9 additions and 9 deletions

View File

@ -83,8 +83,8 @@ public class Manga implements Serializable {
public static final int SHOW_NOT_DOWNLOADED = 0x00000010; public static final int SHOW_NOT_DOWNLOADED = 0x00000010;
public static final int DOWNLOADED_MASK = 0x00000018; public static final int DOWNLOADED_MASK = 0x00000018;
public static final int SORTING_NUMBER = 0x00000000; public static final int SORTING_SOURCE = 0x00000000;
public static final int SORTING_SOURCE = 0x00000100; public static final int SORTING_NUMBER = 0x00000100;
public static final int SORTING_MASK = 0x00000100; public static final int SORTING_MASK = 0x00000100;
public static final int DISPLAY_NAME = 0x00000000; public static final int DISPLAY_NAME = 0x00000000;

View File

@ -214,16 +214,16 @@ class ChaptersFragment : BaseRxFragment<ChaptersPresenter>(), ActionMode.Callbac
private fun showSortingDialog() { private fun showSortingDialog() {
// Get available modes, ids and the selected mode // Get available modes, ids and the selected mode
val modes = intArrayOf(R.string.sort_by_number, R.string.sort_by_source) val modes = intArrayOf(R.string.sort_by_source, R.string.sort_by_number)
val ids = intArrayOf(Manga.SORTING_NUMBER, Manga.SORTING_SOURCE) val ids = intArrayOf(Manga.SORTING_SOURCE, Manga.SORTING_NUMBER)
val selectedIndex = if (presenter.manga.sorting == Manga.SORTING_NUMBER) 0 else 1 val selectedIndex = if (presenter.manga.sorting == Manga.SORTING_SOURCE) 0 else 1
MaterialDialog.Builder(activity) MaterialDialog.Builder(activity)
.title(R.string.sorting_mode) .title(R.string.sorting_mode)
.items(modes.map { getString(it) }) .items(modes.map { getString(it) })
.itemsIds(ids) .itemsIds(ids)
.itemsCallbackSingleChoice(selectedIndex) { dialog, itemView, which, text -> .itemsCallbackSingleChoice(selectedIndex) { dialog, itemView, which, text ->
// Save the new display mode // Save the new sorting mode
presenter.setSorting(itemView.id) presenter.setSorting(itemView.id)
true true
} }
@ -232,13 +232,13 @@ class ChaptersFragment : BaseRxFragment<ChaptersPresenter>(), ActionMode.Callbac
private fun showDownloadDialog() { private fun showDownloadDialog() {
// Get available modes // Get available modes
val modes = listOf(getString(R.string.download_1), getString(R.string.download_5), getString(R.string.download_10), val modes = intArrayOf(R.string.download_1, R.string.download_5, R.string.download_10,
getString(R.string.download_unread), getString(R.string.download_all)) R.string.download_unread, R.string.download_all)
MaterialDialog.Builder(activity) MaterialDialog.Builder(activity)
.title(R.string.manga_download) .title(R.string.manga_download)
.negativeText(android.R.string.cancel) .negativeText(android.R.string.cancel)
.items(modes) .items(modes.map { getString(it) })
.itemsCallback { dialog, view, i, charSequence -> .itemsCallback { dialog, view, i, charSequence ->
var chapters: MutableList<Chapter> = arrayListOf() var chapters: MutableList<Chapter> = arrayListOf()