Add a second font, flesh out browser screen

1 files changed, 72 insertions, 18 deletions

diff --git a/lua/widgets.lua b/lua/widgets.lua
index 76f7c839..95615a8c 100644
--- a/lua/widgets.lua
+++ b/lua/widgets.lua
@@ -2,6 +2,7 @@ local lvgl = require("lvgl")
 local power = require("power")
 local bluetooth = require("bluetooth")
 local playback = require("playback")
+local font = require("font")
 
 local widgets = {}
 
@@ -19,12 +20,18 @@ function widgets.StatusBar(parent, opts)
     h = lvgl.SIZE_CONTENT,
     pad_top = 1,
     pad_bottom = 1,
+    pad_left = 4,
     pad_column = 1,
-    bg_opa = lvgl.OPA(100),
-    bg_color = "#e1bee7",
     scrollbar_mode = lvgl.SCROLLBAR_MODE.OFF,
   }
 
+  if not opts.transparent_bg then
+    status_bar.root:set {
+      bg_opa = lvgl.OPA(100),
+      bg_color = "#fafafa",
+    }
+  end
+
   if opts.back_cb then
     status_bar.back = status_bar.root:Button {
       w = lvgl.SIZE_CONTENT,
@@ -36,8 +43,10 @@ function widgets.StatusBar(parent, opts)
 
   status_bar.title = status_bar.root:Label {
     w = lvgl.PCT(100),
-    h = 16,
+    h = lvgl.SIZE_CONTENT,
+    text_font = font.fusion_10,
     text = "",
+    align = lvgl.ALIGN.CENTER,
     flex_grow = 1,
   }
   if opts.title then
@@ -47,24 +56,50 @@ function widgets.StatusBar(parent, opts)
   status_bar.playing = status_bar.root:Image {}
   status_bar.bluetooth = status_bar.root:Image {}
   status_bar.battery = status_bar.root:Image {}
+  status_bar.chg = status_bar.battery:Image {
+    src = "//lua/img/bat/chg.png"
+  }
+  status_bar.chg:center()
 
-  status_bar.bindings = {
-    power.battery_pct:bind(function(percent)
-      local src
-      if percent >= 95 then
-        src = "battery_full.png"
-      elseif percent >= 75 then
-        src = "battery_80.png"
-      elseif percent >= 55 then
-        src = "battery_60.png"
-      elseif percent >= 35 then
-        src = "battery_40.png"
-      elseif percent >= 15 then
-        src = "battery_20.png"
+  local is_charging = nil
+  local percent = nil
+
+  function update_battery_icon()
+    if is_charging == nil or percent == nil then return end
+    local src
+    if percent >= 95 then
+      src = "100.png"
+    elseif percent >= 75 then
+      src = "80.png"
+    elseif percent >= 55 then
+      src = "60.png"
+    elseif percent >= 35 then
+      src = "40.png"
+    elseif percent >= 15 then
+      src = "20.png"
+    else
+      if is_charging then
+        src = "0chg.png"
       else
-        src = "battery_empty.png"
+        src = "0.png"
       end
-      status_bar.battery:set_src("//lua/assets/" .. src)
+    end
+    if is_charging then
+      status_bar.chg:clear_flag(lvgl.FLAG.HIDDEN)
+    else
+      status_bar.chg:add_flag(lvgl.FLAG.HIDDEN)
+    end
+    status_bar.battery:set_src("//lua/img/bat/" .. src)
+  end
+
+  status_bar.bindings = {
+    power.battery_pct:bind(function(pct)
+      percent = pct
+      update_battery_icon()
+    end),
+    power.plugged_in:bind(function(p)
+      is_charging = p
+      update_battery_icon()
     end),
     playback.playing:bind(function(playing)
       if playing then
@@ -99,4 +134,23 @@ function widgets.StatusBar(parent, opts)
   return status_bar
 end
 
+function widgets.IconBtn(parent, icon, text)
+  local btn = parent:Button {
+    flex = {
+      flex_direction = "row",
+      justify_content = "flex-start",
+      align_items = "center",
+      align_content = "center",
+    },
+    w = lvgl.SIZE_CONTENT,
+    h = lvgl.SIZE_CONTENT,
+    pad_top = 1,
+    pad_bottom = 1,
+    pad_left = 1,
+    pad_column = 1,
+  }
+  btn:Image { src = icon }
+  btn:Label { text = text, text_font = font.fusion_10 }
+end
+
 return widgets