优化
This commit is contained in:
@@ -88,4 +88,11 @@ object LocalConfig :
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var deleteBookOriginal: Boolean
|
||||||
|
get() = getBoolean("deleteBookOriginal")
|
||||||
|
set(value) {
|
||||||
|
putBoolean("deleteBookOriginal", value)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -23,6 +23,7 @@ import io.legado.app.exception.NoStackTraceException
|
|||||||
import io.legado.app.help.AppWebDav
|
import io.legado.app.help.AppWebDav
|
||||||
import io.legado.app.help.book.*
|
import io.legado.app.help.book.*
|
||||||
import io.legado.app.help.config.AppConfig
|
import io.legado.app.help.config.AppConfig
|
||||||
|
import io.legado.app.help.config.LocalConfig
|
||||||
import io.legado.app.lib.dialogs.alert
|
import io.legado.app.lib.dialogs.alert
|
||||||
import io.legado.app.lib.dialogs.selector
|
import io.legado.app.lib.dialogs.selector
|
||||||
import io.legado.app.lib.theme.backgroundColor
|
import io.legado.app.lib.theme.backgroundColor
|
||||||
@@ -477,6 +478,7 @@ class BookInfoActivity :
|
|||||||
) {
|
) {
|
||||||
val checkBox = CheckBox(this@BookInfoActivity).apply {
|
val checkBox = CheckBox(this@BookInfoActivity).apply {
|
||||||
setText(R.string.delete_book_file)
|
setText(R.string.delete_book_file)
|
||||||
|
isChecked = LocalConfig.deleteBookOriginal
|
||||||
}
|
}
|
||||||
val view = LinearLayout(this@BookInfoActivity).apply {
|
val view = LinearLayout(this@BookInfoActivity).apply {
|
||||||
setPadding(16.dpToPx(), 0, 16.dpToPx(), 0)
|
setPadding(16.dpToPx(), 0, 16.dpToPx(), 0)
|
||||||
@@ -484,6 +486,7 @@ class BookInfoActivity :
|
|||||||
}
|
}
|
||||||
customView { view }
|
customView { view }
|
||||||
yesButton {
|
yesButton {
|
||||||
|
LocalConfig.deleteBookOriginal = checkBox.isChecked
|
||||||
viewModel.delBook(checkBox.isChecked) {
|
viewModel.delBook(checkBox.isChecked) {
|
||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import io.legado.app.databinding.ActivityArrangeBookBinding
|
|||||||
import io.legado.app.help.book.contains
|
import io.legado.app.help.book.contains
|
||||||
import io.legado.app.help.book.isLocal
|
import io.legado.app.help.book.isLocal
|
||||||
import io.legado.app.help.config.AppConfig
|
import io.legado.app.help.config.AppConfig
|
||||||
|
import io.legado.app.help.config.LocalConfig
|
||||||
import io.legado.app.lib.dialogs.alert
|
import io.legado.app.lib.dialogs.alert
|
||||||
import io.legado.app.lib.theme.primaryColor
|
import io.legado.app.lib.theme.primaryColor
|
||||||
import io.legado.app.ui.book.group.GroupManageDialog
|
import io.legado.app.ui.book.group.GroupManageDialog
|
||||||
@@ -283,13 +284,17 @@ class BookshelfManageActivity :
|
|||||||
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
|
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
|
||||||
val checkBox = CheckBox(this@BookshelfManageActivity).apply {
|
val checkBox = CheckBox(this@BookshelfManageActivity).apply {
|
||||||
setText(R.string.delete_book_file)
|
setText(R.string.delete_book_file)
|
||||||
|
isChecked = LocalConfig.deleteBookOriginal
|
||||||
}
|
}
|
||||||
val view = LinearLayout(this@BookshelfManageActivity).apply {
|
val view = LinearLayout(this@BookshelfManageActivity).apply {
|
||||||
setPadding(16.dpToPx(), 0, 16.dpToPx(), 0)
|
setPadding(16.dpToPx(), 0, 16.dpToPx(), 0)
|
||||||
addView(checkBox)
|
addView(checkBox)
|
||||||
}
|
}
|
||||||
customView { view }
|
customView { view }
|
||||||
okButton { viewModel.deleteBook(adapter.selection, checkBox.isChecked) }
|
okButton {
|
||||||
|
LocalConfig.deleteBookOriginal = checkBox.isChecked
|
||||||
|
viewModel.deleteBook(adapter.selection, checkBox.isChecked)
|
||||||
|
}
|
||||||
noButton()
|
noButton()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -335,6 +340,7 @@ class BookshelfManageActivity :
|
|||||||
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
|
alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
|
||||||
val checkBox = CheckBox(this@BookshelfManageActivity).apply {
|
val checkBox = CheckBox(this@BookshelfManageActivity).apply {
|
||||||
setText(R.string.delete_book_file)
|
setText(R.string.delete_book_file)
|
||||||
|
isChecked = LocalConfig.deleteBookOriginal
|
||||||
}
|
}
|
||||||
val view = LinearLayout(this@BookshelfManageActivity).apply {
|
val view = LinearLayout(this@BookshelfManageActivity).apply {
|
||||||
setPadding(16.dpToPx(), 0, 16.dpToPx(), 0)
|
setPadding(16.dpToPx(), 0, 16.dpToPx(), 0)
|
||||||
@@ -344,6 +350,7 @@ class BookshelfManageActivity :
|
|||||||
customView { view }
|
customView { view }
|
||||||
}
|
}
|
||||||
okButton {
|
okButton {
|
||||||
|
LocalConfig.deleteBookOriginal = checkBox.isChecked
|
||||||
viewModel.deleteBook(listOf(book), checkBox.isChecked)
|
viewModel.deleteBook(listOf(book), checkBox.isChecked)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user