refactor[auto answer]: extract Q/A display

moves more behavior inside the object Still not too well factored, but getting there
Tyler-Programs · Oct 13, 2021 · 331a8b5 · 331a8b5
1 parent 0ffc8d7
commit 331a8b5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
@@ -1900,15 +1900,7 @@ protected void displayCardQuestion(boolean reload) {
         hideEaseButtons();
 
         // If the user wants to show the answer automatically
-        if (mAutomaticAnswerSettings.useTimer()) {
-            if (mAutomaticAnswerSettings.autoAdvanceAnswer()) {
-                mAutomaticAnswerSettings.stopShowingAnswer();
-                if (!mSpeakText) {
-                    long delay = mAutomaticAnswerSettings.getAnswerDelayMilliseconds() + mUseTimerDynamicMS;
-                    mAutomaticAnswerSettings.delayedShowAnswer(delay);
-                }
-            }
-        }
+        mAutomaticAnswerSettings.onDisplayQuestion(!mSpeakText, mUseTimerDynamicMS);
 
         Timber.i("AbstractFlashcardViewer:: Question successfully shown for card id %d", mCurrentCard.getId());
     }
@@ -1950,15 +1942,7 @@ protected void displayCardAnswer() {
         updateCard(CardAppearance.enrichWithQADiv(answer, true));
         displayAnswerBottomBar();
         // If the user wants to show the next question automatically
-        if (mAutomaticAnswerSettings.useTimer()) {
-            if (mAutomaticAnswerSettings.autoAdvanceQuestion()) {
-                mAutomaticAnswerSettings.stopShowingQuestion();
-                if (!mSpeakText) {
-                    long delay = mAutomaticAnswerSettings.getQuestionDelayMilliseconds() + mUseTimerDynamicMS;
-                    mAutomaticAnswerSettings.delayedShowQuestion(delay);
-                }
-            }
-        }
+        mAutomaticAnswerSettings.onDisplayAnswer(!mSpeakText, mUseTimerDynamicMS);
     }
 
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AutomaticAnswerSettings.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AutomaticAnswerSettings.kt
@@ -69,6 +69,28 @@ class AutomaticAnswerSettings(
         stopShowingQuestion()
     }
 
+    fun onDisplayQuestion(reschedule: Boolean, additionalDelay: Long) {
+        if (!useTimer) return
+        if (!autoAdvanceAnswer) return
+
+        stopShowingAnswer()
+
+        if (!reschedule) return
+        val delay: Long = answerDelayMilliseconds + additionalDelay
+        delayedShowAnswer(delay)
+    }
+
+    fun onDisplayAnswer(reschedule: Boolean, additionalDelay: Long) {
+        if (!useTimer) return
+        if (!autoAdvanceQuestion) return
+
+        stopShowingQuestion()
+
+        if (!reschedule) return
+        val delay: Long = questionDelayMilliseconds + additionalDelay
+        delayedShowQuestion(delay)
+    }
+
     interface AutomaticallyAnswered {
         fun automaticShowAnswer()
         fun automaticShowQuestion()