Updated replace rule activity

app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt

@@ -13,6 +13,8 @@ import io.legado.app.data.entities.ReplaceRule
 import kotlinx.android.synthetic.main.activity_replace_rule.*
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.toast
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.ItemTouchHelper
 
 
 class ReplaceRuleActivity : AppCompatActivity() {
@@ -26,6 +28,7 @@ class ReplaceRuleActivity : AppCompatActivity() {
         rv_replace_rule.layoutManager = LinearLayoutManager(this)
         initRecyclerView()
         initDataObservers()
+        initSwipeToDelete()
     }
 
     private fun initRecyclerView() {
@@ -69,4 +72,28 @@ class ReplaceRuleActivity : AppCompatActivity() {
             }
         }
     }
+
+    private fun initSwipeToDelete() {
+        ItemTouchHelper(object : ItemTouchHelper.Callback() {
+
+            override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+                return ItemTouchHelper.Callback.makeMovementFlags(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT)
+            }
+
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {
+                return false
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                toast("You swiped the item!")
+                TODO()
+                // remove((viewHolder as TodoViewHolder).todo)
+            }
+        }).attachToRecyclerView(rv_replace_rule)
+
+    }
 }

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

@@ -50,13 +50,15 @@ class ReplaceRuleAdapter(context: Context) :
 
     class MyViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         fun bind(rule: ReplaceRule, listener: OnClickListener?, hideDivider: Boolean) = with(itemView) {
-            cb_enable.text      = rule.name
-            cb_enable.isChecked = rule.isEnabled
+            tv_name.text            = rule.name
+            swt_enabled.isChecked = rule.isEnabled
             divider.isGone          = hideDivider
-            iv_delete.onClick { listener?.delete(rule) }
-            iv_edit.onClick { listener?.edit(rule) }
-            cb_enable.onClick {
-                rule.isEnabled = cb_enable.isChecked
+            iv_delete.isGone = true
+            iv_edit.isGone = true
+            // iv_delete.onClick { listener?.delete(rule) }
+            // iv_edit.onClick { listener?.edit(rule) }
+            swt_enabled.onClick {
+                rule.isEnabled = swt_enabled.isChecked
                 listener?.update(rule)
             }
         }

app/src/main/res/layout/item_relace_rule.xml

@@ -2,25 +2,12 @@
 <androidx.constraintlayout.widget.ConstraintLayout
         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:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-    <androidx.appcompat.widget.AppCompatCheckBox
-            android:id="@+id/cb_enable"
-            android:text="Rule Name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:textSize="16sp"
-            android:textColor="@color/text_default"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/iv_delete"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
     <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_edit"
             android:layout_width="wrap_content"
@@ -29,6 +16,7 @@
             android:background="@drawable/bg_ib_pre_round"
             android:contentDescription="@string/edit"
             android:src="@drawable/ic_edit"
+            android:visibility="gone"
             app:tint="@color/text_default"
             app:layout_constraintEnd_toStartOf="@id/iv_delete"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -42,11 +30,54 @@
             android:background="@drawable/bg_ib_pre_round"
             android:contentDescription="@string/delete"
             android:src="@drawable/ic_clear_all"
+            android:visibility="gone"
             app:tint="@color/text_default"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
+
+    <androidx.appcompat.widget.AppCompatCheckBox
+            android:id="@+id/cb_selected"
+            android:text=""
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="16dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tv_name"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:textSize="16sp"
+            android:text="Item Name"
+            android:textColor="@color/text_default"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/cb_selected"
+            app:layout_constraintEnd_toStartOf="@id/swt_enabled"/>
+
+
+    <Switch
+            android:id="@+id/swt_enabled"
+            android:name="@string/enable"
+            android:text=""
+            android:paddingStart="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tv_name"
+            app:layout_constraintHorizontal_bias="1"/>
+
+
     <View
             android:id="@+id/divider"
             android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -30,4 +30,5 @@
     <string name="delete">删除</string>
     <string name="replace">净化替换</string>
     <string name="not_available">暂无</string>
+    <string name="enable">启用</string>
 </resources>