Add 'Previous card info' menu action in old reviewer

Author: lukstbit

AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt

@@ -1774,6 +1774,7 @@ abstract class AbstractFlashcardViewer :
             ViewerCommand.TOGGLE_FLAG_PURPLE,
             ViewerCommand.UNSET_FLAG,
             ViewerCommand.CARD_INFO,
+            ViewerCommand.PREVIOUS_CARD_INFO,
             ViewerCommand.ADD_NOTE,
             ViewerCommand.RESCHEDULE_NOTE,
             ViewerCommand.TOGGLE_AUTO_ADVANCE,

AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt

@@ -117,13 +117,15 @@ import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.ui.windows.reviewer.ReviewerFragment
+import com.ichi2.anki.utils.ext.cardStatsNoCardClean
 import com.ichi2.anki.utils.ext.flag
 import com.ichi2.anki.utils.ext.setUserFlagForCards
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.utils.navBarNeedsScrim
 import com.ichi2.anki.utils.remainingTime
 import com.ichi2.themes.Themes
 import com.ichi2.themes.Themes.currentTheme
+import com.ichi2.utils.BundleUtils.getNullableLong
 import com.ichi2.utils.HandlerUtils.executeFunctionWithDelay
 import com.ichi2.utils.HandlerUtils.getDefaultLooper
 import com.ichi2.utils.Permissions.canRecordAudio
@@ -157,6 +159,7 @@ open class Reviewer :
     private lateinit var colorPalette: LinearLayout
     private var toggleStylus = false
     private var isEraserMode = false
+    private var previousCardId: CardId? = null
 
     // A flag that determines if the SchedulingStates in CurrentQueueState are
     // safe to persist in the database when answering a card. This is used to
@@ -248,6 +251,7 @@ open class Reviewer :
         }
         startLoadingCollection()
         registerOnForgetHandler { listOf(currentCardId!!) }
+        previousCardId = savedInstanceState?.getNullableLong(KEY_PREVIOUS_CARD_ID)
     }
 
     override fun onPause() {
@@ -266,6 +270,11 @@ open class Reviewer :
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        previousCardId?.let { outState.putLong(KEY_PREVIOUS_CARD_ID, it) }
+    }
+
     protected val flagToDisplay: Flag
         get() {
             return FlagToDisplay(
@@ -531,6 +540,10 @@ open class Reviewer :
                 Timber.i("Card Viewer:: Card Info")
                 openCardInfo()
             }
+            R.id.action_previous_card_info -> {
+                Timber.i("Card Viewer:: Previous Card Info")
+                openPreviousCardInfo()
+            }
             R.id.user_action_1 -> userAction(1)
             R.id.user_action_2 -> userAction(2)
             R.id.user_action_3 -> userAction(3)
@@ -802,6 +815,19 @@ open class Reviewer :
         startActivityWithAnimation(intent, animation)
     }
 
+    @NeedsTest("Starting animation from swipe is inverse to the finishing one")
+    protected fun openPreviousCardInfo(fromGesture: Gesture? = null) {
+        if (previousCardId == null) {
+            showSnackbar(TR.cardStatsNoCardClean(), Snackbar.LENGTH_SHORT)
+            return
+        }
+        Timber.i("opening previous card info")
+        val intent = CardInfoDestination(previousCardId!!, TR.cardStatsPreviousCard(TR.decksStudy())).toIntent(this)
+        val animation = getAnimationTransitionFromGesture(fromGesture)
+        intent.putExtra(FINISH_ANIMATION_EXTRA, getInverseTransition(animation) as Parcelable)
+        startActivityWithAnimation(intent, animation)
+    }
+
     // Related to https://github.com/ankidroid/Anki-Android/pull/11061#issuecomment-1107868455
     @NeedsTest("Order of operations needs Testing around Menu (Overflow) Icons and their colors.")
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -1189,13 +1215,15 @@ open class Reviewer :
 
     override suspend fun answerCardInner(rating: Rating) {
         val state = queueState!!
-        Timber.d("answerCardInner: ${currentCard!!.id} $rating")
+        val cardId = currentCard!!.id
+        Timber.d("answerCardInner: $cardId $rating")
         var wasLeech = false
         undoableOp(this) {
             sched.answerCard(state, rating).also {
                 wasLeech = sched.stateIsLeech(state.states.again)
             }
         }.also {
+            previousCardId = cardId
             if (rating == Rating.AGAIN && wasLeech) {
                 state.topCard.load(getColUnsafe)
                 val leechMessage: String =
@@ -1382,6 +1410,10 @@ open class Reviewer :
                 openCardInfo(fromGesture)
                 return true
             }
+            ViewerCommand.PREVIOUS_CARD_INFO -> {
+                openPreviousCardInfo(fromGesture)
+                return true
+            }
             ViewerCommand.RESCHEDULE_NOTE -> {
                 showDueDateDialog()
                 return true
@@ -1769,6 +1801,8 @@ open class Reviewer :
          */
         const val EXTRA_DECK_ID = "deckId"
 
+        private const val KEY_PREVIOUS_CARD_ID = "key_previous_card_id"
+
         private const val REQUEST_AUDIO_PERMISSION = 0
         private const val ANIMATION_DURATION = 200
         private const val TRANSPARENCY = 0.90f

AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt

@@ -546,6 +546,7 @@ object UsageAnalytics {
             R.string.page_down_command_key,
             R.string.tag_command_key,
             R.string.card_info_command_key,
+            R.string.previous_card_info_command_key,
             R.string.record_voice_command_key,
             R.string.replay_voice_command_key,
             R.string.save_voice_command_key,
@@ -597,6 +598,7 @@ object UsageAnalytics {
             R.string.custom_button_add_card_key,
             R.string.custom_button_replay_key,
             R.string.custom_button_card_info_key,
+            R.string.custom_button_previous_card_info_key,
             R.string.custom_button_select_tts_key,
             R.string.custom_button_deck_options_key,
             R.string.custom_button_mark_card_key,

AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt

@@ -56,6 +56,7 @@ enum class ViewerCommand : MappableAction<ReviewerBinding> {
     PAGE_DOWN,
     TAG,
     CARD_INFO,
+    PREVIOUS_CARD_INFO,
     RECORD_VOICE,
     SAVE_VOICE,
     REPLAY_VOICE,
@@ -131,6 +132,10 @@ enum class ViewerCommand : MappableAction<ReviewerBinding> {
                 SAVE_VOICE -> listOf(keyCode(KeyEvent.KEYCODE_S, CardSide.BOTH, shift()))
                 UNDO -> listOf(keyCode(KeyEvent.KEYCODE_Z, CardSide.BOTH, ctrl()))
                 REDO -> listOf(keyCode(KeyEvent.KEYCODE_Z, CardSide.BOTH, ModifierKeys(shift = true, ctrl = true, alt = false)))
+                PREVIOUS_CARD_INFO ->
+                    listOf(
+                        keyCode(KeyEvent.KEYCODE_I, CardSide.BOTH, ModifierKeys(shift = false, ctrl = true, alt = true)),
+                    )
                 TOGGLE_FLAG_RED ->
                     listOf(
                         keyCode(KeyEvent.KEYCODE_1, CardSide.BOTH, ctrl()),

AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ActionButtonStatus.kt

@@ -41,6 +41,7 @@ class ActionButtonStatus {
         setupButton(preferences, R.id.action_add_note_reviewer, "customButtonAddCard", MENU_DISABLED)
         setupButton(preferences, R.id.action_replay, "customButtonReplay", SHOW_AS_ACTION_IF_ROOM)
         setupButton(preferences, R.id.action_card_info, "customButtonCardInfo", MENU_DISABLED)
+        setupButton(preferences, R.id.action_previous_card_info, "customButtonPreviousCardInfo", MENU_DISABLED)
         setupButton(preferences, R.id.action_clear_whiteboard, "customButtonClearWhiteboard", SHOW_AS_ACTION_IF_ROOM)
         setupButton(preferences, R.id.action_hide_whiteboard, "customButtonShowHideWhiteboard", SHOW_AS_ACTION_ALWAYS)
         setupButton(preferences, R.id.action_select_tts, "customButtonSelectTts", SHOW_AS_ACTION_NEVER)

AnkiDroid/src/main/res/menu/reviewer.xml

@@ -113,6 +113,11 @@
         android:icon="@drawable/ic_dialog_info"
         android:title="@string/card_info_title"
         ankidroid:showAsAction="never"/>
+    <item
+        android:id="@+id/action_previous_card_info"
+        android:icon="@drawable/ic_outline_info_24"
+        android:title="@string/previous_card_info_title"
+        ankidroid:showAsAction="never"/>
     <item
         android:id="@+id/action_tag"
         android:icon="@drawable/ic_tag"

AnkiDroid/src/main/res/values/01-core.xml

@@ -156,6 +156,7 @@
 
     <!-- card Info -->
     <string name="card_info_title" maxLength="28">Card info</string>
+    <string name="previous_card_info_title" maxLength="28">Previous card info</string>
 
     <!-- Permissions -->
     <string name="read_write_permission_label">Read and write to the AnkiDroid database</string>

AnkiDroid/src/main/res/values/preferences.xml

@@ -67,6 +67,7 @@
     <string name="custom_button_add_card_key">customButtonAddCard</string>
     <string name="custom_button_replay_key">customButtonReplay</string>
     <string name="custom_button_card_info_key">customButtonCardInfo</string>
+    <string name="custom_button_previous_card_info_key">customButtonPreviousCardInfo</string>
     <string name="custom_button_select_tts_key">customButtonSelectTts</string>
     <string name="custom_button_deck_options_key">customButtonDeckOptions</string>
     <string name="custom_button_mark_card_key">customButtonMarkCard</string>
@@ -129,6 +130,7 @@
     <string name="statistics_command_key">binding_STATISTICS</string>
     <string name="tag_command_key">binding_TAG</string>
     <string name="card_info_command_key">binding_CARD_INFO</string>
+    <string name="previous_card_info_command_key">binding_PREVIOUS_CARD_INFO</string>
     <string name="record_voice_command_key">binding_RECORD_VOICE</string>
     <string name="replay_voice_command_key">binding_REPLAY_VOICE</string>
     <string name="save_voice_command_key">binding_SAVE_VOICE</string>

AnkiDroid/src/main/res/xml/preferences_custom_buttons.xml

@@ -96,6 +96,13 @@ TODO: Add a unit test
             android:key="@string/custom_button_card_info_key"
             android:title="@string/card_info_title"
             app:useSimpleSummaryProvider="true"/>
+        <ListPreference
+            android:defaultValue="3"
+            android:entries="@array/custom_button_labels"
+            android:entryValues="@array/custom_button_values"
+            android:key="@string/custom_button_previous_card_info_key"
+            android:title="@string/previous_card_info_title"
+            app:useSimpleSummaryProvider="true"/>
         <ListPreference
             android:defaultValue="0"
             android:entries="@array/custom_button_labels"

AnkiDroid/src/main/res/xml/preferences_reviewer_controls.xml

@@ -95,6 +95,11 @@
         <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/card_info_command_key"
             android:title="@string/card_info_title"
+            android:icon="@drawable/ic_dialog_info"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/previous_card_info_command_key"
+            android:title="@string/previous_card_info_title"
             android:icon="@drawable/ic_outline_info_24"
             />
     </PreferenceCategory>