Un Successfull Atempt

ios/GoogleService-Info.plist

@@ -23,18 +23,18 @@
 	<key>STORAGE_BUCKET</key>
 	<string>khalis-sundar-gutka.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
-	<true></true>
+	<true/>
 	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
+	<false/>
 	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
+	<true/>
 	<key>IS_GCM_ENABLED</key>
-	<true></true>
+	<true/>
 	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
+	<true/>
 	<key>GOOGLE_APP_ID</key>
 	<string>1:283245223101:ios:d642e17fdae02f2f</string>
 	<key>DATABASE_URL</key>
 	<string>https://khalis-sundar-gutka.firebaseio.com</string>
 </dict>
-</plist>
+</plist>

ios/Podfile.lock

@@ -201,9 +201,9 @@ PODS:
     - GoogleUtilities/MethodSwizzler
   - GoogleUtilities/UserDefaults (7.12.0):
     - GoogleUtilities/Logger
-  - hermes-engine (0.71.8):
-    - hermes-engine/Pre-built (= 0.71.8)
-  - hermes-engine/Pre-built (0.71.8)
+  - hermes-engine (0.71.18):
+    - hermes-engine/Pre-built (= 0.71.18)
+  - hermes-engine/Pre-built (0.71.18)
   - libevent (2.1.12)
   - nanopb (2.30909.1):
     - nanopb/decode (= 2.30909.1)
@@ -857,7 +857,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 5f81939bc6d6bcd3e71bba3744753c2a88991395
@@ -885,7 +885,7 @@ SPEC CHECKSUMS:
   GoogleAppMeasurement: bb3c564c3efb933136af0e94899e0a46167466a8
   GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
   GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
-  hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
+  hermes-engine: 251dcc3511fc68678e2ee96dd7d175d9489b781e
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c

package.json

@@ -76,5 +76,6 @@
   },
   "jest": {
     "preset": "react-native"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

src/ReaderScreen/components/header.jsx

@@ -6,82 +6,68 @@ import { useSelector } from "react-redux";
 import colors from "@common/colors";
 import { getHeaderStyles, styles } from "../styles/styles";
 
-const Header = React.forwardRef(
-  ({ navigation, title, handleBackPress, handleBookmarkPress, handleSettingsPress }, ref) => {
-    const isNightMode = useSelector((state) => state.isNightMode);
-    const getHeaderStyle = getHeaderStyles(isNightMode);
-    const [animationPosition] = useState(new Animated.Value(0));
+const Header = ({
+  navigation,
+  title,
+  handleBackPress,
+  handleBookmarkPress,
+  handleSettingsPress,
+}) => {
+  const isNightMode = useSelector((state) => state.isNightMode);
+  const getHeaderStyle = getHeaderStyles(isNightMode);
+  const [animationPosition] = useState(new Animated.Value(0));
+  const headerLeft = () => {
+    return (
+      <Icon
+        name="arrow-back"
+        size={30}
+        onPress={() => {
+          handleBackPress();
+        }}
+        color={colors.WHITE_COLOR}
+      />
+    );
+  };
+  const headerRight = () => {
+    return (
+      <View style={{ flexDirection: "row" }}>
+        <Icon name="bookmark" color={colors.TOOLBAR_TINT} size={30} onPress={handleBookmarkPress} />
 
-    const headerLeft = () => {
-      return (
         <Icon
-          name="arrow-back"
+          name="settings"
+          color={colors.TOOLBAR_TINT}
           size={30}
-          onPress={() => {
-            handleBackPress();
-          }}
-          color={colors.WHITE_COLOR}
+          onPress={() => handleSettingsPress()}
         />
-      );
-    };
-    const headerRight = () => {
-      return (
-        <View style={{ flexDirection: "row" }}>
-          <Icon
-            name="bookmark"
-            color={colors.TOOLBAR_TINT}
-            size={30}
-            onPress={handleBookmarkPress}
-          />
-          <Icon
-            name="settings"
-            color={colors.TOOLBAR_TINT}
-            size={30}
-            onPress={() => handleSettingsPress()}
-          />
-        </View>
-      );
-    };
-
-    useEffect(() => {
-      navigation.setOptions({
-        headerShown: false,
-      });
-    }, []);
-    const toggleHeader = (isHeader) => {
-      const value = isHeader ? 0 : -120;
-      Animated.timing(animationPosition, {
-        toValue: value,
-        duration: 500,
-        // easing: Easing.ease,
-        useNativeDriver: true,
-      }).start();
-    };
+      </View>
+    );
+  };
 
-    React.useImperativeHandle(ref, () => ({
-      toggle: toggleHeader,
-    }));
+  useEffect(() => {
+    navigation.setOptions({
+      headerShown: false,
+    });
+  }, []);
 
-    return (
-      <Animated.View
-        style={[
-          styles.animatedView,
-          {
-            transform: [{ translateY: animationPosition }],
-          },
-        ]}
-      >
-        <View style={getHeaderStyle.headerStyle}>
-          <View style={styles.headerWrapper}>
-            {headerLeft()}
-            <Text style={getHeaderStyle.headerTitleStyle}>{title}</Text>
-            {headerRight()}
-          </View>
+  return (
+    <Animated.View
+      style={[
+        styles.animatedView,
+        {
+          transform: [{ translateY: animationPosition }],
+        },
+      ]}
+    >
+      <View style={getHeaderStyle.headerStyle}>
+        <View style={styles.headerWrapper}>
+          {headerLeft()}
+          <Text style={getHeaderStyle.headerTitleStyle}>{title}</Text>
+          {headerRight()}
         </View>
-      </Animated.View>
-    );
-  }
-);
+      </View>
+    </Animated.View>
+  );
+};
 
 Header.propTypes = {
   navigation: PropTypes.shape().isRequired,

src/ReaderScreen/hooks/useBookmarks.js

@@ -1,20 +1,17 @@
 import { useEffect } from "react";
-import { useDispatch } from "react-redux";
-import { setBookmarkPosition } from "@common/actions";
 
-const useBookmarks = (webViewRef, shabad, bookmarkPosition) => {
-  const dispatch = useDispatch();
-  useEffect(() => {
-    if (
-      webViewRef.current &&
-      webViewRef.current.postMessage &&
-      Number(bookmarkPosition) !== -1 &&
-      shabad.length > 0
-    ) {
-      webViewRef.current.postMessage(JSON.stringify({ bookmark: bookmarkPosition }));
-      dispatch(setBookmarkPosition(-1));
+const useBookmarks = (scrollViewRef, shabad, bookmarkPosition, elementPositions) => {
+  const scrollToElement = (id) => {
+    if (scrollViewRef.current) {
+      scrollViewRef.current.scrollTo({
+        y: elementPositions.current[id],
+        animated: true,
+      });
     }
-  }, [bookmarkPosition, webViewRef.current, shabad]);
+  };
+  useEffect(() => {
+    scrollToElement(bookmarkPosition);
+  }, [bookmarkPosition, scrollViewRef.current, shabad]);
 };
 
 export default useBookmarks;

src/ReaderScreen/hooks/useFetchShabad.js

@@ -4,6 +4,7 @@ import { getShabadFromID } from "@database";
 
 const useFetchShabad = (shabadID) => {
   const [shabad, setShabad] = useState([]);
+  const [groupedByParagraph, setGroupedByParagraph] = useState({});
   const [isLoading, toggleLoading] = useState(false);
   const baniLength = useSelector((state) => state.baniLength);
   const transliterationLanguage = useSelector((state) => state.transliterationLanguage);
@@ -30,6 +31,15 @@ const useFetchShabad = (shabadID) => {
     if (shabadData) {
       toggleLoading(false);
       setShabad(shabadData);
+      const byParagraph = shabadData.reduce((acc, entry) => {
+        // Check if the group for this paragraph_no already exists
+        if (!acc[entry.paragraphNum]) {
+          acc[entry.paragraphNum] = []; // If not, create it
+        }
+        acc[entry.paragraphNum].push(entry); // Add the entry to the group
+        return acc;
+      }, {});
+      setGroupedByParagraph(byParagraph);
     }
   }, [
     shabadID,
@@ -56,7 +66,7 @@ const useFetchShabad = (shabadID) => {
     isVishraam,
   ]);
 
-  return { shabad, isLoading };
+  return { shabad, isLoading, groupedByParagraph };
 };
 
 export default useFetchShabad;