From 6fb960f6de5d45c2dbc0639da3bceaca87f0c2b1 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 28 Sep 2019 16:13:11 +0800
Subject: [PATCH] up

---
 .../ui/main/bookshelf/BookshelfFragment.kt    | 36 +++++++------------
 app/src/main/res/menu/main_bookshelf.xml      |  6 ++++
 2 files changed, 19 insertions(+), 23 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 b7f91a0af..008ff6131 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
@@ -1,11 +1,9 @@
 package io.legado.app.ui.main.bookshelf
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.EditText
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
@@ -16,11 +14,12 @@ import io.legado.app.R
 import io.legado.app.base.VMBaseFragment
 import io.legado.app.constant.AppConst
 import io.legado.app.data.entities.BookGroup
-import io.legado.app.lib.dialogs.*
+import io.legado.app.lib.dialogs.selector
 import io.legado.app.lib.theme.ATH
 import io.legado.app.ui.book.search.SearchActivity
-import io.legado.app.utils.*
-import kotlinx.android.synthetic.main.dialog_edit_text.view.*
+import io.legado.app.utils.getViewModel
+import io.legado.app.utils.putPrefInt
+import io.legado.app.utils.startActivity
 import kotlinx.android.synthetic.main.fragment_bookshelf.*
 import kotlinx.android.synthetic.main.view_tab_layout.*
 import kotlinx.android.synthetic.main.view_title_bar.*
@@ -51,6 +50,15 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         when (item.itemId) {
             R.id.menu_search -> startActivity<SearchActivity>()
             R.id.menu_bookshelf_layout -> selectBookshelfLayout()
+            R.id.menu_group_manage -> fragmentManager?.let {
+                GroupManageDialog().show(it, "groupManageDialog")
+            }
+            R.id.menu_add_local -> {
+            }
+            R.id.menu_add_url -> {
+            }
+            R.id.menu_arrange_bookshelf -> {
+            }
         }
     }
 
@@ -92,24 +100,6 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         return false
     }
 
-    @SuppressLint("InflateParams")
-    private fun showGroupInputDialog() {
-        alert(title = "新建分组") {
-            var editText: EditText? = null
-            customView {
-                layoutInflater.inflate(R.layout.dialog_edit_text, null).apply {
-                    editText = edit_view.apply {
-                        hint = "分组名称"
-                    }
-                }
-            }
-            yesButton {
-                viewModel.saveBookGroup(editText?.text?.toString())
-            }
-            noButton()
-        }.show().applyTint().requestInputMethod()
-    }
-
     private fun selectBookshelfLayout() {
         selector(
             title = "选择书架布局",
diff --git a/app/src/main/res/menu/main_bookshelf.xml b/app/src/main/res/menu/main_bookshelf.xml
index 19bbbdb7f..45b586ca8 100644
--- a/app/src/main/res/menu/main_bookshelf.xml
+++ b/app/src/main/res/menu/main_bookshelf.xml
@@ -26,6 +26,12 @@
         android:title="@string/download_all"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_group_manage"
+        android:icon="@drawable/ic_groups"
+        android:title="@string/group_manage"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_bookshelf_layout"
         android:icon="@drawable/ic_view_quilt"