refactor(raylib): Move widgets to the widgets folder (#35680)

* refactor: move button to widgets folder

* refactor: move inputbox to widgets folder

* refactor: move label to widgets folder

* refactor: move list_view to widgets

* refactor: move scroll_panel to widgets

* refactor: move scroller to widgets

* refactor: move toggle to widgets

* refactor: Move widget.py to widgets/__init__.py

* fix: remove extra list_view

* refactor: rearrange some of the imports

* fix: remove extra scroller.py

* fix: Add scroller back

* fix: delete right scroller.py this time

* move scroll_panel back to system/ui/lib

* add todos for label and button

selfdrive/ui/layouts/home.py

@@ -9,7 +9,7 @@ from openpilot.selfdrive.ui.widgets.prime import PrimeWidget
 from openpilot.selfdrive.ui.widgets.setup import SetupWidget
 from openpilot.system.ui.lib.text_measure import measure_text_cached
 from openpilot.system.ui.lib.application import gui_app, FontWeight, DEFAULT_TEXT_COLOR
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 HEADER_HEIGHT = 80
 HEAD_BUTTON_FONT_SIZE = 40

selfdrive/ui/layouts/main.py

@@ -4,9 +4,9 @@ import cereal.messaging as messaging
 from openpilot.selfdrive.ui.layouts.sidebar import Sidebar, SIDEBAR_WIDTH
 from openpilot.selfdrive.ui.layouts.home import HomeLayout
 from openpilot.selfdrive.ui.layouts.settings.settings import SettingsLayout, PanelType
-from openpilot.selfdrive.ui.ui_state import device, ui_state
 from openpilot.selfdrive.ui.onroad.augmented_road_view import AugmentedRoadView
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.selfdrive.ui.ui_state import device, ui_state
+from openpilot.system.ui.widgets import Widget
 
 
 class MainState(IntEnum):

selfdrive/ui/layouts/network.py

@@ -1,6 +1,6 @@
 import pyray as rl
-from openpilot.system.ui.lib.widget import Widget
 from openpilot.system.ui.lib.wifi_manager import WifiManagerWrapper
+from openpilot.system.ui.widgets import Widget
 from openpilot.system.ui.widgets.network import WifiManagerUI
 
 

selfdrive/ui/layouts/settings/developer.py

@@ -1,8 +1,8 @@
-from openpilot.system.ui.lib.list_view import toggle_item
-from openpilot.system.ui.lib.scroller import Scroller
-from openpilot.system.ui.lib.widget import Widget
 from openpilot.common.params import Params
 from openpilot.selfdrive.ui.widgets.ssh_key import ssh_key_item
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.list_view import toggle_item
+from openpilot.system.ui.widgets.scroller import Scroller
 
 # Description constants
 DESCRIPTIONS = {

selfdrive/ui/layouts/settings/device.py

@@ -5,15 +5,15 @@ from openpilot.common.basedir import BASEDIR
 from openpilot.common.params import Params
 from openpilot.selfdrive.ui.onroad.driver_camera_dialog import DriverCameraDialog
 from openpilot.selfdrive.ui.ui_state import ui_state
+from openpilot.selfdrive.ui.widgets.pairing_dialog import PairingDialog
 from openpilot.system.hardware import TICI
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.list_view import text_item, button_item, dual_button_item
-from openpilot.system.ui.lib.scroller import Scroller
-from openpilot.system.ui.lib.widget import Widget, DialogResult
-from openpilot.selfdrive.ui.widgets.pairing_dialog import PairingDialog
-from openpilot.system.ui.widgets.option_dialog import MultiOptionDialog
+from openpilot.system.ui.widgets import Widget, DialogResult
 from openpilot.system.ui.widgets.confirm_dialog import confirm_dialog, alert_dialog
 from openpilot.system.ui.widgets.html_render import HtmlRenderer
+from openpilot.system.ui.widgets.list_view import text_item, button_item, dual_button_item
+from openpilot.system.ui.widgets.option_dialog import MultiOptionDialog
+from openpilot.system.ui.widgets.scroller import Scroller
 
 # Description constants
 DESCRIPTIONS = {

selfdrive/ui/layouts/settings/firehose.py

@@ -6,12 +6,12 @@ import threading
 from openpilot.common.api import Api, api_get
 from openpilot.common.params import Params
 from openpilot.common.swaglog import cloudlog
+from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.athena.registration import UNREGISTERED_DONGLE_ID
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.wrap_text import wrap_text
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
-from openpilot.system.ui.lib.widget import Widget
-from openpilot.selfdrive.ui.ui_state import ui_state
+from openpilot.system.ui.lib.wrap_text import wrap_text
+from openpilot.system.ui.widgets import Widget
 
 
 TITLE = "Firehose Mode"

selfdrive/ui/layouts/settings/settings.py

@@ -2,6 +2,7 @@ import pyray as rl
 from dataclasses import dataclass
 from enum import IntEnum
 from collections.abc import Callable
+from openpilot.selfdrive.ui.layouts.network import NetworkLayout
 from openpilot.selfdrive.ui.layouts.settings.developer import DeveloperLayout
 from openpilot.selfdrive.ui.layouts.settings.device import DeviceLayout
 from openpilot.selfdrive.ui.layouts.settings.firehose import FirehoseLayout
@@ -9,8 +10,7 @@ from openpilot.selfdrive.ui.layouts.settings.software import SoftwareLayout
 from openpilot.selfdrive.ui.layouts.settings.toggles import TogglesLayout
 from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.selfdrive.ui.layouts.network import NetworkLayout
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 # Settings close button
 SETTINGS_CLOSE_TEXT = "×"

selfdrive/ui/layouts/settings/software.py

@@ -1,9 +1,9 @@
 from openpilot.common.params import Params
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.list_view import button_item, text_item
-from openpilot.system.ui.lib.scroller import Scroller
-from openpilot.system.ui.lib.widget import Widget, DialogResult
+from openpilot.system.ui.widgets import Widget, DialogResult
 from openpilot.system.ui.widgets.confirm_dialog import confirm_dialog
+from openpilot.system.ui.widgets.list_view import button_item, text_item
+from openpilot.system.ui.widgets.scroller import Scroller
 
 
 class SoftwareLayout(Widget):

selfdrive/ui/layouts/settings/toggles.py

@@ -1,7 +1,7 @@
-from openpilot.system.ui.lib.list_view import multiple_button_item, toggle_item
-from openpilot.system.ui.lib.scroller import Scroller
-from openpilot.system.ui.lib.widget import Widget
 from openpilot.common.params import Params
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.list_view import multiple_button_item, toggle_item
+from openpilot.system.ui.widgets.scroller import Scroller
 
 # Description constants
 DESCRIPTIONS = {

selfdrive/ui/layouts/sidebar.py

@@ -6,7 +6,7 @@ from cereal import log
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 SIDEBAR_WIDTH = 300
 METRIC_HEIGHT = 126

selfdrive/ui/onroad/alert_renderer.py

@@ -2,12 +2,12 @@ import time
 import pyray as rl
 from dataclasses import dataclass
 from cereal import messaging, log
+from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.hardware import TICI
 from openpilot.system.ui.lib.application import gui_app, FontWeight, DEFAULT_FPS
-from openpilot.system.ui.lib.label import gui_text_box
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.widget import Widget
-from openpilot.selfdrive.ui.ui_state import ui_state
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.label import gui_text_box
 
 AlertSize = log.SelfdriveState.AlertSize
 AlertStatus = log.SelfdriveState.AlertStatus

selfdrive/ui/onroad/cameraview.py

@@ -2,12 +2,12 @@ import platform
 import numpy as np
 import pyray as rl
 
-from openpilot.system.hardware import TICI
 from msgq.visionipc import VisionIpcClient, VisionStreamType, VisionBuf
 from openpilot.common.swaglog import cloudlog
+from openpilot.system.hardware import TICI
 from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.lib.egl import init_egl, create_egl_image, destroy_egl_image, bind_egl_image_to_texture, EGLImage
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 CONNECTION_RETRY_INTERVAL = 0.2  # seconds between connection attempts
 

selfdrive/ui/onroad/driver_camera_dialog.py

@@ -5,7 +5,7 @@ from openpilot.selfdrive.ui.onroad.cameraview import CameraView
 from openpilot.selfdrive.ui.onroad.driver_state import DriverStateRenderer
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.label import gui_label
+from openpilot.system.ui.widgets.label import gui_label
 
 
 class DriverCameraDialog(CameraView):

selfdrive/ui/onroad/driver_state.py

@@ -3,7 +3,7 @@ import pyray as rl
 from dataclasses import dataclass
 from openpilot.selfdrive.ui.ui_state import ui_state, UI_BORDER_SIZE
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 # Default 3D coordinates for face keypoints as a NumPy array
 DEFAULT_FACE_KPTS_3D = np.array([

selfdrive/ui/onroad/exp_button.py

@@ -1,9 +1,9 @@
 import time
 import pyray as rl
+from openpilot.common.params import Params
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.widget import Widget
-from openpilot.common.params import Params
+from openpilot.system.ui.widgets import Widget
 
 
 class ExpButton(Widget):

selfdrive/ui/onroad/hud_renderer.py

@@ -1,11 +1,11 @@
 import pyray as rl
 from dataclasses import dataclass
-from openpilot.selfdrive.ui.ui_state import ui_state, UIStatus
+from openpilot.common.conversions import Conversions as CV
 from openpilot.selfdrive.ui.onroad.exp_button import ExpButton
+from openpilot.selfdrive.ui.ui_state import ui_state, UIStatus
 from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.common.conversions import Conversions as CV
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 # Constants
 SET_SPEED_NA = 255

selfdrive/ui/onroad/model_renderer.py

@@ -4,11 +4,11 @@ import pyray as rl
 from cereal import messaging, car
 from dataclasses import dataclass, field
 from openpilot.common.params import Params
+from openpilot.selfdrive.locationd.calibrationd import HEIGHT_INIT
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.lib.application import DEFAULT_FPS
 from openpilot.system.ui.lib.shader_polygon import draw_polygon
-from openpilot.system.ui.lib.widget import Widget
-from openpilot.selfdrive.locationd.calibrationd import HEIGHT_INIT
+from openpilot.system.ui.widgets import Widget
 
 CLIP_MARGIN = 500
 MIN_DRAW_DISTANCE = 10.0

selfdrive/ui/widgets/exp_mode_button.py

@@ -1,7 +1,7 @@
 import pyray as rl
 from openpilot.common.params import Params
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 
 class ExperimentalModeButton(Widget):

selfdrive/ui/widgets/offroad_alerts.py

@@ -5,11 +5,11 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from openpilot.common.params import Params
 from openpilot.system.hardware import HARDWARE
-from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
-from openpilot.system.ui.lib.wrap_text import wrap_text
-from openpilot.system.ui.lib.text_measure import measure_text_cached
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
+from openpilot.system.ui.lib.text_measure import measure_text_cached
+from openpilot.system.ui.lib.wrap_text import wrap_text
+from openpilot.system.ui.widgets import Widget
 
 
 class AlertColors:

selfdrive/ui/widgets/prime.py

@@ -2,10 +2,10 @@ import pyray as rl
 
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.label import gui_label
-from openpilot.system.ui.lib.wrap_text import wrap_text
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.lib.wrap_text import wrap_text
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.label import gui_label
 
 
 class PrimeWidget(Widget):

selfdrive/ui/widgets/setup.py

@@ -1,11 +1,11 @@
 import pyray as rl
 from openpilot.selfdrive.ui.lib.prime_state import PrimeType
-from openpilot.selfdrive.ui.widgets.pairing_dialog import PairingDialog
 from openpilot.selfdrive.ui.ui_state import ui_state
+from openpilot.selfdrive.ui.widgets.pairing_dialog import PairingDialog
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
 from openpilot.system.ui.lib.wrap_text import wrap_text
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
 
 
 class SetupWidget(Widget):

selfdrive/ui/widgets/ssh_key.py

@@ -6,8 +6,12 @@ from enum import Enum
 
 from openpilot.common.params import Params
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.list_view import (
+from openpilot.system.ui.lib.text_measure import measure_text_cached
+from openpilot.system.ui.widgets import DialogResult
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
+from openpilot.system.ui.widgets.confirm_dialog import alert_dialog
+from openpilot.system.ui.widgets.keyboard import Keyboard
+from openpilot.system.ui.widgets.list_view import (
   ItemAction,
   ListItem,
   BUTTON_HEIGHT,
@@ -15,10 +19,6 @@ from openpilot.system.ui.lib.list_view import (
   BUTTON_FONT_SIZE,
   BUTTON_WIDTH,
 )
-from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.widget import DialogResult
-from openpilot.system.ui.widgets.confirm_dialog import alert_dialog
-from openpilot.system.ui.widgets.keyboard import Keyboard
 
 
 class SshKeyActionState(Enum):

system/ui/reset.py

@@ -7,9 +7,9 @@ from enum import IntEnum
 
 from openpilot.system.hardware import PC
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.label import gui_label, gui_text_box
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
+from openpilot.system.ui.widgets.label import gui_label, gui_text_box
 
 NVME = "/dev/nvme0n1"
 USERDATA = "/dev/disk/by-partlabel/userdata"

system/ui/setup.py

@@ -10,11 +10,11 @@ import pyray as rl
 from cereal import log
 from openpilot.system.hardware import HARDWARE
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.label import gui_label, gui_text_box
-from openpilot.system.ui.lib.widget import Widget
-from openpilot.system.ui.widgets.network import WifiManagerUI, WifiManagerWrapper
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
 from openpilot.system.ui.widgets.keyboard import Keyboard
+from openpilot.system.ui.widgets.label import gui_label, gui_text_box
+from openpilot.system.ui.widgets.network import WifiManagerUI, WifiManagerWrapper
 
 NetworkType = log.DeviceState.NetworkType
 

system/ui/spinner.py

@@ -5,8 +5,8 @@ import sys
 
 from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.widget import Widget
 from openpilot.system.ui.text import wrap_text
+from openpilot.system.ui.widgets import Widget
 
 # Constants
 PROGRESS_BAR_WIDTH = 1000

system/ui/text.py

@@ -3,11 +3,11 @@ import re
 import sys
 import pyray as rl
 from openpilot.system.hardware import HARDWARE, PC
-from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
+from openpilot.system.ui.lib.text_measure import measure_text_cached
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
 
 MARGIN = 50
 SPACING = 40

system/ui/updater.py

@@ -7,10 +7,10 @@ from enum import IntEnum
 
 from openpilot.system.hardware import HARDWARE
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.label import gui_text_box, gui_label
 from openpilot.system.ui.lib.wifi_manager import WifiManagerWrapper
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
+from openpilot.system.ui.widgets.label import gui_text_box, gui_label
 from openpilot.system.ui.widgets.network import WifiManagerUI
 
 # Constants

system/ui/widgets/button.py

@@ -54,6 +54,8 @@ BUTTON_PRESSED_BACKGROUND_COLORS = {
 _pressed_buttons: set[str] = set()  # Track mouse press state globally
 
 
+# TODO: This should be a Widget class
+
 def gui_button(
   rect: rl.Rectangle,
   text: str,

system/ui/widgets/confirm_dialog.py

@@ -1,8 +1,8 @@
 import pyray as rl
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.label import gui_text_box
-from openpilot.system.ui.lib.widget import DialogResult
+from openpilot.system.ui.widgets import DialogResult
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
+from openpilot.system.ui.widgets.label import gui_text_box
 
 DIALOG_WIDTH = 1520
 DIALOG_HEIGHT = 600

system/ui/widgets/html_render.py

@@ -4,10 +4,10 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Any
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.wrap_text import wrap_text
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
-from openpilot.system.ui.lib.widget import Widget, DialogResult
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
+from openpilot.system.ui.lib.wrap_text import wrap_text
+from openpilot.system.ui.widgets import Widget, DialogResult
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
 
 
 class ElementType(Enum):

system/ui/widgets/inputbox.py

@@ -2,7 +2,7 @@ import pyray as rl
 import time
 from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.lib.text_measure import measure_text_cached
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 PASSWORD_MASK_CHAR = "•"
 PASSWORD_MASK_DELAY = 1.5  # Seconds to show character before masking

system/ui/widgets/keyboard.py

@@ -2,10 +2,10 @@ import time
 from typing import Literal
 import pyray as rl
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.lib.button import ButtonStyle, gui_button
-from openpilot.system.ui.lib.inputbox import InputBox
-from openpilot.system.ui.lib.label import gui_label
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import ButtonStyle, gui_button
+from openpilot.system.ui.widgets.inputbox import InputBox
+from openpilot.system.ui.widgets.label import gui_label
 
 KEY_FONT_SIZE = 96
 DOUBLE_CLICK_THRESHOLD = 0.5  # seconds

system/ui/widgets/label.py

@@ -4,6 +4,8 @@ from openpilot.system.ui.lib.text_measure import measure_text_cached
 from openpilot.system.ui.lib.utils import GuiStyleContext
 
 
+# TODO: This should be a Widget class
+
 def gui_label(
   rect: rl.Rectangle,
   text: str,

system/ui/widgets/list_view.py

@@ -5,9 +5,9 @@ from abc import ABC
 from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos
 from openpilot.system.ui.lib.text_measure import measure_text_cached
 from openpilot.system.ui.lib.wrap_text import wrap_text
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle
-from openpilot.system.ui.lib.toggle import Toggle, WIDTH as TOGGLE_WIDTH, HEIGHT as TOGGLE_HEIGHT
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle
+from openpilot.system.ui.widgets.toggle import Toggle, WIDTH as TOGGLE_WIDTH, HEIGHT as TOGGLE_HEIGHT
 
 ITEM_BASE_WIDTH = 600
 ITEM_BASE_HEIGHT = 170

system/ui/widgets/network.py

@@ -4,13 +4,13 @@ from typing import Literal
 
 import pyray as rl
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.button import ButtonStyle, gui_button
-from openpilot.system.ui.lib.label import gui_label
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
 from openpilot.system.ui.lib.wifi_manager import NetworkInfo, WifiManagerCallbacks, WifiManagerWrapper, SecurityType
-from openpilot.system.ui.widgets.keyboard import Keyboard
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import ButtonStyle, gui_button
 from openpilot.system.ui.widgets.confirm_dialog import confirm_dialog
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets.keyboard import Keyboard
+from openpilot.system.ui.widgets.label import gui_label
 
 NM_DEVICE_STATE_NEED_AUTH = 60
 MIN_PASSWORD_LENGTH = 8

system/ui/widgets/option_dialog.py

@@ -1,9 +1,9 @@
 import pyray as rl
 from openpilot.system.ui.lib.application import FontWeight
-from openpilot.system.ui.lib.button import gui_button, ButtonStyle, TextAlignment
-from openpilot.system.ui.lib.label import gui_label
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.button import gui_button, ButtonStyle, TextAlignment
+from openpilot.system.ui.widgets.label import gui_label
 
 # Constants
 MARGIN = 50

system/ui/widgets/scroller.py

@@ -1,6 +1,6 @@
 import pyray as rl
-from openpilot.system.ui.lib.widget import Widget
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
+from openpilot.system.ui.widgets import Widget
 
 ITEM_SPACING = 40
 LINE_COLOR = rl.GRAY

system/ui/widgets/toggle.py

@@ -1,6 +1,6 @@
 import pyray as rl
 from openpilot.system.ui.lib.application import MousePos
-from openpilot.system.ui.lib.widget import Widget
+from openpilot.system.ui.widgets import Widget
 
 ON_COLOR = rl.Color(51, 171, 76, 255)
 OFF_COLOR = rl.Color(0x39, 0x39, 0x39, 255)