Merge branch 'main' into jqln/tts

16 files changed, 117 insertions, 43 deletions

diff --git a/lua/browser.lua b/lua/browser.lua
index 406c2e49..bd743152 100644
--- a/lua/browser.lua
+++ b/lua/browser.lua
@@ -42,10 +42,9 @@ return screen:new{
             pad_left = 4,
             pad_right = 4,
             pad_bottom = 2,
-            bg_opa = lvgl.OPA(100),
             scrollbar_mode = lvgl.SCROLLBAR_MODE.OFF
         }
-        theme.set_style(header, "header")
+        theme.set_subject(header, "header")
 
         if self.breadcrumb then
             header:Label{
diff --git a/lua/file_browser.lua b/lua/file_browser.lua
index 0ccd2c13..4371c8e2 100644
--- a/lua/file_browser.lua
+++ b/lua/file_browser.lua
@@ -43,10 +43,9 @@ return screen:new {
       pad_left = 4,
       pad_right = 4,
       pad_bottom = 2,
-      bg_opa = lvgl.OPA(100),
       scrollbar_mode = lvgl.SCROLLBAR_MODE.OFF
     }
-    theme.set_style(header, "header")
+    theme.set_subject(header, "header")
 
     if self.breadcrumb then
       header:Label {
diff --git a/lua/images.lua b/lua/images.lua
index 5bb33d4d..1d08ec17 100644
--- a/lua/images.lua
+++ b/lua/images.lua
@@ -15,6 +15,7 @@ local img = {
   queue = lvgl.ImgData("//lua/img/queue.png"),
   files = lvgl.ImgData("//lua/img/files.png"),
   settings = lvgl.ImgData("//lua/img/settings.png"),
+  chevron = lvgl.ImgData("//lua/img/chevron.png"),
 }
 
 return img
diff --git a/lua/img/bat/chg.png b/lua/img/bat/chg.png
index 629586e3..7b0c1755 100644
--- a/lua/img/bat/chg.png
+++ b/lua/img/bat/chg.png
diff --git a/lua/img/bat/chg_outline.png b/lua/img/bat/chg_outline.png
new file mode 100644
index 00000000..304aca7d
--- /dev/null
+++ b/lua/img/bat/chg_outline.png
diff --git a/lua/img/bt.png b/lua/img/bt.png
index ae45dfbf..f441f2cb 100644
--- a/lua/img/bt.png
+++ b/lua/img/bt.png
diff --git a/lua/img/bt_conn.png b/lua/img/bt_conn.png
index 890e4160..022d5c96 100644
--- a/lua/img/bt_conn.png
+++ b/lua/img/bt_conn.png
diff --git a/lua/img/chevron.png b/lua/img/chevron.png
new file mode 100644
index 00000000..fdc7c97c
--- /dev/null
+++ b/lua/img/chevron.png
diff --git a/lua/main.lua b/lua/main.lua
index f79b0e87..9be94e83 100644
--- a/lua/main.lua
+++ b/lua/main.lua
@@ -43,7 +43,7 @@ local function init_ui()
           radius = 8,
           pad_all = 2,
         })
-        theme.set_style(container, "pop_up")
+        theme.set_subject(container, "pop_up")
         container:Label {
           text = string.format("Volume %i%%", pct),
           text_font = font.fusion_10
diff --git a/lua/main_menu.lua b/lua/main_menu.lua
index f95b0360..164ba650 100644
--- a/lua/main_menu.lua
+++ b/lua/main_menu.lua
@@ -35,7 +35,7 @@ return widgets.MenuScreen:new {
       pad_column = 4,
       border_width = 1,
     })
-    theme.set_style(now_playing, "now_playing");
+    theme.set_subject(now_playing, "now_playing");
 
     local play_pause = now_playing:Image { src = img.play_small }
     local title = now_playing:Label {
@@ -145,7 +145,7 @@ return widgets.MenuScreen:new {
 
     -- local queue_btn = bottom_bar:Button {}
     -- queue_btn:Image { src = img.queue }
-    -- theme.set_style(queue_btn, "icon_enabled")
+    -- theme.set_subject(queue_btn, "icon_enabled")
 
     local files_btn = bottom_bar:Button {}
     files_btn:onClicked(function()
@@ -156,7 +156,7 @@ return widgets.MenuScreen:new {
     end)
     files_btn:Image { src = img.files }
     widgets.Description(files_btn, "File browser")
-    theme.set_style(files_btn, "menu_icon")
+    theme.set_subject(files_btn, "menu_icon")
 
     local settings_btn = bottom_bar:Button {}
     settings_btn:onClicked(function()
@@ -164,6 +164,6 @@ return widgets.MenuScreen:new {
     end)
     settings_btn:Image { src = img.settings }
     widgets.Description(settings_btn, "Settings")
-    theme.set_style(settings_btn, "menu_icon")
+    theme.set_subject(settings_btn, "menu_icon")
   end,
 }
diff --git a/lua/playing.lua b/lua/playing.lua
index b3b4ec4d..f7955720 100644
--- a/lua/playing.lua
+++ b/lua/playing.lua
@@ -119,7 +119,7 @@ return screen:new {
       range = { min = 0, max = 100 },
       value = 0,
     }
-    theme.set_style(scrubber, "scrubber");
+    theme.set_subject(scrubber, "scrubber");
     local scrubber_desc = widgets.Description(scrubber, "Scrubber")
 
     scrubber:onevent(lvgl.EVENT.RELEASED, function()
@@ -161,7 +161,7 @@ return screen:new {
       queue.repeat_track:set(not queue.repeat_track:get())
     end)
     local repeat_img = repeat_btn:Image { src = img.repeat_src }
-    theme.set_style(repeat_btn, icon_enabled_class)
+    theme.set_subject(repeat_btn, icon_enabled_class)
     local repeat_desc = widgets.Description(repeat_btn)
 
 
@@ -174,7 +174,7 @@ return screen:new {
       end
     end)
     local prev_img = prev_btn:Image { src = img.prev }
-    theme.set_style(prev_btn, icon_enabled_class)
+    theme.set_subject(prev_btn, icon_enabled_class)
     local prev_desc = widgets.Description(prev_btn, "Previous track")
 
     local play_pause_btn = controls:Button {}
@@ -183,13 +183,13 @@ return screen:new {
     end)
     play_pause_btn:focus()
     local play_pause_img = play_pause_btn:Image { src = img.pause }
-    theme.set_style(play_pause_btn, icon_enabled_class)
+    theme.set_subject(play_pause_btn, icon_enabled_class)
     local play_pause_desc = widgets.Description(play_pause_btn, "Play")
 
     local next_btn = controls:Button {}
     next_btn:onClicked(queue.next)
     local next_img = next_btn:Image { src = img.next }
-    theme.set_style(next_btn, icon_disabled_class)
+    theme.set_subject(next_btn, icon_disabled_class)
     local next_desc = widgets.Description(next_btn, "Next track")
 
     local shuffle_btn = controls:Button {}
@@ -197,7 +197,7 @@ return screen:new {
       queue.random:set(not queue.random:get())
     end)
     local shuffle_img = shuffle_btn:Image { src = img.shuffle }
-    theme.set_style(shuffle_btn, icon_enabled_class)
+    theme.set_subject(shuffle_btn, icon_enabled_class)
     local shuffle_desc = widgets.Description(shuffle_btn)
 
     controls:Object({ flex_grow = 1, h = 1 }) -- spacer
@@ -251,12 +251,12 @@ return screen:new {
         playlist_pos:set { text = tostring(pos) }
 
         local can_next = pos < queue.size:get() or queue.random:get()
-        theme.set_style(
+        theme.set_subject(
           next_btn, can_next and icon_enabled_class or icon_disabled_class
         )
       end),
       queue.random:bind(function(shuffling)
-        theme.set_style(shuffle_btn, shuffling and icon_enabled_class or icon_disabled_class)
+        theme.set_subject(shuffle_btn, shuffling and icon_enabled_class or icon_disabled_class)
         if shuffling then
           shuffle_img:set_src(img.shuffle)
           shuffle_desc:set { text = "Disable shuffle" }
@@ -266,7 +266,7 @@ return screen:new {
         end
       end),
       queue.repeat_track:bind(function(en)
-        theme.set_style(repeat_btn, en and icon_enabled_class or icon_disabled_class)
+        theme.set_subject(repeat_btn, en and icon_enabled_class or icon_disabled_class)
         if en then
           repeat_img:set_src(img.repeat_src)
           repeat_desc:set { text = "Disable track repeat" }
diff --git a/lua/settings.lua b/lua/settings.lua
index 9b77274d..b23f9756 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -12,6 +12,7 @@ local database = require("database")
 local usb = require("usb")
 local font = require("font")
 local main_menu = require("main_menu")
+local img = require("images")
 
 local SettingsScreen = widgets.MenuScreen:new {
   show_back = true,
@@ -102,7 +103,7 @@ local BluetoothSettings = SettingsScreen:new {
           text = "",
           pad_bottom = 1,
         }
-    theme.set_style(paired_label, "settings_title")
+    theme.set_subject(paired_label, "settings_title")
 
     self.bindings = self.bindings + {
       bluetooth.connecting:bind(function(conn)
@@ -152,7 +153,7 @@ local BluetoothSettings = SettingsScreen:new {
       end),
     }
 
-    theme.set_style(self.content:Label {
+    theme.set_subject(self.content:Label {
       text = "Known Devices",
       pad_bottom = 1,
     }, "settings_title")
@@ -206,13 +207,14 @@ local HeadphonesSettings = SettingsScreen:new {
   create_ui = function(self)
     SettingsScreen.create_ui(self)
 
-    theme.set_style(self.content:Label {
+    theme.set_subject(self.content:Label {
       text = "Maxiumum volume limit",
     }, "settings_title")
 
     local volume_chooser = self.content:Dropdown {
       options = "Line Level (-10 dB)\nCD Level (+6 dB)\nMaximum (+10dB)",
       selected = 1,
+      symbol = img.chevron,
     }
     local limits = { -10, 6, 10 }
     volume_chooser:onevent(lvgl.EVENT.VALUE_CHANGED, function()
@@ -221,7 +223,7 @@ local HeadphonesSettings = SettingsScreen:new {
       volume.limit_db:set(limits[selection])
     end)
 
-    theme.set_style(self.content:Label {
+    theme.set_subject(self.content:Label {
       text = "Left/Right balance",
     }, "settings_title")
 
@@ -282,7 +284,7 @@ local DisplaySettings = SettingsScreen:new {
     }
     brightness_title:Label { text = "Brightness", flex_grow = 1 }
     local brightness_pct = brightness_title:Label {}
-    theme.set_style(brightness_pct, "settings_title")
+    theme.set_subject(brightness_pct, "settings_title")
 
     local brightness = self.content:Slider {
       w = lvgl.PCT(100),
@@ -306,7 +308,7 @@ local ThemeSettings = SettingsScreen:new {
   create_ui = function(self)
     SettingsScreen.create_ui(self)
 
-    theme.set_style(self.content:Label {
+    theme.set_subject(self.content:Label {
       text = "Theme",
     }, "settings_title")
 
@@ -319,7 +321,9 @@ local ThemeSettings = SettingsScreen:new {
     local theme_dir_iter = filesystem.iterator("/.themes/")
     for dir in theme_dir_iter do
       local theme_name = tostring(dir):match("(.+).lua$")
-      themeOptions[theme_name] = "/sdcard/.themes/" .. theme_name .. ".lua"
+      if (theme_name) then
+        themeOptions[theme_name] = "/sd/.themes/" .. theme_name .. ".lua"
+      end
     end
 
     local saved_theme = theme.theme_filename();
@@ -346,6 +350,7 @@ local ThemeSettings = SettingsScreen:new {
 
     local theme_chooser = self.content:Dropdown {
       options = options,
+      symbol = img.chevron,
     }
     theme_chooser:set({selected = selected_idx})
 
@@ -365,7 +370,7 @@ local InputSettings = SettingsScreen:new {
   create_ui = function(self)
     SettingsScreen.create_ui(self)
 
-    theme.set_style(self.content:Label {
+    theme.set_subject(self.content:Label {
       text = "Control scheme",
     }, "settings_title")
 
@@ -388,6 +393,7 @@ local InputSettings = SettingsScreen:new {
 
     local controls_chooser = self.content:Dropdown {
       options = options,
+      symbol = img.chevron,
     }
 
     self.bindings = self.bindings + {
@@ -403,7 +409,7 @@ local InputSettings = SettingsScreen:new {
       controls.scheme:set(scheme)
     end)
 
-    theme.set_style(self.content:Label {
+    theme.set_subject(self.content:Label {
       text = "Scroll Sensitivity",
     }, "settings_title")
 
@@ -761,7 +767,7 @@ local RegulatoryScreen = SettingsScreen:new {
       pad_top = 4,
       pad_column = 4,
     }
-    theme.set_style(logo_container, "regulatory_icons")
+    theme.set_subject(logo_container, "regulatory_icons")
     button_container:add_style(styles.list_item)
 
     logo_container:Image { src = "//lua/img/ce.png" }
@@ -785,7 +791,7 @@ return widgets.MenuScreen:new {
         text = name,
         pad_left = 4,
       }
-      theme.set_style(elem, "settings_title")
+      theme.set_subject(elem, "settings_title")
     end
 
     local function submenu(name, class)
diff --git a/lua/theme_dark.lua b/lua/theme_dark.lua
index 41fddf81..ac1044c6 100644
--- a/lua/theme_dark.lua
+++ b/lua/theme_dark.lua
@@ -38,6 +38,7 @@ local theme_dark = {
   },
   button = {
     {lvgl.PART.MAIN, lvgl.Style {
+      bg_opa = lvgl.OPA(100),
       pad_left = 2,
       pad_right = 2,
       pad_top = 1,
@@ -217,6 +218,12 @@ local theme_dark = {
       radius = 4
     }},
   },
+  bluetooth_icon = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
+  },
   battery = {
     {lvgl.PART.MAIN, lvgl.Style {
       image_recolor_opa = 0,
@@ -240,6 +247,18 @@ local theme_dark = {
       image_recolor = "#fdd833",
     }},
   },
+  battery_charge_outline = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = background_color,
+    }},
+  },
+  regulatory_icons = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
+  },
 }
 
 return theme_dark
diff --git a/lua/theme_hicon.lua b/lua/theme_hicon.lua
index 30947c18..59446bd7 100644
--- a/lua/theme_hicon.lua
+++ b/lua/theme_hicon.lua
@@ -40,6 +40,7 @@ local theme_hicon = {
   },
   button = {
     {lvgl.PART.MAIN, lvgl.Style {
+      bg_opa = lvgl.OPA(100),
       pad_left = 2,
       pad_right = 2,
       pad_top = 1,
@@ -188,6 +189,14 @@ local theme_hicon = {
       bg_color = text_color,
       text_color = background_color,
     }},
+    {lvgl.PART.INDICATOR, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
+    {lvgl.PART.INDICATOR | lvgl.STATE.FOCUSED, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = background_color,
+    }},
   },
   dropdownlist = {
     {lvgl.PART.MAIN, lvgl.Style{
@@ -244,6 +253,12 @@ local theme_hicon = {
       radius = 4
     }},
   },
+  bluetooth_icon = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
+  },
   battery = {
     {lvgl.PART.MAIN, lvgl.Style {
       image_recolor_opa = 255,
@@ -268,6 +283,18 @@ local theme_hicon = {
       image_recolor = text_color,
     }},
   },
+  battery_charge_outline = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = background_color,
+    }},
+  },
+  regulatory_icons = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
+  },
 }
 
 return theme_hicon
diff --git a/lua/theme_light.lua b/lua/theme_light.lua
index 275d06ca..412fec25 100644
--- a/lua/theme_light.lua
+++ b/lua/theme_light.lua
@@ -20,7 +20,7 @@ local theme_light = {
     {lvgl.PART.MAIN, lvgl.Style {
       bg_opa = lvgl.OPA(100),
       bg_color = background_color, -- Root background color
-      text_color = text_color
+      text_color = text_color,
     }},
   },
   header = {
@@ -37,6 +37,7 @@ local theme_light = {
   },
   button = {
     {lvgl.PART.MAIN, lvgl.Style {
+      bg_opa = lvgl.OPA(100),
       pad_left = 1,
       pad_right = 1,
       margin_all = 1,
@@ -185,6 +186,10 @@ local theme_light = {
     {lvgl.PART.MAIN | lvgl.STATE.FOCUSED, lvgl.Style {
       border_color = highlight_color,
     }},
+    {lvgl.PART.INDICATOR, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
   },
   dropdownlist = {
     {lvgl.PART.MAIN, lvgl.Style{
@@ -256,6 +261,12 @@ local theme_light = {
       radius = 4
     }},
   },
+  bluetooth_icon = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = text_color,
+    }},
+  },
   battery = {
     {lvgl.PART.MAIN, lvgl.Style {
       image_recolor_opa = 180,
@@ -280,6 +291,12 @@ local theme_light = {
       image_recolor = "#fdd833",
     }},
   },
+  battery_charge_outline = {
+    {lvgl.PART.MAIN, lvgl.Style {
+      image_recolor_opa = 255,
+      image_recolor = background_color,
+    }},
+  },
   regulatory_icons = {
     {lvgl.PART.MAIN, lvgl.Style {
       image_recolor_opa = 255,
diff --git a/lua/widgets.lua b/lua/widgets.lua
index 980f0bb2..8112b656 100644
--- a/lua/widgets.lua
+++ b/lua/widgets.lua
@@ -13,6 +13,7 @@ local images = require("images")
 local img = {
   db = lvgl.ImgData("//lua/img/db.png"),
   chg = lvgl.ImgData("//lua/img/bat/chg.png"),
+  chg_outline = lvgl.ImgData("//lua/img/bat/chg_outline.png"),
   bat_100 = lvgl.ImgData("//lua/img/bat/100.png"),
   bat_80 = lvgl.ImgData("//lua/img/bat/80.png"),
   bat_60 = lvgl.ImgData("//lua/img/bat/60.png"),
@@ -107,7 +108,7 @@ function widgets.StatusBar(parent, opts)
   }
 
   if not opts.transparent_bg then
-    theme.set_style(root, "header");
+    theme.set_subject(root, "header");
   end
 
   if opts.back_cb then
@@ -116,7 +117,7 @@ function widgets.StatusBar(parent, opts)
       h = lvgl.SIZE_CONTENT,
     }
     back:Image{src=images.back}
-    theme.set_style(back, "back_button")
+    theme.set_subject(back, "back_button")
     widgets.Description(back, "Back")
     back:onClicked(opts.back_cb)
     back:onevent(lvgl.EVENT.FOCUSED, function()
@@ -145,10 +146,12 @@ function widgets.StatusBar(parent, opts)
   end
 
   local db_updating = root:Image { src = img.db }
-  theme.set_style(db_updating, "database_indicator")
+  theme.set_subject(db_updating, "database_indicator")
   local bt_icon = root:Image {}
   local battery_icon = root:Image {}
   local charge_icon = battery_icon:Image { src = img.chg }
+  local charge_icon_outline = battery_icon:Image { src = img.chg_outline }
+  charge_icon_outline:center();
   charge_icon:center()
 
   local is_charging = nil
@@ -157,32 +160,35 @@ function widgets.StatusBar(parent, opts)
   local function update_battery_icon()
     if is_charging == nil or percent == nil then return end
     local src
-    theme.set_style(battery_icon, "battery")
+    theme.set_subject(battery_icon, "battery")
     if percent >= 95 then
-      theme.set_style(battery_icon, "battery_100")
+      theme.set_subject(battery_icon, "battery_100")
       src = img.bat_100
     elseif percent >= 75 then
-      theme.set_style(battery_icon, "battery_80")
+      theme.set_subject(battery_icon, "battery_80")
       src = img.bat_80
     elseif percent >= 55 then
-      theme.set_style(battery_icon, "battery_60")
+      theme.set_subject(battery_icon, "battery_60")
       src = img.bat_60
     elseif percent >= 35 then
-      theme.set_style(battery_icon, "battery_40")
+      theme.set_subject(battery_icon, "battery_40")
       src = img.bat_40
     elseif percent >= 15 then
-      theme.set_style(battery_icon, "battery_20")
+      theme.set_subject(battery_icon, "battery_20")
       src = img.bat_20
     else
-      theme.set_style(battery_icon, "battery_0")
+      theme.set_subject(battery_icon, "battery_0")
       src = img.bat_0
     end
     if is_charging then
-      theme.set_style(battery_icon, "battery_charging")
-      theme.set_style(charge_icon, "battery_charge_icon")
+      theme.set_subject(battery_icon, "battery_charging")
+      theme.set_subject(charge_icon, "battery_charge_icon")
+      theme.set_subject(charge_icon_outline, "battery_charge_outline")
       charge_icon:clear_flag(lvgl.FLAG.HIDDEN)
+      charge_icon_outline:clear_flag(lvgl.FLAG.HIDDEN)
     else
       charge_icon:add_flag(lvgl.FLAG.HIDDEN)
+      charge_icon_outline:add_flag(lvgl.FLAG.HIDDEN)
     end
     battery_icon:set_src(src)
   end
@@ -211,7 +217,7 @@ function widgets.StatusBar(parent, opts)
       end
     end),
     bluetooth.connected:bind(function(connected)
-      theme.set_style(bt_icon, "bluetooth_icon")
+      theme.set_subject(bt_icon, "bluetooth_icon")
       if connected then
         bt_icon:set_src(img.bt_conn)
       else