pull/94/head
kunfei 5 years ago
parent 5cda7c5fbe
commit c023444ff9
  1. 24
      app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
  2. 24
      app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt
  3. 49
      app/src/main/res/layout/activity_arrange_book.xml
  4. 39
      app/src/main/res/layout/activity_import_book.xml
  5. 2
      app/src/main/res/values/strings.xml

@ -175,12 +175,28 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(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) {

@ -186,17 +186,6 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(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<ImportBookViewModel>(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) {

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -19,52 +18,42 @@
android:layout_weight="1" />
<!--文件点击按钮-->
<RelativeLayout
android:id="@+id/rl_bottom"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:background="@color/background"
android:gravity="center_vertical"
android:padding="10dp"
android:elevation="2dp"
tools:ignore="RtlHardcoded,RtlSymmetry">
android:padding="6dp"
android:elevation="2dp">
<io.legado.app.lib.theme.view.ATECheckBox
android:id="@+id/cb_selected_all"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:text="@string/select_all"
android:textColor="@color/tv_text_default" />
<TextView
android:id="@+id/tv_select_count"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/select_count"
android:layout_toRightOf="@+id/cb_selected_all"
tools:ignore="RelativeOverlap" />
android:layout_weight="1"
android:padding="5dp"
android:text="@string/select_all_count"
android:textColor="@color/tv_text_default" />
<io.legado.app.lib.theme.view.ATEAccentStrokeTextView
android:id="@+id/btn_to_group"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:padding="5dp"
android:gravity="center"
android:minWidth="110dp"
android:minWidth="100dp"
android:text="@string/move_to_group" />
<io.legado.app.lib.theme.view.ATEAccentStrokeTextView
android:id="@+id/btn_delete"
android:layout_width="70dp"
android:layout_height="35dp"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:padding="5dp"
android:minWidth="100dp"
android:gravity="center"
android:layout_toLeftOf="@id/btn_to_group"
android:text="@string/delete" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

@ -69,44 +69,43 @@
</FrameLayout>
<!--文件点击按钮-->
<RelativeLayout
android:id="@+id/rl_bottom"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:background="@color/background"
android:gravity="center_vertical"
android:padding="10dp"
android:elevation="2dp"
tools:ignore="RtlHardcoded,RtlSymmetry">
android:padding="6dp"
android:elevation="2dp">
<io.legado.app.lib.theme.view.ATECheckBox
android:id="@+id/cb_selected_all"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:text="@string/select_all"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="5dp"
android:text="@string/select_all_count"
android:textColor="@color/tv_text_default" />
<io.legado.app.lib.theme.view.ATEAccentStrokeTextView
android:id="@+id/btn_add_book"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:padding="5dp"
android:gravity="center"
android:minWidth="110dp"
android:minWidth="100dp"
android:text="@string/add_to_shelf" />
<io.legado.app.lib.theme.view.ATEAccentStrokeTextView
android:id="@+id/btn_delete"
android:layout_width="70dp"
android:layout_height="35dp"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:padding="5dp"
android:minWidth="100dp"
android:gravity="center"
android:layout_toLeftOf="@id/btn_add_book"
android:text="@string/delete" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

@ -205,6 +205,8 @@
<string name="replace_rule_summary">替换规则名称</string>
<string name="select_action">选择操作</string>
<string name="select_all">全选</string>
<string name="select_all_count">全选(%d/%d)</string>
<string name="select_cancel_count">取消(%d/%d)</string>
<string name="dark_theme">深色模式</string>
<string name="welcome">启动页</string>
<string name="download_start">开始下载</string>

Loading…
Cancel
Save