mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-27 15:02:41 +00:00
Remove duplicate code, fix more Chats, and fix C6L MessageRenderer
This commit is contained in:
Jason P
parent
163d8e0540
commit
e606d88297
@ -442,15 +442,15 @@ void menuHandler::messageResponseMenu()
|
|||||||
#if defined(M5STACK_UNITC6L)
|
#if defined(M5STACK_UNITC6L)
|
||||||
optionsArray[options] = "Delete All";
|
optionsArray[options] = "Delete All";
|
||||||
#else
|
#else
|
||||||
optionsArray[options] = "Delete All Threads";
|
optionsArray[options] = "Delete All Chats";
|
||||||
#endif
|
#endif
|
||||||
optionsEnumArray[options++] = DismissAll;
|
optionsEnumArray[options++] = DismissAll;
|
||||||
}
|
}
|
||||||
#if defined(M5STACK_UNITC6L)
|
if (isHighResolution) {
|
||||||
optionsArray[options] = "Delete Oldest";
|
optionsArray[options] = "Delete Oldest Message";
|
||||||
#else
|
} else {
|
||||||
optionsArray[options] = "Delete Oldest Message";
|
optionsArray[options] = "Delete Oldest Msg";
|
||||||
#endif
|
}
|
||||||
optionsEnumArray[options++] = DismissOldest;
|
optionsEnumArray[options++] = DismissOldest;
|
||||||
|
|
||||||
#ifdef HAS_I2S
|
#ifdef HAS_I2S
|
||||||
|
|||||||
@ -327,18 +327,10 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
|
|||||||
display->clear();
|
display->clear();
|
||||||
display->setTextAlignment(TEXT_ALIGN_LEFT);
|
display->setTextAlignment(TEXT_ALIGN_LEFT);
|
||||||
display->setFont(FONT_SMALL);
|
display->setFont(FONT_SMALL);
|
||||||
#if defined(M5STACK_UNITC6L)
|
|
||||||
const int fixedTopHeight = 24;
|
|
||||||
const int windowX = 0;
|
|
||||||
const int windowY = fixedTopHeight;
|
|
||||||
const int windowWidth = 64;
|
|
||||||
const int windowHeight = SCREEN_HEIGHT - fixedTopHeight;
|
|
||||||
#else
|
|
||||||
const int navHeight = FONT_HEIGHT_SMALL;
|
const int navHeight = FONT_HEIGHT_SMALL;
|
||||||
const int scrollBottom = SCREEN_HEIGHT - navHeight;
|
const int scrollBottom = SCREEN_HEIGHT - navHeight;
|
||||||
const int usableHeight = scrollBottom;
|
const int usableHeight = scrollBottom;
|
||||||
const int textWidth = SCREEN_WIDTH;
|
const int textWidth = SCREEN_WIDTH;
|
||||||
#endif
|
|
||||||
|
|
||||||
// Title string depending on mode
|
// Title string depending on mode
|
||||||
static char titleBuf[32];
|
static char titleBuf[32];
|
||||||
@ -374,11 +366,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
|
|||||||
didReset = false;
|
didReset = false;
|
||||||
const char *messageString = "No messages";
|
const char *messageString = "No messages";
|
||||||
int center_text = (SCREEN_WIDTH / 2) - (display->getStringWidth(messageString) / 2);
|
int center_text = (SCREEN_WIDTH / 2) - (display->getStringWidth(messageString) / 2);
|
||||||
#if defined(M5STACK_UNITC6L)
|
|
||||||
display->drawString(center_text, windowY + (windowHeight / 2) - (FONT_HEIGHT_SMALL / 2) - 5, messageString);
|
|
||||||
#else
|
|
||||||
display->drawString(center_text, getTextPositions(display)[2], messageString);
|
display->drawString(center_text, getTextPositions(display)[2], messageString);
|
||||||
#endif
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -519,181 +519,6 @@ void NotificationRenderer::drawNotificationBox(OLEDDisplay *display, OLEDDisplay
|
|||||||
|
|
||||||
uint16_t boxWidth = hPadding * 2 + maxWidth;
|
uint16_t boxWidth = hPadding * 2 + maxWidth;
|
||||||
|
|
||||||
#if defined(M5STACK_UNITC6L)
|
|
||||||
// Special sizing rules for M5STACK_UNITC6L
|
|
||||||
if (needs_bell) {
|
|
||||||
if (isHighResolution && boxWidth <= 150)
|
|
||||||
boxWidth += 26;
|
|
||||||
if (!isHighResolution && boxWidth <= 100)
|
|
||||||
boxWidth += 20;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t screenHeight = display->height();
|
|
||||||
uint8_t effectiveLineHeight = FONT_HEIGHT_SMALL - 3;
|
|
||||||
uint8_t visibleTotalLines = std::min<uint8_t>(lineCount, (screenHeight - vPadding * 2) / effectiveLineHeight);
|
|
||||||
uint16_t contentHeight = visibleTotalLines * effectiveLineHeight;
|
|
||||||
uint16_t boxHeight = contentHeight + vPadding * 2;
|
|
||||||
if (visibleTotalLines == 1)
|
|
||||||
boxHeight += (isHighResolution ? 4 : 3);
|
|
||||||
|
|
||||||
int16_t boxLeft = (display->width() / 2) - (boxWidth / 2);
|
|
||||||
if (totalLines > visibleTotalLines)
|
|
||||||
boxWidth += (isHighResolution ? 4 : 2);
|
|
||||||
int16_t boxTop = (display->height() / 2) - (boxHeight / 2);
|
|
||||||
|
|
||||||
if (visibleTotalLines == 1) {
|
|
||||||
boxTop += 25;
|
|
||||||
}
|
|
||||||
if (alertBannerOptions < 3) {
|
|
||||||
int missingLines = 3 - alertBannerOptions;
|
|
||||||
int moveUp = missingLines * (effectiveLineHeight / 2);
|
|
||||||
boxTop -= moveUp;
|
|
||||||
if (boxTop < 0)
|
|
||||||
boxTop = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw Box
|
|
||||||
display->setColor(BLACK);
|
|
||||||
display->fillRect(boxLeft, boxTop, boxWidth, boxHeight);
|
|
||||||
display->setColor(WHITE);
|
|
||||||
display->drawRect(boxLeft, boxTop, boxWidth, boxHeight);
|
|
||||||
display->fillRect(boxLeft, boxTop - 2, boxWidth, 1);
|
|
||||||
display->fillRect(boxLeft - 2, boxTop, 1, boxHeight);
|
|
||||||
display->fillRect(boxLeft + boxWidth + 1, boxTop, 1, boxHeight);
|
|
||||||
display->setColor(BLACK);
|
|
||||||
display->fillRect(boxLeft, boxTop, 1, 1);
|
|
||||||
display->fillRect(boxLeft + boxWidth - 1, boxTop, 1, 1);
|
|
||||||
display->fillRect(boxLeft, boxTop + boxHeight - 1, 1, 1);
|
|
||||||
display->fillRect(boxLeft + boxWidth - 1, boxTop + boxHeight - 1, 1, 1);
|
|
||||||
display->setColor(WHITE);
|
|
||||||
|
|
||||||
// Draw Content
|
|
||||||
int16_t lineY = boxTop + vPadding;
|
|
||||||
int swingRange = 8;
|
|
||||||
static int swingOffset = 0;
|
|
||||||
static bool swingRight = true;
|
|
||||||
static unsigned long lastSwingTime = 0;
|
|
||||||
unsigned long now = millis();
|
|
||||||
int swingSpeedMs = 10 / (swingRange * 2);
|
|
||||||
if (now - lastSwingTime >= (unsigned long)swingSpeedMs) {
|
|
||||||
lastSwingTime = now;
|
|
||||||
if (swingRight) {
|
|
||||||
swingOffset++;
|
|
||||||
if (swingOffset >= swingRange)
|
|
||||||
swingRight = false;
|
|
||||||
} else {
|
|
||||||
swingOffset--;
|
|
||||||
if (swingOffset <= 0)
|
|
||||||
swingRight = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (int i = 0; i < lineCount; i++) {
|
|
||||||
bool isTitle = (i == 0);
|
|
||||||
int globalOptionIndex = (i - 1) + firstOptionToShow;
|
|
||||||
bool isSelectedOption = (!isTitle && globalOptionIndex >= 0 && globalOptionIndex == curSelected);
|
|
||||||
|
|
||||||
uint16_t visibleWidth = 64 - hPadding * 2;
|
|
||||||
if (totalLines > visibleTotalLines)
|
|
||||||
visibleWidth -= 6;
|
|
||||||
char lineBuffer[lineLengths[i] + 1];
|
|
||||||
strncpy(lineBuffer, lines[i], lineLengths[i]);
|
|
||||||
lineBuffer[lineLengths[i]] = '\0';
|
|
||||||
|
|
||||||
if (isTitle) {
|
|
||||||
if (visibleTotalLines == 1) {
|
|
||||||
display->setColor(BLACK);
|
|
||||||
display->fillRect(boxLeft, boxTop, boxWidth, effectiveLineHeight);
|
|
||||||
display->setColor(WHITE);
|
|
||||||
display->drawString(boxLeft + (boxWidth - lineWidths[i]) / 2, boxTop, lineBuffer);
|
|
||||||
} else {
|
|
||||||
display->setColor(WHITE);
|
|
||||||
display->fillRect(boxLeft, boxTop, boxWidth, effectiveLineHeight);
|
|
||||||
display->setColor(BLACK);
|
|
||||||
display->drawString(boxLeft + (boxWidth - lineWidths[i]) / 2, boxTop, lineBuffer);
|
|
||||||
display->setColor(WHITE);
|
|
||||||
if (needs_bell) {
|
|
||||||
int bellY = boxTop + (FONT_HEIGHT_SMALL - 8) / 2;
|
|
||||||
display->drawXbm(boxLeft + (boxWidth - lineWidths[i]) / 2 - 10, bellY, 8, 8, bell_alert);
|
|
||||||
display->drawXbm(boxLeft + (boxWidth + lineWidths[i]) / 2 + 2, bellY, 8, 8, bell_alert);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
lineY = boxTop + effectiveLineHeight + 1;
|
|
||||||
} else if (isSelectedOption) {
|
|
||||||
display->setColor(WHITE);
|
|
||||||
display->fillRect(boxLeft, lineY, boxWidth, effectiveLineHeight);
|
|
||||||
display->setColor(BLACK);
|
|
||||||
if (lineLengths[i] > 15 && lineWidths[i] > visibleWidth) {
|
|
||||||
int textX = boxLeft + hPadding + swingOffset;
|
|
||||||
display->drawString(textX, lineY - 1, lineBuffer);
|
|
||||||
} else {
|
|
||||||
display->drawString(boxLeft + (boxWidth - lineWidths[i]) / 2, lineY - 1, lineBuffer);
|
|
||||||
}
|
|
||||||
display->setColor(WHITE);
|
|
||||||
lineY += effectiveLineHeight;
|
|
||||||
} else {
|
|
||||||
// Draw non-selected, non-title lines
|
|
||||||
display->setColor(BLACK);
|
|
||||||
display->fillRect(boxLeft, lineY, boxWidth, effectiveLineHeight);
|
|
||||||
display->setColor(WHITE);
|
|
||||||
|
|
||||||
// If this is the Signal line, center text + bars as one group
|
|
||||||
bool isSignalLine = (graphics::bannerSignalBars >= 0 && strstr(lineBuffer, "Signal:") != nullptr);
|
|
||||||
if (isSignalLine) {
|
|
||||||
const int totalBars = 5;
|
|
||||||
const int barWidth = 3;
|
|
||||||
const int barSpacing = 2;
|
|
||||||
const int barHeightStep = 2;
|
|
||||||
const int gap = 6;
|
|
||||||
|
|
||||||
int textWidth = display->getStringWidth(lineBuffer, strlen(lineBuffer), true);
|
|
||||||
int barsWidth = totalBars * barWidth + (totalBars - 1) * barSpacing + gap;
|
|
||||||
int totalWidth = textWidth + barsWidth;
|
|
||||||
int groupStartX = boxLeft + (boxWidth - totalWidth) / 2;
|
|
||||||
|
|
||||||
// Draw the "Signal: ..." text
|
|
||||||
display->drawString(groupStartX, lineY, lineBuffer);
|
|
||||||
|
|
||||||
// Draw the bars
|
|
||||||
int baseX = groupStartX + textWidth + gap;
|
|
||||||
int baseY = lineY + effectiveLineHeight - 1;
|
|
||||||
for (int b = 0; b < totalBars; b++) {
|
|
||||||
int barHeight = (b + 1) * barHeightStep;
|
|
||||||
int x = baseX + b * (barWidth + barSpacing);
|
|
||||||
int y = baseY - barHeight;
|
|
||||||
|
|
||||||
if (b < graphics::bannerSignalBars) {
|
|
||||||
display->fillRect(x, y, barWidth, barHeight);
|
|
||||||
} else {
|
|
||||||
display->drawRect(x, y, barWidth, barHeight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Normal centered line
|
|
||||||
display->drawString(boxLeft + (boxWidth - lineWidths[i]) / 2, lineY, lineBuffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
lineY += effectiveLineHeight;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Scroll Bar (Thicker, inside box, not over title)
|
|
||||||
if (totalLines > visibleTotalLines) {
|
|
||||||
const uint8_t scrollBarWidth = 5;
|
|
||||||
int16_t scrollBarX = boxLeft + boxWidth - scrollBarWidth - 2;
|
|
||||||
int16_t scrollBarY = boxTop + vPadding + effectiveLineHeight;
|
|
||||||
uint16_t scrollBarHeight = boxHeight - vPadding * 2 - effectiveLineHeight;
|
|
||||||
|
|
||||||
float ratio = (float)visibleTotalLines / totalLines;
|
|
||||||
uint16_t indicatorHeight = std::max((int)(scrollBarHeight * ratio), 4);
|
|
||||||
float scrollRatio = (float)(firstOptionToShow + lineCount - visibleTotalLines) / (totalLines - visibleTotalLines);
|
|
||||||
uint16_t indicatorY = scrollBarY + scrollRatio * (scrollBarHeight - indicatorHeight);
|
|
||||||
|
|
||||||
display->drawRect(scrollBarX, scrollBarY, scrollBarWidth, scrollBarHeight);
|
|
||||||
display->fillRect(scrollBarX + 1, indicatorY, scrollBarWidth - 2, indicatorHeight);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
// Default (non-M5STACK) layout
|
|
||||||
if (needs_bell) {
|
if (needs_bell) {
|
||||||
if (isHighResolution && boxWidth <= 150)
|
if (isHighResolution && boxWidth <= 150)
|
||||||
boxWidth += 26;
|
boxWidth += 26;
|
||||||
@ -716,6 +541,18 @@ void NotificationRenderer::drawNotificationBox(OLEDDisplay *display, OLEDDisplay
|
|||||||
}
|
}
|
||||||
int16_t boxTop = (display->height() / 2) - (boxHeight / 2);
|
int16_t boxTop = (display->height() / 2) - (boxHeight / 2);
|
||||||
boxHeight += (isHighResolution) ? 2 : 1;
|
boxHeight += (isHighResolution) ? 2 : 1;
|
||||||
|
#if defined(M5STACK_UNITC6L)
|
||||||
|
if (visibleTotalLines == 1) {
|
||||||
|
boxTop += 25;
|
||||||
|
}
|
||||||
|
if (alertBannerOptions < 3) {
|
||||||
|
int missingLines = 3 - alertBannerOptions;
|
||||||
|
int moveUp = missingLines * (effectiveLineHeight / 2);
|
||||||
|
boxTop -= moveUp;
|
||||||
|
if (boxTop < 0)
|
||||||
|
boxTop = 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Draw Box
|
// Draw Box
|
||||||
display->setColor(BLACK);
|
display->setColor(BLACK);
|
||||||
@ -813,7 +650,6 @@ void NotificationRenderer::drawNotificationBox(OLEDDisplay *display, OLEDDisplay
|
|||||||
display->drawRect(scrollBarX, scrollBarY, scrollBarWidth, scrollBarHeight);
|
display->drawRect(scrollBarX, scrollBarY, scrollBarWidth, scrollBarHeight);
|
||||||
display->fillRect(scrollBarX + 1, indicatorY, scrollBarWidth - 2, indicatorHeight);
|
display->fillRect(scrollBarX + 1, indicatorY, scrollBarWidth - 2, indicatorHeight);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Draw the last text message we received
|
/// Draw the last text message we received
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user