Remove old theme.py

ThomasFarstrike · ThomasFarstrike · commit 2f31d14a4e9c · 2026-01-23T23:08:58.000+01:00
diff --git a/internal_filesystem/lib/mpos/ui/appearance_manager.py b/internal_filesystem/lib/mpos/ui/appearance_manager.py
@@ -155,6 +155,26 @@ def set_light_mode(cls, is_light, prefs=None):
         
         print(f"[AppearanceManager] Light mode set to: {is_light}")
     
+    @classmethod
+    def set_theme(cls, prefs):
+        """
+        Set the theme from preferences and reinitialize LVGL theme.
+        
+        This is a convenience method that loads theme settings from SharedPreferences
+        and applies them. It's equivalent to calling init() with the preferences.
+        
+        Args:
+            prefs: SharedPreferences object containing theme settings
+        
+        Example:
+            from mpos import AppearanceManager
+            import mpos.config
+            
+            prefs = mpos.config.SharedPreferences("theme_settings")
+            AppearanceManager.set_theme(prefs)
+        """
+        cls.init(prefs)
+    
     # ========== Theme Colors ==========
     
     @classmethod
diff --git a/internal_filesystem/lib/mpos/ui/theme.py b/internal_filesystem/lib/mpos/ui/theme.py
diff --git a/tests/test_graphical_custom_keyboard.py b/tests/test_graphical_custom_keyboard.py
@@ -13,7 +13,7 @@
 import lvgl as lv
 import sys
 import os
-from mpos import MposKeyboard, wait_for_render, capture_screenshot
+from mpos import MposKeyboard, wait_for_render, capture_screenshot, AppearanceManager
 
 
 class TestGraphicalMposKeyboard(unittest.TestCase):
@@ -200,12 +200,11 @@ def test_keyboard_visibility_light_mode(self):
 
         # Set light mode (should already be default)
         import mpos.config
-        import mpos.ui.theme
         prefs = mpos.config.SharedPreferences("theme_settings")
         editor = prefs.edit()
         editor.put_string("theme_light_dark", "light")
         editor.commit()
-        mpos.ui.theme.set_theme(prefs)
+        AppearanceManager.set_theme(prefs)
         wait_for_render(10)
 
         # Create keyboard
diff --git a/tests/test_graphical_keyboard_styling.py b/tests/test_graphical_keyboard_styling.py
@@ -25,6 +25,7 @@
 from mpos import (
     wait_for_render,
     capture_screenshot,
+    AppearanceManager,
 )
 
 
@@ -62,7 +63,7 @@ def tearDown(self):
         editor.commit()
 
         # Reapply original theme
-        mpos.ui.theme.set_theme(prefs)
+        AppearanceManager.set_theme(prefs)
 
         print("=== Test cleanup complete ===\n")
 
@@ -90,7 +91,7 @@ def _create_test_keyboard(self):
         keyboard.set_style_min_height(160, 0)
 
         # Apply the keyboard button fix
-        mpos.ui.theme.fix_keyboard_button_style(keyboard)
+        AppearanceManager.apply_keyboard_fix(keyboard)
 
         # Load the screen and wait for rendering
         lv.screen_load(screen)
@@ -228,7 +229,7 @@ def test_keyboard_buttons_visible_in_light_mode(self):
         editor.commit()
 
         # Apply theme
-        mpos.ui.theme.set_theme(prefs)
+        AppearanceManager.set_theme(prefs)
         wait_for_render(iterations=10)
 
         # Create test keyboard
@@ -282,7 +283,7 @@ def test_keyboard_buttons_visible_in_dark_mode(self):
         editor.commit()
 
         # Apply theme
-        mpos.ui.theme.set_theme(prefs)
+        AppearanceManager.set_theme(prefs)
         wait_for_render(iterations=10)
 
         # Create test keyboard
@@ -335,7 +336,7 @@ def test_keyboard_buttons_not_pure_white_in_light_mode(self):
         editor.commit()
 
         # Apply theme
-        mpos.ui.theme.set_theme(prefs)
+        AppearanceManager.set_theme(prefs)
         wait_for_render(iterations=10)
 
         # Create test keyboard
