Adjust navigation at end of book to home page on forward press

(cherry picked from commit deb6ff3b9d1a284594540513f19a3191936915c9)

src/activities/reader/EpubReaderActivity.cpp

@@ -205,11 +205,15 @@ void EpubReaderActivity::loop() {
     return;
   }
 
-  // any botton press when at end of the book goes back to the last page
+  // At end of the book, forward button goes home and back button returns to last page
   if (currentSpineIndex > 0 && currentSpineIndex >= epub->getSpineItemsCount()) {
-    currentSpineIndex = epub->getSpineItemsCount() - 1;
+    if (nextTriggered) {
-    nextPageNumber = UINT16_MAX;
+      onGoHome();
-    requestUpdate();
+    } else {
+      currentSpineIndex = epub->getSpineItemsCount() - 1;
+      nextPageNumber = UINT16_MAX;
+      requestUpdate();
+    }
     return;
   }
 

src/activities/reader/TxtReaderActivity.cpp

@@ -138,9 +138,14 @@ void TxtReaderActivity::loop() {
   if (prevTriggered && currentPage > 0) {
     currentPage--;
     requestUpdate();
-  } else if (nextTriggered && currentPage < totalPages - 1) {
+  } else if (nextTriggered) {
-    currentPage++;
+    if (currentPage < totalPages - 1) {
-    requestUpdate();
+      currentPage++;
+      requestUpdate();
+    } else {
+      onGoHome();
+      return;
+    }
   }
 }
 

src/activities/reader/XtcReaderActivity.cpp

@@ -98,10 +98,14 @@ void XtcReaderActivity::loop() {
     return;
   }
 
-  // Handle end of book
+  // At end of the book, forward button goes home and back button returns to last page
   if (currentPage >= xtc->getPageCount()) {
-    currentPage = xtc->getPageCount() - 1;
+    if (nextTriggered) {
-    requestUpdate();
+      onGoHome();
+    } else {
+      currentPage = xtc->getPageCount() - 1;
+      requestUpdate();
+    }
     return;
   }