MightyPork
/
tangara-fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP: Base styles are applied

Browse Source
custom
ailurux 1 year ago
parent a78614a580
commit 312b70f9f6
4 changed files with 27 additions and 180 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      src/lua/lua_theme.cpp
  2. 2
      src/ui/CMakeLists.txt
  3. 25
      src/ui/include/themes.hpp
  4. 179
      src/ui/themes.cpp

1
src/lua/lua_theme.cpp
Unescape View File

@ -60,6 +60,7 @@ static auto set_theme(lua_State* L) -> int {
ESP_LOGI("DANIEL", "Style was null or malformed??");
return 0;
} else {
ui::themes::Theme::instance()->AddStyle(class_name, selector, style);
ESP_LOGI("DANIEL", "Got style for class %s with selector %d", class_name.c_str(), selector);
}
}

2
src/ui/CMakeLists.txt
Unescape View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-only
idf_component_register(
SRCS "themes copy.cpp" "lvgl_task.cpp" "ui_fsm.cpp" "screen_splash.cpp" "encoder_input.cpp"
SRCS "lvgl_task.cpp" "ui_fsm.cpp" "screen_splash.cpp" "encoder_input.cpp"
"themes.cpp" "screen.cpp" "modal.cpp" "screen_lua.cpp"
"splash.c" "font_fusion_12.c" "font_fusion_10.c"
INCLUDE_DIRS "include"

25
src/ui/include/themes.hpp
Unescape View File

@ -1,5 +1,8 @@
#pragma once
#include <string>
#include <map>
#include <vector>
#include "lvgl.h"
namespace ui {
@ -21,29 +24,15 @@ class Theme {
void Callback(lv_obj_t* obj);
void ApplyStyle(lv_obj_t* obj, Style style);
void AddStyle(std::string key, int selector, lv_style_t* style);
static auto instance() -> Theme*;
private:
Theme();
lv_style_t base_style_;
lv_style_t base_focused_style_;
lv_style_t button_style_;
lv_style_t bar_style_;
lv_style_t dropdown_style_;
lv_style_t dropdown_list_style_;
lv_style_t slider_indicator_style_;
lv_style_t slider_knob_style_;
lv_style_t slider_knob_focused_style_;
lv_style_t switch_style_;
lv_style_t switch_indicator_style_;
lv_style_t switch_indicator_checked_style_;
lv_style_t switch_knob_style_;
std::map<std::string, std::vector<std::pair<int, lv_style_t*>>> style_map;
lv_theme_t theme_;
};
} // namespace themes
} // namespace ui

179
src/ui/themes.cpp
Unescape View File

@ -19,84 +19,6 @@ static void theme_apply_cb(lv_theme_t* th, lv_obj_t* obj) {
}
Theme::Theme() {
lv_style_init(&base_style_);
lv_style_set_bg_opa(&base_style_, LV_OPA_TRANSP);
lv_style_set_text_font(&base_style_, &font_fusion_12);
lv_style_set_text_color(&base_style_, lv_color_black());
lv_style_init(&base_focused_style_);
lv_style_set_bg_opa(&base_focused_style_, LV_OPA_COVER);
lv_style_set_bg_color(&base_focused_style_,
lv_palette_lighten(LV_PALETTE_BLUE, 5));
lv_style_init(&button_style_);
lv_style_set_pad_left(&button_style_, 2);
lv_style_set_pad_right(&button_style_, 2);
lv_style_set_pad_top(&button_style_, 1);
lv_style_set_pad_bottom(&button_style_, 1);
lv_style_set_bg_color(&button_style_, lv_color_white());
lv_style_set_radius(&button_style_, 5);
lv_style_init(&bar_style_);
lv_style_set_bg_opa(&bar_style_, LV_OPA_COVER);
lv_style_set_radius(&bar_style_, LV_RADIUS_CIRCLE);
lv_style_init(&slider_indicator_style_);
lv_style_set_radius(&slider_indicator_style_, LV_RADIUS_CIRCLE);
lv_style_set_bg_color(&slider_indicator_style_,
lv_palette_main(LV_PALETTE_BLUE));
lv_style_init(&slider_knob_style_);
lv_style_set_radius(&slider_knob_style_, LV_RADIUS_CIRCLE);
lv_style_set_pad_all(&slider_knob_style_, 2);
lv_style_set_bg_color(&slider_knob_style_, lv_color_white());
lv_style_set_shadow_width(&slider_knob_style_, 5);
lv_style_set_shadow_opa(&slider_knob_style_, LV_OPA_COVER);
lv_style_init(&slider_knob_focused_style_);
lv_style_set_bg_color(&slider_knob_focused_style_,
lv_palette_lighten(LV_PALETTE_BLUE, 4));
lv_style_init(&switch_style_);
lv_style_set_width(&switch_style_, 28);
lv_style_set_height(&switch_style_, 18);
lv_style_set_radius(&switch_style_, LV_RADIUS_CIRCLE);
lv_style_init(&switch_knob_style_);
lv_style_set_pad_all(&switch_knob_style_, -2);
lv_style_set_radius(&switch_knob_style_, LV_RADIUS_CIRCLE);
lv_style_set_bg_opa(&switch_knob_style_, LV_OPA_COVER);
lv_style_set_bg_color(&switch_knob_style_, lv_color_white());
lv_style_init(&slider_knob_focused_style_);
lv_style_set_bg_color(&slider_knob_focused_style_,
lv_palette_lighten(LV_PALETTE_BLUE, 4));
lv_style_init(&switch_indicator_style_);
lv_style_set_radius(&switch_indicator_style_, LV_RADIUS_CIRCLE);
lv_style_set_bg_opa(&switch_indicator_style_, LV_OPA_COVER);
lv_style_set_bg_color(&switch_indicator_style_,
lv_palette_main(LV_PALETTE_GREY));
lv_style_init(&switch_indicator_checked_style_);
lv_style_set_bg_color(&switch_indicator_checked_style_,
lv_palette_main(LV_PALETTE_BLUE));
lv_style_init(&dropdown_style_);
lv_style_set_radius(&dropdown_style_, 2);
lv_style_set_pad_all(&dropdown_style_, 2);
lv_style_set_border_width(&dropdown_style_, 1);
lv_style_set_border_color(&dropdown_style_, lv_palette_main(LV_PALETTE_BLUE));
lv_style_set_border_side(&dropdown_style_, LV_BORDER_SIDE_FULL);
lv_style_init(&dropdown_list_style_);
lv_style_set_radius(&dropdown_list_style_, 2);
lv_style_set_border_width(&dropdown_list_style_, 1);
lv_style_set_border_color(&dropdown_list_style_, lv_palette_main(LV_PALETTE_BLUE_GREY));
lv_style_set_bg_opa(&dropdown_list_style_, LV_OPA_COVER);
lv_style_set_bg_color(&dropdown_list_style_, lv_color_white());
lv_style_set_pad_all(&dropdown_list_style_, 2);
lv_theme_t* parent_theme = lv_disp_get_theme(NULL);
theme_ = *parent_theme;
theme_.user_data = this;
@ -111,98 +33,33 @@ void Theme::Apply(void) {
}
void Theme::Callback(lv_obj_t* obj) {
lv_obj_add_style(obj, &base_style_, LV_PART_MAIN);
lv_obj_add_style(obj, &base_focused_style_, LV_PART_SELECTED);
lv_obj_add_style(obj, &base_focused_style_, LV_STATE_FOCUSED);
if (lv_obj_check_type(obj, &lv_btn_class)) {
lv_obj_add_style(obj, &button_style_, LV_PART_MAIN);
} else if (lv_obj_check_type(obj, &lv_bar_class)) {
lv_obj_add_style(obj, &bar_style_, LV_PART_MAIN);
} else if (lv_obj_check_type(obj, &lv_slider_class)) {
lv_obj_add_style(obj, &bar_style_, LV_PART_MAIN);
lv_obj_add_style(obj, &slider_indicator_style_, LV_PART_INDICATOR);
lv_obj_add_style(obj, &slider_knob_style_, LV_PART_KNOB);
lv_obj_add_style(obj, &slider_knob_focused_style_, LV_STATE_FOCUSED);
} else if (lv_obj_check_type(obj, &lv_switch_class)) {
lv_obj_add_style(obj, &switch_style_, LV_PART_MAIN);
lv_obj_add_style(obj, &switch_indicator_style_, LV_PART_INDICATOR);
lv_obj_add_style(obj, &switch_indicator_checked_style_,
LV_PART_INDICATOR | LV_STATE_CHECKED);
lv_obj_add_style(obj, &switch_knob_style_, LV_PART_KNOB);
} else if (lv_obj_check_type(obj, &lv_dropdown_class)) {
lv_obj_add_style(obj, &dropdown_style_, LV_PART_MAIN);
} else if (lv_obj_check_type(obj, &lv_dropdownlist_class)) {
lv_obj_add_style(obj, &dropdown_list_style_, LV_PART_MAIN);
// Find and apply base styles
if (auto search = style_map.find("base"); search != style_map.end()) {
for (const auto& pair : search->second) {
lv_obj_add_style(obj, pair.second, pair.first);
}
}
}
void Theme::ApplyStyle(lv_obj_t* obj, Style style) {
switch (style) {
case Style::kTopBar:
lv_obj_set_style_pad_bottom(obj, 1, LV_PART_MAIN);
lv_obj_set_style_shadow_width(obj, 6, LV_PART_MAIN);
lv_obj_set_style_shadow_opa(obj, LV_OPA_COVER, LV_PART_MAIN);
lv_obj_set_style_shadow_ofs_x(obj, 0, LV_PART_MAIN);
break;
case Style::kPopup:
lv_obj_set_style_shadow_width(obj, 6, LV_PART_MAIN);
lv_obj_set_style_shadow_opa(obj, LV_OPA_COVER, LV_PART_MAIN);
lv_obj_set_style_shadow_ofs_x(obj, 0, LV_PART_MAIN);
lv_obj_set_style_shadow_ofs_y(obj, 0, LV_PART_MAIN);
lv_obj_set_style_radius(obj, 5, LV_PART_MAIN);
lv_obj_set_style_bg_opa(obj, LV_OPA_COVER, LV_PART_MAIN);
lv_obj_set_style_bg_color(obj, lv_color_white(), LV_PART_MAIN);
lv_obj_set_style_pad_top(obj, 2, LV_PART_MAIN);
lv_obj_set_style_pad_bottom(obj, 2, LV_PART_MAIN);
lv_obj_set_style_pad_left(obj, 2, LV_PART_MAIN);
lv_obj_set_style_pad_right(obj, 2, LV_PART_MAIN);
break;
case Style::kTab:
lv_obj_set_style_radius(obj, 0, LV_PART_MAIN);
lv_obj_set_style_border_width(obj, 1, LV_STATE_CHECKED);
lv_obj_set_style_border_color(obj, lv_palette_main(LV_PALETTE_BLUE),
LV_STATE_CHECKED);
lv_obj_set_style_border_side(obj, LV_BORDER_SIDE_BOTTOM,
LV_STATE_CHECKED);
break;
case Style::kButtonPrimary:
lv_obj_set_style_border_width(obj, 1, LV_PART_MAIN);
lv_obj_set_style_border_color(obj, lv_palette_main(LV_PALETTE_BLUE),
LV_PART_MAIN);
lv_obj_set_style_border_side(obj, LV_BORDER_SIDE_FULL, LV_PART_MAIN);
break;
case Style::kMenuSubheadFirst:
case Style::kMenuSubhead:
lv_obj_set_style_text_color(obj, lv_palette_darken(LV_PALETTE_GREY, 3),
LV_PART_MAIN);
lv_obj_set_style_text_align(obj, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN);
lv_obj_set_style_border_width(obj, 1, LV_PART_MAIN);
lv_obj_set_style_border_color(obj, lv_palette_lighten(LV_PALETTE_GREY, 3),
LV_PART_MAIN);
// TODO: Apply widget style
if (style == Style::kMenuSubhead) {
lv_obj_set_style_border_side(
obj, LV_BORDER_SIDE_TOP | LV_BORDER_SIDE_BOTTOM, LV_PART_MAIN);
} else {
lv_obj_set_style_border_side(obj, LV_BORDER_SIDE_BOTTOM, LV_PART_MAIN);
}
break;
default:
break;
}
}
void Theme::ApplyStyle(lv_obj_t* obj, Style style) {}
auto Theme::instance() -> Theme* {
static Theme sTheme{};
return &sTheme;
}
void Theme::AddStyle(std::string key, int selector, lv_style_t* style) {
style_map.try_emplace(key, std::vector<std::pair<int, lv_style_t*>>{});
if (auto search = style_map.find(key); search != style_map.end()) {
// Key exists
auto &vec = search->second;
// Add it to the list
vec.push_back(std::make_pair(selector, style));
}
}
} // namespace themes
} // namespace ui

Write Preview
Loading…
Cancel
Save