From a78614a5806c9800956f10f993e1c70b74fbf323 Mon Sep 17 00:00:00 2001 From: ailurux Date: Thu, 7 Mar 2024 12:12:32 +1100 Subject: WIP: Getting styles from lua --- lua/main.lua | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index 5cbbf0a6..5cfba47b 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -1,5 +1,6 @@ local font = require("font") local vol = require("volume") +local theme = require("theme") -- Set up property bindings that are used across every screen. GLOBAL_BINDINGS = { @@ -34,6 +35,31 @@ GLOBAL_BINDINGS = { end), } +local lvgl = require("lvgl") +local my_theme = { + base = { + {lvgl.PART.MAIN, lvgl.Style { + bg_opa = lvgl.OPA(0), + text_font = font.fusion_12, + text_color = "#ff0000", -- Red to check it applies + }}, + {lvgl.STATE.FOCUSED, lvgl.Style { + bg_opa = lvgl.OPA(100), + bg_color = "#0000ff", -- ew + text_color = "#ff0000", -- Red to check it applies + }}, + }, + button = { + {lvgl.STATE.FOCUSED, lvgl.Style { + bg_color = "#00ff00", + }}, + {lvgl.PART.MAIN, lvgl.Style { + bg_color = "#00ff00", + }}, + }, +} +theme.set(my_theme) + local backstack = require("backstack") local main_menu = require("main_menu") -- cgit v1.2.3 From dc74bc1de9dd56c4146232622140b56e90dcc43d Mon Sep 17 00:00:00 2001 From: ailurux Date: Thu, 7 Mar 2024 15:46:42 +1100 Subject: Add other styles to lua theme --- lua/main.lua | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 5 deletions(-) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index 5cfba47b..6cdef17d 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -41,22 +41,89 @@ local my_theme = { {lvgl.PART.MAIN, lvgl.Style { bg_opa = lvgl.OPA(0), text_font = font.fusion_12, - text_color = "#ff0000", -- Red to check it applies + text_color = "#000000", }}, {lvgl.STATE.FOCUSED, lvgl.Style { bg_opa = lvgl.OPA(100), - bg_color = "#0000ff", -- ew - text_color = "#ff0000", -- Red to check it applies + bg_color = "#E3F2FD", }}, }, button = { + {lvgl.PART.MAIN, lvgl.Style { + pad_left = 2, + pad_right = 2, + pad_top = 1, + pad_bottom = 1, + bg_color = "#ffffff", + radius = 5, + }}, + }, + bar = { + {lvgl.PART.MAIN, lvgl.Style { + bg_opa = lvgl.OPA(100), + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + }}, + }, + slider = { + {lvgl.PART.MAIN, lvgl.Style { + bg_opa = lvgl.OPA(100), + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + }}, + {lvgl.PART.INDICATOR, lvgl.Style { + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + bg_color = "#2196F3", + }}, + {lvgl.PART.KNOB, lvgl.Style { + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + pad_all = 2, + bg_color = "#ffffff", + shadow_width = 5, + shadow_opa = lvgl.OPA(100) + }}, {lvgl.STATE.FOCUSED, lvgl.Style { - bg_color = "#00ff00", + bg_color = "#BBDEFB", }}, + }, + switch = { {lvgl.PART.MAIN, lvgl.Style { - bg_color = "#00ff00", + bg_opa = lvgl.OPA(100), + width = 28, + height = 18, + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + }}, + {lvgl.PART.INDICATOR, lvgl.Style { + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + bg_color = "#9E9E9E", + }}, + {lvgl.PART.INDICATOR | lvgl.STATE.CHECKED, lvgl.Style { + bg_color = "#2196F3", + }}, + {lvgl.PART.KNOB, lvgl.Style { + radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff + pad_all = 2, + bg_opa = lvgl.OPA(100), + bg_color = "#ffffff", }}, }, + dropdown = { + {lvgl.PART.MAIN, lvgl.Style{ + radius = 2, + pad_all = 2, + border_width = 1, + border_color = "#2196F3", + border_side = 15, -- LV_BORDER_SIDE_FULL + }} + }, + dropdownlist = { + {lvgl.PART.MAIN, lvgl.Style{ + radius = 2, + pad_all = 2, + border_width = 1, + border_color = "#607D8B", + bg_opa = lvgl.OPA(100), + bg_color = "#ffffff" + }} + } } theme.set(my_theme) -- cgit v1.2.3 From 1133d4621508b7ec6bac4ab8731f3493066ceeee Mon Sep 17 00:00:00 2001 From: ailurux Date: Sun, 10 Mar 2024 13:20:17 +1100 Subject: WIP Lua Theming- style classes --- lua/main.lua | 93 ++---------------------------------------------------------- 1 file changed, 2 insertions(+), 91 deletions(-) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index 6cdef17d..f2533387 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -35,97 +35,8 @@ GLOBAL_BINDINGS = { end), } -local lvgl = require("lvgl") -local my_theme = { - base = { - {lvgl.PART.MAIN, lvgl.Style { - bg_opa = lvgl.OPA(0), - text_font = font.fusion_12, - text_color = "#000000", - }}, - {lvgl.STATE.FOCUSED, lvgl.Style { - bg_opa = lvgl.OPA(100), - bg_color = "#E3F2FD", - }}, - }, - button = { - {lvgl.PART.MAIN, lvgl.Style { - pad_left = 2, - pad_right = 2, - pad_top = 1, - pad_bottom = 1, - bg_color = "#ffffff", - radius = 5, - }}, - }, - bar = { - {lvgl.PART.MAIN, lvgl.Style { - bg_opa = lvgl.OPA(100), - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - }}, - }, - slider = { - {lvgl.PART.MAIN, lvgl.Style { - bg_opa = lvgl.OPA(100), - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - }}, - {lvgl.PART.INDICATOR, lvgl.Style { - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - bg_color = "#2196F3", - }}, - {lvgl.PART.KNOB, lvgl.Style { - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - pad_all = 2, - bg_color = "#ffffff", - shadow_width = 5, - shadow_opa = lvgl.OPA(100) - }}, - {lvgl.STATE.FOCUSED, lvgl.Style { - bg_color = "#BBDEFB", - }}, - }, - switch = { - {lvgl.PART.MAIN, lvgl.Style { - bg_opa = lvgl.OPA(100), - width = 28, - height = 18, - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - }}, - {lvgl.PART.INDICATOR, lvgl.Style { - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - bg_color = "#9E9E9E", - }}, - {lvgl.PART.INDICATOR | lvgl.STATE.CHECKED, lvgl.Style { - bg_color = "#2196F3", - }}, - {lvgl.PART.KNOB, lvgl.Style { - radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff - pad_all = 2, - bg_opa = lvgl.OPA(100), - bg_color = "#ffffff", - }}, - }, - dropdown = { - {lvgl.PART.MAIN, lvgl.Style{ - radius = 2, - pad_all = 2, - border_width = 1, - border_color = "#2196F3", - border_side = 15, -- LV_BORDER_SIDE_FULL - }} - }, - dropdownlist = { - {lvgl.PART.MAIN, lvgl.Style{ - radius = 2, - pad_all = 2, - border_width = 1, - border_color = "#607D8B", - bg_opa = lvgl.OPA(100), - bg_color = "#ffffff" - }} - } -} -theme.set(my_theme) +local theme_light = require("theme_dark") +theme.set(theme_light) local backstack = require("backstack") local main_menu = require("main_menu") -- cgit v1.2.3 From f1599c237c36f08e96dd5d1ab98bc04e35e1ade1 Mon Sep 17 00:00:00 2001 From: ailurux Date: Mon, 18 Mar 2024 13:11:13 +1100 Subject: Better styling for settings pages + dropdown menus --- lua/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index f2533387..f7dfb2c9 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -35,7 +35,7 @@ GLOBAL_BINDINGS = { end), } -local theme_light = require("theme_dark") +local theme_light = require("theme_light") theme.set(theme_light) local backstack = require("backstack") -- cgit v1.2.3 From 170c23b832eed6dad2b118e50164464cc93e5c4c Mon Sep 17 00:00:00 2001 From: ailurux Date: Wed, 20 Mar 2024 11:47:58 +1100 Subject: Fairyfloss dark theme palette test --- lua/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index f7dfb2c9..291f524e 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -35,8 +35,8 @@ GLOBAL_BINDINGS = { end), } -local theme_light = require("theme_light") -theme.set(theme_light) +local theme_dark = require("theme_dark") +theme.set(theme_dark) local backstack = require("backstack") local main_menu = require("main_menu") -- cgit v1.2.3 From 4293c488364171b4abf5d1dccac1a1fb55a42a31 Mon Sep 17 00:00:00 2001 From: ailurux Date: Wed, 20 Mar 2024 14:08:11 +1100 Subject: Fix bad merge --- lua/main.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index d84e2417..1a605dab 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -1,9 +1,14 @@ local font = require("font") local vol = require("volume") local theme = require("theme") +local controls = require("controls") +local time = require("time") + +local lock_time = time.ticks() -- Set up property bindings that are used across every screen. GLOBAL_BINDINGS = { + -- Show an alert with the current volume whenever the volume changes vol.current_pct:bind(function(pct) require("alerts").show(function() local container = lvgl.Object(nil, { -- cgit v1.2.3 From 489fbceb2b5a623ea502ab647f023d2e2e566121 Mon Sep 17 00:00:00 2001 From: ailurux Date: Wed, 27 Mar 2024 16:07:22 +1100 Subject: Update icons and volume dialogue to use themes --- lua/main.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lua/main.lua') diff --git a/lua/main.lua b/lua/main.lua index 1a605dab..dc73c964 100644 --- a/lua/main.lua +++ b/lua/main.lua @@ -6,6 +6,9 @@ local time = require("time") local lock_time = time.ticks() +local theme_dark = require("theme_dark") +theme.set(theme_dark) + -- Set up property bindings that are used across every screen. GLOBAL_BINDINGS = { -- Show an alert with the current volume whenever the volume changes @@ -20,11 +23,10 @@ GLOBAL_BINDINGS = { align_items = "center", align_content = "center", }, - bg_opa = lvgl.OPA(100), - bg_color = "#fafafa", radius = 8, pad_all = 2, }) + theme.set_style(container, "pop_up") container:Label { text = string.format("Volume %i%%", pct), text_font = font.fusion_10 @@ -52,9 +54,6 @@ GLOBAL_BINDINGS = { end), } -local theme_dark = require("theme_dark") -theme.set(theme_dark) - local backstack = require("backstack") local main_menu = require("main_menu") -- cgit v1.2.3