From cbb8971dd1aa9ee4e56e1d739ebdfe1f771f2c62 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:55:54 +0800
Subject: [PATCH] Implement sort downloads by page count

---
 app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt | 4 ++++
 app/src/main/res/values-zh-rCN/strings.xml                  | 2 ++
 app/src/main/res/values/arrays.xml                          | 2 ++
 app/src/main/res/values/strings.xml                         | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt b/app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt
index 97af6bd3d..9709a9916 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt
@@ -12,6 +12,7 @@ data class SortMode(val field: Field, val order: Order) {
         TITLE(1),
         TIME(2),
         LABEL(3),
+        PAGES(4),
     }
 
     enum class Order(val value: Int) {
@@ -25,6 +26,7 @@ data class SortMode(val field: Field, val order: Order) {
             Field.TITLE -> compareBy { EhUtils.getSuitableTitle(it) }
             Field.TIME -> compareBy { it.time }
             Field.LABEL -> compareBy<DownloadInfo> { it.label }.thenBy { EhUtils.getSuitableTitle(it) }
+            Field.PAGES -> compareBy<DownloadInfo> { it.pages }.thenBy { EhUtils.getSuitableTitle(it) }
         }
         return if (order == Order.ASC) comparator else comparator.reversed()
     }
@@ -46,6 +48,8 @@ data class SortMode(val field: Field, val order: Order) {
             SortMode(Field.TITLE, Order.DESC),
             SortMode(Field.LABEL, Order.ASC),
             SortMode(Field.LABEL, Order.DESC),
+            SortMode(Field.PAGES, Order.ASC),
+            SortMode(Field.PAGES, Order.DESC),
         )
     }
 }
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5f23098f9..6a67a1072 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -463,6 +463,8 @@
     <string name="title_desc">标题（降序）</string>
     <string name="download_label_asc">下载标签（升序）</string>
     <string name="download_label_desc">下载标签（降序）</string>
+    <string name="page_count_asc">页数（升序）</string>
+    <string name="page_count_desc">页数（降序）</string>
     <string name="download_filter">过滤</string>
     <string name="download_all">全部</string>
     <string name="download_start_all_reversed">全部开始（倒序）</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5548b07c1..4464dd101 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -237,6 +237,8 @@
         <item>@string/title_desc</item>
         <item>@string/download_label_asc</item>
         <item>@string/download_label_desc</item>
+        <item>@string/page_count_asc</item>
+        <item>@string/page_count_desc</item>
     </string-array>
 
     <string-array name="download_state">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 458296a87..5638f6527 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -528,6 +528,8 @@
     <string name="title_desc">Title (descending)</string>
     <string name="download_label_asc">Download label (ascending)</string>
     <string name="download_label_desc">Download label (descending)</string>
+    <string name="page_count_asc">Page count (ascending)</string>
+    <string name="page_count_desc">Page count (descending)</string>
     <string name="download_filter">Filter</string>
     <string name="download_all">All</string>
     <string name="download_start_all_reversed">Start all (reversed)</string>