From 8826e7984fd28f5ae4678d53001d5c882b31a382 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Mon, 26 Apr 2021 21:28:51 -0400
Subject: [PATCH] Changed wording from "Last fetched" to "Date fetched"

Matches upstream and sounds better
Also moved it lower in the sort list
Also updates "Last Updated" to "Last updated" (was thinking of using this string instead for fetch but too much confusion)
---
 .../eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt  | 2 +-
 .../java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt   | 2 +-
 .../main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt   | 4 ++--
 app/src/main/res/values/strings.xml                           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index 9ef5b1c9c5..28fbb0c10d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -150,7 +150,7 @@ class LibraryCategoryAdapter(val controller: LibraryController) :
                             else title.take(10)
                         }
                     }
-                    LibrarySort.LastFetched -> {
+                    LibrarySort.DateFetched -> {
                         val id = item.manga.id ?: return ""
                         val history = db.getChapters(id).executeAsBlocking()
                         val last = history.maxOfOrNull { it.date_fetch }
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 4e5cf59358..1459ff5acc 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
@@ -378,7 +378,7 @@ class LibraryPresenter(
                             LibrarySort.TotalChapters -> {
                                 i1.manga.totalChapters.compareTo(i2.manga.totalChapters)
                             }
-                            LibrarySort.LastFetched -> {
+                            LibrarySort.DateFetched -> {
                                 val manga1LastRead =
                                     lastFetchedManga[i1.manga.id!!] ?: lastFetchedManga.size
                                 val manga2LastRead =
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 a3da20a961..49c5a82da9 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
@@ -17,10 +17,10 @@ enum class LibrarySort(
     Title(0, R.string.title, R.drawable.ic_sort_by_alpha_24dp),
     LastRead(1, R.string.last_read, R.drawable.ic_recent_read_outline_24dp, 3),
     LatestChapter(2, R.string.latest_chapter, R.drawable.ic_new_releases_24dp, 1),
-    LastFetched(6, R.string.last_fetched, R.drawable.ic_calendar_text_outline_24dp),
     Unread(3, R.string.unread, R.drawable.ic_eye_24dp, 2),
     TotalChapters(4, R.string.total_chapters, R.drawable.ic_sort_by_numeric_24dp),
     DateAdded(5, R.string.date_added, R.drawable.ic_heart_outline_24dp),
+    DateFetched(6, R.string.date_fetched, R.drawable.ic_calendar_text_outline_24dp),
     DragAndDrop(
         7,
         R.string.drag_and_drop,
@@ -44,7 +44,7 @@ enum class LibrarySort(
     fun iconRes(isDynamic: Boolean) = if (isDynamic) dynamicIconRes else iconRes
 
     val hasInvertedSort: Boolean
-        get() = this in listOf(LastRead, DateAdded, LatestChapter, LastFetched)
+        get() = this in listOf(LastRead, DateAdded, LatestChapter, DateFetched)
 
     fun menuSheetItem(isDynamic: Boolean): MaterialMenuSheet.MenuSheetItem {
         return MaterialMenuSheet.MenuSheetItem(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8270d78a89..057edbee94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -146,8 +146,8 @@
     <string name="total_chapters">Total chapters</string>
     <string name="date_added">Date added</string>
     <string name="last_read">Last read</string>
-    <string name="last_fetched">Last fetched</string>
-    <string name="last_updated">Last Updated</string>
+    <string name="date_fetched">Date fetched</string>
+    <string name="last_updated">Last updated</string>
     <string name="latest_chapter">Latest chapter</string>
     <string name="drag_and_drop">Drag &amp; Drop</string>