Last read order in favorites #705

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt

@@ -347,7 +347,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
 
 	var historySortOrder: ListSortOrder
-		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.UPDATED)
+		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, ListSortOrder.LAST_READ)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
 	var allFavoritesSortOrder: ListSortOrder

app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt

@@ -193,8 +193,8 @@ abstract class FavouritesDao {
 		ListSortOrder.ALPHABETIC -> "manga.title ASC"
 		ListSortOrder.ALPHABETIC_REVERSE -> "manga.title DESC"
 		ListSortOrder.NEW_CHAPTERS -> "IFNULL((SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
-		ListSortOrder.UPDATED, // for legacy support
 		ListSortOrder.PROGRESS -> "IFNULL((SELECT percent FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
+		ListSortOrder.LAST_READ -> "IFNULL((SELECT updated_at FROM history WHERE history.manga_id = manga.manga_id), 0) DESC"
 
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}

app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt

@@ -35,7 +35,7 @@ abstract class HistoryDao {
 
 	fun observeAll(order: ListSortOrder): Flow<List<HistoryWithManga>> {
 		val orderBy = when (order) {
-			ListSortOrder.UPDATED -> "history.updated_at DESC"
+			ListSortOrder.LAST_READ -> "history.updated_at DESC"
 			ListSortOrder.NEWEST -> "history.created_at DESC"
 			ListSortOrder.PROGRESS -> "history.percent DESC"
 			ListSortOrder.ALPHABETIC -> "manga.title"

app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt

@@ -172,7 +172,7 @@ class HistoryListViewModel @Inject constructor(
 	}
 
 	private fun MangaHistory.header(order: ListSortOrder): ListHeader? = when (order) {
-		ListSortOrder.UPDATED -> ListHeader(calculateTimeAgo(updatedAt))
+		ListSortOrder.LAST_READ -> ListHeader(calculateTimeAgo(updatedAt))
 		ListSortOrder.NEWEST -> ListHeader(calculateTimeAgo(createdAt))
 		ListSortOrder.PROGRESS -> ListHeader(
 			when (percent) {

app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ListSortOrder.kt

@@ -9,7 +9,6 @@ enum class ListSortOrder(
 	@StringRes val titleResId: Int,
 ) {
 
-	UPDATED(R.string.updated),
 	NEWEST(R.string.order_added),
 	PROGRESS(R.string.progress),
 	ALPHABETIC(R.string.by_name),
@@ -17,14 +16,15 @@ enum class ListSortOrder(
 	RATING(R.string.by_rating),
 	RELEVANCE(R.string.by_relevance),
 	NEW_CHAPTERS(R.string.new_chapters),
+	LAST_READ(R.string.last_read),
 	;
 
-	fun isGroupingSupported() = this == UPDATED || this == NEWEST || this == PROGRESS
+	fun isGroupingSupported() = this == LAST_READ || this == NEWEST || this == PROGRESS
 
 	companion object {
 
-		val HISTORY: Set<ListSortOrder> = EnumSet.of(UPDATED, NEWEST, PROGRESS, ALPHABETIC, ALPHABETIC_REVERSE, NEW_CHAPTERS)
-		val FAVORITES: Set<ListSortOrder> = EnumSet.of(ALPHABETIC, ALPHABETIC_REVERSE, NEWEST, RATING, NEW_CHAPTERS, PROGRESS)
+		val HISTORY: Set<ListSortOrder> = EnumSet.of(LAST_READ, NEWEST, PROGRESS, ALPHABETIC, ALPHABETIC_REVERSE, NEW_CHAPTERS)
+		val FAVORITES: Set<ListSortOrder> = EnumSet.of(ALPHABETIC, ALPHABETIC_REVERSE, NEWEST, RATING, NEW_CHAPTERS, PROGRESS, LAST_READ)
 		val SUGGESTIONS: Set<ListSortOrder> = EnumSet.of(RELEVANCE)
 
 		operator fun invoke(value: String, fallback: ListSortOrder) = entries.find(value) ?: fallback

app/src/main/res/values/strings.xml

@@ -566,4 +566,5 @@
 	<string name="volume_unknown">Unknown volume</string>
 	<string name="incognito_mode_hint">Your reading progress will not be saved</string>
 	<string name="vertical">Vertical</string>
+	<string name="last_read">Last read</string>
 </resources>