Files
flyradar/src/stats_screen.cpp
Eiswolf-BG 81d11ad954 v2.6.1: Fix "highest flight today" layout collision on Statistics screen
The v2.6.0 addition was drawn as a single line that could overflow
and collide with the "Reset logbook data" button. It now uses the
same two-line drawStatRow() layout (label + value) as the other
stats, with all row Y positions shifted up slightly to make room,
and the i18n strings dropped their now-redundant ": " suffix since
drawStatRow() renders label and value on separate lines.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-06 16:03:49 +02:00

149 lines
5.2 KiB
C++

#include "stats_screen.h"
#include "flight_logbook.h"
#include "touch_input.h"
#include "menu_stars.h"
#include "config.h"
#include "i18n.h"
namespace StatsScreen {
namespace {
struct Rect {
int16_t x, y, w, h;
bool contains(int16_t px, int16_t py) const {
return px >= x && px < x + w && py >= y && py < y + h;
}
};
void drawButton(TFT_eSPI& tft, const Rect& r, const String& label, bool danger = false) {
uint16_t accent = danger ? TFT_RED : TFT_GREEN;
tft.fillRoundRect(r.x, r.y, r.w, r.h, 4, TFT_BLACK);
tft.drawRoundRect(r.x, r.y, r.w, r.h, 4, accent);
tft.setTextDatum(MC_DATUM);
tft.setTextColor(accent, TFT_BLACK);
tft.drawString(label, r.x + r.w / 2, r.y + r.h / 2);
tft.setTextDatum(TL_DATUM);
}
void drawStatRow(TFT_eSPI& tft, int16_t labelY, const String& label, const String& value) {
tft.setTextColor(TFT_DARKGREEN, TFT_BLACK);
tft.setCursor(10, labelY);
tft.print(label);
tft.setTextColor(TFT_GREEN, TFT_BLACK);
tft.setCursor(10, labelY + 20);
tft.print(value);
}
constexpr uint32_t CONFIRM_WINDOW_MS = 4000;
constexpr int16_t ROW1_Y = 38;
constexpr int16_t ROW2_Y = 72;
constexpr int16_t ROW3_Y = 106;
constexpr int16_t ROW4_Y = 140;
constexpr int16_t UPTIME_Y = 174;
constexpr int16_t TOP_ALT_Y = 194; // zweizeilig wie drawStatRow (Label + Wert)
}
void run(TFT_eSPI& tft) {
tft.fillScreen(TFT_BLACK);
tft.setTextColor(TFT_GREEN, TFT_BLACK);
tft.setCursor(10, 14);
tft.println(I18n::t(StringId::STATS_TITLE));
tft.setTextColor(TFT_DARKGREEN, TFT_BLACK);
tft.setCursor(10, ROW1_Y);
tft.print(I18n::t(StringId::LOADING));
uint16_t today = FlightLogbook::todayCount();
uint32_t allTimeAircraft = 0;
uint16_t allTimeDays = 0;
FlightLogbook::computeAllTimeStats(allTimeAircraft, allTimeDays);
FlightLogbook::TopAltitude topAlt = FlightLogbook::todayMaxAltitude();
Rect resetBtn = {10, (int16_t)(Config::SCREEN_HEIGHT - 100), (int16_t)(Config::SCREEN_WIDTH - 20), 40};
Rect backBtn = {10, (int16_t)(Config::SCREEN_HEIGHT - 50), (int16_t)(Config::SCREEN_WIDTH - 20), 40};
bool confirmPending = false;
uint32_t confirmArmedAtMs = 0;
bool justReset = false;
auto redraw = [&]() {
tft.fillScreen(TFT_BLACK);
tft.setTextColor(TFT_GREEN, TFT_BLACK);
tft.setCursor(10, 14);
tft.println(I18n::t(StringId::STATS_TITLE));
drawStatRow(tft, ROW1_Y, I18n::t(StringId::STATS_TODAY), String(today));
drawStatRow(tft, ROW2_Y, I18n::t(StringId::STATS_ALLTIME), String(allTimeAircraft));
drawStatRow(tft, ROW3_Y, I18n::t(StringId::STATS_DAYS), String(allTimeDays));
if (justReset) {
tft.setTextColor(TFT_GREEN, TFT_BLACK);
tft.setCursor(10, ROW4_Y);
tft.print(I18n::t(StringId::STATS_RESET_DONE));
} else if (allTimeDays > 0) {
float avgPerDay = (float)allTimeAircraft / (float)allTimeDays;
char buf[16];
snprintf(buf, sizeof(buf), "%.1f", avgPerDay);
drawStatRow(tft, ROW4_Y, I18n::t(StringId::STATS_AVG), String(buf));
}
uint32_t upSec = millis() / 1000;
uint32_t upH = upSec / 3600;
uint32_t upM = (upSec % 3600) / 60;
char upBuf[8];
snprintf(upBuf, sizeof(upBuf), "%luh %lum", (unsigned long)upH, (unsigned long)upM);
tft.setTextColor(TFT_DARKGREEN, TFT_BLACK);
tft.setCursor(10, UPTIME_Y);
tft.print(String(I18n::t(StringId::STATS_UPTIME_PREFIX)) + upBuf);
if (topAlt.found) {
String csign = topAlt.callsign[0] ? String(topAlt.callsign) : "?";
char altBuf[24];
snprintf(altBuf, sizeof(altBuf), "%s (%ld ft)", csign.c_str(), (long)topAlt.altitudeFt);
drawStatRow(tft, TOP_ALT_Y, I18n::t(StringId::STATS_TOP_ALTITUDE_PREFIX), String(altBuf));
}
if (confirmPending) {
drawButton(tft, resetBtn, I18n::t(StringId::STATS_RESET_CONFIRM), true);
} else {
drawButton(tft, resetBtn, I18n::t(StringId::STATS_RESET_BTN));
}
drawButton(tft, backBtn, I18n::t(StringId::BACK));
};
redraw();
MenuStars::reset();
bool done = false;
while (!done) {
if (confirmPending && millis() - confirmArmedAtMs > CONFIRM_WINDOW_MS) {
confirmPending = false;
redraw();
}
TouchInput::Point tap;
if (TouchInput::wasTapped(tap)) {
if (resetBtn.contains(tap.x, tap.y)) {
if (confirmPending) {
FlightLogbook::resetAllData();
today = 0;
allTimeAircraft = 0;
allTimeDays = 0;
confirmPending = false;
justReset = true;
redraw();
} else {
confirmPending = true;
confirmArmedAtMs = millis();
redraw();
}
} else if (backBtn.contains(tap.x, tap.y)) {
done = true;
}
}
MenuStars::update(tft);
delay(20);
}
}
}