src/components/UITheme.h (1)

9-10: Unused forward declaration.

MappedInputManager is forward-declared but not referenced anywhere in this header. If it's not needed, consider removing it.

🧹 Proposed removal

-class MappedInputManager;
-
 class UITheme {

src/CrossPointSettings.h (1)

120-120: Consider adding a count sentinel for consistency.

Other enums in this file include a _COUNT sentinel value (e.g., SLEEP_SCREEN_MODE_COUNT, ORIENTATION_COUNT). Adding UI_THEME_COUNT would maintain consistency and simplify bounds checking.

♻️ Proposed change

-  enum UI_THEME { CLASSIC = 0, LYRA = 1, LYRA_3_COVERS = 2 };
+  enum UI_THEME { CLASSIC = 0, LYRA = 1, LYRA_3_COVERS = 2, UI_THEME_COUNT };

src/activities/settings/ClearCacheActivity.cpp (1)

78-82: Minor: "Clearing cache..." no longer bold.

The removal of the bold styling and the true parameter for text wrapping from the "Clearing cache..." message appears intentional but is a subtle UX change. Confirm this is the desired behavior, as other status messages in this file (e.g., "Cache Cleared" at line 85) retain bold styling.

src/components/UITheme.cpp (2)

7-7: Unused include.

MappedInputManager.h appears to be included but not used in this file. Consider removing it if not needed.

---

12-14: Remove unused constant SKIP_PAGE_MS.

The constant is defined but never used anywhere in the codebase. Remove it to reduce code clutter.

src/activities/network/WifiSelectionActivity.cpp (1)

593-595: Magic number in help text positioning.

The -15 offset in the Y coordinate calculation (pageHeight - metrics.buttonHintsHeight - metrics.contentSidePadding - 15) appears to be a hardcoded adjustment. Consider extracting this as a named constant or using a metric value for consistency with the theme system.

src/activities/settings/OtaUpdateActivity.cpp (1)

166-174: Missing button hints for terminal states.

The NO_UPDATE, FAILED, and FINISHED states render status text but don't display button hints to inform the user how to navigate back. The loop() method handles Back button presses for NO_UPDATE and FAILED, but users won't see visual guidance.

Consider adding button hints similar to WAITING_CONFIRMATION:

   } else if (state == NO_UPDATE) {
     renderer.drawCenteredText(UI_10_FONT_ID, top, "No update available", true, EpdFontFamily::BOLD);
+    const auto labels = mappedInput.mapLabels("« Back", "", "", "");
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
   } else if (state == FAILED) {
     renderer.drawCenteredText(UI_10_FONT_ID, top, "Update failed", true, EpdFontFamily::BOLD);
+    const auto labels = mappedInput.mapLabels("« Back", "", "", "");
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
   } else if (state == FINISHED) {

src/components/themes/lyra/Lyra3CoversTheme.cpp (1)

16-20: Remove unused coverWidth variable.

The coverWidth variable is declared in the anonymous namespace but never used in this file. This appears to be leftover from copying the structure from LyraTheme.cpp.

 namespace {
 constexpr int hPaddingInSelection = 8;
 constexpr int cornerRadius = 6;
-int coverWidth = 0;
 }  // namespace

src/components/themes/lyra/Lyra3CoversTheme.h (1)

1-3: Remove extraneous blank lines at file start.

Minor style issue: the file starts with two blank lines before #pragma once.

-
-
 `#pragma` once

src/components/themes/BaseTheme.cpp (2)

67-67: Remove or gate debug logging in production code.

The Serial.printf in drawProgressBar will output to serial on every progress update. Consider removing this debug statement or guarding it with a debug flag:

-  Serial.printf("Drawing progress bar: current=%u, total=%u, percent=%d\n", current, total, percent);

---

262-281: Remove unused local constants in drawSubHeader.

The constants underlineHeight and underlineGap are declared but never used in the function body:

 void BaseTheme::drawSubHeader(const GfxRenderer& renderer, Rect rect, const char* label, const char* rightLabel) const {
-  constexpr int underlineHeight = 2;  // Height of selection underline
-  constexpr int underlineGap = 4;     // Gap between text and underline
   constexpr int maxListValueWidth = 200;

src/components/themes/lyra/LyraTheme.cpp (2)

23-23: Mutable namespace-scope variable can cause persistent state issues.

coverWidth is modified at runtime (lines 300, 322) and never reset. Once a bitmap sets this width, subsequent calls will use that width even for different books or after the cover fails to load. Consider making this a class member variable or passing it as an output parameter to avoid shared mutable state.

---

307-307: Consider using const reference to avoid copy.

RecentBook book = recentBooks[0]; creates a full copy of the struct. Since the book is only read, using a const reference would be more efficient.

♻️ Suggested change

-    RecentBook book = recentBooks[0];
+    const RecentBook& book = recentBooks[0];

src/activities/settings/KOReaderAuthActivity.cpp (1)

126-148: Center the multi-line status block within the available content.

top is computed from a single-line height across the full page, but SUCCESS/FAILED render two lines. This makes the block sit low and can crowd header/button hints on smaller or landscape screens. Consider computing a block height and centering that (and, if available, within the content area below the header).

Proposed adjustment

-  const auto height = renderer.getLineHeight(UI_10_FONT_ID);
-  const auto top = (pageHeight - height) / 2;
+  const auto height = renderer.getLineHeight(UI_10_FONT_ID);
+  const auto lineCount = (state == SUCCESS || state == FAILED) ? 2 : 1;
+  const auto blockHeight = lineCount * height + (lineCount - 1) * 10;
+  const auto top = (pageHeight - blockHeight) / 2;

src/activities/network/CrossPointWebServerActivity.cpp (2)

26-27: Align QR code height with the rendered size.

The QR code is rendered as 33 modules × 6 px (= 198), but QR_CODE_HEIGHT is set to 200. This small mismatch can accumulate into layout drift. Consider deriving height from width to keep the geometry consistent.

🛠️ Suggested tweak

-constexpr int QR_CODE_HEIGHT = 200;
+constexpr int QR_CODE_HEIGHT = QR_CODE_WIDTH;

---

386-399: Avoid double‑drawing the header/subheader in SERVER_RUNNING.

render() draws the header/subheader and then renderServerRunning() draws them again, duplicating work each render. Let one path own the header/subheader to keep responsibilities clear and reduce buffer work.

♻️ Suggested refactor

-    GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight},
-                   isApMode ? "Hotspot Mode" : "Network Transfer", nullptr);
-
-    if (state == WebServerActivityState::SERVER_RUNNING) {
-      GUI.drawSubHeader(renderer, Rect{0, metrics.topPadding + metrics.headerHeight, pageWidth, metrics.tabBarHeight},
-                        connectedSSID.c_str());
-      renderServerRunning();
-    } else {
+    if (state == WebServerActivityState::SERVER_RUNNING) {
+      renderServerRunning();
+    } else {
+      GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight},
+                     isApMode ? "Hotspot Mode" : "Network Transfer", nullptr);
       const auto height = renderer.getLineHeight(UI_10_FONT_ID);
       const auto top = (pageHeight - height) / 2;
       renderer.drawCenteredText(UI_10_FONT_ID, top, "Starting Hotspot...");
     }