fix: play Ui logic

WisteFinch · Aug 18, 2024 · ef1b8a0 · ef1b8a0
1 parent d743e5f
commit ef1b8a0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/...agems/app/src/main/java/indie/wistefinch/callforstratagems/fragments/play/PlayFragment.kt b/...agems/app/src/main/java/indie/wistefinch/callforstratagems/fragments/play/PlayFragment.kt
@@ -419,19 +419,20 @@ class PlayFragment : Fragment() {
 
         // Set Uis and flags.
         if (!isFreeInput) {
-            itemSelected = true
-            currentItem = data
-            stepAdapter.setData(data.steps)
-            stepsList = data.steps.toMutableList()
-            binding.playStratagemTitle.text = data.name
-            binding.playBlank.visibility = View.INVISIBLE
-            binding.playStratagemTitle.visibility = View.VISIBLE
-            binding.playStepsScrollView.visibility = View.VISIBLE
-        }
-        else {
-            itemSelected = false
-            binding.playStratagemTitle.visibility = View.INVISIBLE
-            binding.playStepsScrollView.visibility = View.INVISIBLE
+            if (itemSelected && currentItem == data) {
+                resetUi()
+            }
+            else {
+                itemSelected = true
+                currentItem = data
+                stepAdapter.clear()
+                stepAdapter.setData(data.steps)
+                stepsList = data.steps.toMutableList()
+                binding.playStratagemTitle.text = data.name
+                binding.playBlank.visibility = View.INVISIBLE
+                binding.playStratagemTitle.visibility = View.VISIBLE
+                binding.playStepsScrollView.visibility = View.VISIBLE
+            }
         }
     }
 
@@ -499,10 +500,17 @@ class PlayFragment : Fragment() {
         lifecycleScope.launch {
             activateStratagem(currentItem)
         }
+        resetUi()
+    }
+
+    /**
+     * Reset Ui
+     */
+    private fun resetUi() {
         // Reset Uis and flags
         itemSelected = false
         currentStepPos = 0
-        stepAdapter.setData(listOf())
+        stepAdapter.clear()
         binding.playBlank.visibility = View.VISIBLE
         binding.playStratagemTitle.visibility = View.INVISIBLE
         binding.playStepsScrollView.visibility = View.INVISIBLE
@@ -529,6 +537,7 @@ class PlayFragment : Fragment() {
                 lifecycleScope.launch {
                     activateStratagem(item)
                 }
+                resetUi()
             }
         }
         val itemTouchHelper = ItemTouchHelper(callback)

diff --git a/...ms/app/src/main/java/indie/wistefinch/callforstratagems/fragments/play/StepPlayAdapter.kt b/...ms/app/src/main/java/indie/wistefinch/callforstratagems/fragments/play/StepPlayAdapter.kt
@@ -80,4 +80,14 @@ class StepPlayAdapter: RecyclerView.Adapter<StepPlayAdapter.ListViewHolder>() {
         this.dataList = list
         notifyDataSetChanged()
     }
+
+    /**
+     * Clear the adapter data
+     *
+     * Because of the small amount of data, there is no need to compare the difference, ignore the warning.
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    fun clear() {
+        setData(listOf())
+    }
 }