ui: add navigation stack for tici (#37275)

* initial * start to support nav stack in settings panels + fix some navwidget bugs * add deprecation warning and move more to new nav stack * fix overriding NavWidget enabled and do developer panel * fix interactive timeout and do main * more device, not done yet * minor network fixes * dcam dialog * start onboarding * fix onboarding * do mici setup * remove now useless CUSTOM_SOFTWARE * support big ui with old modal overlay * reset can be old modal overlay, but updater needs new since it uses wifiui * flip name truthiness to inspire excitement * all *should* work, but will do pass later * clean up main * clean up settiings * clean up dialog and developer * cleanup mici setup some * rm one more * fix keyboard * revert * might as well but clarify * fix networkinfopage buttons * lint * nice clean up from cursor * animate background fade with position * fix device overlays * cursor fix pt1 cursor fix pt2 * rm print * capital * temp fix from cursor for onboarding not freeing space after reviewing training guide * fix home screen scroller snap not resetting * stash * nice gradient on top * 40 * 20 * no gradient * return unused returns and always show regulatory btn * nice! * revert selfdrive/ui * let's do tici first * bring back ui * not sure why __del__, SetupWidget was never deleted? * device "done" * network "done!!" * toggles "done" * software "done" * developer "done" * fix onboarding * use new modal for debug windows * and aug * setup "done" * clean up * updater "done" * reset "done" * pop first before callbacks in case callbacks push * fix cmt * not needed * remove two commented functions for mici * clean up application * typing * static * not sure what this means * fix big * more static * actually great catch * fix cmt
2026-08-21 08:14:00 +08:00 · 2026-02-20 02:43:11 -08:00
parent f829c90de6
commit cefddf4b9b
22 changed files with 231 additions and 188 deletions
@@ -1,4 +1,5 @@
 import pyray as rl
+from collections.abc import Callable
 from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.widgets import DialogResult
@@ -17,7 +18,7 @@ BACKGROUND_COLOR = rl.Color(27, 27, 27, 255)


 class ConfirmDialog(Widget):
-  def __init__(self, text: str, confirm_text: str, cancel_text: str | None = None, rich: bool = False):
+  def __init__(self, text: str, confirm_text: str, cancel_text: str | None = None, rich: bool = False, callback: Callable[[DialogResult], None] | None = None):
    super().__init__()
    if cancel_text is None:
      cancel_text = tr("Cancel")
@@ -26,7 +27,7 @@ class ConfirmDialog(Widget):
    self._cancel_button = Button(cancel_text, self._cancel_button_callback)
    self._confirm_button = Button(confirm_text, self._confirm_button_callback, button_style=ButtonStyle.PRIMARY)
    self._rich = rich
-    self._dialog_result = DialogResult.NO_ACTION
+    self._callback = callback
    self._cancel_text = cancel_text
    self._scroller = Scroller([self._html_renderer], line_separator=False, spacing=0)

@@ -36,14 +37,15 @@ class ConfirmDialog(Widget):
    else:
      self._html_renderer.parse_html_content(text)

-  def reset(self):
-    self._dialog_result = DialogResult.NO_ACTION
-
  def _cancel_button_callback(self):
-    self._dialog_result = DialogResult.CANCEL
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(DialogResult.CANCEL)

  def _confirm_button_callback(self):
-    self._dialog_result = DialogResult.CONFIRM
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(DialogResult.CONFIRM)

  def _render(self, rect: rl.Rectangle):
    dialog_x = OUTER_MARGIN if not self._rich else RICH_OUTER_MARGIN
@@ -73,9 +75,9 @@ class ConfirmDialog(Widget):
      self._scroller.render(text_rect)

    if rl.is_key_pressed(rl.KeyboardKey.KEY_ENTER):
-      self._dialog_result = DialogResult.CONFIRM
+      self._confirm_button_callback()
    elif rl.is_key_pressed(rl.KeyboardKey.KEY_ESCAPE):
-      self._dialog_result = DialogResult.CANCEL
+      self._cancel_button_callback()

    if self._cancel_text:
      self._confirm_button.render(confirm_button)
@@ -85,8 +87,6 @@ class ConfirmDialog(Widget):
      full_confirm_button = rl.Rectangle(dialog_rect.x + MARGIN, button_y, full_button_width, BUTTON_HEIGHT)
      self._confirm_button.render(full_confirm_button)

-    return self._dialog_result
-

 def alert_dialog(message: str, button_text: str | None = None):
  if button_text is None:
@@ -260,7 +260,7 @@ class HtmlModal(Widget):
    super().__init__()
    self._content = HtmlRenderer(file_path=file_path, text=text)
    self._scroll_panel = GuiScrollPanel()
-    self._ok_button = Button(tr("OK"), click_callback=lambda: gui_app.set_modal_overlay(None), button_style=ButtonStyle.PRIMARY)
+    self._ok_button = Button(tr("OK"), click_callback=gui_app.pop_widget, button_style=ButtonStyle.PRIMARY)

  def _render(self, rect: rl.Rectangle):
    margin = 50
@@ -1,12 +1,13 @@
 from functools import partial
 import time
 from typing import Literal
+from collections.abc import Callable

 import pyray as rl

 from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.multilang import tr
-from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets import DialogResult, Widget
 from openpilot.system.ui.widgets.button import ButtonStyle, Button
 from openpilot.system.ui.widgets.inputbox import InputBox
 from openpilot.system.ui.widgets.label import Label
@@ -58,7 +59,8 @@ KEYBOARD_LAYOUTS = {


 class Keyboard(Widget):
-  def __init__(self, max_text_size: int = 255, min_text_size: int = 0, password_mode: bool = False, show_password_toggle: bool = False):
+  def __init__(self, max_text_size: int = 255, min_text_size: int = 0, password_mode: bool = False, show_password_toggle: bool = False,
+               callback: Callable[[DialogResult], None] | None = None):
    super().__init__()
    self._layout_name: Literal["lowercase", "uppercase", "numbers", "specials"] = "lowercase"
    self._caps_lock = False
@@ -71,13 +73,13 @@ class Keyboard(Widget):
    self._input_box = InputBox(max_text_size)
    self._password_mode = password_mode
    self._show_password_toggle = show_password_toggle
+    self._callback = callback

    # Backspace key repeat tracking
    self._backspace_pressed: bool = False
    self._backspace_press_time: float = 0.0
    self._backspace_last_repeat: float = 0.0

-    self._render_return_status = -1
    self._cancel_button = Button(lambda: tr("Cancel"), self._cancel_button_callback)

    self._eye_button = Button("", self._eye_button_callback, button_style=ButtonStyle.TRANSPARENT)
@@ -122,16 +124,23 @@ class Keyboard(Widget):
    self._title.set_text(title)
    self._sub_title.set_text(sub_title)

+  def set_callback(self, callback: Callable[[DialogResult], None] | None):
+    self._callback = callback
+
  def _eye_button_callback(self):
    self._password_mode = not self._password_mode

  def _cancel_button_callback(self):
    self.clear()
-    self._render_return_status = 0
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(DialogResult.CANCEL)

  def _key_callback(self, k):
    if k == ENTER_KEY:
-      self._render_return_status = 1
+      gui_app.pop_widget()
+      if self._callback:
+        self._callback(DialogResult.CONFIRM)
    else:
      self.handle_key_press(k)

@@ -197,8 +206,6 @@ class Keyboard(Widget):
          self._all_keys[key].set_enabled(is_enabled)
          self._all_keys[key].render(key_rect)

-    return self._render_return_status
-
  def _render_input_area(self, input_rect: rl.Rectangle):
    if self._show_password_toggle:
      self._input_box.set_password_mode(self._password_mode)
@@ -250,7 +257,6 @@ class Keyboard(Widget):
  def reset(self, min_text_size: int | None = None):
    if min_text_size is not None:
      self._min_text_size = min_text_size
-    self._render_return_status = -1
    self._last_shift_press_time = 0
    self._backspace_pressed = False
    self._backspace_press_time = 0.0
@@ -259,15 +265,18 @@ class Keyboard(Widget):


 if __name__ == "__main__":
-  gui_app.init_window("Keyboard")
-  keyboard = Keyboard(min_text_size=8, show_password_toggle=True)
-  for _ in gui_app.render():
-    keyboard.set_title("Keyboard Input", "Type your text below")
-    result = keyboard.render(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
-    if result == 1:
+  def callback(result: DialogResult):
+    if result == DialogResult.CONFIRM:
      print(f"You typed: {keyboard.text}")
-      gui_app.request_close()
-    elif result == 0:
+    elif result == DialogResult.CANCEL:
      print("Canceled")
-      gui_app.request_close()
+    gui_app.request_close()
+
+  gui_app.init_window("Keyboard", new_modal=True)
+  keyboard = Keyboard(min_text_size=8, show_password_toggle=True, callback=callback)
+  keyboard.set_title("Keyboard Input", "Type your text below")
+
+  gui_app.push_widget(keyboard)
+  for _ in gui_app.render():
+    pass
  gui_app.close()
@@ -7,7 +7,7 @@ from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
 from openpilot.system.ui.lib.wifi_manager import WifiManager, SecurityType, Network, MeteredType, normalize_ssid
-from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets import DialogResult, Widget
 from openpilot.system.ui.widgets.button import ButtonStyle, Button
 from openpilot.system.ui.widgets.confirm_dialog import ConfirmDialog
 from openpilot.system.ui.widgets.keyboard import Keyboard
@@ -187,8 +187,8 @@ class AdvancedNetworkSettings(Widget):
    self._wifi_manager.update_gsm_settings(roaming_state, self._params.get("GsmApn") or "", self._params.get_bool("GsmMetered"))

  def _edit_apn(self):
-    def update_apn(result):
-      if result != 1:
+    def update_apn(result: DialogResult):
+      if result != DialogResult.CONFIRM:
        return

      apn = self._keyboard.text.strip()
@@ -203,7 +203,8 @@ class AdvancedNetworkSettings(Widget):
    self._keyboard.reset(min_text_size=0)
    self._keyboard.set_title(tr("Enter APN"), tr("leave blank for automatic configuration"))
    self._keyboard.set_text(current_apn)
-    gui_app.set_modal_overlay(self._keyboard, update_apn)
+    self._keyboard.set_callback(update_apn)
+    gui_app.push_widget(self._keyboard)

  def _toggle_cellular_metered(self):
    metered = self._cellular_metered_action.get_state()
@@ -216,15 +217,18 @@ class AdvancedNetworkSettings(Widget):
    self._wifi_manager.set_current_network_metered(metered_type)

  def _connect_to_hidden_network(self):
-    def connect_hidden(result):
-      if result != 1:
+    def connect_hidden(result: DialogResult):
+      if result != DialogResult.CONFIRM:
        return

      ssid = self._keyboard.text
      if not ssid:
        return

-      def enter_password(result):
+      def enter_password(result: DialogResult):
+        if result != DialogResult.CONFIRM:
+          return
+
        password = self._keyboard.text
        if password == "":
          # connect without password
@@ -235,15 +239,17 @@ class AdvancedNetworkSettings(Widget):

      self._keyboard.reset(min_text_size=0)
      self._keyboard.set_title(tr("Enter password"), tr("for \"{}\"").format(ssid))
-      gui_app.set_modal_overlay(self._keyboard, enter_password)
+      self._keyboard.set_callback(enter_password)
+      gui_app.push_widget(self._keyboard)

    self._keyboard.reset(min_text_size=1)
    self._keyboard.set_title(tr("Enter SSID"), "")
-    gui_app.set_modal_overlay(self._keyboard, connect_hidden)
+    self._keyboard.set_callback(connect_hidden)
+    gui_app.push_widget(self._keyboard)

  def _edit_tethering_password(self):
-    def update_password(result):
-      if result != 1:
+    def update_password(result: DialogResult):
+      if result != DialogResult.CONFIRM:
        return

      password = self._keyboard.text
@@ -253,7 +259,8 @@ class AdvancedNetworkSettings(Widget):
    self._keyboard.reset(min_text_size=MIN_PASSWORD_LENGTH)
    self._keyboard.set_title(tr("Enter new tethering password"), "")
    self._keyboard.set_text(self._wifi_manager.tethering_password)
-    gui_app.set_modal_overlay(self._keyboard, update_password)
+    self._keyboard.set_callback(update_password)
+    gui_app.push_widget(self._keyboard)

  def _update_state(self):
    self._wifi_manager.process_callbacks()
@@ -314,29 +321,29 @@ class WifiManagerUI(Widget):
      self.keyboard.set_title(tr("Wrong password") if self._password_retry else tr("Enter password"),
                              tr("for \"{}\"").format(normalize_ssid(self._state_network.ssid)))
      self.keyboard.reset(min_text_size=MIN_PASSWORD_LENGTH)
-      gui_app.set_modal_overlay(self.keyboard, lambda result: self._on_password_entered(cast(Network, self._state_network), result))
+      self.keyboard.set_callback(lambda result: self._on_password_entered(cast(Network, self._state_network), result))
+      gui_app.push_widget(self.keyboard)
    elif self.state == UIState.SHOW_FORGET_CONFIRM and self._state_network:
-      confirm_dialog = ConfirmDialog("", tr("Forget"), tr("Cancel"))
+      confirm_dialog = ConfirmDialog("", tr("Forget"), tr("Cancel"), callback=lambda result: self.on_forgot_confirm_finished(self._state_network, result))
      confirm_dialog.set_text(tr("Forget Wi-Fi Network \"{}\"?").format(normalize_ssid(self._state_network.ssid)))
-      confirm_dialog.reset()
-      gui_app.set_modal_overlay(confirm_dialog, callback=lambda result: self.on_forgot_confirm_finished(self._state_network, result))
+      gui_app.push_widget(confirm_dialog)
    else:
      self._draw_network_list(rect)

-  def _on_password_entered(self, network: Network, result: int):
-    if result == 1:
+  def _on_password_entered(self, network: Network, result: DialogResult):
+    if result == DialogResult.CONFIRM:
      password = self.keyboard.text
      self.keyboard.clear()

      if len(password) >= MIN_PASSWORD_LENGTH:
        self.connect_to_network(network, password)
-    elif result == 0:
+    elif result == DialogResult.CANCEL:
      self.state = UIState.IDLE

-  def on_forgot_confirm_finished(self, network, result: int):
-    if result == 1:
+  def on_forgot_confirm_finished(self, network, result: DialogResult):
+    if result == DialogResult.CONFIRM:
      self.forget_network(network)
-    elif result == 0:
+    elif result == DialogResult.CANCEL:
      self.state = UIState.IDLE

  def _draw_network_list(self, rect: rl.Rectangle):
@@ -474,11 +481,11 @@ class WifiManagerUI(Widget):


 def main():
-  gui_app.init_window("Wi-Fi Manager")
-  wifi_ui = WifiManagerUI(WifiManager())
+  gui_app.init_window("Wi-Fi Manager", new_modal=True)
+  gui_app.push_widget(WifiManagerUI(WifiManager()))

  for _ in gui_app.render():
-    wifi_ui.render(rl.Rectangle(50, 50, gui_app.width - 100, gui_app.height - 100))
+    pass

  gui_app.close()

@@ -1,5 +1,6 @@
 import pyray as rl
-from openpilot.system.ui.lib.application import FontWeight
+from collections.abc import Callable
+from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.widgets import Widget, DialogResult
 from openpilot.system.ui.widgets.button import Button, ButtonStyle
@@ -17,13 +18,13 @@ LIST_ITEM_SPACING = 25


 class MultiOptionDialog(Widget):
-  def __init__(self, title, options, current="", option_font_weight=FontWeight.MEDIUM):
+  def __init__(self, title, options, current="", option_font_weight=FontWeight.MEDIUM, callback: Callable[[DialogResult], None] | None = None):
    super().__init__()
    self.title = title
    self.options = options
    self.current = current
    self.selection = current
-    self._result: DialogResult = DialogResult.NO_ACTION
+    self._callback = callback

    # Create scroller with option buttons
    self.option_buttons = [Button(option, click_callback=lambda opt=option: self._on_option_clicked(opt),
@@ -36,7 +37,9 @@ class MultiOptionDialog(Widget):
    self.select_button = Button(lambda: tr("Select"), click_callback=lambda: self._set_result(DialogResult.CONFIRM), button_style=ButtonStyle.PRIMARY)

  def _set_result(self, result: DialogResult):
-    self._result = result
+    gui_app.pop_widget()
+    if self._callback:
+      self._callback(result)

  def _on_option_clicked(self, option):
    self.selection = option
@@ -74,5 +77,3 @@ class MultiOptionDialog(Widget):
    select_rect = rl.Rectangle(content_rect.x + button_w + BUTTON_SPACING, button_y, button_w, BUTTON_HEIGHT)
    self.select_button.set_enabled(self.selection != self.current)
    self.select_button.render(select_rect)
-
-    return self._result