fix: whiteboard control icon & label do not match

- For the "Toggle whiteboard" label in Controls settings page, replace the current "Show/Hide whiteboard" icon with "Enable whiteboard" icon
- Add a new control item for "Show/Hide whiteboard"

Author: snowtimeglass

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

@@ -1734,6 +1734,11 @@ abstract class AbstractFlashcardViewer :
                 true
             }
 
+            ViewerCommand.TOGGLE_WHITEBOARD_VISIBILITY -> {
+                toggleWhiteboardVisibility()
+                true
+            }
+
             ViewerCommand.CLEAR_WHITEBOARD -> {
                 clearWhiteboard()
                 true
@@ -1801,6 +1806,10 @@ abstract class AbstractFlashcardViewer :
         // intentionally blank
     }
 
+    protected open fun toggleWhiteboardVisibility() {
+        // intentionally blank
+    }
+
     protected open fun clearWhiteboard() {
         // intentionally blank
     }

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

@@ -478,8 +478,7 @@ open class Reviewer :
             }
             R.id.action_hide_whiteboard -> { // toggle whiteboard visibility
                 Timber.i("Reviewer:: Whiteboard visibility set to %b", !showWhiteboard)
-                setWhiteboardVisibility(!showWhiteboard)
-                refreshActionBar()
+                toggleWhiteboardVisibility()
             }
             R.id.action_toggle_stylus -> { // toggle stylus mode
                 Timber.i("Reviewer:: Stylus set to %b", !toggleStylus)
@@ -538,6 +537,13 @@ open class Reviewer :
         refreshActionBar()
     }
 
+    public override fun toggleWhiteboardVisibility() {
+        if (whiteboard != null) {
+            setWhiteboardVisibility(!showWhiteboard)
+            refreshActionBar()
+        }
+    }
+
     public override fun clearWhiteboard() {
         if (whiteboard != null) {
             whiteboard!!.clear()

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

@@ -550,6 +550,7 @@ object UsageAnalytics {
             R.string.replay_voice_command_key,
             R.string.save_voice_command_key,
             R.string.toggle_whiteboard_command_key,
+            R.string.toggle_whiteboard_visibility_command_key,
             R.string.clear_whiteboard_command_key,
             R.string.change_whiteboard_pen_color_command_key,
             R.string.toggle_auto_advance_command_key,

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

@@ -60,6 +60,7 @@ enum class ViewerCommand {
     SAVE_VOICE,
     REPLAY_VOICE,
     TOGGLE_WHITEBOARD,
+    TOGGLE_WHITEBOARD_VISIBILITY,
     CLEAR_WHITEBOARD,
     CHANGE_WHITEBOARD_PEN_COLOR,
     SHOW_HINT,
@@ -173,7 +174,8 @@ enum class ViewerCommand {
                 TAG,
                 CARD_INFO,
                 ABORT_AND_SYNC,
-                TOGGLE_WHITEBOARD,
+                TOGGLE_WHITEBOARD, // enable/disable whiteboard
+                TOGGLE_WHITEBOARD_VISIBILITY, // show/hide whiteboard
                 CLEAR_WHITEBOARD,
                 CHANGE_WHITEBOARD_PEN_COLOR,
                 RESCHEDULE_NOTE,

AnkiDroid/src/main/res/values/11-arrays.xml

@@ -83,6 +83,7 @@
     <string name="gesture_page_down" maxLength="41">Page Down</string>
     <string name="gesture_abort_sync" maxLength="41">Close reviewer and Sync</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">Toggle Whiteboard</string>
+    <string name="gesture_toggle_whiteboard_visibility" maxLength="41">Show/Hide whiteboard</string>
     <string name="gesture_show_hint" maxLength="41">Show Hint</string>
     <string name="gesture_show_all_hints" maxLength="41">Show All Hints</string>
     <string name="record_voice" maxLength="41">Record Voice</string>

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

@@ -119,6 +119,7 @@
     <string name="replay_voice_command_key">binding_REPLAY_VOICE</string>
     <string name="save_voice_command_key">binding_SAVE_VOICE</string>
     <string name="toggle_whiteboard_command_key">binding_TOGGLE_WHITEBOARD</string>
+    <string name="toggle_whiteboard_visibility_command_key">binding_TOGGLE_WHITEBOARD_VISIBILITY</string>
     <string name="clear_whiteboard_command_key">binding_CLEAR_WHITEBOARD</string>
     <string name="change_whiteboard_pen_color_command_key">binding_CHANGE_WHITEBOARD_PEN_COLOR</string>
     <string name="show_hint_command_key">binding_SHOW_HINT</string>

AnkiDroid/src/main/res/xml/preferences_controls.xml

@@ -233,6 +233,11 @@
         <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/toggle_whiteboard_command_key"
             android:title="@string/gesture_toggle_whiteboard"
+            android:icon="@drawable/ic_enable_whiteboard"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/toggle_whiteboard_visibility_command_key"
+            android:title="@string/gesture_toggle_whiteboard_visibility"
             android:icon="@drawable/ic_gesture_white"
             />
         <com.ichi2.preferences.ReviewerControlPreference

AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/ViewerCommandTest.kt

@@ -61,7 +61,8 @@ class ViewerCommandTest {
                 "binding_RECORD_VOICE",
                 "binding_SAVE_VOICE",
                 "binding_REPLAY_VOICE",
-                "binding_TOGGLE_WHITEBOARD",
+                "binding_TOGGLE_WHITEBOARD", // enable/disable whiteboard
+                "binding_TOGGLE_WHITEBOARD_VISIBILITY", // show/hide whiteboard
                 "binding_CLEAR_WHITEBOARD",
                 "binding_CHANGE_WHITEBOARD_PEN_COLOR",
                 "binding_SHOW_HINT",