cleanup font

Author: itzandroidtab

ui/numeric_popup.hpp

@@ -142,7 +142,7 @@ namespace menu {
                 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_text::font::width) / 2
                     ), 2
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
@@ -155,8 +155,8 @@ namespace menu {
                 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_text::font::width) / 2
+                    ), (134 / 2) - (screen_base::large_text::font::height / 2)
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );

ui/screen.hpp

@@ -76,16 +76,19 @@ namespace menu {
      */
     template <typename FrameBuffer>
     class screen {
+    private:
+        // fonts used in the string functions
+        using small_font = klib::graphics::ascii_font_8x8;
+        using large_font = klib::graphics::ascii_font_16x16;
+
     protected:
         // Screen queue. Allows up for 8 screens deep
         static inline screen_buffer<8> buffer = {};
 
         // small text for in the screens
-        using small_font = klib::graphics::ascii_font_8x8;
         using small_text = klib::graphics::string<small_font>;
 
         // large text for in the screens
-        using large_font = klib::graphics::ascii_font_16x16;
         using large_text = klib::graphics::string<large_font>;
 
         /**

ui/splash.hpp

@@ -112,11 +112,17 @@ namespace menu {
                 klib::vector2i{95, 34} - offset.cast<int32_t>()
             );
 
+            // url to show
+            constexpr static char url[] = "koon.io";
+
             // draw using the small font
             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>(), 
+                frame_buffer, url, 
+                klib::vector2i{
+                    240 - (
+                        klib::string::strlen(url) * screen_base::small_text::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_base::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_base::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_base::small_text::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_base::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_base::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_base::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_base::small_text::font::width
                         ), 
-                    (135 - 1 - screen<FrameBuffer>::small_font::height)
+                    (135 - 1 - screen_base::small_text::font::height)
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );
 
             // draw using the large font
-            screen<FrameBuffer>::small_text::template draw<FrameBuffer>(
+            screen_base::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_base::small_text::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_base::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_base::small_text::font::width) / 2), 
+                    (68 + 1) - (screen_base::small_text::font::height / 2)
                 } - offset.cast<int32_t>(), 
                 klib::graphics::white
             );