From ff3af56226f1655f39747a32607c52efbd889090 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 31 Aug 2019 20:33:02 +0800 Subject: [PATCH] up --- .../app/ui/booksource/BookSourceActivity.kt | 7 ++++--- app/src/main/res/menu/book_source.xml | 18 +++++++++--------- app/src/main/res/menu/source_edit.xml | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/booksource/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/booksource/BookSourceActivity.kt index 7125a2e7b..6cfd7fa7e 100644 --- a/app/src/main/java/io/legado/app/ui/booksource/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/booksource/BookSourceActivity.kt @@ -64,13 +64,13 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.action_add_book_source -> { + R.id.menu_add_book_source -> { this.startActivity() } - R.id.action_import_book_source_qr -> { + R.id.menu_import_book_source_qr -> { this.startActivityForResult(qrRequestCode) } - R.id.action_select_all -> { + R.id.menu_select_all -> { launch(IO) { val isEnableList = App.db.bookSourceDao().searchIsEnable("%${search_view.query}%") @@ -81,6 +81,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } } } + } if (item.groupId == R.id.source_group) { search_view.setQuery(item.title, true) diff --git a/app/src/main/res/menu/book_source.xml b/app/src/main/res/menu/book_source.xml index 6660208ae..36b9b8952 100644 --- a/app/src/main/res/menu/book_source.xml +++ b/app/src/main/res/menu/book_source.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/res/menu/source_edit.xml b/app/src/main/res/menu/source_edit.xml index f1ee15173..ac204a22a 100644 --- a/app/src/main/res/menu/source_edit.xml +++ b/app/src/main/res/menu/source_edit.xml @@ -40,7 +40,7 @@ app:showAsAction="never" />