Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-09-17 17:25:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed wording from "Last fetched" to "Date fetched"

Browse Source 
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)
This commit is contained in:
Jays2Kings 2021-04-26 21:28:51 -04:00
parent 1858d70f97
commit 8826e7984f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
View File

@ -150,7 +150,7 @@ class LibraryCategoryAdapter(val controller: LibraryController) :
else title.take(10) else title.take(10)
} }
} }
LibrarySort.LastFetched -> { LibrarySort.DateFetched -> {
val id = item.manga.id ?: return "" val id = item.manga.id ?: return ""
val history = db.getChapters(id).executeAsBlocking() val history = db.getChapters(id).executeAsBlocking()
val last = history.maxOfOrNull { it.date_fetch } val last = history.maxOfOrNull { it.date_fetch }

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -378,7 +378,7 @@ class LibraryPresenter(
LibrarySort.TotalChapters -> { LibrarySort.TotalChapters -> {
i1.manga.totalChapters.compareTo(i2.manga.totalChapters) i1.manga.totalChapters.compareTo(i2.manga.totalChapters)
} }
LibrarySort.LastFetched -> { LibrarySort.DateFetched -> {
val manga1LastRead = val manga1LastRead =
lastFetchedManga[i1.manga.id!!] ?: lastFetchedManga.size lastFetchedManga[i1.manga.id!!] ?: lastFetchedManga.size
val manga2LastRead = val manga2LastRead =

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
View File

@ -17,10 +17,10 @@ enum class LibrarySort(
Title(0, R.string.title, R.drawable.ic_sort_by_alpha_24dp), 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), 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), 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), Unread(3, R.string.unread, R.drawable.ic_eye_24dp, 2),
TotalChapters(4, R.string.total_chapters, R.drawable.ic_sort_by_numeric_24dp), 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), 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( DragAndDrop(
7, 7,
R.string.drag_and_drop, R.string.drag_and_drop,
@ -44,7 +44,7 @@ enum class LibrarySort(
fun iconRes(isDynamic: Boolean) = if (isDynamic) dynamicIconRes else iconRes fun iconRes(isDynamic: Boolean) = if (isDynamic) dynamicIconRes else iconRes
val hasInvertedSort: Boolean 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 { fun menuSheetItem(isDynamic: Boolean): MaterialMenuSheet.MenuSheetItem {
return MaterialMenuSheet.MenuSheetItem( return MaterialMenuSheet.MenuSheetItem(

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

@ -146,8 +146,8 @@
<string name="total_chapters">Total chapters</string> <string name="total_chapters">Total chapters</string>
<string name="date_added">Date added</string> <string name="date_added">Date added</string>
<string name="last_read">Last read</string> <string name="last_read">Last read</string>
<string name="last_fetched">Last fetched</string> <string name="date_fetched">Date fetched</string>
<string name="last_updated">Last Updated</string> <string name="last_updated">Last updated</string>
<string name="latest_chapter">Latest chapter</string> <string name="latest_chapter">Latest chapter</string>
<string name="drag_and_drop">Drag &amp; Drop</string> <string name="drag_and_drop">Drag &amp; Drop</string>