diff --git a/lua/browser.lua b/lua/browser.lua index ce89d5ab..013dcacf 100644 --- a/lua/browser.lua +++ b/lua/browser.lua @@ -69,12 +69,12 @@ return screen:new{ pad_column = 4 }) local original_iterator = self.iterator:clone() - local enqueue = widgets.IconBtn(buttons, "//lua/img/enqueue.png", "Enqueue") + local enqueue = widgets.IconBtn(buttons, img.enqueue, "Enqueue") enqueue:onClicked(function() queue.add(original_iterator) playback.playing:set(true) end) - local shuffle_play = widgets.IconBtn(buttons, "//lua/img/shuffleplay.png", "Shuffle") + local shuffle_play = widgets.IconBtn(buttons, img.shuffleplay, "Shuffle") shuffle_play:onClicked(function() queue.clear() queue.random:set(true) @@ -83,7 +83,7 @@ return screen:new{ backstack.push(playing:new()) end) -- enqueue:add_flag(lvgl.FLAG.HIDDEN) - local play = widgets.IconBtn(buttons, "//lua/img/play_small.png", "Play") + local play = widgets.IconBtn(buttons, img.play_small, "Play") play:onClicked(function() queue.clear() queue.random:set(false) diff --git a/lua/images.lua b/lua/images.lua index 42a4a3fd..3b19f694 100644 --- a/lua/images.lua +++ b/lua/images.lua @@ -3,9 +3,12 @@ local lvgl = require("lvgl") local img = { back = lvgl.ImgData("//lua/img/back.png"), play = lvgl.ImgData("//lua/img/play.png"), - play_small = lvgl.ImgData("//lua/img/playcirc.png"), + play_circ = lvgl.ImgData("//lua/img/playcirc.png"), + play_small = lvgl.ImgData("//lua/img/play_small.png"), pause = lvgl.ImgData("//lua/img/pause.png"), - pause_small = lvgl.ImgData("//lua/img/pausecirc.png"), + pause_circ = lvgl.ImgData("//lua/img/pausecirc.png"), + enqueue = lvgl.ImgData("//lua/img/enqueue.png"), + shuffleplay = lvgl.ImgData("//lua/img/shuffleplay.png"), next = lvgl.ImgData("//lua/img/next.png"), prev = lvgl.ImgData("//lua/img/prev.png"), shuffle = lvgl.ImgData("//lua/img/shuffle.png"), diff --git a/lua/main_menu.lua b/lua/main_menu.lua index ca228102..17cd24ee 100644 --- a/lua/main_menu.lua +++ b/lua/main_menu.lua @@ -38,7 +38,7 @@ return widgets.MenuScreen:new { }) theme.set_subject(now_playing, "now_playing"); - local play_pause = now_playing:Image { src = img.play_small } + local play_pause = now_playing:Image { src = img.play_circ } local title = now_playing:Label { flex_grow = 1, h = lvgl.SIZE_CONTENT, @@ -58,9 +58,9 @@ return widgets.MenuScreen:new { self.bindings = self.bindings + { playback.playing:bind(function(playing) if playing then - play_pause:set_src(img.play_small) + play_pause:set_src(img.play_circ) else - play_pause:set_src(img.pause_small) + play_pause:set_src(img.pause_circ) end end), playback.track:bind(function(track)