#1223 show reset sort button when changing the order as well

keymapperorg · Feb 2, 2025 · 7833710 · 7833710
1 parent 5eb072b
commit 7833710
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/src/main/java/io/github/sds100/keymapper/sorting/SortBottomSheetContent.kt b/app/src/main/java/io/github/sds100/keymapper/sorting/SortBottomSheetContent.kt
@@ -198,7 +198,7 @@ private fun SortBottomSheetContent(
             TextButton(
                 modifier = Modifier.align(Alignment.CenterEnd),
                 onClick = onReset,
-                enabled = sortFieldOrderList.any { it.order != SortOrder.NONE },
+                enabled = sortFieldOrderList != SortKeyMapsUseCaseImpl.defaultOrder,
             ) {
                 Text(stringResource(R.string.reset))
             }

diff --git a/app/src/main/java/io/github/sds100/keymapper/sorting/SortKeyMapsUseCase.kt b/app/src/main/java/io/github/sds100/keymapper/sorting/SortKeyMapsUseCase.kt
@@ -86,13 +86,22 @@ class SortKeyMapsUseCaseImpl(
             SortField.ACTIONS -> KeyMapActionsComparator(reverseOrder)
 
             SortField.CONSTRAINTS -> KeyMapConstraintsComparator(
-                constraintUiHelper,
+                displaySimpleMappingUseCase,
                 reverseOrder,
             )
 
             SortField.OPTIONS -> KeyMapOptionsComparator(reverseOrder)
         }
     }
+
+    companion object {
+        val defaultOrder = listOf(
+            SortFieldOrder(SortField.TRIGGER),
+            SortFieldOrder(SortField.ACTIONS),
+            SortFieldOrder(SortField.CONSTRAINTS),
+            SortFieldOrder(SortField.OPTIONS),
+        )
+    }
 }
 
 interface SortKeyMapsUseCase {

diff --git a/app/src/main/java/io/github/sds100/keymapper/sorting/SortViewModel.kt b/app/src/main/java/io/github/sds100/keymapper/sorting/SortViewModel.kt
@@ -62,11 +62,7 @@ class SortViewModel(
     }
 
     fun resetSortPriority() {
-        sortFieldOrder.update {
-            it.map { sortFieldOrder ->
-                sortFieldOrder.copy(order = SortOrder.NONE)
-            }
-        }
+        sortFieldOrder.value = SortKeyMapsUseCaseImpl.defaultOrder
     }
 
     fun applySortPriority() {