From fee4fb1f7136ece3427e2b7c63f059fb1d8d0f53 Mon Sep 17 00:00:00 2001
From: GKF <gekunfei@live.com>
Date: Wed, 5 Jun 2019 15:21:45 +0800
Subject: [PATCH] up

---
 app/src/main/res/menu/book_source.xml | 113 +++++++++++++++++++++++---
 app/src/main/res/menu/bookshelf.xml   |  39 ++++++---
 app/src/main/res/menu/find_book.xml   |   7 +-
 3 files changed, 131 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/menu/book_source.xml b/app/src/main/res/menu/book_source.xml
index ffa80409c..9dd19b56a 100644
--- a/app/src/main/res/menu/book_source.xml
+++ b/app/src/main/res/menu/book_source.xml
@@ -1,15 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_settings"
-          android:title="@string/action_settings"
-          android:orderInCategory="100"
-          app:showAsAction="never"/>
-
-
-    <item android:id="@+id/action_test"
-          android:title="测试"
-          android:icon="@drawable/ic_search"
-          android:orderInCategory="100"
-          app:showAsAction="never"/>
+      xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools">
+
+    <item
+            android:id="@+id/action_select_all"
+            android:icon="@drawable/ic_select_all"
+            android:title="@string/select_all"
+            app:showAsAction="always"
+            tools:ignore="AlwaysShowAction"/>
+
+    <item
+            android:id="@+id/action_group"
+            android:icon="@drawable/ic_groups"
+            android:title="@string/menu_action_group"
+            app:showAsAction="always"
+            tools:ignore="AlwaysShowAction">
+
+        <menu>
+            <group android:id="@+id/source_group">
+
+            </group>
+
+        </menu>
+
+    </item>
+
+    <item
+            android:id="@+id/action_sort"
+            android:icon="@drawable/ic_format_line_spacing"
+            android:title="@string/sort"
+            app:showAsAction="always"
+            tools:ignore="AlwaysShowAction">
+
+        <menu>
+
+            <item
+                    android:id="@+id/sort_manual"
+                    android:checkable="true"
+                    android:title="@string/sort_manual"/>
+
+            <item
+                    android:id="@+id/sort_auto"
+                    android:checkable="true"
+                    android:title="@string/sort_auto"/>
+
+            <item
+                    android:id="@+id/sort_pin_yin"
+                    android:checkable="true"
+                    android:title="@string/sort_pin_yin"/>
+
+        </menu>
+
+    </item>
+
+    <item
+            android:id="@+id/action_add_book_source"
+            android:icon="@drawable/ic_add"
+            android:title="@string/add_book_source"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_import_book_source_local"
+            android:icon="@drawable/ic_import"
+            android:title="@string/import_book_source_local"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_import_book_source_onLine"
+            android:icon="@drawable/ic_import"
+            android:title="@string/import_book_source_on_line"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_import_book_source_rwm"
+            android:icon="@drawable/ic_import"
+            android:title="@string/import_by_qr_code"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_revert_selection"
+            android:icon="@drawable/ic_swap_outline_24dp"
+            android:title="@string/revert_selection"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_del_select"
+            android:icon="@drawable/ic_clear_all"
+            android:title="@string/del_select"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_check_book_source"
+            android:icon="@drawable/ic_check_source"
+            android:title="@string/check_select_source"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_share_wifi"
+            android:icon="@drawable/ic_share"
+            android:title="@string/wifi_share"
+            app:showAsAction="never"/>
+
 </menu>
diff --git a/app/src/main/res/menu/bookshelf.xml b/app/src/main/res/menu/bookshelf.xml
index 6a7f00e90..d8ffa3191 100644
--- a/app/src/main/res/menu/bookshelf.xml
+++ b/app/src/main/res/menu/bookshelf.xml
@@ -2,14 +2,33 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/action_settings"
-          android:title="筛选"
-          android:orderInCategory="100"
-          app:showAsAction="always"/>
-
-    <item android:id="@+id/action_test"
-          android:title="测试"
-          android:icon="@drawable/ic_search"
-          android:orderInCategory="100"
-          app:showAsAction="never"/>
+    <item
+            android:id="@+id/action_add_local"
+            android:icon="@drawable/ic_add"
+            android:title="@string/book_local"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_add_url"
+            android:icon="@drawable/ic_add_online"
+            android:title="@string/add_url"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_download_all"
+            android:icon="@drawable/ic_download_line"
+            android:title="@string/download_all"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_list_grid"
+            android:icon="@drawable/ic_view_quilt"
+            android:title="@string/action_list_grid"
+            app:showAsAction="never"/>
+
+    <item
+            android:id="@+id/action_arrange_bookshelf"
+            android:icon="@drawable/ic_arrange"
+            android:title="@string/arrange_bookshelf"
+            app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/find_book.xml b/app/src/main/res/menu/find_book.xml
index ffa80409c..39f557f7d 100644
--- a/app/src/main/res/menu/find_book.xml
+++ b/app/src/main/res/menu/find_book.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item android:id="@+id/action_settings"
           android:title="@string/action_settings"
-          android:orderInCategory="100"
           app:showAsAction="never"/>
 
 
-    <item android:id="@+id/action_test"
-          android:title="测试"
-          android:icon="@drawable/ic_search"
-          android:orderInCategory="100"
-          app:showAsAction="never"/>
 </menu>