Merge branch 'main' into themes

2024-03-20 13:42:03 +11:00
parent 170c23b832 a05d93a1e2
commit 51dfb5b3e3
61 changed files with 3239 additions and 907 deletions
@@ -5,41 +5,42 @@ local backstack = require("backstack")
 local browser = require("browser")
 local playing = require("playing")
 local styles = require("styles")
+local screen = require("screen")

-return function()
-  local menu = widgets.MenuScreen({})
+return screen:new {
+  createUi = function()
+    local menu = widgets.MenuScreen({})

-  menu.list = lvgl.List(menu.root, {
-    w = lvgl.PCT(100),
-    h = lvgl.PCT(100),
-    flex_grow = 1,
-  })
+    menu.list = lvgl.List(menu.root, {
+      w = lvgl.PCT(100),
+      h = lvgl.PCT(100),
+      flex_grow = 1,
+    })

-  local now_playing = menu.list:add_btn(nil, "Now Playing")
-  now_playing:onClicked(function()
-    backstack.push(playing)
-  end)
-  now_playing:add_style(styles.list_item)
-
-  local indexes = database.indexes()
-  for _, idx in ipairs(indexes) do
-    local btn = menu.list:add_btn(nil, tostring(idx))
-    btn:onClicked(function()
-      backstack.push(function()
-        return browser {
-          title = tostring(idx),
-          iterator = idx:iter()
-        }
-      end)
+    local now_playing = menu.list:add_btn(nil, "Now Playing")
+    now_playing:onClicked(function()
+      backstack.push(playing:new())
    end)
-    btn:add_style(styles.list_item)
-  end
+    now_playing:add_style(styles.list_item)

-  local settings = menu.list:add_btn(nil, "Settings")
-  settings:onClicked(function()
-    backstack.push(require("settings").root)
-  end)
-  settings:add_style(styles.list_item)
+    local indexes = database.indexes()
+    for _, idx in ipairs(indexes) do
+      local btn = menu.list:add_btn(nil, tostring(idx))
+      btn:onClicked(function()
+        backstack.push(browser:new {
+          title = tostring(idx),
+          iterator = idx:iter(),
+        })
+      end)
+      btn:add_style(styles.list_item)
+    end

-  return menu
-end
+    local settings = menu.list:add_btn(nil, "Settings")
+    settings:onClicked(function()
+      backstack.push(require("settings"):new())
+    end)
+    settings:add_style(styles.list_item)
+
+    return menu
+  end,
+}