From cdc538c4981dfb040cd303edf0259c7aea3bd3ec Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Wed, 2 Dec 2020 10:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/read/ReadBookActivity.kt      |  3 +-
 app/src/main/res/menu/read_book.xml           | 48 ++++++++++---------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index b7c3f2ea1..f50800709 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -160,7 +160,8 @@ class ReadBookActivity : ReadBookBaseActivity(),
                 for (i in 0 until menu.size) {
                     val item = menu[i]
                     when (item.groupId) {
-                        R.id.menu_group_on_line -> item.isVisible = onLine
+                        R.id.menu_group_on_line,
+                        R.id.menu_group_on_line_ns -> item.isVisible = onLine
                         R.id.menu_group_local -> item.isVisible = !onLine
                         R.id.menu_group_text -> item.isVisible = book.isLocalTxt()
                         R.id.menu_group_login ->
diff --git a/app/src/main/res/menu/read_book.xml b/app/src/main/res/menu/read_book.xml
index eb9aedd34..5e5d73736 100644
--- a/app/src/main/res/menu/read_book.xml
+++ b/app/src/main/res/menu/read_book.xml
@@ -1,14 +1,8 @@
 <menu 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"
-    tools:context=".ui.main.MainActivity">
-
-    <item
-        android:id="@+id/menu_add_bookmark"
-        android:icon="@drawable/ic_bookmark"
-        android:title="@string/bookmark_add"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
+    tools:context=".ui.main.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <group android:id="@+id/menu_group_on_line">
         <item
@@ -25,22 +19,10 @@
 
         <item
             android:id="@+id/menu_download"
+            android:icon="@drawable/ic_download_line"
             android:title="@string/offline_cache"
-            app:showAsAction="never" />
-
-        <item
-            android:id="@+id/menu_disable_book_source"
-            android:title="@string/disable_book_source"
-            app:showAsAction="never" />
-
-    </group>
+            app:showAsAction="always" />
 
-    <group android:id="@+id/menu_group_login">
-        <item
-            android:id="@+id/menu_login"
-            android:visible="false"
-            android:title="@string/login"
-            app:showAsAction="never" />
     </group>
 
     <group android:id="@+id/menu_group_text">
@@ -62,6 +44,28 @@
 
     </group>
 
+    <item
+        android:id="@+id/menu_add_bookmark"
+        android:title="@string/bookmark_add"
+        app:showAsAction="never" />
+
+    <group android:id="@+id/menu_group_login">
+        <item
+            android:id="@+id/menu_login"
+            android:visible="false"
+            android:title="@string/login"
+            app:showAsAction="never" />
+    </group>
+
+    <group android:id="@+id/menu_group_on_line_ns">
+
+        <item
+            android:id="@+id/menu_disable_book_source"
+            android:title="@string/disable_book_source"
+            app:showAsAction="never" />
+
+    </group>
+
     <item
         android:id="@+id/menu_copy_text"
         android:title="@string/copy_text"