Albirew/tachiyomi
Albirew/tachiyomi
Archivé
1
0
Bifurcation 0
Code Activité

Rename "Last updated" sort to "Last checked"

Parcourir la source
Cette révision appartient à :
arkon 2020-03-21 14:41:46 -04:00
Parent 2f28fcba05
révision a7e4657752
5 fichiers modifiés avec 8 ajouts et 8 suppressions
Voir les statistiques Télécharger le patch en tant que fichier Télécharger le fichier diff Développer tous les fichiers Réduire tous les fichiers

8
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt
Voir le fichier

@ -111,13 +111,13 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A
private val lastRead = Item.MultiSort(R.string.action_sort_last_read, this) private val lastRead = Item.MultiSort(R.string.action_sort_last_read, this)
private val lastUpdated = Item.MultiSort(R.string.action_sort_last_updated, this) private val lastChecked = Item.MultiSort(R.string.action_sort_last_checked, this)
private val unread = Item.MultiSort(R.string.action_filter_unread, this) private val unread = Item.MultiSort(R.string.action_filter_unread, this)
private val latestChapter = Item.MultiSort(R.string.action_sort_latest_chapter, this) private val latestChapter = Item.MultiSort(R.string.action_sort_latest_chapter, this)
override val items = listOf(alphabetically, lastRead, lastUpdated, unread, total, latestChapter) override val items = listOf(alphabetically, lastRead, lastChecked, unread, total, latestChapter)
override val header = Item.Header(R.string.action_sort) override val header = Item.Header(R.string.action_sort)
@ -130,7 +130,7 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A
alphabetically.state = if (sorting == LibrarySort.ALPHA) order else SORT_NONE alphabetically.state = if (sorting == LibrarySort.ALPHA) order else SORT_NONE
lastRead.state = if (sorting == LibrarySort.LAST_READ) order else SORT_NONE lastRead.state = if (sorting == LibrarySort.LAST_READ) order else SORT_NONE
lastUpdated.state = if (sorting == LibrarySort.LAST_UPDATED) order else SORT_NONE lastChecked.state = if (sorting == LibrarySort.LAST_CHECKED) order else SORT_NONE
unread.state = if (sorting == LibrarySort.UNREAD) order else SORT_NONE unread.state = if (sorting == LibrarySort.UNREAD) order else SORT_NONE
total.state = if (sorting == LibrarySort.TOTAL) order else SORT_NONE total.state = if (sorting == LibrarySort.TOTAL) order else SORT_NONE
latestChapter.state = if (sorting == LibrarySort.LATEST_CHAPTER) order else SORT_NONE latestChapter.state = if (sorting == LibrarySort.LATEST_CHAPTER) order else SORT_NONE
@ -151,7 +151,7 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A
preferences.librarySortingMode().set(when (item) { preferences.librarySortingMode().set(when (item) {
alphabetically -> LibrarySort.ALPHA alphabetically -> LibrarySort.ALPHA
lastRead -> LibrarySort.LAST_READ lastRead -> LibrarySort.LAST_READ
lastUpdated -> LibrarySort.LAST_UPDATED lastChecked -> LibrarySort.LAST_CHECKED
unread -> LibrarySort.UNREAD unread -> LibrarySort.UNREAD
total -> LibrarySort.TOTAL total -> LibrarySort.TOTAL
latestChapter -> LibrarySort.LATEST_CHAPTER latestChapter -> LibrarySort.LATEST_CHAPTER

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
Voir le fichier

@ -199,7 +199,7 @@ class LibraryPresenter(
val manga2LastRead = lastReadManga[i2.manga.id!!] ?: lastReadManga.size val manga2LastRead = lastReadManga[i2.manga.id!!] ?: lastReadManga.size
manga1LastRead.compareTo(manga2LastRead) manga1LastRead.compareTo(manga2LastRead)
} }
LibrarySort.LAST_UPDATED -> i2.manga.last_update.compareTo(i1.manga.last_update) LibrarySort.LAST_CHECKED -> i2.manga.last_update.compareTo(i1.manga.last_update)
LibrarySort.UNREAD -> i1.manga.unread.compareTo(i2.manga.unread) LibrarySort.UNREAD -> i1.manga.unread.compareTo(i2.manga.unread)
LibrarySort.TOTAL -> { LibrarySort.TOTAL -> {
val manga1TotalChapter = totalChapterManga[i1.manga.id!!] ?: 0 val manga1TotalChapter = totalChapterManga[i1.manga.id!!] ?: 0

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
Voir le fichier

@ -4,7 +4,7 @@ object LibrarySort {
const val ALPHA = 0 const val ALPHA = 0
const val LAST_READ = 1 const val LAST_READ = 1
const val LAST_UPDATED = 2 const val LAST_CHECKED = 2
const val UNREAD = 3 const val UNREAD = 3
const val TOTAL = 4 const val TOTAL = 4
const val LATEST_CHAPTER = 6 const val LATEST_CHAPTER = 6

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
Voir le fichier

@ -137,7 +137,7 @@ class SettingsLibraryController : SettingsController() {
// ../../data/library/LibraryUpdateRanker.kt // ../../data/library/LibraryUpdateRanker.kt
val priorities = arrayOf( val priorities = arrayOf(
Pair("0", R.string.action_sort_alpha), Pair("0", R.string.action_sort_alpha),
Pair("1", R.string.action_sort_last_updated) Pair("1", R.string.action_sort_last_checked)
) )
val defaultPriority = priorities[0] val defaultPriority = priorities[0]

2
app/src/main/res/values/strings.xml
Voir le fichier

@ -39,7 +39,7 @@
<string name="action_sort_alpha">Alphabetically</string> <string name="action_sort_alpha">Alphabetically</string>
<string name="action_sort_total">Total chapters</string> <string name="action_sort_total">Total chapters</string>
<string name="action_sort_last_read">Last read</string> <string name="action_sort_last_read">Last read</string>
<string name="action_sort_last_updated">Last updated</string> <string name="action_sort_last_checked">Last checked</string>
<string name="action_sort_latest_chapter">Latest chapter</string> <string name="action_sort_latest_chapter">Latest chapter</string>
<string name="action_search">Search</string> <string name="action_search">Search</string>
<string name="action_global_search">Global search</string> <string name="action_global_search">Global search</string>