1 files changed, 26 insertions, 5 deletions
diff --git a/src/ui/themes.cpp b/src/ui/themes.cpp
index ecb1d434..bcbf01f2 100644
--- a/src/ui/themes.cpp
+++ b/src/ui/themes.cpp
@@ -1,6 +1,7 @@
 #include "themes.hpp"
 #include "core/lv_obj.h"
 #include "misc/lv_color.h"
+#include "esp_log.h"
 
 LV_FONT_DECLARE(font_fusion);
 
@@ -14,10 +15,11 @@ static void theme_apply_cb(lv_theme_t* th, lv_obj_t* obj) {
 Theme::Theme() {
   /*Initialize the styles*/
   lv_style_init(&button_style_);
-  lv_style_set_bg_color(&button_style_, lv_palette_main(LV_PALETTE_GREEN));
-  lv_style_set_border_color(&button_style_,
-                            lv_palette_darken(LV_PALETTE_GREEN, 3));
-  lv_style_set_border_width(&button_style_, 1);
+  lv_style_set_pad_all(&button_style_, 2);
+  lv_style_set_bg_color(&button_style_, lv_color_white());
+
+  lv_style_init(&button_style_focused_);
+  lv_style_set_bg_color(&button_style_focused_, lv_palette_lighten(LV_PALETTE_BLUE_GREY, 2));
 
   lv_theme_t* parent_theme = lv_disp_get_theme(NULL);
   theme_ = *parent_theme;
@@ -33,13 +35,32 @@ void Theme::Apply(void) {
 }
 
 void Theme::Callback(lv_obj_t* obj) {
+  ESP_LOGI("Theme", "Callback called on object %p", obj);
   lv_obj_set_style_text_font(obj, &font_fusion, 0);
   lv_obj_set_style_text_color(obj, lv_color_black(), 0);
 
   if (lv_obj_check_type(obj, &lv_btn_class) ||
       lv_obj_check_type(obj, &lv_list_btn_class)) {
-    lv_obj_add_style(obj, &button_style_, LV_PART_MAIN | LV_STATE_FOCUSED);
+    lv_obj_add_style(obj, &button_style_, LV_PART_MAIN);
+    lv_obj_add_style(obj, &button_style_focused_, LV_PART_MAIN | LV_STATE_FOCUSED);
+  }
+}
+
+void Theme::ApplyStyle(lv_obj_t* obj, Style style) {
+  ESP_LOGI("Theme", "Apply style called on object %p", obj);
+  if (style == Style::kTopBar) {
+    lv_obj_set_style_border_color(obj, lv_palette_darken(LV_PALETTE_BLUE_GREY, 2), LV_PART_MAIN);
+    lv_obj_set_style_border_width(obj, 1, LV_PART_MAIN);
+    lv_obj_set_style_border_side(obj, LV_BORDER_SIDE_BOTTOM|LV_BORDER_SIDE_TOP, 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);
   }
 }
+
+auto Theme::instance() -> Theme* {
+  static Theme sTheme{};
+  return &sTheme;
+}
+
 }  // namespace themes
 }  // namespace ui