From c023444ff9ab2b84d437b83571d2d90978549161 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 8 Feb 2020 14:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/book/arrange/ArrangeBookActivity.kt | 24 +++++++-- .../app/ui/importbook/ImportBookActivity.kt | 24 +++++---- .../main/res/layout/activity_arrange_book.xml | 49 +++++++------------ .../main/res/layout/activity_import_book.xml | 39 +++++++-------- app/src/main/res/values/strings.xml | 2 + 5 files changed, 71 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt index 783e7e6da..d1d0a01b7 100644 --- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt @@ -175,12 +175,28 @@ class ArrangeBookActivity : VMBaseActivity(R.layout.activi cb_selected_all.isChecked = adapter.isSelectAll() //重置全选的文字 if (cb_selected_all.isChecked) { - cb_selected_all.setText(R.string.cancel) + cb_selected_all.text = getString( + R.string.select_cancel_count, + adapter.selectedBooks.size, + adapter.getItems().size + ) } else { - cb_selected_all.setText(R.string.select_all) + cb_selected_all.text = getString( + R.string.select_all_count, + adapter.selectedBooks.size, + adapter.getItems().size + ) } - tv_select_count.text = - getString(R.string.select_count, adapter.selectedBooks.size, adapter.getItems().size) + setMenuClickable(adapter.selectedBooks.isNotEmpty()) + } + + private fun setMenuClickable(isClickable: Boolean) { + //设置是否可删除 + btn_delete.isEnabled = isClickable + btn_delete.isClickable = isClickable + //设置是否可添加书籍 + btn_to_group.isEnabled = isClickable + btn_to_group.isClickable = isClickable } override fun deleteBook(book: Book) { diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt index 2f67e8f90..bbcdf6954 100644 --- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt @@ -186,17 +186,6 @@ class ImportBookActivity : VMBaseActivity(R.layout.activity } override fun upCountView() { - if (adapter.selectedUris.isEmpty()) { - btn_add_book.setText(R.string.nb_file_add_shelf) - //设置某些按钮的是否可点击 - setMenuClickable(false) - } else { - btn_add_book.text = - getString(R.string.nb_file_add_shelves, adapter.selectedUris.size) - //设置某些按钮的是否可点击 - setMenuClickable(true) - } - if (adapter.checkableCount == 0) { cb_selected_all.isChecked = false } else { @@ -205,10 +194,19 @@ class ImportBookActivity : VMBaseActivity(R.layout.activity //重置全选的文字 if (cb_selected_all.isChecked) { - cb_selected_all.setText(R.string.cancel) + cb_selected_all.text = getString( + R.string.select_cancel_count, + adapter.selectedUris.size, + adapter.checkableCount + ) } else { - cb_selected_all.setText(R.string.select_all) + cb_selected_all.text = getString( + R.string.select_all_count, + adapter.selectedUris.size, + adapter.checkableCount + ) } + setMenuClickable(adapter.selectedUris.isNotEmpty()) } private fun setMenuClickable(isClickable: Boolean) { diff --git a/app/src/main/res/layout/activity_arrange_book.xml b/app/src/main/res/layout/activity_arrange_book.xml index 45919b240..9fdc30961 100644 --- a/app/src/main/res/layout/activity_arrange_book.xml +++ b/app/src/main/res/layout/activity_arrange_book.xml @@ -1,7 +1,6 @@ @@ -19,52 +18,42 @@ android:layout_weight="1" /> - + android:padding="6dp" + android:elevation="2dp"> - - + android:layout_weight="1" + android:padding="5dp" + android:text="@string/select_all_count" + android:textColor="@color/tv_text_default" /> - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml index 1d322fcfc..38bfab5d5 100644 --- a/app/src/main/res/layout/activity_import_book.xml +++ b/app/src/main/res/layout/activity_import_book.xml @@ -69,44 +69,43 @@ - + android:padding="6dp" + android:elevation="2dp"> - + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 246eda3a1..05117b38f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -205,6 +205,8 @@ 替换规则名称 选择操作 全选 + 全选(%d/%d) + 取消(%d/%d) 深色模式 启动页 开始下载