mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-12-25 02:18:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added sorting by upload date

Browse Source 
Spanish 'strings' contains the proper translation for the new feature.
This commit is contained in:
Lautaro Martin Emanuel 2020-05-14 23:38:19 -03:00
parent a9d16fad34
commit ee8c71c14a
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View File

@ -78,7 +78,8 @@ interface Manga : SManga {
const val SORTING_SOURCE = 0x00000000 const val SORTING_SOURCE = 0x00000000
const val SORTING_NUMBER = 0x00000100 const val SORTING_NUMBER = 0x00000100
const val SORTING_MASK = 0x00000100 const val SORTING_UPLOAD_DATE = 0x00000200
const val SORTING_MASK = 0x00000300
const val DISPLAY_NAME = 0x00000000 const val DISPLAY_NAME = 0x00000000
const val DISPLAY_NUMBER = 0x00100000 const val DISPLAY_NUMBER = 0x00100000

14
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
View File

@ -196,11 +196,13 @@ class ChaptersController :
} }
// Sorting mode submenu // Sorting mode submenu
if (presenter.manga.sorting == Manga.SORTING_SOURCE) { val sortingItem = when (presenter.manga.sorting) {
menu.findItem(R.id.sort_by_source).isChecked = true Manga.SORTING_SOURCE -> R.id.sort_by_source
} else { Manga.SORTING_NUMBER -> R.id.sort_by_number
menu.findItem(R.id.sort_by_number).isChecked = true Manga.SORTING_UPLOAD_DATE -> R.id.sort_by_upload_date
else -> throw NotImplementedError("Unimplemented sorting method")
} }
menu.findItem(sortingItem).isChecked = true
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -222,6 +224,10 @@ class ChaptersController :
item.isChecked = true item.isChecked = true
presenter.setSorting(Manga.SORTING_NUMBER) presenter.setSorting(Manga.SORTING_NUMBER)
} }
R.id.sort_by_upload_date -> {
item.isChecked = true
presenter.setSorting(Manga.SORTING_UPLOAD_DATE)
}
R.id.download_next, R.id.download_next_5, R.id.download_next_10, R.id.download_next, R.id.download_next_5, R.id.download_next_10,
R.id.download_custom, R.id.download_unread, R.id.download_all R.id.download_custom, R.id.download_unread, R.id.download_all

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
View File

@ -203,6 +203,10 @@ class ChaptersPresenter(
true -> { c1, c2 -> c2.chapter_number.compareTo(c1.chapter_number) } true -> { c1, c2 -> c2.chapter_number.compareTo(c1.chapter_number) }
false -> { c1, c2 -> c1.chapter_number.compareTo(c2.chapter_number) } false -> { c1, c2 -> c1.chapter_number.compareTo(c2.chapter_number) }
} }
Manga.SORTING_UPLOAD_DATE -> when (sortDescending()) {
true -> { c1, c2 -> c2.date_upload.compareTo(c1.date_upload) }
false -> { c1, c2 -> c1.date_upload.compareTo(c2.date_upload) }
}
else -> throw NotImplementedError("Unimplemented sorting method") else -> throw NotImplementedError("Unimplemented sorting method")
} }
return observable.toSortedList(sortFunction) return observable.toSortedList(sortFunction)

3
app/src/main/res/menu/chapters.xml
View File

@ -64,6 +64,9 @@
<item <item
android:id="@+id/sort_by_number" android:id="@+id/sort_by_number"
android:title="@string/sort_by_number" /> android:title="@string/sort_by_number" />
<item
android:id="@+id/sort_by_upload_date"
android:title="@string/sort_by_upload_date" />
</group> </group>
</menu> </menu>
</item> </item>

1
app/src/main/res/values-es/strings.xml
View File

@ -183,6 +183,7 @@
<string name="sorting_mode">Ordenado de capítulos</string> <string name="sorting_mode">Ordenado de capítulos</string>
<string name="sort_by_source">Por fuente</string> <string name="sort_by_source">Por fuente</string>
<string name="sort_by_number">Por número de capítulo</string> <string name="sort_by_number">Por número de capítulo</string>
<string name="sort_by_upload_date">Por fecha de carga</string>
<string name="manga_download">Descargar</string> <string name="manga_download">Descargar</string>
<string name="download_1">Siguiente capítulo</string> <string name="download_1">Siguiente capítulo</string>
<string name="download_5">Siguientes 5 capítulos</string> <string name="download_5">Siguientes 5 capítulos</string>

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

@ -473,6 +473,7 @@
<string name="sorting_mode">Sorting mode</string> <string name="sorting_mode">Sorting mode</string>
<string name="sort_by_source">By source</string> <string name="sort_by_source">By source</string>
<string name="sort_by_number">By chapter number</string> <string name="sort_by_number">By chapter number</string>
<string name="sort_by_upload_date">By chapter upload date</string>
<string name="manga_download">Download</string> <string name="manga_download">Download</string>
<string name="custom_download">Download custom amount</string> <string name="custom_download">Download custom amount</string>
<string name="download_1">Next chapter</string> <string name="download_1">Next chapter</string>