Rename set_style to set_subject

lua/browser.lua

@@ -45,7 +45,7 @@ return screen:new{
             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{

lua/file_browser.lua

@@ -46,7 +46,7 @@ return screen:new {
       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 {

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

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()
@@ -155,13 +155,13 @@ return widgets.MenuScreen:new {
       })
     end)
     files_btn:Image { src = img.files }
-    theme.set_style(files_btn, "menu_icon")
+    theme.set_subject(files_btn, "menu_icon")
 
     local settings_btn = bottom_bar:Button {}
     settings_btn:onClicked(function()
       backstack.push(require("settings"):new())
     end)
     settings_btn:Image { src = img.settings }
-    theme.set_style(settings_btn, "menu_icon")
+    theme.set_subject(settings_btn, "menu_icon")
   end,
 }

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" }

lua/settings.lua

@@ -102,7 +102,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 +152,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,7 +206,7 @@ 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")
 
@@ -221,7 +221,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 +282,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 +306,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")
 
@@ -365,7 +365,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")
 
@@ -403,7 +403,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 +761,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 +785,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)

lua/widgets.lua

@@ -107,7 +107,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 +116,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,7 +145,7 @@ 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 }
@@ -157,29 +157,29 @@ 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")
       charge_icon:clear_flag(lvgl.FLAG.HIDDEN)
     else
       charge_icon:add_flag(lvgl.FLAG.HIDDEN)
@@ -211,7 +211,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

luals-stubs/theme.lua

@@ -15,11 +15,12 @@ function theme.load_theme(filename) end
 --- @param theme
 function theme.set(theme) end
 
---- Set the style name (similar in concept to a css selector) for an object
---- This will set any styles associated with that style name on the object
+--- Set the subject (similar in concept to a css class) of an object. 
+--- This will set any styles within the theme associated with that subject
+--- on the given object
 --- @param obj Object The object to set a particular style on
 --- @param style string The name of the style to apply to this object
-function theme.set_style(obj, style) end
+function theme.set_subject(obj, subject_name) end
 
 --- Returns the filename of the saved theme
 --- @return string 

src/tangara/lua/lua_theme.cpp

@@ -22,12 +22,12 @@
 
 namespace lua {
 
-static auto set_style(lua_State* L) -> int {
-  // Get the object and class name from the stack
-  std::string class_name = luaL_checkstring(L, -1);
+static auto set_subject(lua_State* L) -> int {
+  // Get the object and subject name from the stack
+  std::string subject_name = luaL_checkstring(L, -1);
   lv_obj_t* obj = luavgl_to_obj(L, -2);
   if (obj != NULL) {
-    ui::themes::Theme::instance()->ApplyStyle(obj, class_name);
+    ui::themes::Theme::instance()->ApplyStyle(obj, subject_name);
   }
   return 0;
 }
@@ -107,7 +107,7 @@ static auto theme_filename(lua_State* L) -> int {
 }
 
 static const struct luaL_Reg kThemeFuncs[] = {{"set", set_theme},
-                                              {"set_style", set_style},
+                                              {"set_subject", set_subject},
                                               {"load_theme", load_theme},
                                               {"theme_filename", theme_filename},
                                               {NULL, NULL}};