Add position via dragging the recyclerview

app/src/main/java/com/geeksville/mesh/ui/DragManageAdapter.kt

@@ -1,12 +1,13 @@
 package com.geeksville.mesh.ui
 
-import android.content.Context
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 
-class DragManageAdapter(var adapter: SwapAdapter, context: Context, dragDirs: Int, swipeDirs: Int) : ItemTouchHelper.SimpleCallback(dragDirs, swipeDirs) {
+class DragManageAdapter(var adapter: SwapAdapter, dragDirs: Int, swipeDirs: Int) :
+    ItemTouchHelper.SimpleCallback(dragDirs, swipeDirs) {
     interface SwapAdapter {
         fun swapItems(fromPosition: Int, toPosition: Int)
+        fun commitSwaps()
     }
 
     override fun onMove(
@@ -15,7 +16,15 @@ class DragManageAdapter(var adapter: SwapAdapter, context: Context, dragDirs: In
         target: RecyclerView.ViewHolder
     ): Boolean {
         adapter.swapItems(viewHolder.absoluteAdapterPosition, target.absoluteAdapterPosition)
-        TODO("Not yet implemented")
+        return true
+    }
+
+    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+        super.onSelectedChanged(viewHolder, actionState)
+
+        if (actionState == ItemTouchHelper.ACTION_STATE_IDLE) {
+            adapter.commitSwaps()
+        }
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {

app/src/main/java/com/geeksville/mesh/ui/QuickChatActionAdapter.kt

@@ -1,7 +1,6 @@
 package com.geeksville.mesh.ui
 
 import android.content.Context
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,12 +11,13 @@ import com.geeksville.mesh.database.entity.QuickChatAction
 
 class QuickChatActionAdapter internal constructor(
     context: Context,
-    private val onEdit: (action: QuickChatAction) -> Unit
+    private val onEdit: (action: QuickChatAction) -> Unit,
+    private val repositionAction: (fromPos: Int, toPos: Int) -> Unit,
+    private val commitAction: () -> Unit,
 ) : RecyclerView.Adapter<QuickChatActionAdapter.ActionViewHolder>(), DragManageAdapter.SwapAdapter {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
     private var actions = emptyList<QuickChatAction>()
-    private val TAG = "QuickChatAdapter"
 
     inner class ActionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val actionName: TextView = itemView.findViewById(R.id.quickChatActionName)
@@ -27,7 +27,6 @@ class QuickChatActionAdapter internal constructor(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ActionViewHolder {
         val itemView = inflater.inflate(R.layout.adapter_quick_chat_action_layout, parent, false)
-        Log.d(TAG, "Created view holder")
         return ActionViewHolder(itemView)
     }
 
@@ -35,24 +34,26 @@ class QuickChatActionAdapter internal constructor(
         val current = actions[position]
         holder.actionName.text = current.name
         holder.actionValue.text = current.message
-        holder.actionEdit.setOnClickListener{
+        holder.actionEdit.setOnClickListener {
             onEdit(current)
         }
-        Log.d(TAG, "Bound actions")
     }
 
 
     internal fun setActions(actions: List<QuickChatAction>) {
         this.actions = actions
         notifyDataSetChanged()
-        Log.d(TAG, String.format("setActions(size=%d, count=%d)", actions.size, itemCount))
     }
 
     override fun getItemCount() = actions.size
 
     override fun swapItems(fromPosition: Int, toPosition: Int) {
-        // TODO: Update data
+        repositionAction(fromPosition, toPosition)
         notifyItemMoved(fromPosition, toPosition)
     }
 
+    override fun commitSwaps() {
+        commitAction()
+    }
+
 }

app/src/main/java/com/geeksville/mesh/ui/QuickChatSettingsFragment.kt

@@ -13,12 +13,13 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.geeksville.android.Logging
 import com.geeksville.mesh.R
-import com.geeksville.mesh.databinding.QuickChatSettingsFragmentBinding
 import com.geeksville.mesh.database.entity.QuickChatAction
+import com.geeksville.mesh.databinding.QuickChatSettingsFragmentBinding
 import com.geeksville.mesh.model.UIViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.switchmaterial.SwitchMaterial
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.*
 
 @AndroidEntryPoint
 class QuickChatSettingsFragment : ScreenFragment("Quick Chat settings"), Logging {
@@ -28,6 +29,8 @@ class QuickChatSettingsFragment : ScreenFragment("Quick Chat settings"), Logging
 
     private val model: UIViewModel by activityViewModels()
 
+    private lateinit var actions: List<QuickChatAction>
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -39,11 +42,7 @@ class QuickChatSettingsFragment : ScreenFragment("Quick Chat settings"), Logging
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        Log.d(TAG, "viewCreated")
-
         binding.quickChatSettingsCreateButton.setOnClickListener {
-            Log.d(TAG, "Create quick chat")
-
             val builder = createEditDialog(requireContext(), "New quick chat")
 
             builder.builder.setPositiveButton("Add") { view, x ->
@@ -62,7 +61,7 @@ class QuickChatSettingsFragment : ScreenFragment("Quick Chat settings"), Logging
         }
 
         val quickChatActionAdapter =
-            QuickChatActionAdapter(requireContext()) { action: QuickChatAction ->
+            QuickChatActionAdapter(requireContext(), { action: QuickChatAction ->
                 val builder = createEditDialog(requireContext(), "Edit quick chat")
                 builder.nameInput.setText(action.name)
                 builder.messageInput.setText(action.message)
@@ -83,9 +82,14 @@ class QuickChatSettingsFragment : ScreenFragment("Quick Chat settings"), Logging
                 }
                 val dialog = builder.builder.create()
                 dialog.show()
-            }
+            }, { fromPos, toPos ->
+                Collections.swap(actions, fromPos, toPos)
+            }, {
+                model.updateActionPositions(actions)
+            })
 
-        val dragCallback = DragManageAdapter(quickChatActionAdapter, requireContext(), ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
+        val dragCallback =
+            DragManageAdapter(quickChatActionAdapter, ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
         val helper = ItemTouchHelper(dragCallback)
 
         binding.quickChatSettingsView.apply {
@@ -94,12 +98,12 @@ class QuickChatSettingsFragment : ScreenFragment("Quick Chat settings"), Logging
             helper.attachToRecyclerView(this)
         }
 
-
         model.quickChatActions.asLiveData().observe(viewLifecycleOwner) { actions ->
-            actions?.let { quickChatActionAdapter.setActions(actions) }
+            actions?.let {
+                quickChatActionAdapter.setActions(actions)
+                this.actions = actions
+            }
         }
-
-        Log.d(TAG, "viewCreation done")
     }
 
     data class DialogBuilder(