Merge branch 'master' of https://github.com/gedoor/legado

app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookAdapter.kt

@@ -52,16 +52,17 @@ class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
     override fun registerListener(holder: ItemViewHolder, binding: ItemArrangeBookBinding) {
         binding.apply {
             checkbox.setOnCheckedChangeListener { buttonView, isChecked ->
-                getItem(holder.layoutPosition)?.let {
-                    if (buttonView.isPressed) {
-                        if (isChecked) {
-                            selectedBooks.add(it)
-                        } else {
-                            selectedBooks.remove(it)
+                if (buttonView.isPressed) {
+                    getItem(holder.layoutPosition)?.let {
+                        if (buttonView.isPressed) {
+                            if (isChecked) {
+                                selectedBooks.add(it)
+                            } else {
+                                selectedBooks.remove(it)
+                            }
+                            callBack.upSelectCount()
                         }
-                        callBack.upSelectCount()
                     }
-
                 }
             }
             root.onClick {

app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt

@@ -177,8 +177,8 @@ class GroupSelectDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener
         override fun registerListener(holder: ItemViewHolder, binding: ItemGroupSelectBinding) {
             with(binding) {
                 cbGroup.setOnCheckedChangeListener { buttonView, isChecked ->
-                    getItem(holder.layoutPosition)?.let {
-                        if (buttonView.isPressed) {
+                    if (buttonView.isPressed) {
+                        getItem(holder.layoutPosition)?.let {
                             groupId = if (isChecked) {
                                 groupId + it.groupId
                             } else {

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt

@@ -117,22 +117,26 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
     override fun registerListener(holder: ItemViewHolder, binding: ItemBookSourceBinding) {
         binding.apply {
             swtEnabled.setOnCheckedChangeListener { view, checked ->
-                getItem(holder.layoutPosition)?.let {
-                    if (view.isPressed) {
-                        it.enabled = checked
-                        callBack.update(it)
+                if (view.isPressed) {
+                    getItem(holder.layoutPosition)?.let {
+                        if (view.isPressed) {
+                            it.enabled = checked
+                            callBack.update(it)
+                        }
                     }
                 }
             }
             cbBookSource.setOnCheckedChangeListener { view, checked ->
-                getItem(holder.layoutPosition)?.let {
-                    if (view.isPressed) {
-                        if (checked) {
-                            selected.add(it)
-                        } else {
-                            selected.remove(it)
+                if (view.isPressed) {
+                    getItem(holder.layoutPosition)?.let {
+                        if (view.isPressed) {
+                            if (checked) {
+                                selected.add(it)
+                            } else {
+                                selected.remove(it)
+                            }
+                            callBack.upCountView()
                         }
-                        callBack.upCountView()
                     }
                 }
             }

app/src/main/java/io/legado/app/ui/replace/ReplaceRuleAdapter.kt

@@ -101,10 +101,12 @@ class ReplaceRuleAdapter(context: Context, var callBack: CallBack) :
 
     override fun registerListener(holder: ItemViewHolder, binding: ItemReplaceRuleBinding) {
         binding.apply {
-            swtEnabled.setOnCheckedChangeListener { _, isChecked ->
-                getItem(holder.layoutPosition)?.let {
-                    it.isEnabled = isChecked
-                    callBack.update(it)
+            swtEnabled.setOnCheckedChangeListener { buttonView, isChecked ->
+                if (buttonView.isPressed) {
+                    getItem(holder.layoutPosition)?.let {
+                        it.isEnabled = isChecked
+                        callBack.update(it)
+                    }
                 }
             }
             ivEdit.onClick {

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt

@@ -98,22 +98,26 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
     override fun registerListener(holder: ItemViewHolder, binding: ItemRssSourceBinding) {
         binding.apply {
             swtEnabled.setOnCheckedChangeListener { view, checked ->
-                getItem(holder.layoutPosition)?.let {
-                    if (view.isPressed) {
-                        it.enabled = checked
-                        callBack.update(it)
+                if (view.isPressed) {
+                    getItem(holder.layoutPosition)?.let {
+                        if (view.isPressed) {
+                            it.enabled = checked
+                            callBack.update(it)
+                        }
                     }
                 }
             }
             cbSource.setOnCheckedChangeListener { view, checked ->
-                getItem(holder.layoutPosition)?.let {
-                    if (view.isPressed) {
-                        if (checked) {
-                            selected.add(it)
-                        } else {
-                            selected.remove(it)
+                if (view.isPressed) {
+                    getItem(holder.layoutPosition)?.let {
+                        if (view.isPressed) {
+                            if (checked) {
+                                selected.add(it)
+                            } else {
+                                selected.remove(it)
+                            }
+                            callBack.upCountView()
                         }
-                        callBack.upCountView()
                     }
                 }
             }