Review comments

src/activities/reader/EpubReaderMenuActivity.cpp

@@ -68,10 +68,10 @@ std::function<bool(int)> EpubReaderMenuActivity::buildSelectablePredicate() cons
 
 void EpubReaderMenuActivity::onEnter() {
   Activity::onEnter();
-  buttonNavigator.setSelectablePredicate(buildSelectablePredicate(), static_cast<int>(menuItems.size()));
-  const int next = buttonNavigator.nextIndex(selectedIndex);
-  if (next != selectedIndex) {
-    selectedIndex = next;
+  const auto selectablePredicate = buildSelectablePredicate();
+  buttonNavigator.setSelectablePredicate(selectablePredicate, static_cast<int>(menuItems.size()));
+  if (!selectablePredicate(selectedIndex)) {
+    selectedIndex = buttonNavigator.nextIndex(selectedIndex);
   }
   requestUpdate();
 }

src/components/themes/BaseTheme.cpp

@@ -291,9 +291,6 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
     const bool isSeparator = UITheme::isSeparatorTitle(itemName);
     if (isSeparator) {
       itemName = UITheme::stripSeparatorTitle(itemName);
-    }
-
-    if (isSeparator) {
       drawListSeparator(renderer,
                         Rect{rect.x + BaseMetrics::values.contentSidePadding, itemY,
                              contentWidth - BaseMetrics::values.contentSidePadding * 2, rowHeight},
@@ -304,7 +301,6 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
     auto font = (rowSubtitle != nullptr) ? UI_12_FONT_ID : UI_10_FONT_ID;
     auto item = renderer.truncatedText(font, itemName.c_str(), textWidth);
     renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), true);
-    renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), true);
 
     if (rowSubtitle != nullptr) {
       // Draw subtitle; if the text is newline-separated (author\nseries), join with • for single-line display

src/components/themes/lyra/LyraTheme.cpp

@@ -446,9 +446,6 @@ void LyraTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
     const bool isSeparator = UITheme::isSeparatorTitle(itemName);
     if (isSeparator) {
       itemName = UITheme::stripSeparatorTitle(itemName);
-    }
-
-    if (isSeparator) {
       drawListSeparator(renderer,
                         Rect{rect.x + LyraMetrics::values.contentSidePadding, itemY,
                              contentWidth - LyraMetrics::values.contentSidePadding * 2, rowHeight},