From af95e19788915e02b78447ac70bb21e50c2c2ea6 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Wed, 8 Apr 2020 20:50:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/main/bookshelf/BookshelfFragment.kt    |  8 ++-
 app/src/main/res/menu/book_group_manage.xml   | 52 ++++++++++---------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
index c11bb5107..524ff38ea 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
@@ -110,7 +110,9 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
                 }
                 var noGroupSize = 0
                 withContext(IO) {
-                    noGroupSize = App.db.bookDao().noGroupSize
+                    if (AppConfig.bookGroupNoneShow) {
+                        noGroupSize = App.db.bookDao().noGroupSize
+                    }
                 }
                 synchronized(this@BookshelfFragment) {
                     bookGroups.clear()
@@ -162,7 +164,9 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         launch {
             var noGroupSize = 0
             withContext(IO) {
-                noGroupSize = App.db.bookDao().noGroupSize
+                if (AppConfig.bookGroupNoneShow) {
+                    noGroupSize = App.db.bookDao().noGroupSize
+                }
             }
             synchronized(this@BookshelfFragment) {
                 bookGroups.remove(AppConst.bookGroupAll)
diff --git a/app/src/main/res/menu/book_group_manage.xml b/app/src/main/res/menu/book_group_manage.xml
index 9d3d9241b..8c65f9f8d 100644
--- a/app/src/main/res/menu/book_group_manage.xml
+++ b/app/src/main/res/menu/book_group_manage.xml
@@ -10,32 +10,36 @@
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
-    <item
-        android:id="@+id/menu_group_all"
-        android:title="@string/all"
-        android:checkable="true"
-        android:checked="true"
-        app:showAsAction="never" />
+    <group android:id="@+id/menu_groups">
 
-    <item
-        android:id="@+id/menu_group_local"
-        android:title="@string/local"
-        android:checkable="true"
-        android:checked="true"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_group_all"
+            android:title="@string/all"
+            android:checkable="true"
+            android:checked="true"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_group_audio"
-        android:title="@string/audio"
-        android:checkable="true"
-        android:checked="true"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_group_local"
+            android:title="@string/local"
+            android:checkable="true"
+            android:checked="false"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_group_none"
-        android:title="@string/no_group"
-        android:checkable="true"
-        android:checked="true"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_group_audio"
+            android:title="@string/audio"
+            android:checkable="true"
+            android:checked="false"
+            app:showAsAction="never" />
+
+        <item
+            android:id="@+id/menu_group_none"
+            android:title="@string/no_group"
+            android:checkable="true"
+            android:checked="false"
+            app:showAsAction="never" />
+
+    </group>
 
 </menu>
\ No newline at end of file