Fixed last read not updating and bookmark button in reader mode. (#1368)

* Fixed "Continue Reading" button The lastRead chapter object that the "Continue Reading" button uses for everything is now updated on entering and leaving the chapter, instead of never updating when information changes. * Fixed bookmark button not saving state Done by passing the bookmark state down from the parent. * Fixed bug caused by my own code More thorough testing revealed that lastRead did not update properly on chapter switch * Fixed issue that rendered previous fix ineffective The original fix caused a new bug when changing chapters, and fixing that caused some of the old bugs to return. It should now be completely fixed. --------- Co-authored-by: orionduffy <[email protected]>
LNReader · Jan 13, 2025 · 430a067 · 430a067
1 parent c2c8935
commit 430a067
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/src/screens/reader/ReaderScreen.tsx b/src/screens/reader/ReaderScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useCallback } from 'react';
+import React, { useRef, useCallback, useState, useEffect } from 'react';
 import { DrawerLayoutAndroid } from 'react-native';
 
 import { useChapterGeneralSettings, useTheme } from '@hooks/persisted';
@@ -63,6 +63,11 @@ export const ChapterContent = ({
   const readerSheetRef = useRef<BottomSheetModalMethods>(null);
   const theme = useTheme();
   const { pageReader = false, keepScreenOn } = useChapterGeneralSettings();
+  const [bookmarked, setBookmarked] = useState(chapter.bookmark);
+
+  useEffect(() => {
+    setBookmarked(chapter.bookmark);
+  }, [chapter]);
 
   const {
     hidden,
@@ -146,7 +151,12 @@ export const ChapterContent = ({
       <ReaderBottomSheetV2 bottomSheetRef={readerSheetRef} />
       {!hidden ? (
         <>
-          <ReaderAppbar goBack={navigation.goBack} theme={theme} />
+          <ReaderAppbar
+            goBack={navigation.goBack}
+            theme={theme}
+            bookmarked={bookmarked}
+            setBookmarked={setBookmarked}
+          />
           <ReaderFooter
             theme={theme}
             nextChapter={nextChapter}

diff --git a/src/screens/reader/components/ReaderAppbar.tsx b/src/screens/reader/components/ReaderAppbar.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { StatusBar, StyleSheet, View } from 'react-native';
 import color from 'color';
 
@@ -14,12 +14,14 @@ interface ReaderAppbarProps {
   goBack: () => void;
 }
 
-const ReaderAppbar = ({ goBack, theme }: ReaderAppbarProps) => {
+const ReaderAppbar = ({
+  goBack,
+  theme,
+  bookmarked,
+  setBookmarked,
+}: ReaderAppbarProps) => {
   const { chapter, novel } = useChapterContext();
-  const [bookmarked, setBookmarked] = useState(chapter.bookmark);
-  useEffect(() => {
-    setBookmarked(chapter.bookmark);
-  }, [chapter]);
+
   return (
     <Animated.View
       entering={FadeIn.duration(150)}

diff --git a/src/screens/reader/hooks/useChapter.ts b/src/screens/reader/hooks/useChapter.ts
@@ -1,4 +1,5 @@
 import {
+  getChapter as getDbChapter,
   getNextChapter,
   getPrevChapter,
   markChapterRead,
@@ -188,10 +189,17 @@ export default function useChapter(webViewRef: RefObject<WebView>) {
   useEffect(() => {
     setLoading(true);
     getChapter().finally(() => setLoading(false));
+
     if (!incognitoMode) {
       insertHistory(chapter.id);
-      setLastRead(chapter);
+      getDbChapter(chapter.id).then(result => setLastRead(result));
     }
+
+    return () => {
+      if (!incognitoMode) {
+        getDbChapter(chapter.id).then(result => setLastRead(result));
+      }
+    };
   }, [chapter]);
 
   const refetch = () => {