From 298e5d36c9f0546ac018a42b5456f3639f1c6daa Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 31 May 2025 13:51:30 -0500 Subject: [PATCH] Another --- src/graphics/Screen.cpp | 9 +-------- src/graphics/Screen.h | 2 -- src/graphics/draw/UIRenderer.cpp | 8 ++++++++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index f589b15b3..5bdc4da7a 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -139,13 +139,6 @@ static bool heartbeat = false; extern bool hasUnreadMessage; -void Screen::drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message) -{ - uint16_t x_offset = display->width() / 2; - display->setTextAlignment(TEXT_ALIGN_CENTER); - display->setFont(FONT_MEDIUM); - display->drawString(x_offset + x, 26 + y, message); -} // ============================== // Overlay Alert Banner Renderer // ============================== @@ -1002,7 +995,7 @@ void Screen::setup() alertFrames[0] = [this](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { #ifdef ARCH_ESP32 if (wakeCause == ESP_SLEEP_WAKEUP_TIMER || wakeCause == ESP_SLEEP_WAKEUP_EXT1) - drawFrameText(display, state, x, y, "Resuming..."); + graphics::UIRenderer::drawFrameText(display, state, x, y, "Resuming..."); else #endif { diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h index 13d04adba..0ab1bae6b 100644 --- a/src/graphics/Screen.h +++ b/src/graphics/Screen.h @@ -233,8 +233,6 @@ class Screen : public concurrency::OSThread void blink(); - void drawFrameText(OLEDDisplay *, OLEDDisplayUiState *, int16_t, int16_t, const char *); - void getTimeAgoStr(uint32_t agoSecs, char *timeStr, uint8_t maxLength); // Draw north diff --git a/src/graphics/draw/UIRenderer.cpp b/src/graphics/draw/UIRenderer.cpp index fe141f1c4..5368d3699 100644 --- a/src/graphics/draw/UIRenderer.cpp +++ b/src/graphics/draw/UIRenderer.cpp @@ -1223,6 +1223,14 @@ void drawNavigationBar(OLEDDisplay *display, OLEDDisplayUiState *state) display->setColor(WHITE); } +void drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message) +{ + uint16_t x_offset = display->width() / 2; + display->setTextAlignment(TEXT_ALIGN_CENTER); + display->setFont(FONT_MEDIUM); + display->drawString(x_offset + x, 26 + y, message); +} + std::string drawTimeDelta(uint32_t days, uint32_t hours, uint32_t minutes, uint32_t seconds) { std::string uptime;