From 80ebdf1988cf297099077301e2fc92c1771ecc67 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 4 Oct 2024 17:48:45 +1000
Subject: [PATCH] Flip order of question/answer actions, and
 ascending/descending ease

https://forums.ankiweb.net/t/anki-24-10-beta/49989/53
---
 ts/routes/deck-options/AutoAdvance.svelte |  36 ++++----
 ts/routes/deck-options/choices.ts         | 102 ++++++++++++----------
 2 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/ts/routes/deck-options/AutoAdvance.svelte b/ts/routes/deck-options/AutoAdvance.svelte
index b8069ff39..f17f0e5d9 100644
--- a/ts/routes/deck-options/AutoAdvance.svelte
+++ b/ts/routes/deck-options/AutoAdvance.svelte
@@ -40,14 +40,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             title: tr.deckConfigWaitForAudio(),
             help: tr.deckConfigWaitForAudioTooltip2(),
         },
-        answerAction: {
-            title: tr.deckConfigAnswerAction(),
-            help: tr.deckConfigAnswerActionTooltip2(),
-        },
         questionAction: {
             title: tr.deckConfigQuestionAction(),
             help: tr.deckConfigQuestionActionToolTip(),
         },
+        answerAction: {
+            title: tr.deckConfigAnswerAction(),
+            help: tr.deckConfigAnswerActionTooltip2(),
+        },
     };
     const helpSections = Object.values(settings) as HelpItem[];
 
@@ -120,20 +120,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             </SwitchRow>
         </Item>
 
-        <Item>
-            <EnumSelectorRow
-                bind:value={$config.answerAction}
-                defaultValue={defaults.answerAction}
-                choices={answerChoices()}
-            >
-                <SettingTitle
-                    on:click={() =>
-                        openHelpModal(Object.keys(settings).indexOf("answerAction"))}
-                >
-                    {settings.answerAction.title}
-                </SettingTitle>
-            </EnumSelectorRow>
-        </Item>
         <Item>
             <EnumSelectorRow
                 bind:value={$config.questionAction}
@@ -148,5 +134,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 </SettingTitle>
             </EnumSelectorRow>
         </Item>
+        <Item>
+            <EnumSelectorRow
+                bind:value={$config.answerAction}
+                defaultValue={defaults.answerAction}
+                choices={answerChoices()}
+            >
+                <SettingTitle
+                    on:click={() =>
+                        openHelpModal(Object.keys(settings).indexOf("answerAction"))}
+                >
+                    {settings.answerAction.title}
+                </SettingTitle>
+            </EnumSelectorRow>
+        </Item>
     </DynamicallySlottable>
 </TitledContainer>
diff --git a/ts/routes/deck-options/choices.ts b/ts/routes/deck-options/choices.ts
index 1622704c5..0b4611528 100644
--- a/ts/routes/deck-options/choices.ts
+++ b/ts/routes/deck-options/choices.ts
@@ -71,50 +71,47 @@ export function newSortOrderChoices(): Choice<DeckConfig_Config_NewCardSortOrder
 
 export function reviewOrderChoices(fsrs: boolean): Choice<DeckConfig_Config_ReviewCardOrder>[] {
     return [
-        {
-            label: tr.deckConfigSortOrderDueDateThenRandom(),
-            value: DeckConfig_Config_ReviewCardOrder.DAY,
-        },
-        {
-            label: tr.deckConfigSortOrderDueDateThenDeck(),
-            value: DeckConfig_Config_ReviewCardOrder.DAY_THEN_DECK,
-        },
-        {
-            label: tr.deckConfigSortOrderDeckThenDueDate(),
-            value: DeckConfig_Config_ReviewCardOrder.DECK_THEN_DAY,
-        },
-        {
-            label: tr.deckConfigSortOrderAscendingIntervals(),
-            value: DeckConfig_Config_ReviewCardOrder.INTERVALS_ASCENDING,
-        },
-        {
-            label: tr.deckConfigSortOrderDescendingIntervals(),
-            value: DeckConfig_Config_ReviewCardOrder.INTERVALS_DESCENDING,
-        },
-        {
-            label: fsrs ? tr.deckConfigSortOrderDescendingDifficulty() : tr.deckConfigSortOrderAscendingEase(),
-            value: DeckConfig_Config_ReviewCardOrder.EASE_ASCENDING,
-        },
-        {
-            label: fsrs ? tr.deckConfigSortOrderAscendingDifficulty() : tr.deckConfigSortOrderDescendingEase(),
-            value: DeckConfig_Config_ReviewCardOrder.EASE_DESCENDING,
-        },
-        {
-            label: tr.deckConfigSortOrderRelativeOverdueness(),
-            value: DeckConfig_Config_ReviewCardOrder.RELATIVE_OVERDUENESS,
-        },
-        {
-            label: tr.deckConfigSortOrderRandom(),
-            value: DeckConfig_Config_ReviewCardOrder.RANDOM,
-        },
-        {
-            label: tr.decksOrderAdded(),
-            value: DeckConfig_Config_ReviewCardOrder.ADDED,
-        },
-        {
-            label: tr.decksLatestAddedFirst(),
-            value: DeckConfig_Config_ReviewCardOrder.REVERSE_ADDED,
-        },
+        ...[
+            {
+                label: tr.deckConfigSortOrderDueDateThenRandom(),
+                value: DeckConfig_Config_ReviewCardOrder.DAY,
+            },
+            {
+                label: tr.deckConfigSortOrderDueDateThenDeck(),
+                value: DeckConfig_Config_ReviewCardOrder.DAY_THEN_DECK,
+            },
+            {
+                label: tr.deckConfigSortOrderDeckThenDueDate(),
+                value: DeckConfig_Config_ReviewCardOrder.DECK_THEN_DAY,
+            },
+            {
+                label: tr.deckConfigSortOrderAscendingIntervals(),
+                value: DeckConfig_Config_ReviewCardOrder.INTERVALS_ASCENDING,
+            },
+            {
+                label: tr.deckConfigSortOrderDescendingIntervals(),
+                value: DeckConfig_Config_ReviewCardOrder.INTERVALS_DESCENDING,
+            },
+        ],
+        ...difficultyOrders(fsrs),
+        ...[
+            {
+                label: tr.deckConfigSortOrderRelativeOverdueness(),
+                value: DeckConfig_Config_ReviewCardOrder.RELATIVE_OVERDUENESS,
+            },
+            {
+                label: tr.deckConfigSortOrderRandom(),
+                value: DeckConfig_Config_ReviewCardOrder.RANDOM,
+            },
+            {
+                label: tr.decksOrderAdded(),
+                value: DeckConfig_Config_ReviewCardOrder.ADDED,
+            },
+            {
+                label: tr.decksLatestAddedFirst(),
+                value: DeckConfig_Config_ReviewCardOrder.REVERSE_ADDED,
+            },
+        ],
     ];
 }
 
@@ -197,3 +194,20 @@ export function questionActionChoices(): Choice<DeckConfig_Config_QuestionAction
         },
     ];
 }
+
+function difficultyOrders(fsrs: boolean): Choice<DeckConfig_Config_ReviewCardOrder>[] {
+    const order = [
+        {
+            label: fsrs ? tr.deckConfigSortOrderDescendingDifficulty() : tr.deckConfigSortOrderAscendingEase(),
+            value: DeckConfig_Config_ReviewCardOrder.EASE_ASCENDING,
+        },
+        {
+            label: fsrs ? tr.deckConfigSortOrderAscendingDifficulty() : tr.deckConfigSortOrderDescendingEase(),
+            value: DeckConfig_Config_ReviewCardOrder.EASE_DESCENDING,
+        },
+    ];
+    if (fsrs) {
+        order.reverse();
+    }
+    return order;
+}