Skip to content

Commit 4d68684

Browse files
david-allisonmikehardy
authored andcommitted
feat(reviewer): 'toggle auto advance'
If it's disabled by default, it should be able to be enabled Not great to add another menu item, but required to keep the feature usable And we're moving to the new reviewer shortly Issue 17701
1 parent 0ef49a3 commit 4d68684

File tree

7 files changed

+19
-1
lines changed

7 files changed

+19
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,10 @@ open class Reviewer :
461461
Timber.i("Reviewer:: Delete note button pressed")
462462
showDeleteNoteDialog()
463463
}
464+
R.id.action_toggle_auto_advance -> {
465+
Timber.i("Reviewer:: Toggle Auto Advance button pressed")
466+
toggleAutoAdvance()
467+
}
464468
R.id.action_change_whiteboard_pen_color -> {
465469
Timber.i("Reviewer:: Pen Color button pressed")
466470
changeWhiteboardPenColor()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ object UsageAnalytics {
611611
R.string.custom_button_whiteboard_pen_color_key,
612612
R.string.custom_button_show_hide_whiteboard_key,
613613
R.string.custom_button_clear_whiteboard_key,
614+
R.string.custom_button_toggle_auto_advance,
614615
R.string.custom_button_user_action_1_key,
615616
R.string.custom_button_user_action_2_key,
616617
R.string.custom_button_user_action_3_key,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class ActionButtonStatus {
5757
setupButton(preferences, R.id.action_toggle_stylus, "customButtonToggleStylus", SHOW_AS_ACTION_IF_ROOM)
5858
setupButton(preferences, R.id.action_save_whiteboard, "customButtonSaveWhiteboard", SHOW_AS_ACTION_NEVER)
5959
setupButton(preferences, R.id.action_change_whiteboard_pen_color, "customButtonWhiteboardPenColor", SHOW_AS_ACTION_IF_ROOM)
60+
setupButton(preferences, R.id.action_toggle_auto_advance, "customButtonToggleAutoAdvance", SHOW_AS_ACTION_NEVER)
6061
setupButton(preferences, R.id.user_action_1, "customButtonUserAction1", MENU_DISABLED)
6162
setupButton(preferences, R.id.user_action_2, "customButtonUserAction2", MENU_DISABLED)
6263
setupButton(preferences, R.id.user_action_3, "customButtonUserAction3", MENU_DISABLED)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@
197197
android:id="@+id/action_open_deck_options"
198198
android:icon="@drawable/ic_tune_white"
199199
android:title="@string/menu__deck_options" />
200+
<item
201+
android:id="@+id/action_toggle_auto_advance"
202+
android:icon="@drawable/ic_fast_forward"
203+
android:title="@string/toggle_auto_advance" />
200204
<item
201205
android:id="@+id/user_action_1"
202206
android:icon="@drawable/user_action_1"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
<string name="user_action_7" maxLength="28">User action 7</string>
273273
<string name="user_action_8" maxLength="28">User action 8</string>
274274
<string name="user_action_9" maxLength="28">User action 9</string>
275-
<string name="toggle_auto_advance" maxLength="41">Toggle auto advance</string>
275+
<string name="toggle_auto_advance" maxLength="28">Toggle auto advance</string>
276276

277277
<!-- Select card side -->
278278
<string name="card_side_selection_title">Select card side</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
<string name="custom_button_whiteboard_pen_color_key">customButtonWhiteboardPenColor</string>
7474
<string name="custom_button_show_hide_whiteboard_key">customButtonShowHideWhiteboard</string>
7575
<string name="custom_button_clear_whiteboard_key">customButtonClearWhiteboard</string>
76+
<string name="custom_button_toggle_auto_advance">customButtonToggleAutoAdvance</string>
7677
<string name="custom_button_user_action_1_key">customButtonUserAction1</string>
7778
<string name="custom_button_user_action_2_key">customButtonUserAction2</string>
7879
<string name="custom_button_user_action_3_key">customButtonUserAction3</string>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@ TODO: Add a unit test
124124
android:key="@string/custom_button_toggle_mic_toolbar_key"
125125
android:title="@string/menu_enable_voice_playback"
126126
app:useSimpleSummaryProvider="true"/>
127+
<ListPreference
128+
android:defaultValue="2"
129+
android:entries="@array/custom_button_labels"
130+
android:entryValues="@array/custom_button_values"
131+
android:key="@string/custom_button_toggle_auto_advance"
132+
android:title="@string/toggle_auto_advance"
133+
app:useSimpleSummaryProvider="true"/>
127134
</PreferenceCategory>
128135
<PreferenceCategory android:title="@string/menu_dismiss_note" >
129136
<ListPreference

0 commit comments

Comments
 (0)