added a version option in the settings

Author: itzandroidtab

ui/menu.hpp

@@ -75,9 +75,9 @@ namespace menu {
             data(args)
         {}
 
-        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] = {})
+        template <typename Font, typename FrameBuffer>
+        void draw(FrameBuffer& fb, const klib::vector2u& offset, const uint32_t selected, const char** option,
+            const klib::graphics::color foreground, const klib::graphics::color background, const bool* hidden)
         {
             uint32_t onscreen_index = 0;
             uint32_t hidden_by_scroll = 0;
@@ -127,29 +127,32 @@ namespace menu {
                 // move the onscreen index
                 onscreen_index++;
 
-                // // check if we need to show a option for the current item
-                // if (option == nullptr || option[i] == nullptr) {
-                //     // skip if we dont have one
-                //     continue;
-                // }
-
-                // // get the length of the option string
-                // const uint32_t len = klib::string::strlen(option[i]);
-
-                // // check if the string has any length
-                // if (!len) {
-                //     continue;
-                // }
-
-                // // write the value to the display
-                // writer.draw(
-                //     fb, option[i], 
-                //     klib::vector2i{
-                //         static_cast<int32_t>(Width - line_boarder_pixels + (len * 8)), 
-                //         static_cast<int32_t>(3 + position_index * line_boarder_pixels)
-                //     } - offset.cast<int32_t>(),
-                //     col_foreground, klib::graphics::transparent
-                // );
+                // check if we need to show a option for the current item
+                if (option == nullptr || option[i] == nullptr) {
+                    // skip if we dont have one
+                    continue;
+                }
+
+                // get the length of the option string
+                const uint32_t len = klib::string::strnlen(option[i], sizeof(string));
+
+                // check if the string has any length
+                if (!len || (len == sizeof(string))) {
+                    continue;
+                }
+
+                // write the value to the display
+                Font::template draw(
+                    fb, option[i], 
+                    klib::vector2i{
+                        static_cast<int32_t>(Width - (line_boarder_pixels + (Font::font::width * len))),
+                        static_cast<int32_t>(
+                            boarder_pixels + (boarder_pixels / 2) + 
+                            (position_index * line_pixels)
+                        )
+                    } - offset.cast<int32_t>(),
+                    col_foreground, klib::graphics::transparent
+                );
             }
 
             // check if we need to clear parts of the screen

ui/settings.hpp

@@ -2,6 +2,8 @@
 
 #include <klib/graphics/bitmap.hpp>
 
+#include <version.hpp>
+
 #include "menu.hpp"
 #include "screen.hpp"
 
@@ -16,6 +18,7 @@ namespace menu {
             time,
             calibration,
             mouse,
+            version,
 
             // should always be at the end
             count
@@ -32,6 +35,7 @@ namespace menu {
             "set time",
             "set cal",
             "usb jiggler",
+            "version",
         };
 
         // menu that can draw all the labels
@@ -90,14 +94,17 @@ namespace menu {
             // clear the background black
             frame_buffer.clear(klib::graphics::black);
 
-            // array with all the options
-            char buffer[label_count][sizeof(labels[0])] = {};
+            // create a array with nullptrs
+            const char* ptr[label_count] = {};
+
+            // set the version to the version string
+            ptr[static_cast<uint8_t>(item::version)] = version;
 
             // update the labels
             options.template draw<typename screen_base::large_text>(
                 frame_buffer, 
                 offset, static_cast<uint8_t>(selection), 
-                buffer, klib::graphics::grey, 
+                ptr, klib::graphics::grey, 
                 klib::graphics::white, {}
             );
         }

version.hpp

@@ -0,0 +1,4 @@
+#pragma once
+
+// Current version
+constexpr static char version[] = "0.1";