GUI element cleanup, WiFi test, progress and confirmation dialogs

Author: renzenicolai

components/gui/CMakeLists.txt

@@ -2,7 +2,9 @@ idf_component_register(
 	SRCS
 		gui_menu.c
 		gui_menu_render.c
-		gui_footer.c
+		gui_element_header.c
+		gui_element_footer.c
+		gui_element_icontext.c
 		gui_osk.c
 		gui_osk_edit.c
 		gui_edit.c

components/gui/gui_element_footer.c

@@ -0,0 +1,30 @@
+#include "gui_element_footer.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "gui_element_icontext.h"
+#include "pax_gfx.h"
+
+void gui_footer_draw(pax_buf_t* pax_buffer, gui_theme_t* theme, gui_element_icontext_t* left, size_t left_count,
+                     gui_element_icontext_t* right, size_t right_count) {
+    gui_element_style_t* style         = &theme->footer;
+    int                  buffer_width  = pax_buf_get_width(pax_buffer);
+    int                  buffer_height = pax_buf_get_height(pax_buffer);
+    int                  box_height    = style->height + (style->vertical_margin * 2);
+
+    pax_draw_line(pax_buffer, theme->palette.color_foreground, style->horizontal_margin, buffer_height - box_height,
+                  buffer_width - style->horizontal_margin, buffer_height - box_height);
+
+    int x = style->horizontal_margin + style->horizontal_padding;
+    for (size_t i = 0; i < left_count; i++) {
+        x += gui_icontext_draw(pax_buffer, theme, x, buffer_height - box_height, &left[i], style->horizontal_padding,
+                               box_height);
+    }
+
+    x = buffer_width - style->horizontal_margin;
+    for (size_t i = 0; i < right_count; i++) {
+        x -= gui_icontext_width(theme, buffer_width, buffer_height, &right[i], style->horizontal_padding);
+        gui_icontext_draw(pax_buffer, theme, x - style->horizontal_padding, buffer_height - box_height, &right[i],
+                          style->horizontal_padding, box_height);
+    }
+}

components/gui/gui_element_header.c

@@ -0,0 +1,29 @@
+#include "gui_element_header.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "gui_element_icontext.h"
+#include "pax_gfx.h"
+
+void gui_header_draw(pax_buf_t* pax_buffer, gui_theme_t* theme, gui_element_icontext_t* left, size_t left_count,
+                     gui_element_icontext_t* right, size_t right_count) {
+    gui_element_style_t* style = &theme->header;
+
+    int buffer_width = pax_buf_get_width(pax_buffer);
+    int box_height   = style->height + (style->vertical_margin * 2);
+
+    pax_draw_line(pax_buffer, theme->palette.color_foreground, style->horizontal_margin, box_height,
+                  buffer_width - style->horizontal_margin, box_height);
+
+    int x = style->horizontal_margin + style->horizontal_padding;
+    for (size_t i = 0; i < left_count; i++) {
+        x += gui_icontext_draw(pax_buffer, theme, x, 0, &left[i], style->horizontal_padding, box_height);
+    }
+
+    x = buffer_width - style->horizontal_margin;
+    for (size_t i = 0; i < right_count; i++) {
+        x -= gui_icontext_width(theme, buffer_width, 0, &right[i], style->horizontal_padding);
+        gui_icontext_draw(pax_buffer, theme, x - style->horizontal_padding, 0, &right[i], style->horizontal_padding,
+                          box_height);
+    }
+}

components/gui/gui_element_icontext.c

@@ -0,0 +1,29 @@
+#include "gui_element_icontext.h"
+#include <stddef.h>
+#include "gui_style.h"
+#include "pax_gfx.h"
+#include "pax_types.h"
+
+float gui_icontext_width(gui_theme_t* theme, int x, int y, gui_element_icontext_t* content, float padding) {
+    float icon_width = 0;
+    if (content->icon) {
+        icon_width = pax_buf_get_width(content->icon);
+    }
+    pax_vec2f text_size = pax_text_size(theme->footer.text_font, theme->footer.text_height, content->text);
+    return icon_width + padding + text_size.x;
+}
+
+float gui_icontext_draw(pax_buf_t* pax_buffer, gui_theme_t* theme, int x, int y, gui_element_icontext_t* content,
+                        float padding, int box_height) {
+    float icon_width = 0;
+    if (content->icon) {
+        icon_width        = pax_buf_get_width(content->icon);
+        float icon_height = pax_buf_get_height(content->icon);
+        pax_draw_image(pax_buffer, content->icon, x, y + (box_height - icon_height) / 2);
+    }
+    pax_draw_text(pax_buffer, theme->palette.color_foreground, theme->footer.text_font, theme->footer.text_height,
+                  x + icon_width + padding, y + ((float)(box_height - theme->footer.text_height)) / 2.0f,
+                  content->text);
+    pax_vec2f text_size = pax_text_size(theme->footer.text_font, theme->footer.text_height, content->text);
+    return icon_width + padding + text_size.x;
+}

components/gui/gui_footer.c

@@ -26,6 +26,9 @@
 #include <malloc.h>
 #include <string.h>
 #include "esp_timer.h"
+#include "pax_fonts.h"
+#include "pax_gfx.h"
+#include "pax_shapes.h"
 
 // Initialise the context with default settings.
 void gui_osk_init(pax_buf_t* buf, gui_osk_ctx_t* ctx, size_t buffer_cap) {

components/gui/gui_osk.c

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <stddef.h>
+#include "gui_element_icontext.h"
+#include "gui_style.h"
+#include "pax_types.h"
+
+void gui_footer_draw(pax_buf_t* pax_buffer, gui_theme_t* theme, gui_element_icontext_t* left, size_t left_count,
+                     gui_element_icontext_t* right, size_t right_count);

components/gui/include/gui_element_footer.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <stddef.h>
+#include "gui_element_icontext.h"
+#include "gui_style.h"
+#include "pax_types.h"
+
+void gui_header_draw(pax_buf_t* pax_buffer, gui_theme_t* theme, gui_element_icontext_t* left, size_t left_count,
+                     gui_element_icontext_t* right, size_t right_count);

components/gui/include/gui_element_header.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stddef.h>
+#include "gui_style.h"
+#include "pax_types.h"
+
+typedef struct {
+    pax_buf_t* icon;
+    char*      text;
+} gui_element_icontext_t;
+
+float gui_icontext_width(gui_theme_t* theme, int x, int y, gui_element_icontext_t* content, float padding);
+float gui_icontext_draw(pax_buf_t* pax_buffer, gui_theme_t* theme, int x, int y, gui_element_icontext_t* content,
+                        float padding, int box_height);