[ACTV-369] Standardize and clarify dismiss behavior in tour dialogs

ankihub/django/app/templates/tour_step.html

@@ -1,7 +1,7 @@
 <div x-data="{ open: true, currentStep: {{ current_step }} }" x-effect="if(!open) { {{ on_close }} }">
     <c-v1.tour_step
         open_var="open" total_steps="{{ total_steps }}" current_step_var="currentStep" :show_backdrop="{{ show_backdrop }}"
-        body="{{ body|safe }}" back_label="{{ back_label }}" on_back="{{ on_back }}" on_next="{{ on_next }}" next_label="{{ next_label }}"
+        body="{{ body|safe }}" back_label="{{ back_label }}" on_back="{{ on_back }}" on_continue_later="{{ on_continue_later }}" on_next="{{ on_next }}" next_label="{{ next_label }}"
         :close_button="{{ close_button }}" class="{{ class }}"
       />
 </div>

ankihub/gui/tutorial.py

@@ -97,6 +97,7 @@ def render_tour_step(
     total_steps: int,
     back_label: str = "Back",
     on_back: Optional[str] = None,
+    on_continue_later: Optional[str] = None,
     next_label: str = "Next",
     on_next: Optional[str] = None,
     on_close: Optional[str] = None,
@@ -111,6 +112,7 @@ def render_tour_step(
             "total_steps": total_steps,
             "back_label": back_label,
             "on_back": on_back,
+            "on_continue_later": on_continue_later,
             "next_label": next_label,
             "on_next": on_next,
             "on_close": on_close,
@@ -425,6 +427,7 @@ def _render_tooltip(self, eval_js: bool = True) -> str:
             back_label=step.back_label,
             on_back=f"pycmd('{PREV_STEP_PYCMD}')",
             on_next=f"pycmd('{NEXT_STEP_PYCMD}')",
+            on_continue_later=f"pycmd('{SKIP_TUTORIAL_PYCMD}')",
             next_label=step.next_label,
             on_close=f"pycmd('{TUTORIAL_CLOSED_PYCMD}')",
             show_backdrop=step.apply_backdrop,
@@ -575,6 +578,14 @@ def end(self) -> None:
         global active_tutorial
         active_tutorial = None
 
+    def _skip_tutorial(self) -> None:
+        # It copies the end() method because it can be called from the Tutorial children
+        self._cleanup_step(all_webviews=True)
+        gui_hooks.webview_did_receive_js_message.remove(self._on_webview_did_receive_js_message)
+        gui_hooks.webview_will_set_content.remove(self._on_webview_will_set_content)
+        global active_tutorial
+        active_tutorial = None
+
     def _on_webview_did_receive_js_message(
         self, handled: tuple[bool, Any], message: str, context: Any
     ) -> tuple[bool, Any]:
@@ -637,6 +648,9 @@ def _on_webview_did_receive_js_message(
         elif message == TUTORIAL_CLOSED_PYCMD:
             self.end()
             return True, None
+        elif message == SKIP_TUTORIAL_PYCMD:
+            self._skip_tutorial()
+            return True, None
         elif message == TARGET_CLICK_PYCMD:
             step = self.steps[self.current_step - 1]
             if step.next_callback:
@@ -757,7 +771,8 @@ def js_for_context(context: Any) -> str:
                 **dialog_kwargs,
                 "on_main_button_click": f"pycmd('{START_TUTORIAL_PYCMD}')",
                 "on_secondary_button_click": f"pycmd('{SKIP_TUTORIAL_PYCMD}')",
-                "on_close": f"pycmd('{DISMISS_TUTORIAL_PYCMD}')",
+                "on_close": f"pycmd('{SKIP_TUTORIAL_PYCMD}')",
+                "on_text_button_click": f"pycmd('{DISMISS_TUTORIAL_PYCMD}')",
             }
             body = render_dialog(**kwargs)
             js = f"AnkiHub.showModal({json.dumps(body)})"
@@ -834,8 +849,9 @@ def prompt_for_onboarding_tutorial() -> None:
             title="📚 First time with Anki?",
             body="Find your way in the app with this <b>onboarding tour</b>.<br>"
             "You can revisit it anytime in AnkiHub's Help menu.",
-            secondary_button_label="Maybe later",
+            secondary_button_label="Not now",
             main_button_label="Take tour",
+            text_button_label="Don't show again",
         ),
         on_start=lambda: OnboardingTutorial().start(),
         on_dismiss=lambda: config.set_onboarding_tutorial_pending(False),
@@ -865,8 +881,9 @@ def prompt_for_step_deck_tutorial(on_skip: Optional[Callable[[], None]] = None)
             body="When installed, the AnKing Step Deck comes with all cards hidden (suspended). "
             "Take this tour to learn how to <b>select cards to study</b> and <b>set your daily limits</b>.<br><br>"
             "You can revisit this anytime in AnkiHub's Help menu.",
-            secondary_button_label="Skip for now",
+            secondary_button_label="Not now",
             main_button_label="Take tour",
+            text_button_label="Don't show again",
         ),
         on_start=lambda: StepDeckTutorial().start(),
         on_dismiss=lambda: config.set_step_deck_tutorial_pending(False),