Integrate and extend pr 1372 by andreaturchet

src/activities/reader/TxtReaderActivity.cpp

@@ -12,6 +12,7 @@
 #include "MappedInputManager.h"
 #include "ReaderUtils.h"
 #include "RecentBooksStore.h"
+#include "StarredPagesActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
@@ -99,6 +100,9 @@ void TxtReaderActivity::onEnter() {
 
   txt->setupCacheDir();
 
+  // Load bookmarks for this file
+  bookmarkStore.load(txt->getCachePath());
+
   // Save current txt as last opened file and add to recent books
   auto filePath = txt->getPath();
   auto fileName = filePath.substr(filePath.rfind('/') + 1);
@@ -113,6 +117,9 @@ void TxtReaderActivity::onEnter() {
 void TxtReaderActivity::onExit() {
   Activity::onExit();
 
+  // Save bookmarks before exit
+  bookmarkStore.save();
+
   // Reset orientation back to portrait for the rest of the UI
   renderer.setOrientation(GfxRenderer::Orientation::Portrait);
 
@@ -143,6 +150,29 @@ void TxtReaderActivity::loop() {
     return;
   }
 
+  // Star page toggle via short power button press
+  if (SETTINGS.shortPwrBtn == CrossPointSettings::SHORT_PWRBTN::STAR_PAGE &&
+      mappedInput.wasReleased(MappedInputManager::Button::Power)) {
+    bookmarkStore.toggle(0, static_cast<uint16_t>(currentPage));
+    requestUpdate();
+    return;
+  }
+
+  // Open starred pages list via Confirm button
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) && !bookmarkStore.isEmpty()) {
+    startActivityForResult(std::make_unique<StarredPagesActivity>(renderer, mappedInput, bookmarkStore.getAll()),
+                           [this](const ActivityResult& result) {
+                             if (!result.isCancelled) {
+                               const auto& starred = std::get<StarredPageResult>(result.data);
+                               currentPage = starred.pageNumber;
+                               if (currentPage >= totalPages) currentPage = totalPages - 1;
+                               if (currentPage < 0) currentPage = 0;
+                             }
+                             requestUpdate();
+                           });
+    return;
+  }
+
   auto [prevTriggered, nextTriggered] = ReaderUtils::detectPageTurn(mappedInput);
   if (!prevTriggered && !nextTriggered) {
     return;
@@ -373,7 +403,8 @@ void TxtReaderActivity::renderStatusBar() const {
   if (SETTINGS.statusBarTitle != CrossPointSettings::STATUS_BAR_TITLE::HIDE_TITLE) {
     title = txt->getTitle();
   }
-  GUI.drawStatusBar(renderer, progress, currentPage + 1, totalPages, title);
+  const bool isStarred = bookmarkStore.has(0, static_cast<uint16_t>(currentPage));
+  GUI.drawStatusBar(renderer, progress, currentPage + 1, totalPages, title, 0, 0, isStarred);
 }
 
 void TxtReaderActivity::saveProgress() const {