#378 remove actions

keymapperorg · Nov 14, 2020 · a314492 · a314492
1 parent 2a9765a
commit a314492
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/app/src/main/java/io/github/sds100/keymapper/data/viewmodel/FingerprintGestureViewModel.kt b/app/src/main/java/io/github/sds100/keymapper/data/viewmodel/FingerprintGestureViewModel.kt
@@ -35,14 +35,26 @@ class FingerprintGestureViewModel(private val mPreferenceDataStore: IPreferenceD
         this.models.value = Data(models)
     }
 
-    fun setAction(id: String, action: Action) {
-        val fingerprintGestureMap = retrieveFingerprintMap(FingerprintGestureUtils.PREF_KEYS[id]!!)
+    fun setAction(id: String, action: Action) = editFingerprintMap(id) {
+        it.clone(action = action)
+    }
+
+
+    fun removeAction(id: String) = editFingerprintMap(id) {
+        it.clone(action = null)
+    }
+
+    private fun editFingerprintMap(
+        gestureId: String,
+        block: (old: FingerprintGestureMap) -> FingerprintGestureMap
+    ) {
+        val fingerprintGestureMap = retrieveFingerprintMap(FingerprintGestureUtils.PREF_KEYS[gestureId]!!)
             ?: FingerprintGestureMap()
 
         fingerprintGestureMap.apply {
-            val prefKey = FingerprintGestureUtils.PREF_KEYS[id]!!
+            val prefKey = FingerprintGestureUtils.PREF_KEYS[gestureId]!!
 
-            saveFingerprintMap(prefKey, clone(action = action))
+            saveFingerprintMap(prefKey, block.invoke(fingerprintGestureMap))
         }
     }
 

diff --git a/app/src/main/java/io/github/sds100/keymapper/ui/fragment/FingerprintGestureFragment.kt b/app/src/main/java/io/github/sds100/keymapper/ui/fragment/FingerprintGestureFragment.kt
@@ -41,6 +41,10 @@ class FingerprintGestureFragment : DefaultRecyclerViewFragment() {
 
                             findNavController().navigate(direction)
                         }
+
+                        onRemoveActionClick { _ ->
+                            mViewModel.removeAction(it.id)
+                        }
                     }
                 }
             }

diff --git a/app/src/main/java/io/github/sds100/keymapper/util/FingerprintGestureUtils.kt b/app/src/main/java/io/github/sds100/keymapper/util/FingerprintGestureUtils.kt
@@ -10,7 +10,7 @@ object FingerprintGestureUtils {
     const val SWIPE_UP = "swipe_up"
 
     const val CHOOSE_ACTION_SWIPE_DOWN_REQUEST_KEY = "request_choose_action_swipe_down"
-    const val CHOOSE_ACTION_SWIPE_UP_REQUEST_KEY = "request_choose_action_swipe_down"
+    const val CHOOSE_ACTION_SWIPE_UP_REQUEST_KEY = "request_choose_action_swipe_up"
 
     val GESTURES = arrayOf(SWIPE_DOWN, SWIPE_UP)