Move drawfunctionoverlay

src/graphics/Screen.cpp

@@ -114,17 +114,16 @@ uint32_t dopThresholds[5] = {2000, 1000, 500, 200, 100};
 // we'll need to hold onto pointers for the modules that can draw a frame.
 std::vector<MeshModule *> moduleFrames;
 
+// Global variables for screen function overlay symbols
+std::vector<std::string> functionSymbol;
+std::string functionSymbolString;
+
 // Stores the last 4 of our hardware ID, to make finding the device for pairing easier
 // FIXME: Needs refactoring and getMacAddr needs to be moved to a utility class
 extern "C" {
 char ourId[5];
 }
 
-// vector where symbols (string) are displayed in bottom corner of display.
-std::vector<std::string> functionSymbol;
-// string displayed in bottom right corner of display. Created from elements in functionSymbol vector
-std::string functionSymbolString = "";
-
 #if HAS_GPS
 // GeoCoord object for the screen
 GeoCoord geoCoord;
@@ -163,18 +162,6 @@ void Screen::showOverlayBanner(const String &message, uint32_t durationMs)
     alertBannerUntil = (durationMs == 0) ? 0 : millis() + durationMs;
 }
 
-// draw overlay in bottom right corner of screen to show when notifications are muted or modifier key is active
-static void drawFunctionOverlay(OLEDDisplay *display, OLEDDisplayUiState *state)
-{
-    // LOG_DEBUG("Draw function overlay");
-    if (functionSymbol.begin() != functionSymbol.end()) {
-        char buf[64];
-        display->setFont(FONT_SMALL);
-        snprintf(buf, sizeof(buf), "%s", functionSymbolString.c_str());
-        display->drawString(SCREEN_WIDTH - display->getStringWidth(buf), SCREEN_HEIGHT - FONT_HEIGHT_SMALL, buf);
-    }
-}
-
 static void drawModuleFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     uint8_t module_frame;
@@ -1078,8 +1065,8 @@ void Screen::setup()
 
     // === Set custom overlay callbacks ===
     static OverlayCallback overlays[] = {
-        drawFunctionOverlay,                    // For mute/buzzer modifiers etc.
-        graphics::UIRenderer::drawNavigationBar // Custom indicator icons for each frame
+        graphics::UIRenderer::drawFunctionOverlay, // For mute/buzzer modifiers etc.
+        graphics::UIRenderer::drawNavigationBar    // Custom indicator icons for each frame
     };
     ui->setOverlays(overlays, sizeof(overlays) / sizeof(overlays[0]));
 

src/graphics/Screen.h

@@ -5,6 +5,8 @@
 #include "detect/ScanI2C.h"
 #include "mesh/generated/meshtastic/config.pb.h"
 #include <OLEDDisplay.h>
+#include <string>
+#include <vector>
 
 #define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
 
@@ -66,6 +68,7 @@ class Screen
 #include "mesh/MeshModule.h"
 #include "power.h"
 #include <string>
+#include <vector>
 
 // 0 to 255, though particular variants might define different defaults
 #ifndef BRIGHTNESS_DEFAULT
@@ -701,4 +704,8 @@ class Screen : public concurrency::OSThread
 extern String alertBannerMessage;
 extern uint32_t alertBannerUntil;
 
+// Extern declarations for function symbols used in UIRenderer
+extern std::vector<std::string> functionSymbol;
+extern std::string functionSymbolString;
+
 #endif

src/graphics/ScreenGlobals.cpp

@@ -0,0 +1,6 @@
+#include <string>
+#include <vector>
+
+// Global variables for screen function overlay
+std::vector<std::string> functionSymbol;
+std::string functionSymbolString;

src/graphics/draw/CompassRenderer.cpp

@@ -1,4 +1,5 @@
 #include "CompassRenderer.h"
+#include "NodeDB.h"
 #include "UIRenderer.h"
 #include "configuration.h"
 #include "gps/GeoCoord.h"

src/graphics/draw/DebugRenderer.cpp

@@ -1,6 +1,7 @@
 #include "DebugRenderer.h"
 #include "../Screen.h"
 #include "FSCommon.h"
+#include "NodeDB.h"
 #include "Throttle.h"
 #include "UIRenderer.h"
 #include "airtime.h"

src/graphics/draw/ScreenRenderer.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include "graphics/Screen.h"
-#include <OLEDDisplay.h>
-#include <OLEDDisplayUi.h>
-
-namespace graphics
-{
-
-/// Forward declarations
-class Screen;
-
-/**
- * @brief Screen-specific drawing functions
- *
- * Contains drawing functions for specific screen types like GPS location,
- * memory usage, device info, and other specialized screens.
- */
-namespace ScreenRenderer
-{
-// Screen frame functions
-void drawCompassAndLocationScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-void drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-
-// Text message screen
-void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-
-// Module and firmware frames
-void drawModuleFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
-
-} // namespace ScreenRenderer
-
-} // namespace graphics

src/graphics/draw/UIRenderer.cpp

@@ -1,9 +1,10 @@
 #include "UIRenderer.h"
-#include "../Screen.h"
 #include "GPSStatus.h"
+#include "NodeDB.h"
 #include "NodeListRenderer.h"
 #include "configuration.h"
 #include "gps/GeoCoord.h"
+#include "graphics/Screen.h"
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
 #include "graphics/images.h"
@@ -1126,6 +1127,18 @@ void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t
 
 #endif
 
+// Function overlay for showing mute/buzzer modifiers etc.
+void drawFunctionOverlay(OLEDDisplay *display, OLEDDisplayUiState *state)
+{
+    // LOG_DEBUG("Draw function overlay");
+    if (functionSymbol.begin() != functionSymbol.end()) {
+        char buf[64];
+        display->setFont(FONT_SMALL);
+        snprintf(buf, sizeof(buf), "%s", functionSymbolString.c_str());
+        display->drawString(SCREEN_WIDTH - display->getStringWidth(buf), SCREEN_HEIGHT - FONT_HEIGHT_SMALL, buf);
+    }
+}
+
 // Navigation bar overlay implementation
 static int8_t lastFrameIndex = -1;
 static uint32_t lastFrameChangeTime = 0;

src/graphics/draw/UIRenderer.h

@@ -48,6 +48,9 @@ void drawScrollbar(OLEDDisplay *display, int visibleItems, int totalItems, int s
 // Overlay and special screens
 void drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *text);
 
+// Function overlay for showing mute/buzzer modifiers etc.
+void drawFunctionOverlay(OLEDDisplay *display, OLEDDisplayUiState *state);
+
 // Navigation bar overlay
 void drawNavigationBar(OLEDDisplay *display, OLEDDisplayUiState *state);