From bbdba2e8c8c8c6ccb87b51cb2ba0f002a5807cde Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 5 Jan 2023 22:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/dialog_book_group_edit.xml     | 28 +++++++++++++------
 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-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            |  8 ++++++
 app/src/main/res/values/strings.xml           |  1 +
 9 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/dialog_book_group_edit.xml b/app/src/main/res/layout/dialog_book_group_edit.xml
index 90aa0274c..2b8436b85 100644
--- a/app/src/main/res/layout/dialog_book_group_edit.xml
+++ b/app/src/main/res/layout/dialog_book_group_edit.xml
@@ -40,10 +40,10 @@
         android:layout_height="wrap_content"
         android:layout_margin="6dp"
         android:hint="@string/group_name"
+        app:layout_constraintBottom_toTopOf="@+id/tv_sort"
         app:layout_constraintLeft_toRightOf="@+id/iv_cover"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tool_bar"
-        app:layout_constraintBottom_toTopOf="@+id/tv_sort">
+        app:layout_constraintTop_toBottomOf="@+id/tool_bar">
 
         <io.legado.app.lib.theme.view.ThemeEditText
             android:id="@+id/tie_group_name"
@@ -53,22 +53,34 @@
             tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />
     </io.legado.app.ui.widget.text.TextInputLayout>
 
-    <TextView
+    <io.legado.app.ui.widget.text.AccentTextView
         android:id="@+id/tv_sort"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/sort"
         android:textColor="@color/primaryText"
-        app:layout_constraintTop_toBottomOf="@id/til_group_name"
+        app:layout_constraintBottom_toTopOf="@id/btn_ok"
         app:layout_constraintLeft_toLeftOf="@id/til_group_name"
-        app:layout_constraintBottom_toTopOf="@id/btn_ok" />
+        app:layout_constraintTop_toBottomOf="@id/til_group_name" />
+
+    <androidx.appcompat.widget.AppCompatSpinner
+        android:id="@+id/sp_sort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dp"
+        android:entries="@array/book_sort"
+        app:layout_constraintBottom_toBottomOf="@id/tv_sort"
+        app:layout_constraintLeft_toRightOf="@+id/tv_sort"
+        app:layout_constraintTop_toTopOf="@id/tv_sort"
+        app:theme="@style/Spinner"
+        tools:ignore="RtlHardcoded" />
 
     <io.legado.app.ui.widget.text.AccentTextView
         android:id="@+id/btn_delete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="6dp"
         android:layout_margin="6dp"
+        android:padding="6dp"
         android:text="@string/delete"
         app:layout_constraintBottom_toBottomOf="@id/btn_ok"
         app:layout_constraintLeft_toRightOf="@+id/iv_cover"
@@ -79,8 +91,8 @@
         android:id="@+id/btn_ok"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="6dp"
         android:layout_margin="6dp"
+        android:padding="6dp"
         android:text="@string/ok"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -91,8 +103,8 @@
         android:id="@+id/btn_cancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="6dp"
         android:layout_margin="6dp"
+        android:padding="6dp"
         android:text="@string/cancel"
         app:layout_constraintBottom_toBottomOf="@id/btn_ok"
         app:layout_constraintRight_toLeftOf="@+id/btn_ok"
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a3cba1456..f42581da4 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -662,6 +662,7 @@
     <string name="plus">Plus</string>
     <string name="system_typeface">System typeface</string>
     <string name="delete_book_file">Delete source file</string>
+    <string name="text_default">Default</string>
     <string name="default1">Default-1</string>
     <string name="default2">Default-2</string>
     <string name="default3">Default-3</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 581c9e1d1..5c0efc21b 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -666,6 +666,7 @@
     <string name="plus">Plus</string>
     <string name="system_typeface">System typeface</string>
     <string name="delete_book_file">Delete source file</string>
+    <string name="text_default">Default</string>
     <string name="default1">Default-1</string>
     <string name="default2">Default-2</string>
     <string name="default3">Default-3</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2a40b80f2..6ab99cf62 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -664,6 +664,7 @@
     <string name="plus">Mais</string>
     <string name="system_typeface">Tamanho e tipo da fonte</string>
     <string name="delete_book_file">Excluir arquivo fonte</string>
+    <string name="text_default">Padrão</string>
     <string name="default1">Padrão-1</string>
     <string name="default2">Padrão-2</string>
     <string name="default3">Padrão-3</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index b818a35fc..a9b4256d9 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -657,6 +657,7 @@
     <string name="plus">加</string>
     <string name="system_typeface">系統內置字體樣式</string>
     <string name="delete_book_file">刪除源文件</string>
+    <string name="text_default">默认</string>
     <string name="default1">預設一</string>
     <string name="default2">預設二</string>
     <string name="default3">預設三</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0b4fe4c16..59b13e878 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -665,6 +665,7 @@
     <string name="plus">加</string>
     <string name="system_typeface">系統內建字體樣式</string>
     <string name="delete_book_file">刪除來源文件</string>
+    <string name="text_default">默认</string>
     <string name="default1">預設一</string>
     <string name="default2">預設二</string>
     <string name="default3">預設三</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 30a187038..865435d18 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -665,6 +665,7 @@
     <string name="plus">加</string>
     <string name="system_typeface">系统内置字体样式</string>
     <string name="delete_book_file">删除源文件</string>
+    <string name="text_default">默认</string>
     <string name="default1">预设一</string>
     <string name="default2">预设二</string>
     <string name="default3">预设三</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 72146bce7..21c0e25ab 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -12,6 +12,14 @@
 		<item>Folder</item>
 	</string-array>
 
+	<string-array name="book_sort">
+		<item>@string/text_default</item>
+		<item>@string/bookshelf_px_0</item>
+		<item>@string/bookshelf_px_1</item>
+		<item>@string/bookshelf_px_2</item>
+		<item>@string/bookshelf_px_3</item>
+	</string-array>
+
 	<string-array name="indent">
 		<item>@string/indent_0</item>
 		<item>@string/indent_1</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ad4444db..42e038f9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -667,6 +667,7 @@
     <string name="plus">Plus</string>
     <string name="system_typeface">System typeface</string>
     <string name="delete_book_file">Delete source file</string>
+    <string name="text_default">Default</string>
     <string name="default1">Default-1</string>
     <string name="default2">Default-2</string>
     <string name="default3">Default-3</string>