refactor: move application-specific widgets from lib/gui to top-level…

… src and include Signed-off-by: Aditya Agarwal <[email protected]>
Aditya-A-garwal · Mar 27, 2024 · 93bfbca · 93bfbca
1 parent 5aa4af7
commit 93bfbca
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/lib/gui/include/widgets/colorselector.h → include/widgets/colorselector.h b/lib/gui/include/widgets/colorselector.h → include/widgets/colorselector.h
@@ -8,8 +8,8 @@
 #ifndef __ARDUINO_WIFI_TFT_LCD_CANVAS_APP_WIDGETS_COLOR_SELECTOR_H__
 #define __ARDUINO_WIFI_TFT_LCD_CANVAS_APP_WIDGETS_COLOR_SELECTOR_H__
 
-#include "widget.h"
-#include "frame.h"
+#include "widgets/widget.h"
+#include "widgets/frame.h"
 
 /**
  * @brief                   Class that implements a widget which is used to create a grid of colors to pick from from

diff --git a/lib/gui/include/widgets/drawablecanvas.h → include/widgets/drawablecanvas.h b/lib/gui/include/widgets/drawablecanvas.h → include/widgets/drawablecanvas.h
@@ -8,12 +8,14 @@
 #ifndef __ARDUINO_WIFI_TFT_LCD_CANVAS_APP_WIDGETS_DRAWABLE_CANVAS_H__
 #define __ARDUINO_WIFI_TFT_LCD_CANVAS_APP_WIDGETS_DRAWABLE_CANVAS_H__
 
-#include "widget.h"
-#include "frame.h"
+#include "widgets/widget.h"
+#include "widgets/frame.h"
 
 #include "WiFiS3.h"
 #include "cstring"
 
+class WiFiClient;
+
 /**
  * @brief                   Class that provides a canvas to draw on
  *

diff --git a/lib/gui/include/widgets/pensizeselector.h → include/widgets/pensizeselector.h b/lib/gui/include/widgets/pensizeselector.h → include/widgets/pensizeselector.h
@@ -8,8 +8,8 @@
 #ifndef __ARDUINO_WIFI_TFT_LCD_CANVAS_APP_WIDGETS_PEN_SIZE_SELECTOR_H__
 #define __ARDUINO_WIFI_TFT_LCD_CANVAS_APP_WIDGETS_PEN_SIZE_SELECTOR_H__
 
-#include "widget.h"
-#include "frame.h"
+#include "widgets/widget.h"
+#include "widgets/frame.h"
 
 /**
  * @brief                   Class that implements a widget which is used to create row of pen-sizes to pick from from

diff --git a/lib/gui/src/widgets/colorselector.cpp → src/widgets/colorselector.cpp b/lib/gui/src/widgets/colorselector.cpp → src/widgets/colorselector.cpp
diff --git a/lib/gui/src/widgets/drawablecanvas.cpp → src/widgets/drawablecanvas.cpp b/lib/gui/src/widgets/drawablecanvas.cpp → src/widgets/drawablecanvas.cpp
@@ -1,7 +1,7 @@
 /**
- * @file                    button.cpp
+ * @file                    drawablecanvas.cpp
  * @author                  Aditya Agarwal ([email protected])
- * @brief                   This file implements the methods of the `Button` class
+ * @brief                   This file implements the methods of the `DrawableCanvas` class
  *
  */
 

diff --git a/lib/gui/src/widgets/pensizeselector.cpp → src/widgets/pensizeselector.cpp b/lib/gui/src/widgets/pensizeselector.cpp → src/widgets/pensizeselector.cpp