From 4f59ec0b5546ce9365a1906af0594829cd9cb9e1 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 26 Sep 2022 10:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E6=9E=B6=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B9=A6=E6=BA=90=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/book/manage/BookAdapter.kt  |  6 ++
 app/src/main/res/layout/item_arrange_book.xml | 55 ++++++++++++-------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt
index 33224a3c6..875832190 100644
--- a/app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
+import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.RecyclerAdapter
 import io.legado.app.data.entities.Book
@@ -52,6 +53,11 @@ class BookAdapter(context: Context, val callBack: CallBack) :
             tvAuthor.visibility = if (item.author.isEmpty()) View.GONE else View.VISIBLE
             tvGroupS.text = getGroupName(item.group)
             checkbox.isChecked = selectedBooks.contains(item)
+            if (item.isLocalBook()) {
+                tvOrigin.setText(R.string.local_book)
+            } else {
+                tvOrigin.text = item.originName
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/item_arrange_book.xml b/app/src/main/res/layout/item_arrange_book.xml
index 15e33e291..48ae5a58a 100644
--- a/app/src/main/res/layout/item_arrange_book.xml
+++ b/app/src/main/res/layout/item_arrange_book.xml
@@ -1,9 +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"
-    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:padding="6dp">
 
     <io.legado.app.lib.theme.view.ThemeCheckBox
@@ -22,13 +23,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="3dp"
-        android:textSize="15sp"
+        android:singleLine="true"
         android:text="@string/book_name"
         android:textColor="@color/primaryText"
-        android:singleLine="true"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textSize="15sp"
         app:layout_constraintBottom_toTopOf="@id/tv_group_s"
-        app:layout_constraintLeft_toRightOf="@id/checkbox" />
+        app:layout_constraintLeft_toRightOf="@id/checkbox"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_author"
@@ -36,29 +37,43 @@
         android:layout_height="wrap_content"
         android:paddingLeft="12dp"
         android:paddingRight="8dp"
+        android:singleLine="true"
         android:text="@string/author"
         android:textColor="@color/tv_text_summary"
         android:textSize="12sp"
-        android:singleLine="true"
-        app:layout_constraintTop_toTopOf="@+id/tv_name"
-        app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_name"
+        tools:ignore="RtlHardcoded" />
 
     <TextView
-        android:id="@+id/tv_group_s"
-        android:layout_width="0dp"
+        android:id="@+id/tv_origin"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:padding="3dp"
-        android:hint="@string/no_group"
+        android:textColor="@color/tv_text_summary"
         android:textSize="12sp"
-        android:textColor="@color/secondaryText"
-        android:singleLine="true"
-        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/checkbox"
         app:layout_constraintTop_toBottomOf="@id/tv_author"
+        tools:text="书源" />
+
+    <TextView
+        android:id="@+id/tv_group_s"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:hint="@string/no_group"
+        android:padding="3dp"
+        android:singleLine="true"
+        android:textColor="@color/secondaryText"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_group" />
+        app:layout_constraintLeft_toRightOf="@+id/tv_origin"
+        app:layout_constraintRight_toLeftOf="@+id/tv_group"
+        app:layout_constraintTop_toBottomOf="@id/tv_author" />
 
     <TextView
         android:id="@+id/tv_group"
@@ -68,9 +83,9 @@
         android:padding="10dp"
         android:text="@string/group"
         android:textColor="@color/secondaryText"
-        app:layout_constraintTop_toBottomOf="@id/tv_author"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_delete" />
+        app:layout_constraintRight_toLeftOf="@+id/tv_delete"
+        app:layout_constraintTop_toBottomOf="@id/tv_author" />
 
     <TextView
         android:id="@+id/tv_delete"
@@ -80,8 +95,8 @@
         android:padding="10dp"
         android:text="@string/delete"
         android:textColor="@color/secondaryText"
-        app:layout_constraintTop_toBottomOf="@id/tv_author"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_author" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file