updated to new fonts + gui string

Author: itzandroidtab

ui/config.hpp

@@ -729,7 +729,7 @@ namespace menu {
             frame_buffer.clear(klib::graphics::black);
 
             // draw the current token using the large font
-            screen<FrameBuffer>::large_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::large_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 "USB mode", 
                 klib::vector2i{60, 60} - offset.cast<int32_t>(), 

ui/menu.hpp

@@ -75,8 +75,8 @@ namespace menu {
             data(args)
         {}
 
-        template <typename T, typename FrameBuffer, uint32_t BufferSize>
-        void draw(T& writer, FrameBuffer& fb, const klib::vector2u& offset, const uint32_t selected, char option[Count][BufferSize],
+        template <typename Font, typename FrameBuffer, uint32_t BufferSize>
+        void draw(FrameBuffer& fb, const klib::vector2u& offset, const uint32_t selected, char option[Count][BufferSize],
             const klib::graphics::color foreground, const klib::graphics::color background, const bool hidden[Count] = {})
         {
             uint32_t onscreen_index = 0;
@@ -112,7 +112,7 @@ namespace menu {
 
                 // draw the text on the screen
                 // write the text to the display
-                writer.draw(
+                Font::template draw(
                     fb, data[i], 
                     klib::vector2i{
                         line_boarder_pixels, 

ui/mouse.hpp

@@ -79,7 +79,7 @@ namespace menu {
             frame_buffer.clear(klib::graphics::black);
 
             // draw the current token using the large font
-            screen<FrameBuffer>::large_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::large_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 "USB jiggler", 
                 klib::vector2i{36, 60} - offset.cast<int32_t>(), 

ui/numeric_popup.hpp

@@ -136,27 +136,27 @@ namespace menu {
             // draw the bigmaps of the arrows
 
             // draw the string using the small font
-            screen_base::large_text.template draw<FrameBuffer>(
+            screen_base::large_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 str,
                 klib::vector2i{
                     (240 / 2) - 
                     static_cast<int32_t>(
-                        (klib::string::strlen(str) * screen_base::large_font.width) / 2
+                        (klib::string::strlen(str) * screen_base::large_font::width) / 2
                     ), 2
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
 
             // draw the string using the small font
-            screen_base::large_text.template draw<FrameBuffer>(
+            screen_base::large_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 buffer,
                 klib::vector2i{
                     (240 / 2) - 
                     static_cast<int32_t>(
-                        (klib::string::strlen(buffer) * screen_base::large_font.width) / 2
-                    ), (134 / 2) - (screen_base::large_font.height / 2)
+                        (klib::string::strlen(buffer) * screen_base::large_font::width) / 2
+                    ), (134 / 2) - (screen_base::large_font::height / 2)
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );

ui/screen.hpp

@@ -81,12 +81,12 @@ namespace menu {
         static inline screen_buffer<8> buffer = {};
 
         // small text for in the screens
-        constexpr static auto small_font = klib::graphics::ascii_font_8x8();
-        static inline auto small_text = klib::graphics::string(small_font);
+        using small_font = klib::graphics::ascii_font_8x8;
+        using small_text = klib::graphics::string<small_font>;
 
         // large text for in the screens
-        constexpr static auto large_font = klib::graphics::ascii_font_16x16();
-        static inline auto large_text = klib::graphics::string(large_font);
+        using large_font = klib::graphics::ascii_font_16x16;
+        using large_text = klib::graphics::string<large_font>;
 
         /**
          * @brief Draws a rectangle

ui/settings.hpp

@@ -94,8 +94,8 @@ namespace menu {
             char buffer[label_count][sizeof(labels[0])] = {};
 
             // update the labels
-            options.draw(
-                screen_base::large_text, frame_buffer, 
+            options.template draw<typename screen_base::large_text>(
+                frame_buffer, 
                 offset, static_cast<uint8_t>(selection), 
                 buffer, klib::graphics::grey, 
                 klib::graphics::white, {}

ui/splash.hpp

@@ -113,10 +113,10 @@ namespace menu {
             );
 
             // draw using the small font
-            screen_base::small_text.template draw<FrameBuffer>(
+            screen_base::small_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 "koon.io", 
-                klib::vector2i{240 - (7 * screen_base::small_font.width), 120} - offset.cast<int32_t>(), 
+                klib::vector2i{240 - (7 * screen_base::small_font::width), 120} - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
         }

ui/totp.hpp

@@ -203,56 +203,56 @@ namespace menu {
             // draw the entry text with a small font above the token if we have any
             if (klib::string::strlen(entries[current].str)) {
                 // draw the current token using the large font
-                screen<FrameBuffer>::small_text.template draw<FrameBuffer>(
+                screen<FrameBuffer>::small_text::template draw<FrameBuffer>(
                     frame_buffer, 
                     "profile", 
                     klib::vector2i{3, 3} - offset.cast<int32_t>(), 
                     klib::graphics::white
                 );
 
                 // draw the current token using the large font
-                screen<FrameBuffer>::large_text.template draw<FrameBuffer>(
+                screen<FrameBuffer>::large_text::template draw<FrameBuffer>(
                     frame_buffer, 
                     entries[current].str, 
-                    klib::vector2i{6, 9 + screen<FrameBuffer>::small_font.height} - offset.cast<int32_t>(), 
+                    klib::vector2i{6, 9 + screen<FrameBuffer>::small_font::height} - offset.cast<int32_t>(), 
                     klib::graphics::white
                 );
             }
 
             // draw the current token using the large font
-            screen<FrameBuffer>::large_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::large_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 current_token_buf, 
                 klib::vector2i{60, 60} - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
 
             // draw the next token using the small font
-            screen<FrameBuffer>::small_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::small_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 next_token_buf, 
                 klib::vector2i{108, 78} - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
 
             // draw the epoch time using the small font
-            screen<FrameBuffer>::small_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::small_text::template draw<FrameBuffer>(
                 frame_buffer, 
                 epoch_buf, 
                 klib::vector2i{
                     (240 - 1) - static_cast<int32_t>(
-                            klib::string::strlen(epoch_buf) * screen<FrameBuffer>::small_font.width
+                            klib::string::strlen(epoch_buf) * screen<FrameBuffer>::small_font::width
                         ), 
-                    (135 - 1 - screen<FrameBuffer>::small_font.height)
+                    (135 - 1 - screen<FrameBuffer>::small_font::height)
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
 
             // draw using the large font
-            screen<FrameBuffer>::small_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::small_text::template draw<FrameBuffer>(
                 frame_buffer,
                 delta_buf, 
-                klib::vector2i{1, (135 - 1 - screen<FrameBuffer>::small_font.height)} - offset.cast<int32_t>(), 
+                klib::vector2i{1, (135 - 1 - screen<FrameBuffer>::small_font::height)} - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
 
@@ -271,11 +271,11 @@ namespace menu {
             }
 
             // draw the time left in seconds in the circle
-            screen<FrameBuffer>::small_text.template draw<FrameBuffer>(
+            screen<FrameBuffer>::small_text::template draw<FrameBuffer>(
                 frame_buffer, seconds_left_buf, 
                 klib::vector2i{
-                    (204 + 1) - static_cast<int32_t>((klib::string::strlen(seconds_left_buf) * screen<FrameBuffer>::small_font.width) / 2), 
-                    (68 + 1) - (screen<FrameBuffer>::small_font.height / 2)
+                    (204 + 1) - static_cast<int32_t>((klib::string::strlen(seconds_left_buf) * screen<FrameBuffer>::small_font::width) / 2), 
+                    (68 + 1) - (screen<FrameBuffer>::small_font::height / 2)
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );