Merge branch 'rl-sp-toggles' into rl-sp-panels

common/params_keys.h

@@ -173,7 +173,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"ShowAdvancedControls", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"ShowTurnSignals", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"StandstillTimer", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"sunnypilot_ui", {PERSISTENT, BOOL, "1"}},
     {"TrueVEgoUI", {PERSISTENT | BACKUP, BOOL, "0"}},
 
     // MADS params

selfdrive/ui/layouts/settings/developer.py

@@ -9,7 +9,7 @@ from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.lib.multilang import tr, tr_noop
 from openpilot.system.ui.widgets import DialogResult
 
-if Params().get_bool("sunnypilot_ui"):
+if gui_app.sunnypilot_ui():
   from openpilot.system.ui.sunnypilot.widgets.list_view import toggle_item_sp as toggle_item
 
 # Description constants

selfdrive/ui/layouts/settings/toggles.py

@@ -9,7 +9,7 @@ from openpilot.system.ui.lib.multilang import tr, tr_noop
 from openpilot.system.ui.widgets import DialogResult
 from openpilot.selfdrive.ui.ui_state import ui_state
 
-if Params().get_bool("sunnypilot_ui"):
+if gui_app.sunnypilot_ui():
   from openpilot.system.ui.sunnypilot.widgets.list_view import toggle_item_sp as toggle_item
 
 PERSONALITY_TO_INT = log.LongitudinalPersonality.schema.enumerants

selfdrive/ui/tests/test_ui/raylib_screenshots.py

@@ -354,7 +354,6 @@ def create_screenshots():
     with OpenpilotPrefix():
       params = Params()
       params.put("DongleId", "123456789012345")
-      params.put_bool("sunnypilot_ui", True)
 
       # Set branch name
       params.put("UpdaterCurrentDescription", VERSION)

system/ui/sunnypilot/widgets/list_view.py

@@ -19,6 +19,9 @@ class ListItemSP(ListItem):
                action_item: ItemAction | None = None):
     ListItem.__init__(self, title, icon, description, description_visible, callback, action_item)
 
+  def show_description(self, show: bool):
+    self._set_description_visible(show)
+
   def get_right_item_rect(self, item_rect: rl.Rectangle) -> rl.Rectangle:
     if not self.action_item:
       return rl.Rectangle(0, 0, 0, 0)
@@ -48,7 +51,7 @@ class ListItemSP(ListItem):
         style.TOGGLE_WIDTH,
         style.TOGGLE_HEIGHT
       )
-      text_x = left_rect.x + left_rect.width + style.ITEM_PADDING
+      text_x = left_rect.x + left_rect.width + style.ITEM_PADDING * 1.5
 
       # Draw title
       if self.title:
@@ -90,6 +93,6 @@ class ListItemSP(ListItem):
       self._html_renderer.render(description_rect)
 
 def toggle_item_sp(title: str | Callable[[], str], description: str | Callable[[], str] | None = None, initial_state: bool = False,
-                callback: Callable | None = None, icon: str = "", enabled: bool | Callable[[], bool] = True, param: str | None = None) -> ListItem:
+                callback: Callable | None = None, icon: str = "", enabled: bool | Callable[[], bool] = True, param: str | None = None) -> ListItemSP:
   action = ToggleActionSP(initial_state=initial_state, enabled=enabled, callback=callback, param=param)
   return ListItemSP(title=title, description=description, action_item=action, icon=icon, callback=callback)

system/ui/widgets/scroller.py

@@ -28,8 +28,8 @@ class LineSeparator(Widget):
     self._rect.width = parent_rect.width
 
   def _render(self, _):
-    rl.draw_line(int(self._rect.x) + LINE_PADDING, int(self._rect.y),
-                 int(self._rect.x + self._rect.width) - LINE_PADDING, int(self._rect.y),
+    rl.draw_line(int(self._rect.x), int(self._rect.y),
+                 int(self._rect.x + self._rect.width), int(self._rect.y),
                  LINE_COLOR)