Merge remote-tracking branch 'origin/master' into dev1

4 years ago · e990c0afe0
parent fa0fc6cb28 b4c0f1f018
commit e990c0afe0
7 changed files with 57 additions and 27 deletions
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
@ -130,6 +130,11 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
                sortCheck(Sort.Update)
                initLiveDataBookSource(searchView.query?.toString())
            }
+            R.id.menu_sort_enable -> {
+                item.isChecked = true
+                sortCheck(Sort.Enable)
+                initLiveDataBookSource(searchView.query?.toString())
+            }
            R.id.menu_enabled_group -> {
                searchView.setQuery(getString(R.string.enabled), true)
            }
@ -187,29 +192,44 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
            else -> {
                App.db.bookSourceDao.liveDataSearch("%$searchKey%")
            }
-        }
-        bookSourceLiveDate?.observe(this, { data ->
-            val sourceList =
-                if (sortAscending) when (sort) {
-                    Sort.Weight -> data.sortedBy { it.weight }
-                    Sort.Name -> data.sortedWith { o1, o2 ->
-                        o1.bookSourceName.cnCompare(o2.bookSourceName)
+        }.apply {
+            observe(this@BookSourceActivity, { data ->
+                val sourceList =
+                    if (sortAscending) when (sort) {
+                        Sort.Weight -> data.sortedBy { it.weight }
+                        Sort.Name -> data.sortedWith { o1, o2 ->
+                            o1.bookSourceName.cnCompare(o2.bookSourceName)
+                        }
+                        Sort.Url -> data.sortedBy { it.bookSourceUrl }
+                        Sort.Update -> data.sortedByDescending { it.lastUpdateTime }
+                        Sort.Enable -> data.sortedWith { o1, o2 ->
+                            var sort = -o1.enabled.compareTo(o2.enabled)
+                            if (sort == 0) {
+                                sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
+                            }
+                            sort
+                        }
+                        else -> data
                    }
-                    Sort.Url -> data.sortedBy { it.bookSourceUrl }
-                    Sort.Update -> data.sortedByDescending { it.lastUpdateTime }
-                    else -> data
-                }
-                else when (sort) {
-                    Sort.Weight -> data.sortedByDescending { it.weight }
-                    Sort.Name -> data.sortedWith { o1, o2 ->
-                        o2.bookSourceName.cnCompare(o1.bookSourceName)
+                    else when (sort) {
+                        Sort.Weight -> data.sortedByDescending { it.weight }
+                        Sort.Name -> data.sortedWith { o1, o2 ->
+                            o2.bookSourceName.cnCompare(o1.bookSourceName)
+                        }
+                        Sort.Url -> data.sortedByDescending { it.bookSourceUrl }
+                        Sort.Update -> data.sortedBy { it.lastUpdateTime }
+                        Sort.Enable -> data.sortedWith { o1, o2 ->
+                            var sort = o1.enabled.compareTo(o2.enabled)
+                            if (sort == 0) {
+                                sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
+                            }
+                            sort
+                        }
+                        else -> data.reversed()
                    }
-                    Sort.Url -> data.sortedByDescending { it.bookSourceUrl }
-                    Sort.Update -> data.sortedBy { it.lastUpdateTime }
-                    else -> data.reversed()
-                }
-            adapter.setItems(sourceList, adapter.diffItemCallback)
-        })
+                adapter.setItems(sourceList, adapter.diffItemCallback)
+            })
+        }
    }

    private fun showHelp() {
@ -483,6 +503,6 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
    }

    enum class Sort {
-        Default, Name, Url, Weight, Update
+        Default, Name, Url, Weight, Update, Enable
    }
 }
--- a/app/src/main/res/layout/item_bookshelf_list.xml
+++ b/app/src/main/res/layout/item_bookshelf_list.xml
@ -11,8 +11,8 @@

    <io.legado.app.ui.widget.image.CoverImageView
        android:id="@+id/iv_cover"
-        android:layout_width="60dp"
-        android:layout_height="80dp"
+        android:layout_width="66dp"
+        android:layout_height="90dp"
        android:layout_marginStart="16dp"
        android:layout_marginTop="16dp"
        android:layout_marginBottom="12dp"
@ -97,7 +97,7 @@
        android:textSize="13sp"
        app:layout_constraintBottom_toTopOf="@+id/tv_read"
        app:layout_constraintLeft_toRightOf="@+id/iv_author"
-        app:layout_constraintRight_toLeftOf="@id/fl_has_new"
+        app:layout_constraintRight_toRightOf="@id/fl_has_new"
        app:layout_constraintTop_toBottomOf="@+id/tv_name"
        tools:ignore="RtlSymmetry" />

@ -126,7 +126,7 @@
        android:textSize="13sp"
        app:layout_constraintBottom_toTopOf="@id/tv_last"
        app:layout_constraintLeft_toRightOf="@+id/iv_read"
-        app:layout_constraintRight_toLeftOf="@id/fl_has_new"
+        app:layout_constraintRight_toRightOf="@+id/fl_has_new"
        app:layout_constraintTop_toBottomOf="@+id/tv_author" />

    <androidx.appcompat.widget.AppCompatImageView
@ -154,7 +154,7 @@
        android:textSize="13sp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toRightOf="@+id/iv_last"
-        app:layout_constraintRight_toLeftOf="@id/fl_has_new"
+        app:layout_constraintRight_toRightOf="@id/fl_has_new"
        app:layout_constraintTop_toBottomOf="@+id/tv_read" />

    <View
--- a/app/src/main/res/menu/book_source.xml
+++ b/app/src/main/res/menu/book_source.xml
@ -50,6 +50,12 @@
                            android:id="@+id/menu_sort_time"
                            android:checkable="true"
                            android:title="@string/sort_by_lastUpdateTime" />
+
+                        <item
+                            android:id="@+id/menu_sort_enable"
+                            android:checkable="true"
+                            android:title="@string/sort_enable" />
+
                    </group>

                </menu>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -799,5 +799,6 @@
    <string name="import_bookshelf">导入书单</string>
    <string name="pre_download">预下载</string>
    <string name="pre_download_s">预先下载10章正文</string>
+    <string name="sort_enable">启用排序</string>

 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -800,5 +800,6 @@
    <string name="import_bookshelf">导入书单</string>
    <string name="pre_download">预下载</string>
    <string name="pre_download_s">预先下载10章正文</string>
+    <string name="sort_enable">启用排序</string>

 </resources>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -803,5 +803,6 @@
    <string name="import_bookshelf">导入书单</string>
    <string name="pre_download">预下载</string>
    <string name="pre_download_s">预先下载10章正文</string>
+    <string name="sort_enable">启用排序</string>

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -806,5 +806,6 @@
    <string name="import_bookshelf">导入书单</string>
    <string name="pre_download">预下载</string>
    <string name="pre_download_s">预先下载10章正文</string>
+    <string name="sort_enable">启用排序</string>

 </resources>