From a7e465775243ac86f471c491b5893050d7abdef2 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 21 Mar 2020 14:41:46 -0400 Subject: [PATCH] Rename "Last updated" sort to "Last checked" --- .../kanade/tachiyomi/ui/library/LibraryNavigationView.kt | 8 ++++---- .../eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt | 2 +- .../tachiyomi/ui/setting/SettingsLibraryController.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt index 7c0491f718..3a118fc1dd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt @@ -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 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 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) @@ -130,7 +130,7 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A alphabetically.state = if (sorting == LibrarySort.ALPHA) 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 total.state = if (sorting == LibrarySort.TOTAL) 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) { alphabetically -> LibrarySort.ALPHA lastRead -> LibrarySort.LAST_READ - lastUpdated -> LibrarySort.LAST_UPDATED + lastChecked -> LibrarySort.LAST_CHECKED unread -> LibrarySort.UNREAD total -> LibrarySort.TOTAL latestChapter -> LibrarySort.LATEST_CHAPTER diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index e95a9fb4e3..9d37972037 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -199,7 +199,7 @@ class LibraryPresenter( val manga2LastRead = lastReadManga[i2.manga.id!!] ?: lastReadManga.size 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.TOTAL -> { val manga1TotalChapter = totalChapterManga[i1.manga.id!!] ?: 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt index 4fd8d4bf71..be629c09f7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt @@ -4,7 +4,7 @@ object LibrarySort { const val ALPHA = 0 const val LAST_READ = 1 - const val LAST_UPDATED = 2 + const val LAST_CHECKED = 2 const val UNREAD = 3 const val TOTAL = 4 const val LATEST_CHAPTER = 6 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index 42230a02a4..1a8c23fa8e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -137,7 +137,7 @@ class SettingsLibraryController : SettingsController() { // ../../data/library/LibraryUpdateRanker.kt val priorities = arrayOf( 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] diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e11016cc17..23d824810e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,7 +39,7 @@ Alphabetically Total chapters Last read - Last updated + Last checked Latest chapter Search Global search