From 28b8b66bdf17fdf5c286620379f2812ba68aced1 Mon Sep 17 00:00:00 2001
From: niuhb <76513019+niu-hb@users.noreply.github.com>
Date: Sat, 25 Jan 2025 17:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E6=9E=B6=E5=A2=9E=E5=8A=A0=E6=8C=89?=
 =?UTF-8?q?=E4=BD=9C=E8=80=85=E6=8E=92=E5=BA=8F=20(#4574)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/main/bookshelf/style1/books/BooksFragment.kt    |  4 ++++
 app/src/main/res/layout/dialog_bookshelf_config.xml    | 10 ++++++++--
 app/src/main/res/layout/item_book_group_manage.xml     |  2 ++
 app/src/main/res/values-es-rES/strings.xml             |  1 +
 app/src/main/res/values-ja-rJP/strings.xml             |  1 +
 app/src/main/res/values-pt-rBR/strings.xml             |  1 +
 app/src/main/res/values-vi/strings.xml                 |  1 +
 app/src/main/res/values-zh-rHK/strings.xml             |  1 +
 app/src/main/res/values-zh-rTW/strings.xml             |  1 +
 app/src/main/res/values-zh/strings.xml                 |  1 +
 app/src/main/res/values/arrays.xml                     |  1 +
 app/src/main/res/values/strings.xml                    |  1 +
 12 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
index 847f6a83c..af9a88ce8 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
@@ -178,6 +178,10 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
                     4 -> list.sortedByDescending {
                         max(it.latestChapterTime, it.durChapterTime)
                     }
+                    // 按作者排序
+                    5 -> list.sortedWith { o1, o2 ->
+                        o1.author.cnCompare(o2.author)
+                    }
 
                     else -> list.sortedByDescending { it.durChapterTime }
                 }
diff --git a/app/src/main/res/layout/dialog_bookshelf_config.xml b/app/src/main/res/layout/dialog_bookshelf_config.xml
index a417e1290..b40582749 100644
--- a/app/src/main/res/layout/dialog_bookshelf_config.xml
+++ b/app/src/main/res/layout/dialog_bookshelf_config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:padding="16dp">
 
     <LinearLayout
         android:id="@+id/ll_group_style"
@@ -174,6 +174,12 @@
                 android:text="@string/bookshelf_px_4"
                 tools:ignore="TouchTargetSizeCheck" />
 
+            <RadioButton
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/bookshelf_px_5"
+                tools:ignore="TouchTargetSizeCheck" />
+
         </RadioGroup>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_book_group_manage.xml b/app/src/main/res/layout/item_book_group_manage.xml
index d5d907f71..c48e13e67 100644
--- a/app/src/main/res/layout/item_book_group_manage.xml
+++ b/app/src/main/res/layout/item_book_group_manage.xml
@@ -27,6 +27,8 @@
 
     <io.legado.app.lib.theme.view.ThemeSwitch
         android:id="@+id/sw_show"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b40b3be5d..5d6c9cfca 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1128,6 +1128,7 @@
     <string name="exit_app">退出软件</string>
     <string name="result_analyzed">Analyzed</string>
     <string name="bookshelf_px_4">Comprehensive</string>
+    <string name="bookshelf_px_5">Ordenar por autor</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ecf9eee3e..b364ed302 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1131,6 +1131,7 @@
     <string name="exit_app">退出软件</string>
     <string name="result_analyzed">Analyzed</string>
     <string name="bookshelf_px_4">Comprehensive</string>
+    <string name="bookshelf_px_5">著者別</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2f0a38f2b..570bee64d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1131,6 +1131,7 @@
     <string name="exit_app">退出软件</string>
     <string name="result_analyzed">Analyzed</string>
     <string name="bookshelf_px_4">Comprehensive</string>
+    <string name="bookshelf_px_5">Ordenar por autor</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 217e08b34..377936cc7 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1127,6 +1127,7 @@ Còn </string>
      <string name="exit_app">Thoát khỏi phần mềm</string>
     <string name="result_analyzed">Analyzed</string>
     <string name="bookshelf_px_4">Comprehensive</string>
+    <string name="bookshelf_px_5">Sắp xếp theo tác giả</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 2d8db8543..3e995c4c5 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1128,6 +1128,7 @@
     <string name="exit_app">退出软件</string>
     <string name="result_analyzed">解析示例</string>
     <string name="bookshelf_px_4">綜合排序</string>
+    <string name="bookshelf_px_5">按作者</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0e69f311d..bb853248e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1130,6 +1130,7 @@
     <string name="exit_app">退出软件</string>
     <string name="result_analyzed">解析示例</string>
     <string name="bookshelf_px_4">綜合排序</string>
+    <string name="bookshelf_px_5">按作者</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index b5ea4a207..75a7342ef 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1130,6 +1130,7 @@
     <string name="exit_app">退出软件</string>
     <string name="result_analyzed">解析示例</string>
     <string name="bookshelf_px_4">综合排序</string>
+    <string name="bookshelf_px_5">按作者</string>
     <string name="effective_replaces">起效的替换</string>
     <string name="export_book">导出书籍</string>
     <string name="export_book_notification_content">正在导出(%1$s),还有%2$d本待导出</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5dc6bc30b..67350daa6 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -24,6 +24,7 @@
 		<item>@string/bookshelf_px_2</item>
 		<item>@string/bookshelf_px_3</item>
 		<item>@string/bookshelf_px_4</item>
+		<item>@string/bookshelf_px_5</item>
 	</string-array>
 
 	<string-array name="indent">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab2c21571..cf31953e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1133,6 +1133,7 @@
     <string name="exit_app">Exit</string>
     <string name="result_analyzed">Analyzed</string>
     <string name="bookshelf_px_4">Comprehensive</string>
+    <string name="bookshelf_px_5">Sort by author</string>
     <string name="effective_replaces">Effective replacement</string>
     <string name="export_book">Export Book</string>
     <string name="export_book_notification_content">Exporting (%1$s), with %2$d to be exported.</string>