From 5e1819f788417eed98eaa2b8ebe9ddef1cbca3a1 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 2 Sep 2019 10:47:38 +0800
Subject: [PATCH] up

---
 app/src/main/res/menu/bookshelf.xml      | 12 ++++++------
 app/src/main/res/menu/main_bookshelf.xml | 10 +++++-----
 app/src/main/res/values/strings.xml      |  5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/menu/bookshelf.xml b/app/src/main/res/menu/bookshelf.xml
index a3e509913..a913d9925 100644
--- a/app/src/main/res/menu/bookshelf.xml
+++ b/app/src/main/res/menu/bookshelf.xml
@@ -3,31 +3,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_add_local"
+        android:id="@+id/menu_add_local"
         android:icon="@drawable/ic_add"
         android:title="@string/book_local"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_add_url"
+        android:id="@+id/menu_add_url"
         android:icon="@drawable/ic_add_online"
         android:title="@string/add_url"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_download_all"
+        android:id="@+id/menu_download_all"
         android:icon="@drawable/ic_download_line"
         android:title="@string/download_all"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_list_grid"
+        android:id="@+id/menu_bookshelf_layout"
         android:icon="@drawable/ic_view_quilt"
-        android:title="@string/action_list_grid"
+        android:title="@string/bookshelf_layout"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_arrange_bookshelf"
+        android:id="@+id/menu_arrange_bookshelf"
         android:icon="@drawable/ic_arrange"
         android:title="@string/arrange_bookshelf"
         app:showAsAction="never" />
diff --git a/app/src/main/res/menu/main_bookshelf.xml b/app/src/main/res/menu/main_bookshelf.xml
index e4bc08efe..6815c9cae 100644
--- a/app/src/main/res/menu/main_bookshelf.xml
+++ b/app/src/main/res/menu/main_bookshelf.xml
@@ -9,19 +9,19 @@
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/action_add_local"
+        android:id="@+id/menu_add_local"
         android:icon="@drawable/ic_add"
         android:title="@string/book_local"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_add_url"
+        android:id="@+id/menu_add_url"
         android:icon="@drawable/ic_add_online"
         android:title="@string/add_url"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_download_all"
+        android:id="@+id/menu_download_all"
         android:icon="@drawable/ic_download_line"
         android:title="@string/download_all"
         app:showAsAction="never" />
@@ -29,11 +29,11 @@
     <item
         android:id="@+id/action_list_grid"
         android:icon="@drawable/ic_view_quilt"
-        android:title="@string/action_list_grid"
+        android:title="@string/bookshelf_layout"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_arrange_bookshelf"
+        android:id="@+id/menu_arrange_bookshelf"
         android:icon="@drawable/ic_arrange"
         android:title="@string/arrange_bookshelf"
         app:showAsAction="never" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 574d0e454..b7a9ed8ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,8 +44,9 @@
     <string name="action_search">搜索</string>
     <string name="action_download">下载任务</string>
     <string name="action_list">列表视图</string>
-    <string name="action_grid">网格视图</string>
-    <string name="action_list_grid">列表/网格</string>
+    <string name="action_grid3">网格视图三列</string>
+    <string name="action_grid4">网格视图四列</string>
+    <string name="bookshelf_layout">书架布局</string>
     <string name="book_library">书城</string>
     <string name="book_local">添加本地</string>
     <string name="book_source">书源</string>