Fix tracker crashes and update app version

LNReader · Apr 30, 2021 · 1ed0e8b · 1ed0e8b
1 parent 458cdb2
commit 1ed0e8b
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 16 deletions.
diff --git a/app.json b/app.json
@@ -3,7 +3,7 @@
         "name": "LNReader",
         "slug": "LNReader",
         "scheme": "lnreader",
-        "version": "1.0.14",
+        "version": "1.0.15",
         "orientation": "portrait",
         "icon": "./assets/icon.png",
         "splash": {

diff --git a/src/redux/chapter/chapter.actions.js b/src/redux/chapter/chapter.actions.js
@@ -27,12 +27,9 @@ export const getChapterAction = (
 ) => async (dispatch) => {
     dispatch({ type: CHAPTER_LOADING });
 
-    const isDownloaded = await isChapterDownloaded(novelId);
-    let chapter;
+    let chapter = await getChapter(novelId);
 
-    if (isDownloaded) {
-        chapter = await getChapter(novelId);
-    } else {
+    if (!chapter) {
         chapter = await fetchChapter(extensionId, novelUrl, chapterUrl);
     }
     console.log(isDownloaded);

diff --git a/src/screens/More/About.js b/src/screens/More/About.js
@@ -17,12 +17,12 @@ const AboutScreen = ({ navigation }) => {
                 <ListSection>
                     <ListItem
                         title="Version"
-                        description="Stable 1.0.14"
+                        description="Stable 1.0.15"
                         theme={theme}
                     />
                     <ListItem
                         title="Build Time"
-                        description="26-04-21 20:45 PM"
+                        description="30-04-21 11:00 AM"
                         theme={theme}
                     />
                     <ListItem

diff --git a/src/screens/More/Trackers.js b/src/screens/More/Trackers.js
@@ -79,7 +79,7 @@ const TrackerScreen = ({ navigation }) => {
                         right={tracker && "check"}
                         theme={theme}
                     />
-                    {tracker.expires_in < new Date(Date.now()) && (
+                    {tracker && tracker.expires_in < new Date(Date.now()) && (
                         <>
                             <Divider theme={theme} />
                             <ListSubHeader theme={theme}>

diff --git a/src/screens/More/components/GridSizeModal.js b/src/screens/More/components/GridSizeModal.js
@@ -2,6 +2,7 @@ import React from "react";
 import { Text, StyleSheet } from "react-native";
 import { Portal, Modal } from "react-native-paper";
 import Slider from "@react-native-community/slider";
+import { RadioButton, RadioButtonGroup } from "../../../components/RadioButton";
 
 const GridSizeModal = ({
     itemsPerRow,
@@ -10,6 +11,14 @@ const GridSizeModal = ({
     setItemsPerRow,
     theme,
 }) => {
+    const gridSizes = {
+        1: "XS",
+        2: "S",
+        3: "M",
+        4: "L",
+        5: "XL",
+    };
+
     return (
         <Portal>
             <Modal
@@ -47,6 +56,19 @@ const GridSizeModal = ({
                     thumbTintColor={theme.colorAccentDark}
                     onValueChange={(value) => setItemsPerRow(value)}
                 />
+                {/* <RadioButtonGroup
+                    onValueChange={(value) => setItemsPerRow(value)}
+                    value={itemsPerRow}
+                >
+                    {Object.keys(gridSizes).map((item) => (
+                        <RadioButton
+                            key={item}
+                            value={item}
+                            label={gridSizes[item]}
+                            theme={theme}
+                        />
+                    ))}
+                </RadioButtonGroup> */}
             </Modal>
         </Portal>
     );
@@ -65,7 +87,7 @@ const styles = StyleSheet.create({
         marginBottom: 10,
     },
     modalDescription: {
-        marginBottom: 4,
+        marginBottom: 16,
     },
     slider: {
         width: "100%",

diff --git a/src/screens/Novel/components/NovelHeader.js b/src/screens/Novel/components/NovelHeader.js
@@ -31,6 +31,7 @@ const NovelInfoHeader = ({
 
     const [downloadMenu, showDownloadMenu] = useState(false);
 
+    const tracker = useSelector((state) => state.trackerReducer.tracker);
     const trackedNovels = useSelector(
         (state) => state.trackerReducer.trackedNovels
     );
@@ -109,11 +110,13 @@ const NovelInfoHeader = ({
                             followed={novel.followed}
                             novel={novel}
                         />
-                        <TrackerChip
-                            theme={theme}
-                            isTracked={isTracked}
-                            trackerSheetRef={trackerSheetRef}
-                        />
+                        {tracker && (
+                            <TrackerChip
+                                theme={theme}
+                                isTracked={isTracked}
+                                trackerSheetRef={trackerSheetRef}
+                            />
+                        )}
                         <IconButton
                             onPress={() =>
                                 WebBrowser.openBrowserAsync(novel.sourceUrl)

diff --git a/src/screens/Novel/components/Tracker/TrackSearchDialog.js b/src/screens/Novel/components/Tracker/TrackSearchDialog.js
@@ -109,7 +109,8 @@ const TrackSearchDialog = ({
                         style={{ margin: 16 }}
                     />
                 ) : (
-                    searchResults.data.length > 0 &&
+                    searchResults &&
+                    searchResults.data &&
                     searchResults.data.map((result) =>
                         renderSearchResultCard(result)
                     )

diff --git a/src/screens/Novel/components/Tracker/TrackSheet.js b/src/screens/Novel/components/Tracker/TrackSheet.js
@@ -109,6 +109,7 @@ const TrackSheet = ({ bottomSheetRef, novelId, novelName, theme }) => {
                 ref={bottomSheetRef}
                 draggableRange={{ top: 120, bottom: 0 }}
                 snappingPoints={[0, 120]}
+                backdropOpacity={0.25}
             >
                 <View
                     style={[