YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

优化 #5696

Browse Source
This commit is contained in:
Horis
2026-02-12 22:46:02 +08:00
parent fc6a1e38fd
commit 94e7aa464c
23 changed files with 185 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/lib/theme/view/ThemeCheckBox.kt
+21
View File
@@ -8,9 +8,30 @@ import io.legado.app.utils.applyTint
class ThemeCheckBox(context: Context, attrs: AttributeSet) : AppCompatCheckBox(context, attrs) {
private var isUserAction = false
init {
if (!isInEditMode) {
applyTint(context.accentColor)
}
}
override fun performClick(): Boolean {
isUserAction = true
val result = super.performClick()
isUserAction = false
return result
}
fun setOnUserCheckedChangeListener(listener: ((Boolean) -> Unit)?) {
if (listener == null) {
return super.setOnCheckedChangeListener(null)
}
super.setOnCheckedChangeListener { _, isChecked ->
if (isUserAction) {
listener.invoke(isChecked)
}
}
}
}
app/src/main/java/io/legado/app/lib/theme/view/ThemeRadioButton.kt
+21
View File
@@ -9,9 +9,30 @@ import io.legado.app.utils.applyTint
class ThemeRadioButton(context: Context, attrs: AttributeSet) :
AppCompatRadioButton(context, attrs) {
private var isUserAction = false
init {
if (!isInEditMode) {
applyTint(context.accentColor)
}
}
override fun performClick(): Boolean {
isUserAction = true
val result = super.performClick()
isUserAction = false
return result
}
fun setOnUserCheckedChangeListener(listener: ((Boolean) -> Unit)?) {
if (listener == null) {
return super.setOnCheckedChangeListener(null)
}
super.setOnCheckedChangeListener { _, isChecked ->
if (isUserAction) {
listener.invoke(isChecked)
}
}
}
}
app/src/main/java/io/legado/app/lib/theme/view/ThemeSwitch.kt
+19
View File
@@ -11,11 +11,30 @@ import io.legado.app.utils.applyTint
*/
class ThemeSwitch(context: Context, attrs: AttributeSet) : SwitchCompat(context, attrs) {
private var isUserAction = false
init {
if (!isInEditMode) {
applyTint(context.accentColor)
}
}
override fun performClick(): Boolean {
isUserAction = true
val result = super.performClick()
isUserAction = false
return result
}
fun setOnUserCheckedChangeListener(listener: ((Boolean) -> Unit)?) {
if (listener == null) {
return super.setOnCheckedChangeListener(null)
}
super.setOnCheckedChangeListener { _, isChecked ->
if (isUserAction) {
listener.invoke(isChecked)
}
}
}
}
app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt
+8 -4
View File
@@ -25,8 +25,14 @@ import io.legado.app.lib.dialogs.alert
import io.legado.app.lib.theme.primaryColor
import io.legado.app.ui.widget.dialog.CodeDialog
import io.legado.app.ui.widget.dialog.WaitDialog
import io.legado.app.utils.*
import io.legado.app.utils.GSON
import io.legado.app.utils.dpToPx
import io.legado.app.utils.fromJsonObject
import io.legado.app.utils.putPrefBoolean
import io.legado.app.utils.setLayout
import io.legado.app.utils.showDialogFragment
import io.legado.app.utils.viewbindingdelegate.viewBinding
import io.legado.app.utils.visible
import splitties.views.onClick
@@ -255,12 +261,10 @@ class ImportBookSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.apply {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/association/ImportDictRuleDialog.kt
+6 -4
View File
@@ -18,8 +18,12 @@ import io.legado.app.databinding.ItemSourceImportBinding
import io.legado.app.lib.theme.primaryColor
import io.legado.app.ui.widget.dialog.CodeDialog
import io.legado.app.ui.widget.dialog.WaitDialog
import io.legado.app.utils.*
import io.legado.app.utils.GSON
import io.legado.app.utils.fromJsonObject
import io.legado.app.utils.setLayout
import io.legado.app.utils.showDialogFragment
import io.legado.app.utils.viewbindingdelegate.viewBinding
import io.legado.app.utils.visible
import splitties.views.onClick
class ImportDictRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_view),
@@ -148,12 +152,10 @@ class ImportDictRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_view)
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.apply {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt
+1 -3
View File
@@ -152,12 +152,10 @@ class ImportHttpTtsDialog() : BaseDialogFragment(R.layout.dialog_recycler_view),
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.apply {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt
+9 -4
View File
@@ -24,8 +24,14 @@ import io.legado.app.lib.dialogs.alert
import io.legado.app.lib.theme.primaryColor
import io.legado.app.ui.widget.dialog.CodeDialog
import io.legado.app.ui.widget.dialog.WaitDialog
import io.legado.app.utils.*
import io.legado.app.utils.GSON
import io.legado.app.utils.dpToPx
import io.legado.app.utils.fromJsonObject
import io.legado.app.utils.putPrefBoolean
import io.legado.app.utils.setLayout
import io.legado.app.utils.showDialogFragment
import io.legado.app.utils.viewbindingdelegate.viewBinding
import io.legado.app.utils.visible
import splitties.views.onClick
class ImportReplaceRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_view),
@@ -212,6 +218,7 @@ class ImportReplaceRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vi
|| item.replacement != localRule.replacement
|| item.isRegex != localRule.isRegex
|| item.scope != localRule.scope -> "更新"
else -> "已有"
}
}
@@ -219,12 +226,10 @@ class ImportReplaceRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vi
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.run {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt
+1 -3
View File
@@ -240,12 +240,10 @@ class ImportRssSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_view
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.apply {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt
+1 -3
View File
@@ -151,12 +151,10 @@ class ImportThemeDialog() : BaseDialogFragment(R.layout.dialog_recycler_view) {
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.apply {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt
+1 -3
View File
@@ -151,12 +151,10 @@ class ImportTxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie
override fun registerListener(holder: ItemViewHolder, binding: ItemSourceImportBinding) {
binding.apply {
cbSourceName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbSourceName.setOnUserCheckedChangeListener { isChecked ->
viewModel.selectStatus[holder.layoutPosition] = isChecked
upSelectText()
}
}
root.onClick {
cbSourceName.isChecked = !cbSourceName.isChecked
viewModel.selectStatus[holder.layoutPosition] = cbSourceName.isChecked
app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt
+1 -3
View File
@@ -135,15 +135,13 @@ class GroupManageDialog : BaseDialogFragment(R.layout.dialog_recycler_view),
)
}
}
swShow.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
swShow.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
viewModel.upGroup(it.copy(show = isChecked))
}
}
}
}
}
override fun swap(srcPosition: Int, targetPosition: Int): Boolean {
swapItem(srcPosition, targetPosition)
app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt
+1 -3
View File
@@ -127,8 +127,7 @@ class GroupSelectDialog() : BaseDialogFragment(R.layout.dialog_book_group_picker
override fun registerListener(holder: ItemViewHolder, binding: ItemGroupSelectBinding) {
binding.run {
cbGroup.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
cbGroup.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
groupId = if (isChecked) {
groupId + it.groupId
@@ -137,7 +136,6 @@ class GroupSelectDialog() : BaseDialogFragment(R.layout.dialog_book_group_picker
}
}
}
}
tvEdit.setOnClickListener {
showDialogFragment(
GroupEditDialog(getItem(holder.layoutPosition))
app/src/main/java/io/legado/app/ui/book/import/remote/ServersDialog.kt
+2 -2
View File
@@ -116,8 +116,8 @@ class ServersDialog : BaseDialogFragment(R.layout.dialog_recycler_view),
}
override fun registerListener(holder: ItemViewHolder, binding: ItemServerSelectBinding) {
binding.rbServer.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed && isChecked) {
binding.rbServer.setOnUserCheckedChangeListener { isChecked ->
if (isChecked) {
selectServerId = getItemByLayoutPosition(holder.layoutPosition)!!.id
adapter.updateItems(0, itemCount - 1, "upSelect")
}
app/src/main/java/io/legado/app/ui/book/manage/BookAdapter.kt
+2 -6
View File
@@ -17,7 +17,7 @@ import io.legado.app.help.config.AppConfig
import io.legado.app.lib.theme.backgroundColor
import io.legado.app.ui.widget.recycler.DragSelectTouchHelper
import io.legado.app.ui.widget.recycler.ItemTouchCallback
import java.util.*
import java.util.Collections
class BookAdapter(context: Context, val callBack: CallBack) :
RecyclerAdapter<Book, ItemArrangeBookBinding>(context),
@@ -65,10 +65,8 @@ class BookAdapter(context: Context, val callBack: CallBack) :
override fun registerListener(holder: ItemViewHolder, binding: ItemArrangeBookBinding) {
binding.apply {
checkbox.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
checkbox.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
if (buttonView.isPressed) {
if (isChecked) {
selectedBooks.add(it)
} else {
@@ -77,8 +75,6 @@ class BookAdapter(context: Context, val callBack: CallBack) :
callBack.upSelectCount()
}
}
}
}
root.setOnClickListener {
getItem(holder.layoutPosition)?.let {
checkbox.isChecked = !checkbox.isChecked
app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt
+4 -8
View File
@@ -203,31 +203,28 @@ class SearchScopeDialog : BaseDialogFragment(R.layout.dialog_search_scope) {
groups.getOrNull(position)?.let {
holder.binding.checkBox.isChecked = selectGroups.contains(it)
holder.binding.checkBox.text = it
holder.binding.checkBox.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
holder.binding.checkBox.setOnUserCheckedChangeListener { isChecked ->
if (isChecked) {
selectGroups.add(it)
} else {
selectGroups.remove(it)
}
buttonView.post {
holder.itemView.post {
notifyItemRangeChanged(0, itemCount, "up")
}
}
}
}
}
is ItemRadioButtonBinding -> {
screenSources.getOrNull(position)?.let {
holder.binding.radioButton.isChecked = selectSource == it
holder.binding.radioButton.text = it.bookSourceName
holder.binding.radioButton.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
holder.binding.radioButton.setOnUserCheckedChangeListener { isChecked ->
if (isChecked) {
selectSource = it
}
buttonView.post {
holder.itemView.post {
notifyItemRangeChanged(0, itemCount, "up")
}
}
@@ -235,7 +232,6 @@ class SearchScopeDialog : BaseDialogFragment(R.layout.dialog_search_scope) {
}
}
}
}
override fun getItemCount(): Int {
return if (binding.rbSource.isChecked) {
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt
+2 -6
View File
@@ -125,17 +125,14 @@ class BookSourceAdapter(
override fun registerListener(holder: ItemViewHolder, binding: ItemBookSourceBinding) {
binding.apply {
swtEnabled.setOnCheckedChangeListener { view, checked ->
swtEnabled.setOnUserCheckedChangeListener { checked ->
getItem(holder.layoutPosition)?.let {
if (view.isPressed) {
it.enabled = checked
callBack.enable(checked, it)
}
}
}
cbBookSource.setOnCheckedChangeListener { view, checked ->
cbBookSource.setOnUserCheckedChangeListener { checked ->
getItem(holder.layoutPosition)?.let {
if (view.isPressed) {
if (checked) {
selected.add(it)
} else {
@@ -144,7 +141,6 @@ class BookSourceAdapter(
callBack.upCountView()
}
}
}
ivEdit.setOnClickListener {
getItem(holder.layoutPosition)?.let {
callBack.edit(it)
app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt
+2 -6
View File
@@ -100,9 +100,8 @@ class TxtTocRuleAdapter(context: Context, private val callBack: CallBack) :
}
override fun registerListener(holder: ItemViewHolder, binding: ItemTxtTocRuleBinding) {
binding.cbSource.setOnCheckedChangeListener { buttonView, isChecked ->
binding.cbSource.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
if (buttonView.isPressed) {
if (isChecked) {
selected.add(it)
} else {
@@ -111,15 +110,12 @@ class TxtTocRuleAdapter(context: Context, private val callBack: CallBack) :
callBack.upCountView()
}
}
}
binding.swtEnabled.setOnCheckedChangeListener { buttonView, isChecked ->
binding.swtEnabled.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
if (buttonView.isPressed) {
it.enable = isChecked
callBack.update(it)
}
}
}
binding.ivEdit.setOnClickListener {
getItem(holder.layoutPosition)?.let {
callBack.edit(it)
app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt
+4 -5
View File
@@ -150,6 +150,7 @@ class TxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_toc_regex),
mode = HandleFileContract.FILE
allowExtensions = arrayOf("txt", "json")
}
R.id.menu_import_onLine -> showImportDialog()
R.id.menu_import_qr -> qrCodeResult.launch()
R.id.menu_import_default -> viewModel.importDefault()
@@ -274,20 +275,18 @@ class TxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_toc_regex),
override fun registerListener(holder: ItemViewHolder, binding: ItemTocRegexBinding) {
binding.apply {
rbRegexName.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed && isChecked) {
rbRegexName.setOnUserCheckedChangeListener { isChecked ->
if (isChecked) {
selectedName = getItem(holder.layoutPosition)?.name
updateItems(0, itemCount - 1, bundleOf("upSelect" to null))
}
}
swtEnabled.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
swtEnabled.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
it.enable = isChecked
viewModel.update(it)
}
}
}
ivEdit.setOnClickListener {
showDialogFragment(TxtTocRuleEditDialog(getItem(holder.layoutPosition)?.id))
}
app/src/main/java/io/legado/app/ui/dict/rule/DictRuleAdapter.kt
+1 -3
View File
@@ -117,14 +117,12 @@ class DictRuleAdapter(context: Context, var callBack: CallBack) :
override fun registerListener(holder: ItemViewHolder, binding: ItemDictRuleBinding) {
binding.apply {
swtEnabled.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
swtEnabled.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
it.enabled = isChecked
callBack.update(it)
}
}
}
cbName.setOnClickListener {
getItem(holder.layoutPosition)?.let {
if (cbName.isChecked) {
app/src/main/java/io/legado/app/ui/replace/ReplaceRuleAdapter.kt
+1 -3
View File
@@ -125,14 +125,12 @@ class ReplaceRuleAdapter(context: Context, var callBack: CallBack) :
override fun registerListener(holder: ItemViewHolder, binding: ItemReplaceRuleBinding) {
binding.apply {
swtEnabled.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
swtEnabled.setOnUserCheckedChangeListener { isChecked ->
getItem(holder.layoutPosition)?.let {
it.isEnabled = isChecked
callBack.update(it)
}
}
}
ivEdit.setOnClickListener {
getItem(holder.layoutPosition)?.let {
callBack.edit(it)
app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditAdapter.kt
+3 -4
View File
@@ -40,6 +40,7 @@ class RssSourceEditAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
.inflate(LayoutInflater.from(parent.context), parent, false)
CheckBoxViewHolder(binding)
}
else -> {
val binding = ItemSourceEditBinding
.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -113,19 +114,17 @@ class RssSourceEditAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
}
}
inner class CheckBoxViewHolder(val binding: ItemSourceEditCheckBoxBinding) :
class CheckBoxViewHolder(val binding: ItemSourceEditCheckBoxBinding) :
RecyclerView.ViewHolder(binding.root) {
fun bind(editEntity: EditEntity) = binding.run {
checkBox.setOnCheckedChangeListener(null)
checkBox.text = editEntity.hint
checkBox.isChecked = editEntity.value.isTrue()
checkBox.setOnCheckedChangeListener { _, isChecked ->
checkBox.setOnUserCheckedChangeListener { isChecked ->
editEntity.value = isChecked.toString()
}
}
}
app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt
+2 -10
View File
@@ -95,20 +95,14 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
override fun registerListener(holder: ItemViewHolder, binding: ItemRssSourceBinding) {
binding.apply {
swtEnabled.setOnCheckedChangeListener { view, checked ->
if (view.isPressed) {
swtEnabled.setOnUserCheckedChangeListener { checked ->
getItem(holder.layoutPosition)?.let {
if (view.isPressed) {
it.enabled = checked
callBack.update(it)
}
}
}
}
cbSource.setOnCheckedChangeListener { view, checked ->
if (view.isPressed) {
cbSource.setOnUserCheckedChangeListener { checked ->
getItem(holder.layoutPosition)?.let {
if (view.isPressed) {
if (checked) {
selected.add(it)
} else {
@@ -117,8 +111,6 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
callBack.upCountView()
}
}
}
}
ivEdit.setOnClickListener {
getItem(holder.layoutPosition)?.let {
callBack.edit(it)
app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt
+1 -3
View File
@@ -44,11 +44,9 @@ class SelectActionBar @JvmOverloads constructor(
binding.cbSelectedAll.setTextColor(primaryTextColor)
TintHelper.setTint(binding.cbSelectedAll, context.accentColor, !bgIsLight)
binding.ivMenuMore.setColorFilter(disabledColor, PorterDuff.Mode.SRC_IN)
binding.cbSelectedAll.setOnCheckedChangeListener { buttonView, isChecked ->
if (buttonView.isPressed) {
binding.cbSelectedAll.setOnUserCheckedChangeListener { isChecked ->
callBack?.selectAll(isChecked)
}
}
binding.btnRevertSelection.setOnClickListener { callBack?.revertSelection() }
binding.btnSelectActionMain.setOnClickListener { callBack?.onClickSelectBarMainAction() }
binding.ivMenuMore.setOnClickListener { selMenu?.show() }