Remove unused dependencies

App.js

@@ -10,11 +10,17 @@ import Router from "./src/navigation/Router";
 import { Provider } from "react-redux";
 import { persistor, store } from "./src/redux/store";
 import { PersistGate } from "redux-persist/lib/integration/react";
-import { createDB } from "./src/database/DBHelper";
+import { createDB, deleteDb } from "./src/database/DBHelper";
 
 const getFonts = () =>
     Font.loadAsync({
         "pt-sans-bold": require("./assets/fonts/PTSansNarrow-Bold.ttf"),
+        "arbutus-slab": require("./assets/fonts/ArbutusSlab-Regular.ttf"),
+        domine: require("./assets/fonts/Domine-VariableFont_wght.ttf"),
+        lato: require("./assets/fonts/Lato-Regular.ttf"),
+        "noto-sans": require("./assets/fonts/NotoSans-Regular.ttf"),
+        "open-sans": require("./assets/fonts/OpenSans-Regular.ttf"),
+        "pt-serif": require("./assets/fonts/PTSerif-Regular.ttf"),
     });
 
 const App = () => {

app.json

@@ -11,7 +11,8 @@
             "backgroundColor": "#000000"
         },
         "updates": {
-            "fallbackToCacheTimeout": 0
+            "fallbackToCacheTimeout": 0,
+            "enabled": false
         },
         "assetBundlePatterns": ["**/*"],
         "ios": {

package.json

@@ -1,56 +1,53 @@
 {
-    "main": "node_modules/expo/AppEntry.js",
-    "scripts": {
-        "start": "expo start",
-        "android": "expo start --android",
-        "ios": "expo start --ios",
-        "web": "expo start --web",
-        "eject": "expo eject"
-    },
-    "dependencies": {
-        "@react-native-async-storage/async-storage": "^1.13.2",
-        "@react-native-community/masked-view": "0.1.10",
-        "@react-native-community/netinfo": "^5.9.7",
-        "@react-native-community/slider": "^3.0.3",
-        "@react-navigation/material-bottom-tabs": "^5.3.10",
-        "@react-navigation/native": "^5.8.10",
-        "@react-navigation/stack": "^5.12.8",
-        "expo": "~40.0.0",
-        "expo-app-loading": "^1.0.1",
-        "expo-font": "^8.4.0",
-        "expo-linear-gradient": "^8.4.0",
-        "expo-sharing": "~8.5.0",
-        "expo-sqlite": "~8.5.0",
-        "expo-status-bar": "~1.0.3",
-        "expo-web-browser": "~8.6.0",
-        "moment": "^2.29.1",
-        "react": "16.13.1",
-        "react-color-extractor": "^1.1.2",
-        "react-dom": "16.13.1",
-        "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
-        "react-native-collapsible-header-views": "^1.1.2",
-        "react-native-gesture-handler": "^1.8.0",
-        "react-native-input-spinner": "^1.7.7",
-        "react-native-offline": "^5.7.0",
-        "react-native-paper": "^4.5.0",
-        "react-native-reanimated": "^1.13.2",
-        "react-native-safe-area-context": "3.1.9",
-        "react-native-screens": "~2.15.0",
-        "react-native-vector-icons": "^7.1.0",
-        "react-native-web": "~0.13.12",
-        "react-native-webview": "11.0.0",
-        "react-redux": "^7.2.2",
-        "redux": "^4.0.5",
-        "redux-devtools-extension": "^2.13.9",
-        "redux-persist": "^6.0.0",
-        "redux-thunk": "^2.3.0",
-        "reflect-metadata": "^0.1.13",
-        "rn-sliding-up-panel": "^2.4.4",
-        "typeorm": "^0.2.31"
-    },
-    "devDependencies": {
-        "@babel/core": "~7.9.0",
-        "@types/node": "^14.14.35"
-    },
-    "private": true
+  "main": "node_modules/expo/AppEntry.js",
+  "scripts": {
+    "start": "expo start",
+    "android": "expo start --android",
+    "ios": "expo start --ios",
+    "web": "expo start --web",
+    "eject": "expo eject"
+  },
+  "dependencies": {
+    "@react-native-async-storage/async-storage": "^1.13.2",
+    "@react-native-community/masked-view": "0.1.10",
+    "@react-native-community/netinfo": "^5.9.7",
+    "@react-native-community/slider": "^3.0.3",
+    "@react-navigation/material-bottom-tabs": "^5.3.10",
+    "@react-navigation/native": "^5.8.10",
+    "@react-navigation/stack": "^5.12.8",
+    "expo": "~40.0.0",
+    "expo-app-loading": "^1.0.1",
+    "expo-font": "^8.4.0",
+    "expo-linear-gradient": "^8.4.0",
+    "expo-sharing": "~8.5.0",
+    "expo-sqlite": "~8.5.0",
+    "expo-status-bar": "~1.0.3",
+    "expo-web-browser": "~8.6.0",
+    "moment": "^2.29.1",
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
+    "react-native-collapsible-header-views": "^1.1.2",
+    "react-native-gesture-handler": "^1.8.0",
+    "react-native-offline": "^5.7.0",
+    "react-native-paper": "^4.5.0",
+    "react-native-reanimated": "^1.13.2",
+    "react-native-safe-area-context": "3.1.9",
+    "react-native-screens": "~2.15.0",
+    "react-native-vector-icons": "^7.1.0",
+    "react-native-web": "~0.13.12",
+    "react-native-webview": "11.0.0",
+    "react-redux": "^7.2.2",
+    "redux": "^4.0.5",
+    "redux-devtools-extension": "^2.13.9",
+    "redux-persist": "^6.0.0",
+    "redux-thunk": "^2.3.0",
+    "reflect-metadata": "^0.1.13",
+    "rn-sliding-up-panel": "^2.4.4"
+  },
+  "devDependencies": {
+    "@babel/core": "~7.9.0",
+    "@types/node": "^14.14.35"
+  },
+  "private": true
 }

src/components/Appbar.js

@@ -10,11 +10,13 @@ import Constants from "expo-constants";
 import { useNavigation } from "@react-navigation/native";
 import { useSelector } from "react-redux";
 
-export const Appbar = ({ title, onBackAction }) => {
+export const Appbar = ({ title, onBackAction, style }) => {
     const theme = useSelector((state) => state.themeReducer.theme);
 
     return (
-        <MaterialAppbar.Header style={{ backgroundColor: theme.colorPrimary }}>
+        <MaterialAppbar.Header
+            style={[{ backgroundColor: theme.colorPrimary }, style]}
+        >
             {onBackAction && (
                 <MaterialAppbar.BackAction onPress={onBackAction} />
             )}
@@ -34,7 +36,7 @@ export const SearchAppbar = ({
     getNovels,
     setLoading,
     screen,
-    onFilter,
+    openWebView,
 }) => {
     const searchRef = useRef(null);
 
@@ -110,17 +112,15 @@ export const SearchAppbar = ({
                         }}
                     />
                 )}
-                <IconButton
-                    icon="filter-variant"
-                    color={theme.textColorSecondary}
-                    style={{ marginRight: 0 }}
-                    size={23}
-                    disabled={typeof onFilter === "function" ? false : true}
-                    /**
-                     * TODO
-                     */
-                    onPress={() => onFilter?.()}
-                />
+                {openWebView && (
+                    <IconButton
+                        icon="earth"
+                        color={theme.textColorSecondary}
+                        style={{ marginRight: 0 }}
+                        size={23}
+                        onPress={openWebView}
+                    />
+                )}
             </View>
         </TouchableRipple>
     );

src/components/EmptyView.js

@@ -10,9 +10,7 @@ const EmptyView = ({ icon, description }) => {
             <Text
                 style={[
                     styles.emptyViewIcon,
-                    {
-                        color: theme.textColorSecondary,
-                    },
+                    { color: theme.textColorSecondary },
                 ]}
             >
                 {icon}
@@ -20,9 +18,7 @@ const EmptyView = ({ icon, description }) => {
             <Text
                 style={[
                     styles.emptyViewText,
-                    {
-                        color: theme.textColorSecondary,
-                    },
+                    { color: theme.textColorSecondary },
                 ]}
             >
                 {description}

src/components/List.js

@@ -0,0 +1,57 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import { List, Divider as PaperDivider } from "react-native-paper";
+
+const ListSection = ({ children }) => (
+    <List.Section style={styles.listSection}>{children}</List.Section>
+);
+
+const ListSubHeader = ({ children, theme }) => (
+    <List.Subheader
+        style={[styles.listSubHeader, { color: theme.colorAccentDark }]}
+    >
+        {children}
+    </List.Subheader>
+);
+
+const ListItem = ({ title, description, icon, onPress, theme }) => (
+    <List.Item
+        title={title}
+        titleStyle={{ color: theme.textColorPrimary }}
+        description={description}
+        descriptionStyle={{ color: theme.textColorSecondary }}
+        descriptionNumberOfLines={1}
+        left={() =>
+            icon && (
+                <List.Icon
+                    color={theme.colorAccentDark}
+                    icon={icon}
+                    style={{ marginVertical: 0 }}
+                />
+            )
+        }
+        onPress={onPress}
+        rippleColor={theme.rippleColor}
+    />
+);
+
+const Divider = ({ theme }) => (
+    <PaperDivider
+        style={{
+            backgroundColor: theme.dividerColor,
+            height: 1,
+        }}
+    />
+);
+
+export { ListSection, ListSubHeader, ListItem, Divider };
+
+const styles = StyleSheet.create({
+    listSection: {
+        flex: 1,
+        marginVertical: 0,
+    },
+    listSubHeader: {
+        paddingBottom: 5,
+    },
+});

src/components/settings/Checkbox.js

@@ -1,41 +0,0 @@
-import React from "react";
-import { Checkbox } from "react-native-paper";
-import { useSelector } from "react-redux";
-
-export const DisplayCheckbox = ({ displayMode, onPress, value }) => {
-    const theme = useSelector((state) => state.themeReducer.theme);
-
-    const label = {
-        0: "Compact Grid",
-        1: "Comfortable Grid",
-        2: "List",
-    };
-
-    return (
-        <Checkbox.Item
-            label={label[value]}
-            labelStyle={{ color: theme.textColorPrimary }}
-            status={displayMode === value ? "checked" : "unchecked"}
-            mode="ios"
-            uncheckedColor={theme.textColorSecondary}
-            color={theme.colorAccentDark}
-            onPress={onPress}
-        />
-    );
-};
-
-export const ThemeCheckbox = ({ onPress, label, checked }) => {
-    const theme = useSelector((state) => state.themeReducer.theme);
-
-    return (
-        <Checkbox.Item
-            label={label}
-            labelStyle={{ color: theme.textColorPrimary }}
-            status={checked ? "checked" : "unchecked"}
-            mode="ios"
-            uncheckedColor={theme.textColorSecondary}
-            color={theme.colorAccentDark}
-            onPress={onPress}
-        />
-    );
-};

src/database/DBHelper.js

@@ -14,6 +14,10 @@ import {
     createChapterIdIndexQuery,
 } from "./tables/HistoryTable";
 import { createDownloadTableQuery } from "./tables/DownloadTable";
+import {
+    createUpdatesTableQuery,
+    updatesSeedDataQuery,
+} from "./tables/UpdateTable";
 
 /**
  * Database Version = 2
@@ -29,6 +33,7 @@ export const createDB = () => {
         tx.executeSql(createChapterTableQuery);
         tx.executeSql(createHistoryTableQuery);
         tx.executeSql(createDownloadTableQuery);
+        tx.executeSql(createUpdatesTableQuery);
 
         //Db indexes
         tx.executeSql(createUrlIndexQuery);
@@ -45,5 +50,6 @@ export const deleteDb = () => {
         tx.executeSql("DROP TABLE chapters");
         tx.executeSql("DROP TABLE history");
         tx.executeSql("DROP TABLE downloads");
+        tx.executeSql("DROP TABLE updates");
     });
 };

src/database/queries/ChapterQueries.js

@@ -5,24 +5,43 @@ const insertChaptersQuery = `INSERT INTO chapters (chapterUrl, chapterName, rele
 
 export const insertChapters = async (novelId, chapters) => {
     db.transaction((tx) => {
-        chapters.map((chapter) =>
-            tx.executeSql(insertChaptersQuery, [
-                chapter.chapterUrl,
-                chapter.chapterName,
-                chapter.releaseDate,
-                novelId,
-            ])
+        chapters.map(
+            (chapter) =>
+                tx.executeSql(
+                    insertChaptersQuery,
+                    [
+                        chapter.chapterUrl,
+                        chapter.chapterName,
+                        chapter.releaseDate,
+                        novelId,
+                    ],
+                    (txObj, res) => {},
+                    (txObj, error) =>
+                        console.log(
+                            "Error ",
+                            error,
+                            " Chapter URL: ",
+                            chapter.chapterUrl,
+                            " Novel ID ",
+                            novelId
+                        )
+                ),
+            (txObj, res) => {
+                console.log("Success");
+            },
+            (txObj, error) => console.log("Error ", error)
         );
     });
 };
 
-const getChaptersQuery = `SELECT * FROM chapters WHERE novelId = ? ORDER BY chapterId ASC`;
+const getChaptersQuery = (sort, filter) =>
+    `SELECT * FROM chapters WHERE novelId = ? ${filter ?? ""} ${sort ?? ""}`;
 
-export const getChapters = (novelId) => {
+export const getChapters = (novelId, sort, filter) => {
     return new Promise((resolve, reject) =>
         db.transaction((tx) => {
             tx.executeSql(
-                getChaptersQuery,
+                getChaptersQuery(sort, filter),
                 [novelId],
                 (txObj, { rows: { _array } }) => {
                     resolve(_array);
@@ -94,6 +113,8 @@ export const downloadChapter = async (
 ) => {
     const downloadUrl = `https://lnreader-extensions.herokuapp.com/api/${extensionId}/novel/${novelUrl}${chapterUrl}`;
 
+    // console.log(downloadUrl);
+
     const response = await fetch(downloadUrl);
     const chapter = await response.json();
 
@@ -138,6 +159,26 @@ export const deleteChapter = async (chapterId) => {
     });
 };
 
+// export const deleteAllChapters = async (novelId) => {
+//     const updateIsDownloadedQuery = `UPDATE chapters SET downloaded = 0 WHERE novelId=?`;
+//     const deleteChapterQuery = `DELETE FROM downloads WHERE downloadChapterId=?`;
+
+//     db.transaction((tx) => {
+//         tx.executeSql(
+//             updateIsDownloadedQuery,
+//             [chapterId],
+//             (tx, res) => console.log(`Chaptermarked not downapdeod deleted`),
+//             (txObj, error) => console.log("Error ", error)
+//         );
+//         tx.executeSql(
+//             deleteChapterQuery,
+//             [chapterId],
+//             (tx, res) => console.log(`Chapter deleted`),
+//             (txObj, error) => console.log("Error ", error)
+//         );
+//     });
+// };
+
 const getLastReadChapterQuery = `
     SELECT chapters.*
     FROM history

src/database/queries/HistoryQueries.js

@@ -30,7 +30,7 @@ export const getHistory = async () => {
 export const insertHistory = async (novelId, chapterId) => {
     db.transaction((tx) => {
         tx.executeSql(
-            "INSERT OR REPLACE INTO history (historyNovelId, historyChapterId) VALUES (?, ?)",
+            "INSERT OR REPLACE INTO history (historyNovelId, historyChapterId, historyTimeRead) VALUES (?, ?, (datetime('now','localtime')))",
             [novelId, chapterId],
             (txObj, res) => {},
             (txObj, error) => console.log("Error ", error)

src/database/queries/LibraryQueries.js

@@ -44,7 +44,26 @@ export const searchLibrary = (searchText) => {
     return new Promise((resolve, reject) => {
         db.transaction((tx) => {
             tx.executeSql(
-                `SELECT * FROM novels WHERE followed = 1 AND novelName LIKE '%${searchText}%'`,
+                `
+                SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded
+                FROM novels
+                LEFT JOIN (
+                    SELECT chapters.novelId, COUNT(*) AS chaptersUnread 
+                    FROM chapters
+                    WHERE chapters.read = 0
+                    GROUP BY chapters.novelId
+                ) AS C
+                ON novels.novelId = C.novelId
+                LEFT JOIN (
+                    SELECT chapters.novelId, COUNT(*) AS chaptersDownloaded 
+                    FROM chapters
+                    WHERE chapters.downloaded = 1
+                    GROUP BY chapters.novelId
+                ) AS D
+                ON novels.novelId = D.novelId
+                WHERE novels.followed = 1 AND novelName LIKE '%${searchText}%'
+                GROUP BY novels.novelId
+                `,
                 null,
                 (txObj, { rows: { _array } }) => resolve(_array),
                 (txObj, error) => console.log("Error ", error)

src/database/queries/NovelQueries.js

@@ -79,7 +79,7 @@ export const deleteNovelCache = () => {
             "DELETE FROM novels WHERE followed = 0",
             null,
             (txObj, res) => {
-                console.log("Deleted");
+                console.log("Cleared Novel Cache");
             },
             (txObj, error) => console.log("Error ", error)
         );

src/database/queries/UpdateQueries.js

@@ -0,0 +1,26 @@
+import * as SQLite from "expo-sqlite";
+const db = SQLite.openDatabase("lnreader.db");
+
+const getHistoryQuery = `
+    SELECT chapters.chapterId, chapters.chapterUrl, chapters.chapterName, novels.novelUrl, novels.novelId, novels.novelCover, novels.novelName, novels.sourceId, updates.updateTime, updates.updateId
+    FROM updates 
+    JOIN chapters 
+    ON updates.chapterId = chapters.chapterId
+    JOIN novels
+    ON updates.novelId = novels.novelId
+    ORDER BY updates.updateTime DESC`;
+
+export const getUpdates = async () => {
+    return new Promise((resolve, reject) => {
+        db.transaction((tx) => {
+            tx.executeSql(
+                getHistoryQuery,
+                null,
+                (txObj, { rows: { _array } }) => {
+                    resolve(_array);
+                },
+                (txObj, error) => console.log("Error ", error)
+            );
+        });
+    });
+};

src/database/tables/DownloadTable.js

@@ -6,6 +6,6 @@ export const createDownloadTableQuery = `
     chapterText TEXT,
     nextChapter TEXT,
     prevChapter TEXT,
-    FOREIGN KEY (downloadChapterId) REFERENCES chapters(chapter_id)
+    FOREIGN KEY (downloadChapterId) REFERENCES chapters(chapterId)
     ON DELETE CASCADE
     )`;

src/database/tables/UpdateTable.js

@@ -0,0 +1,11 @@
+export const createUpdatesTableQuery = `
+    CREATE TABLE IF NOT EXISTS updates(
+    updateId INTEGER PRIMARY KEY AUTOINCREMENT,
+    chapterId INTEGER NOT NULL,
+    novelId INTEGER NOT NULL,
+    updateTime DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(novelId, chapterId),
+    FOREIGN KEY (chapterId) REFERENCES chapters(chapterId),
+    FOREIGN KEY (novelId) REFERENCES novels(novelId)
+    ON DELETE CASCADE
+    )`;

src/navigation/Router.js

@@ -10,6 +10,7 @@ import { setStatusBarStyle } from "expo-status-bar";
 import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
 
 import Library from "../screens/Library/Library";
+import Updates from "../screens/Updates/Updates";
 import History from "../screens/History/History";
 import Browse from "../screens/Browse/Browse";
 
@@ -20,9 +21,7 @@ import Settings from "../screens/More/Settings";
 import NovelItem from "../screens/Novel/Novel";
 import ChapterItem from "../screens/Chapter/Chapter";
 
-// Extensions
-import BoxNovel from "../screens/Extensions/boxnovel/BoxNovel";
-import ReadLightNovel from "../screens/Extensions/readlightnovel/ReadLightNovel";
+import Extension from "../screens/Extension/Extension";
 
 const Stack = createStackNavigator();
 
@@ -33,32 +32,15 @@ const stackNavigatorConfig = {
     ...TransitionPresets.RevealFromBottomAndroid,
 };
 
-const MoreStack = () => {
+const SettingsStack = () => {
     return (
         <Stack.Navigator screenOptions={stackNavigatorConfig}>
-            <Stack.Screen name="More" component={More} />
             <Stack.Screen name="About" component={About} />
             <Stack.Screen name="Settings" component={Settings} />
         </Stack.Navigator>
     );
 };
 
-const BoxNovelStack = () => {
-    return (
-        <Stack.Navigator screenOptions={stackNavigatorConfig}>
-            <Stack.Screen name="BoxNovel" component={BoxNovel} />
-        </Stack.Navigator>
-    );
-};
-
-const ReadLightNovelStack = () => {
-    return (
-        <Stack.Navigator screenOptions={stackNavigatorConfig}>
-            <Stack.Screen name="ReadLightNovel" component={ReadLightNovel} />
-        </Stack.Navigator>
-    );
-};
-
 import { useSelector } from "react-redux";
 
 const BottomNavigator = () => {
@@ -83,7 +65,7 @@ const BottomNavigator = () => {
                     ),
                 }}
             />
-            {/* 
+
             <Tab.Screen
                 name="Updates"
                 component={Updates}
@@ -96,7 +78,7 @@ const BottomNavigator = () => {
                         />
                     ),
                 }}
-            /> */}
+            />
             <Tab.Screen
                 name="History"
                 component={History}
@@ -125,7 +107,7 @@ const BottomNavigator = () => {
             />
             <Tab.Screen
                 name="More"
-                component={MoreStack}
+                component={More}
                 options={{
                     tabBarIcon: ({ color }) => (
                         <MaterialCommunityIcons
@@ -141,9 +123,9 @@ const BottomNavigator = () => {
 };
 
 const Router = () => {
-    const themeCode = useSelector((state) => state.themeReducer.themeCode);
+    const theme = useSelector((state) => state.themeReducer.theme);
 
-    useEffect(() => setStatusBarStyle(themeCode === 1 ? "dark" : "light"), []);
+    useEffect(() => setStatusBarStyle(theme.id === 1 ? "dark" : "light"), []);
 
     return (
         <Provider>
@@ -164,11 +146,12 @@ const Router = () => {
                         headerTintColor: "white",
                     }}
                 />
-                <Stack.Screen name="BoxNovelStack" component={BoxNovelStack} />
-                <Stack.Screen
-                    name="ReadLightNovelStack"
-                    component={ReadLightNovelStack}
-                />
+                <Stack.Screen name="SettingsStack" component={SettingsStack} />
+                <Stack.Screen name="Extension" component={Extension} />
+                {/* <Stack.Screen
+                    name="ExtensionStack"
+                    component={ExtensionStack}
+                /> */}
             </Stack.Navigator>
         </Provider>
     );

src/redux/chapter/chapter.actions.js

@@ -35,6 +35,7 @@ export const getChapterAction = (
     } else {
         chapter = await fetchChapter(extensionId, novelUrl, chapterUrl);
     }
+    console.log(isDownloaded);
     dispatch({ type: GET_CHAPTER, payload: chapter });
 };
 

src/redux/library/library.actions.js

@@ -1,4 +1,7 @@
-import { GET_LIBRARY_NOVELS } from "./library.types";
+import {
+    GET_LIBRARY_NOVELS,
+    GET_LIBRARY_SEARCH_RESULTS,
+} from "./library.types";
 import {
     getLibrary,
     searchLibrary,
@@ -14,11 +17,10 @@ export const getLibraryAction = () => async (dispatch) => {
 };
 
 export const searchLibraryAction = (searchText) => async (dispatch) => {
-    console.log(searchText);
     const res = await searchLibrary(searchText);
 
     dispatch({
-        type: GET_LIBRARY_NOVELS,
+        type: GET_LIBRARY_SEARCH_RESULTS,
         payload: res,
     });
 };

src/redux/library/library.reducer.js

@@ -1,8 +1,12 @@
 import { FOLLOW_NOVEL, UNFOLLOW_NOVEL } from "../novel/novel.types";
-import { GET_LIBRARY_NOVELS } from "./library.types";
+import {
+    GET_LIBRARY_NOVELS,
+    GET_LIBRARY_SEARCH_RESULTS,
+} from "./library.types";
 
 const initialState = {
     novels: [],
+    searchResults: [],
     loading: true,
 };
 
@@ -11,7 +15,9 @@ const libraryReducer = (state = initialState, action) => {
 
     switch (type) {
         case GET_LIBRARY_NOVELS:
-            return { novels: payload, loading: false };
+            return { ...state, novels: payload, loading: false };
+        case GET_LIBRARY_SEARCH_RESULTS:
+            return { ...state, searchResults: payload, loading: false };
         case FOLLOW_NOVEL:
             return {
                 ...state,

src/redux/library/library.types.js

@@ -1 +1,2 @@
 export const GET_LIBRARY_NOVELS = "GET_LIBRARY_NOVELS";
+export const GET_LIBRARY_SEARCH_RESULTS = "GET_LIBRARY_SEARCH_RESULTS";

src/redux/novel/novel.actions.js

@@ -14,9 +14,6 @@ import {
     CHAPTER_DOWNLOADED,
     CHAPTER_DELETED,
     UPDATE_NOVEL,
-    UPDATE_LAST_READ,
-    FOLLOW_NOVEL,
-    UNFOLLOW_NOVEL,
 } from "./novel.types";
 
 import { updateNovel } from "../../services/updates";
@@ -24,7 +21,6 @@ import { fetchChapter, fetchNovel } from "../../source/Source";
 import {
     followNovel,
     insertNovel,
-    checkNovelInCache,
     getNovel,
 } from "../../database/queries/NovelQueries";
 import {
@@ -35,20 +31,24 @@ import {
     getChapter,
     downloadChapter,
     deleteChapter,
-    getLastReadChapter,
 } from "../../database/queries/ChapterQueries";
 
 export const setNovel = (novel) => async (dispatch) => {
     dispatch({ type: SET_NOVEL, payload: novel });
 };
 
-export const getNovelAction = (followed, sourceId, novelUrl, novelId) => async (
-    dispatch
-) => {
+export const getNovelAction = (
+    followed,
+    sourceId,
+    novelUrl,
+    novelId,
+    sort,
+    filter
+) => async (dispatch) => {
     dispatch({ type: LOADING_NOVEL });
 
     if (followed === 1) {
-        const chapters = await getChapters(novelId);
+        const chapters = await getChapters(novelId, sort, filter);
 
         dispatch({
             type: GET_CHAPTERS,
@@ -57,11 +57,10 @@ export const getNovelAction = (followed, sourceId, novelUrl, novelId) => async (
     } else {
         dispatch({ type: FETCHING_NOVEL });
 
-        const inCache = await checkNovelInCache(novelUrl);
+        const novel = await getNovel(novelUrl);
 
-        if (inCache) {
-            const novel = await getNovel(novelUrl);
-            novel.chapters = await getChapters(novel.novelId);
+        if (novel) {
+            novel.chapters = await getChapters(novel.novelId, sort, filter);
             dispatch({
                 type: GET_NOVEL,
                 payload: novel,
@@ -105,18 +104,6 @@ export const sortAndFilterChapters = (novelUrl, filter, sort) => async (
 export const followNovelAction = (novel) => async (dispatch) => {
     await followNovel(novel.followed, novel.novelId);
 
-    if (!novel.followed) {
-        dispatch({
-            type: FOLLOW_NOVEL,
-            payload: novel,
-        });
-    } else {
-        dispatch({
-            type: UNFOLLOW_NOVEL,
-            payload: novel.novelId,
-        });
-    }
-
     dispatch({
         type: UPDATE_IN_LIBRARY,
         payload: !novel.followed,
@@ -161,21 +148,50 @@ export const downloadChapterAction = (
 ) => async (dispatch) => {
     dispatch({
         type: CHAPTER_DOWNLOADING,
-        payload: {
-            chapterId,
-        },
+        payload: chapterId,
     });
 
     await downloadChapter(extensionId, novelUrl, chapterUrl, chapterId);
 
     dispatch({
         type: CHAPTER_DOWNLOADED,
-        payload: { chapterId },
+        payload: chapterId,
     });
 
     ToastAndroid.show(`Downloaded ${chapterName}`, ToastAndroid.SHORT);
 };
 
+export const downloadAllChaptersAction = (
+    extensionId,
+    novelUrl,
+    chapters
+) => async (dispatch) => {
+    await chapters.map((chapter, index) => {
+        setTimeout(async () => {
+            dispatch({
+                type: CHAPTER_DOWNLOADING,
+                payload: chapter.chapterId,
+            });
+
+            if (!chapter.downloaded) {
+                await downloadChapter(
+                    extensionId,
+                    novelUrl,
+                    chapter.chapterUrl,
+                    chapter.chapterId
+                );
+            }
+
+            dispatch({
+                type: CHAPTER_DOWNLOADED,
+                payload: chapter.chapterId,
+            });
+        }, 1000 * index);
+    });
+
+    ToastAndroid.show(`All chapters downloaded`, ToastAndroid.SHORT);
+};
+
 export const deleteChapterAction = (chapterId, chapterName) => async (
     dispatch
 ) => {
@@ -183,30 +199,37 @@ export const deleteChapterAction = (chapterId, chapterName) => async (
 
     dispatch({
         type: CHAPTER_DELETED,
-        payload: { chapterId },
+        payload: chapterId,
     });
 
     ToastAndroid.show(`Deleted ${chapterName}`, ToastAndroid.SHORT);
 };
 
+export const deleteAllChaptersAction = (chapters) => async (dispatch) => {
+    await chapters.map((chapter) => {
+        deleteChapter(chapter.chapterId);
+
+        dispatch({
+            type: CHAPTER_DELETED,
+            payload: chapter.chapterId,
+        });
+    });
+
+    ToastAndroid.show(`Deleted all chapters`, ToastAndroid.SHORT);
+};
+
 export const updateNovelAction = (extensionId, novelUrl, novelId) => async (
     dispatch
 ) => {
     dispatch({ type: FETCHING_NOVEL });
 
-    const updatedNovel = await updateNovel(extensionId, novelUrl, novelId);
+    await updateNovel(extensionId, novelUrl, novelId);
+
+    let novel = await getNovel(novelUrl);
+    let chapters = await getChapters(novel.novelId);
 
     dispatch({
         type: UPDATE_NOVEL,
-        payload: { novel: updatedNovel, chapters: updatedNovel.chapters },
-    });
-};
-
-export const getLastReadChapterAction = (novelId) => async (dispatch) => {
-    const lastReadChapter = await getLastReadChapter(novelId);
-
-    dispatch({
-        type: UPDATE_LAST_READ,
-        payload: lastReadChapter,
+        payload: { novel, chapters },
     });
 };

src/redux/novel/novel.reducer.js

@@ -58,16 +58,7 @@ const novelReducer = (state = initialState, action) => {
         case UPDATE_NOVEL:
             return {
                 ...state,
-                novel: {
-                    ...state.novel,
-                    novelName: payload.novel.novelName,
-                    novelUrl: payload.novel.novelUrl,
-                    novelSummary: payload.novel.novelSummary,
-                    author: payload.novel.author,
-                    artist: payload.novel.artist,
-                    genre: payload.novel.genre,
-                    status: payload.novel.status,
-                },
+                novel: payload.novel,
                 chapters: payload.chapters,
                 loading: false,
                 fetching: false,
@@ -91,14 +82,18 @@ const novelReducer = (state = initialState, action) => {
         case CHAPTER_DOWNLOADING:
             return {
                 ...state,
-                downloading: payload.chapterId,
+                chapters: state.chapters.map((chapter) =>
+                    chapter.chapterId === payload
+                        ? { ...chapter, downloaded: 3 }
+                        : chapter
+                ),
             };
         case CHAPTER_DOWNLOADED:
             return {
                 ...state,
-                downloading: null,
+                // downloading: state.downloading.filter((id) => id === payload),
                 chapters: state.chapters.map((chapter) =>
-                    chapter.chapterId === payload.chapterId
+                    chapter.chapterId === payload
                         ? { ...chapter, downloaded: 1 }
                         : chapter
                 ),
@@ -107,7 +102,7 @@ const novelReducer = (state = initialState, action) => {
             return {
                 ...state,
                 chapters: state.chapters.map((chapter) =>
-                    chapter.chapterId === payload.chapterId
+                    chapter.chapterId === payload
                         ? { ...chapter, downloaded: 0 }
                         : chapter
                 ),

src/redux/settings/settings.actions.js

@@ -3,6 +3,9 @@ import {
     SET_ITEMS_PER_ROW,
     UPDATE_READER_TEXT_SIZE,
     UPDATE_READER_THEME,
+    UPDATE_READER_TEXT_ALIGN,
+    UPDATE_READER_PADDING,
+    SET_READER_FONT,
 } from "./settings.types";
 
 export const setDisplayMode = (val) => (dispatch) => {
@@ -13,7 +16,6 @@ export const setDisplayMode = (val) => (dispatch) => {
 };
 
 export const setItemsPerRow = (val) => (dispatch) => {
-    console.log("called" + val);
     dispatch({
         type: SET_ITEMS_PER_ROW,
         payload: val,
@@ -33,3 +35,24 @@ export const updateReaderTextSize = (val) => (dispatch) => {
         payload: val,
     });
 };
+
+export const updateReaderTextAlign = (val) => (dispatch) => {
+    dispatch({
+        type: UPDATE_READER_TEXT_ALIGN,
+        payload: val,
+    });
+};
+
+export const updateReaderPadding = (val) => (dispatch) => {
+    dispatch({
+        type: UPDATE_READER_PADDING,
+        payload: val,
+    });
+};
+
+export const setReaderFont = (val) => (dispatch) => {
+    dispatch({
+        type: SET_READER_FONT,
+        payload: val,
+    });
+};

src/redux/settings/settings.reducer.js

@@ -1,6 +1,9 @@
 import {
     SET_DISPLAY_MODE,
     SET_ITEMS_PER_ROW,
+    SET_READER_FONT,
+    UPDATE_READER_PADDING,
+    UPDATE_READER_TEXT_ALIGN,
     UPDATE_READER_TEXT_SIZE,
     UPDATE_READER_THEME,
 } from "./settings.types";
@@ -11,6 +14,9 @@ const initialState = {
     reader: {
         theme: 1,
         textSize: 16,
+        textAlign: "left",
+        padding: 5,
+        fontFamily: null,
     },
 };
 
@@ -48,6 +54,21 @@ const settingsReducer = (state = initialState, action) => {
             return { ...state, reader: { ...state.reader, theme: payload } };
         case UPDATE_READER_TEXT_SIZE:
             return { ...state, reader: { ...state.reader, textSize: payload } };
+        case UPDATE_READER_TEXT_ALIGN:
+            return {
+                ...state,
+                reader: { ...state.reader, textAlign: payload },
+            };
+        case UPDATE_READER_PADDING:
+            return {
+                ...state,
+                reader: { ...state.reader, padding: payload },
+            };
+        case SET_READER_FONT:
+            return {
+                ...state,
+                reader: { ...state.reader, fontFamily: payload },
+            };
         default:
             return state;
     }

src/redux/settings/settings.types.js

@@ -2,3 +2,6 @@ export const SET_DISPLAY_MODE = "SET_DISPLAY_MODE";
 export const SET_ITEMS_PER_ROW = "SET_ITEMS_PER_ROW";
 export const UPDATE_READER_THEME = "UPDATE_READER_THEME";
 export const UPDATE_READER_TEXT_SIZE = "UPDATE_READER_TEXT_SIZE";
+export const UPDATE_READER_TEXT_ALIGN = "UPDATE_READER_TEXT_ALIGN";
+export const UPDATE_READER_PADDING = "UPDATE_READER_PADDING";
+export const SET_READER_FONT = "SET_READER_FONT";

src/redux/store.js

@@ -9,6 +9,7 @@ import libraryReducer from "./library/library.reducer";
 import extensionReducer from "./source/source.reducers";
 import novelReducer from "./novel/novel.reducer";
 import historyReducer from "./history/history.reducer";
+import updatesReducer from "./updates/updates.reducer";
 
 const persistConfig = {
     key: "root",
@@ -25,6 +26,7 @@ const persistedReducer = persistReducer(
         extensionReducer,
         novelReducer,
         historyReducer,
+        updatesReducer,
     })
 );
 

src/redux/theme/theme.actions.js

@@ -1,12 +1,5 @@
 import { SWITCH_THEME } from "./theme.types";
 
-/**
- * 0 -> Amoled Dark Theme
- * 1 -> Light Theme
- * 2 -> Dark Theme
- * 3 -> Midnight Dusk Theme
- */
-
 export const switchTheme = (val) => (dispatch) => {
     dispatch({
         type: SWITCH_THEME,

src/redux/theme/theme.reducer.js

@@ -13,7 +13,6 @@ const themes = {
 };
 
 const initialState = {
-    themeCode: 0,
     theme: themes[0],
 };
 
@@ -22,7 +21,7 @@ const themeReducer = (state = initialState, action) => {
 
     switch (type) {
         case "SWITCH_THEME":
-            return { ...state, themeCode: payload, theme: themes[payload] };
+            return { ...state, theme: themes[payload] };
         default:
             return state;
     }

src/redux/updates/updates.actions.js

@@ -0,0 +1,9 @@
+import { GET_UPDATES } from "./updates.types";
+
+import { getUpdates } from "../../database/queries/UpdateQueries";
+
+export const getUpdatesAction = () => async (dispatch) => {
+    const updates = await getUpdates();
+
+    dispatch({ type: GET_UPDATES, payload: updates });
+};

src/redux/updates/updates.reducer.js

@@ -0,0 +1,21 @@
+import { LOAD_UPDATES, GET_UPDATES } from "./updates.types";
+
+const initialState = {
+    updates: [],
+    loading: true,
+};
+
+const updateReducer = (state = initialState, action) => {
+    const { type, payload } = action;
+
+    switch (type) {
+        case LOAD_UPDATES:
+            return { ...state, loading: true };
+        case GET_UPDATES:
+            return { ...state, updates: payload, loading: false };
+        default:
+            return state;
+    }
+};
+
+export default updateReducer;

src/redux/updates/updates.types.js

@@ -0,0 +1,2 @@
+export const GET_UPDATES = "GET_UPDATES";
+export const LOAD_UPDATES = "LOAD_UPDATES";

src/screens/Browse/Browse.js

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
-import { Appbar } from "../../components/common/Appbar";
+import { Appbar } from "../../components/Appbar";
 import { connect } from "react-redux";
 
 import { getSourcesAction } from "../../redux/source/source.actions";
@@ -10,7 +10,7 @@ import ExtensionCard from "./components/ExtensionCard";
 const Browse = ({ theme, extensions, loading, getSourcesAction }) => {
     useEffect(() => {
         getSourcesAction();
-    }, []);
+    }, [getSourcesAction]);
 
     return (
         <>
@@ -51,6 +51,5 @@ export default connect(mapStateToProps, { getSourcesAction })(Browse);
 const styles = StyleSheet.create({
     container: {
         flex: 1,
-        paddingHorizontal: 4,
     },
 });

src/screens/Browse/components/ExtensionCard.js

@@ -6,7 +6,7 @@ import { useNavigation } from "@react-navigation/native";
 import { useSelector } from "react-redux";
 
 const ExtensionCard = ({ item }) => {
-    const { sourceName, sourceCover, sourceLanguage } = item;
+    const { sourceName, sourceCover, sourceLanguage, status } = item;
 
     const navigation = useNavigation();
 
@@ -15,15 +15,19 @@ const ExtensionCard = ({ item }) => {
     return (
         <TouchableRipple
             style={styles.extensionCard}
-            onPress={() => navigation.navigate(sourceName + "Stack")}
+            onPress={() =>
+                navigation.navigate("Extension", {
+                    sourceId: item.sourceId,
+                    sourceName: item.sourceName,
+                    sourceUrl: item.sourceUrl,
+                })
+            }
             rippleColor={theme.rippleColor}
             borderless
         >
             <>
                 <Image
-                    source={{
-                        uri: sourceCover,
-                    }}
+                    source={{ uri: sourceCover }}
                     style={styles.extensionIcon}
                     resizeMode="contain"
                 />
@@ -37,14 +41,25 @@ const ExtensionCard = ({ item }) => {
                         >
                             {sourceName}
                         </Text>
-                        <Text
-                            style={{
-                                color: theme.textColorSecondary,
-                                fontSize: 12,
-                            }}
-                        >
-                            {sourceLanguage}
-                        </Text>
+                        <View style={{ flexDirection: "row" }}>
+                            <Text
+                                style={{
+                                    color: theme.textColorSecondary,
+                                    fontSize: 12,
+                                }}
+                            >
+                                {sourceLanguage}
+                            </Text>
+                            <Text
+                                style={{
+                                    color: "#D63B2F",
+                                    fontSize: 12,
+                                    marginLeft: 5,
+                                }}
+                            >
+                                {status === 0 && "(Not Working)"}
+                            </Text>
+                        </View>
                     </View>
                     <View>
                         <Button
@@ -54,7 +69,11 @@ const ExtensionCard = ({ item }) => {
                             uppercase={false}
                             color={theme.colorAccentDark}
                             onPress={() =>
-                                navigation.navigate(sourceName + "Stack")
+                                navigation.navigate("Extension", {
+                                    sourceId: item.sourceId,
+                                    sourceName: item.sourceName,
+                                    sourceUrl: item.sourceUrl,
+                                })
                             }
                         >
                             Browse
@@ -75,7 +94,6 @@ const styles = StyleSheet.create({
         marginVertical: 4,
         paddingVertical: 8,
         paddingHorizontal: 20,
-        borderRadius: 4,
     },
     extensionIcon: {
         width: 40,

src/screens/Chapter/Chapter.js

@@ -59,7 +59,9 @@ const ChapterItem = ({
     const readerLineHeight = (val) => {
         const lineHeight = {
             12: 20,
+            14: 22,
             16: 25,
+            18: 26,
             20: 28,
         };
         return lineHeight[val];
@@ -105,10 +107,12 @@ const ChapterItem = ({
                                     size={26}
                                     disabled={!chapter.prevChapter}
                                     onPress={() => {
-                                        navigation.push("ChapterItem", {
+                                        navigation.replace("ChapterItem", {
                                             chapterUrl: chapter.prevChapter,
+                                            chapterId: chapterId - 1,
                                             extensionId,
                                             novelUrl,
+                                            novelId,
                                             chapterName: chapter.chapterName,
                                         });
                                     }}
@@ -119,10 +123,12 @@ const ChapterItem = ({
                                     size={26}
                                     disabled={!chapter.nextChapter}
                                     onPress={() => {
-                                        navigation.push("ChapterItem", {
+                                        navigation.replace("ChapterItem", {
                                             chapterUrl: chapter.nextChapter,
                                             extensionId,
                                             novelUrl,
+                                            novelId,
+                                            chapterId: chapterId + 1,
                                             chapterName: chapter.chapterName,
                                         });
                                     }}
@@ -166,6 +172,11 @@ const ChapterItem = ({
                                 fontSize: reader.textSize,
                                 color: readerTextColor(reader.theme),
                                 lineHeight: readerLineHeight(reader.textSize),
+                                textAlign: reader.textAlign,
+                                paddingHorizontal: `${reader.padding}%`,
+                            },
+                            reader.fontFamily && {
+                                fontFamily: reader.fontFamily,
                             },
                         ]}
                     >
@@ -196,7 +207,6 @@ export default connect(mapStateToProps, {
 const styles = StyleSheet.create({
     container: {
         flexGrow: 1,
-        paddingHorizontal: 10,
         paddingVertical: 10,
     },
 });

src/screens/Chapter/components/BottomSheet.js

@@ -1,17 +1,20 @@
 import React from "react";
-
 import { Animated, StyleSheet, View, Text, Dimensions } from "react-native";
-import { ToggleButton } from "react-native-paper";
+import { ToggleButton, IconButton, Chip } from "react-native-paper";
 import Slider from "@react-native-community/slider";
 import Bottomsheet from "rn-sliding-up-panel";
+import { fonts } from "../../../utils/constants";
 
 import { connect } from "react-redux";
 
 import {
+    setReaderFont,
+    updateReaderPadding,
+    updateReaderTextAlign,
     updateReaderTextSize,
     updateReaderTheme,
 } from "../../../redux/settings/settings.actions";
-import BottomSheetHandle from "../../../components/common/BottomSheetHandle";
+import BottomSheetHandle from "../../../components/BottomSheetHandle";
 
 const ChapterBottomSheet = ({
     bottomSheetRef,
@@ -19,13 +22,16 @@ const ChapterBottomSheet = ({
     reader,
     updateReaderTextSize,
     updateReaderTheme,
+    updateReaderTextAlign,
+    updateReaderPadding,
+    setReaderFont,
 }) => {
     return (
         <Bottomsheet
             animatedValue={new Animated.Value(0)}
             ref={bottomSheetRef}
-            draggableRange={{ top: 200, bottom: 0 }}
-            snappingPoints={[0, 200]}
+            draggableRange={{ top: 400, bottom: 0 }}
+            snappingPoints={[0, 400]}
             showBackdrop={false}
         >
             <View style={styles.contentContainer}>
@@ -33,7 +39,7 @@ const ChapterBottomSheet = ({
                 <View style={styles.readerSettingsContainer}>
                     <Text
                         style={{
-                            color: theme.textColorPrimary,
+                            color: "#FFFFFF",
                             fontWeight: "bold",
                         }}
                     >
@@ -47,53 +53,199 @@ const ChapterBottomSheet = ({
                         value={reader.textSize}
                         minimumValue={12}
                         maximumValue={20}
-                        step={4}
+                        step={2}
                         minimumTrackTintColor={theme.colorAccentDark}
                         maximumTrackTintColor="#000000"
                         thumbTintColor={theme.colorAccentDark}
                         onValueChange={(value) => updateReaderTextSize(value)}
                     />
-                    <Text
+                    <View
                         style={{
-                            color: theme.textColorPrimary,
-                            fontWeight: "bold",
+                            flexDirection: "row",
+                            justifyContent: "center",
                         }}
                     >
-                        Reader Theme
-                    </Text>
-                    <ToggleButton.Row
-                        onValueChange={(value) => updateReaderTheme(value)}
-                        value={reader.theme}
-                        style={{ marginTop: 10 }}
+                        <View
+                            style={{
+                                justifyContent: "center",
+                                alignItems: "center",
+                            }}
+                        >
+                            <Text
+                                style={{
+                                    color: "#FFFFFF",
+                                    fontWeight: "bold",
+                                }}
+                            >
+                                Reader Theme
+                            </Text>
+                            <ToggleButton.Row
+                                onValueChange={(value) =>
+                                    updateReaderTheme(value)
+                                }
+                                value={reader.theme}
+                                style={{ marginTop: 10 }}
+                            >
+                                <ToggleButton
+                                    icon="format-text"
+                                    color="#FFFFFF"
+                                    value={1}
+                                    style={{
+                                        backgroundColor: "#000000",
+                                        marginHorizontal: 10,
+                                    }}
+                                />
+                                <ToggleButton
+                                    icon="format-text"
+                                    color="#000000"
+                                    value={2}
+                                    style={{
+                                        backgroundColor: "#FFFFFF",
+                                        marginHorizontal: 10,
+                                    }}
+                                />
+                                <ToggleButton
+                                    icon="format-text"
+                                    color="#000000"
+                                    value={3}
+                                    style={{
+                                        backgroundColor: "#F4ECD8",
+                                        marginHorizontal: 10,
+                                    }}
+                                />
+                            </ToggleButton.Row>
+                        </View>
+                        <View
+                            style={{
+                                justifyContent: "center",
+                                alignItems: "center",
+                            }}
+                        >
+                            <Text
+                                style={{
+                                    color: "#FFFFFF",
+                                    fontWeight: "bold",
+                                }}
+                            >
+                                Text Align
+                            </Text>
+                            <ToggleButton.Row
+                                onValueChange={(value) =>
+                                    updateReaderTextAlign(value ?? "left")
+                                }
+                                value={reader.textAlign}
+                                style={{ marginTop: 10 }}
+                            >
+                                <ToggleButton
+                                    icon="format-align-left"
+                                    color="#000000"
+                                    value="left"
+                                    style={{
+                                        backgroundColor: "#FFFFFF",
+                                        marginHorizontal: 10,
+                                    }}
+                                />
+                                <ToggleButton
+                                    icon="format-align-justify"
+                                    color="#000000"
+                                    value="justify"
+                                    style={{
+                                        backgroundColor: "#FFFFFF",
+                                        marginHorizontal: 10,
+                                    }}
+                                />
+                                <ToggleButton
+                                    icon="format-align-right"
+                                    color="#000000"
+                                    value="right"
+                                    style={{
+                                        backgroundColor: "#FFFFFF",
+                                        marginHorizontal: 10,
+                                    }}
+                                />
+                            </ToggleButton.Row>
+                        </View>
+                    </View>
+                    <Text
+                        style={{
+                            color: "#FFFFFF",
+                            fontWeight: "bold",
+                            marginTop: 10,
+                        }}
                     >
-                        <ToggleButton
-                            icon="format-text"
-                            color="#FFFFFF"
-                            value={1}
-                            style={{
-                                backgroundColor: "#000000",
-                                marginHorizontal: 10,
-                            }}
+                        Padding
+                    </Text>
+                    <View
+                        style={{
+                            width: "100%",
+                            flexDirection: "row",
+                            justifyContent: "center",
+                            alignItems: "center",
+                        }}
+                    >
+                        <IconButton
+                            icon="minus"
+                            color={theme.colorAccentDark}
+                            size={26}
+                            disabled={reader.padding <= 0 ? true : false}
+                            onPress={() =>
+                                updateReaderPadding(reader.padding - 1)
+                            }
                         />
-                        <ToggleButton
-                            icon="format-text"
-                            color="#000000"
-                            value={2}
+                        <Text
                             style={{
-                                backgroundColor: "#FFFFFF",
-                                marginHorizontal: 10,
+                                color: "#FFFFFF",
+                                paddingHorizontal: 50,
                             }}
+                        >
+                            {`${reader.padding}%`}
+                        </Text>
+                        <IconButton
+                            icon="plus"
+                            color={theme.colorAccentDark}
+                            size={26}
+                            disabled={reader.padding >= 10 ? true : false}
+                            onPress={() =>
+                                updateReaderPadding(reader.padding + 1)
+                            }
                         />
-                        <ToggleButton
-                            icon="format-text"
-                            color="#000000"
-                            value={3}
-                            style={{
-                                backgroundColor: "#F4ECD8",
-                                marginHorizontal: 10,
-                            }}
-                        />
-                    </ToggleButton.Row>
+                    </View>
+                    <Text
+                        style={{
+                            color: "#FFFFFF",
+                            fontWeight: "bold",
+                            marginTop: 10,
+                        }}
+                    >
+                        Font Style
+                    </Text>
+                    <View
+                        style={{
+                            flexDirection: "row",
+                            flexWrap: "wrap",
+                            justifyContent: "center",
+                        }}
+                    >
+                        {fonts.map((font, index) => (
+                            <Chip
+                                key={index}
+                                onPress={() => setReaderFont(font.fontFamily)}
+                                textStyle={{ fontFamily: font.fontFamily }}
+                                style={{
+                                    borderWidth: 0,
+                                    marginHorizontal: 5,
+                                    marginVertical: 5,
+                                }}
+                                selected={
+                                    reader.fontFamily === font.fontFamily
+                                        ? true
+                                        : false
+                                }
+                            >
+                                {font.name}
+                            </Chip>
+                        ))}
+                    </View>
                 </View>
             </View>
         </Bottomsheet>
@@ -108,6 +260,9 @@ const mapStateToProps = (state) => ({
 export default connect(mapStateToProps, {
     updateReaderTextSize,
     updateReaderTheme,
+    updateReaderTextAlign,
+    updateReaderPadding,
+    setReaderFont,
 })(ChapterBottomSheet);
 
 const styles = StyleSheet.create({

src/screens/Extension/Extension.js

@@ -1,14 +1,17 @@
 import React, { useEffect, useState } from "react";
 import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
 import { Provider } from "react-native-paper";
+import * as WebBrowser from "expo-web-browser";
 
-import NovelCover from "../../../components/common/NovelCover";
-import { SearchAppbar } from "../../../components/common/Appbar";
+import NovelCover from "../../components/NovelCover";
+import EmptyView from "../../components/EmptyView";
+import { SearchAppbar } from "../../components/Appbar";
 
 import { useSelector } from "react-redux";
-import EmptyView from "../../../components/common/EmptyView";
 
-const ReadLightNovel = ({ navigation }) => {
+const Extension = ({ navigation, route }) => {
+    const { sourceId, sourceName, sourceUrl } = route.params;
+
     const theme = useSelector((state) => state.themeReducer.theme);
     const library = useSelector((state) => state.libraryReducer.novels);
     const itemsPerRow = useSelector(
@@ -16,13 +19,28 @@ const ReadLightNovel = ({ navigation }) => {
     );
 
     const [loading, setLoading] = useState(true);
-
     const [novels, setNovels] = useState();
 
     const [searchText, setSearchText] = useState("");
 
+    const getSourceUrl = () => {
+        if (sourceId === 1) {
+            return `https://lnreader-extensions.herokuapp.com/api/1/novels/1/?o=rating`;
+        } else {
+            return `https://lnreader-extensions.herokuapp.com/api/${sourceId}/novels/`;
+        }
+    };
+
+    const getSearchUrl = () => {
+        if (sourceId === 1) {
+            return `https://lnreader-extensions.herokuapp.com/api/1/search/?s=${searchText}&?o=rating`;
+        } else {
+            return `https://lnreader-extensions.herokuapp.com/api/${sourceId}/search/?s=${searchText}`;
+        }
+    };
+
     const getNovels = () => {
-        fetch(`https://lnreader-extensions.herokuapp.com/api/2/novels/`)
+        fetch(getSourceUrl())
             .then((response) => response.json())
             .then((json) => {
                 setNovels(json);
@@ -32,9 +50,7 @@ const ReadLightNovel = ({ navigation }) => {
 
     const getSearchResults = (searchText) => {
         setLoading(true);
-        fetch(
-            `https://lnreader-extensions.herokuapp.com/api/2/search/?s=${searchText}`
-        )
+        fetch(getSearchUrl())
             .then((response) => response.json())
             .then((json) => {
                 setNovels(json);
@@ -60,12 +76,13 @@ const ReadLightNovel = ({ navigation }) => {
             >
                 <SearchAppbar
                     screen="Extension"
-                    placeholder="Search ReadLightNovel"
+                    placeholder={`Search ${sourceName}`}
                     searchText={searchText}
                     setSearchText={setSearchText}
                     getSearchResults={getSearchResults}
                     getNovels={getNovels}
                     setLoading={setLoading}
+                    openWebView={() => WebBrowser.openBrowserAsync(sourceUrl)}
                 />
 
                 {loading ? (
@@ -94,15 +111,10 @@ const ReadLightNovel = ({ navigation }) => {
                                         sourceId: item.extensionId,
                                     })
                                 }
-                                libraryStatus={
-                                    checkIFInLibrary(item.novelUrl)
-                                        ? true
-                                        : false
-                                }
+                                libraryStatus={checkIFInLibrary(item.novelUrl)}
                             />
                         )}
                         ListEmptyComponent={
-                            searchText !== "" &&
                             novels.length === 0 && (
                                 <EmptyView
                                     icon="(；￣Д￣)"
@@ -117,7 +129,7 @@ const ReadLightNovel = ({ navigation }) => {
     );
 };
 
-export default ReadLightNovel;
+export default Extension;
 
 const styles = StyleSheet.create({
     container: {

src/screens/History/History.js

@@ -3,11 +3,11 @@ import { useFocusEffect } from "@react-navigation/native";
 
 import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
 
-import { Appbar } from "../../components/common/Appbar";
+import { Appbar } from "../../components/Appbar";
 import HistoryCard from "./components/HistoryCard";
 
 import { connect } from "react-redux";
-import EmptyView from "../../components/common/EmptyView";
+import EmptyView from "../../components/EmptyView";
 
 import {
     getHistoryAction,

src/screens/History/components/HistoryCard.js

@@ -49,7 +49,7 @@ const HistoryCard = ({ item, deleteHistoryAction, navigation }) => {
                             numberOfLines={1}
                         >
                             {`${item.chapterName} - ${moment(
-                                item.lastRead
+                                item.historyTimeRead
                             ).calendar()}`}
                         </Text>
                     </View>
@@ -75,11 +75,11 @@ const HistoryCard = ({ item, deleteHistoryAction, navigation }) => {
                             style={{ marginRight: 10 }}
                             onPress={() =>
                                 navigation.navigate("ChapterItem", {
+                                    chapterId: item.historyChapterId,
                                     chapterUrl: item.chapterUrl,
-                                    extensionId: item.extensionId,
+                                    extensionId: item.sourceId,
                                     novelUrl: item.novelUrl,
-                                    novelName: item.novelName,
-                                    novelCover: item.novelCover,
+                                    novelId: item.novelId,
                                     chapterName: item.chapterName,
                                 })
                             }

src/screens/Library/Library.js

@@ -11,15 +11,16 @@ import { FlatList } from "react-native-gesture-handler";
 import { useFocusEffect } from "@react-navigation/native";
 import { connect } from "react-redux";
 
-import NovelCover from "../../components/common/NovelCover";
-import EmptyView from "../../components/common/EmptyView";
+import NovelCover from "../../components/NovelCover";
+import EmptyView from "../../components/EmptyView";
 
 import {
     getLibraryAction,
     searchLibraryAction,
 } from "../../redux/library/library.actions";
-import { SearchAppbar } from "../../components/common/Appbar";
+import { SearchAppbar } from "../../components/Appbar";
 import { setNovel } from "../../redux/novel/novel.actions";
+import { updateAllNovels } from "../../services/updates";
 
 const LibraryScreen = ({
     navigation,
@@ -29,6 +30,7 @@ const LibraryScreen = ({
     getLibraryAction,
     searchLibraryAction,
     setNovel,
+    searchResults,
     itemsPerRow,
 }) => {
     const [refreshing, setRefreshing] = useState(false);
@@ -37,7 +39,7 @@ const LibraryScreen = ({
 
     useEffect(() => {
         getLibraryAction();
-    }, [getLibraryAction]);
+    }, [getLibraryAction, novels]);
 
     /**
      * TODO: fix refreshing
@@ -45,7 +47,7 @@ const LibraryScreen = ({
     const onRefresh = () => {
         ToastAndroid.show("Updating library", ToastAndroid.SHORT);
         setRefreshing(true);
-        getLibraryAction();
+        updateAllNovels();
         setRefreshing(false);
     };
 
@@ -83,7 +85,7 @@ const LibraryScreen = ({
                         }}
                         numColumns={itemsPerRow}
                         key={itemsPerRow}
-                        data={novels}
+                        data={!searchText ? novels : searchResults}
                         keyExtractor={(item) => item.novelUrl}
                         renderItem={({ item }) => (
                             <NovelCover
@@ -127,6 +129,7 @@ const mapStateToProps = (state) => ({
     theme: state.themeReducer.theme,
     itemsPerRow: state.settingsReducer.itemsPerRow,
     novels: state.libraryReducer.novels,
+    searchResults: state.libraryReducer.searchResults,
     loading: state.libraryReducer.loading,
 });
 

src/screens/More/About.js

@@ -1,10 +1,11 @@
 import React from "react";
+import { View } from "react-native";
 import * as Linking from "expo-linking";
-import { List, Divider } from "react-native-paper";
 
-import { Appbar } from "../../components/common/Appbar";
+import { Appbar } from "../../components/Appbar";
 
 import { useSelector } from "react-redux";
+import { Divider, ListItem, ListSection } from "../../components/List";
 
 const AboutScreen = ({ navigation }) => {
     const theme = useSelector((state) => state.themeReducer.theme);
@@ -12,65 +13,58 @@ const AboutScreen = ({ navigation }) => {
     return (
         <>
             <Appbar title="About" onBackAction={() => navigation.goBack()} />
-            <List.Section
-                style={{
-                    flex: 1,
-                    marginTop: 0,
-                    backgroundColor: theme.colorPrimaryDark,
-                    marginBottom: 0,
-                }}
-            >
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    title="Version"
-                    descriptionStyle={{ color: theme.textColorSecondary }}
-                    description="Stable 1.0.10"
-                />
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    title="Build Time"
-                    descriptionStyle={{ color: theme.textColorSecondary }}
-                    description="21-03-21 11:10 AM"
-                />
-
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    title="What's new"
-                    onPress={() =>
-                        Linking.openURL(
-                            "https://github.com/rajarsheechatterjee/lnreader/commits/main"
-                        )
-                    }
-                    rippleColor={theme.rippleColor}
-                />
-                <Divider />
-
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    descriptionStyle={{ color: theme.textColorSecondary }}
-                    title="Github"
-                    description="https://github.com/rajarsheechatterjee/lnreader"
-                    onPress={() =>
-                        Linking.openURL(
-                            "https://github.com/rajarsheechatterjee/lnreader"
-                        )
-                    }
-                    rippleColor={theme.rippleColor}
-                />
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    descriptionStyle={{ color: theme.textColorSecondary }}
-                    title="Extensions"
-                    description="https://github.com/rajarsheechatterjee/lnreader-extensions"
-                    descriptionNumberOfLines={1}
-                    onPress={() =>
-                        Linking.openURL(
-                            "https://github.com/rajarsheechatterjee/lnreader-extensions"
-                        )
-                    }
-                    rippleColor={theme.rippleColor}
-                />
-            </List.Section>
+            <View style={{ flex: 1, backgroundColor: theme.colorPrimaryDark }}>
+                <ListSection>
+                    <ListItem
+                        title="Version"
+                        description="Stable 1.0.13"
+                        theme={theme}
+                    />
+                    <ListItem
+                        title="Build Time"
+                        description="24-04-21 21:00 PM"
+                        theme={theme}
+                    />
+                    <ListItem
+                        title="What's new"
+                        onPress={() =>
+                            Linking.openURL(
+                                "https://github.com/rajarsheechatterjee/lnreader/commits/main"
+                            )
+                        }
+                        theme={theme}
+                    />
+                    <Divider theme={theme} />
+                    <ListItem
+                        title="Discord"
+                        description="https://discord.gg/QdcWN4MD63"
+                        onPress={() =>
+                            Linking.openURL("https://discord.gg/QdcWN4MD63")
+                        }
+                        theme={theme}
+                    />
+                    <ListItem
+                        title="Github"
+                        description="https://github.com/rajarsheechatterjee/lnreader"
+                        onPress={() =>
+                            Linking.openURL(
+                                "https://github.com/rajarsheechatterjee/lnreader"
+                            )
+                        }
+                        theme={theme}
+                    />
+                    <ListItem
+                        title="Extensions"
+                        description="https://github.com/rajarsheechatterjee/lnreader-extensions"
+                        onPress={() =>
+                            Linking.openURL(
+                                "https://github.com/rajarsheechatterjee/lnreader-extensions"
+                            )
+                        }
+                        theme={theme}
+                    />
+                </ListSection>
+            </View>
         </>
     );
 };

src/screens/More/More.js

@@ -1,49 +1,60 @@
 import React from "react";
-
-import { StyleSheet } from "react-native";
-import { List } from "react-native-paper";
-
-import { Appbar } from "../../components/common/Appbar";
-
+import { StyleSheet, View, Image } from "react-native";
 import { useSelector } from "react-redux";
 
+import { Appbar } from "../../components/Appbar";
+import { ListItem, ListSection } from "../../components/List";
+
 const MoreScreen = ({ navigation }) => {
     const theme = useSelector((state) => state.themeReducer.theme);
 
     return (
         <>
-            <Appbar title="More" />
-            <List.Section
-                style={{
-                    flex: 1,
-                    backgroundColor: theme.colorPrimaryDark,
-                    marginTop: 0,
-                    marginBottom: 0,
-                }}
-            >
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    title="Settings"
-                    left={() => (
-                        <List.Icon
-                            color={theme.colorAccentDark}
-                            icon="cog-outline"
+            <Appbar title="More" style={{ elevation: 0 }} />
+            <View style={{ flex: 1, backgroundColor: theme.colorPrimaryDark }}>
+                <View style={{ overflow: "hidden", paddingBottom: 4 }}>
+                    <View
+                        style={{
+                            paddingTop: 20,
+                            paddingBottom: 30,
+                            alignItems: "center",
+                            backgroundColor: theme.colorPrimary,
+                            elevation: 4,
+                        }}
+                    >
+                        <Image
+                            source={require("../../../assets/logo.png")}
+                            style={{
+                                height: 60,
+                                width: 60,
+                                tintColor: theme.textColorPrimary,
+                            }}
                         />
-                    )}
-                    onPress={() => navigation.navigate("Settings")}
-                />
-                <List.Item
-                    titleStyle={{ color: theme.textColorPrimary }}
-                    title="About"
-                    left={() => (
-                        <List.Icon
-                            color={theme.colorAccentDark}
-                            icon="information-outline"
-                        />
-                    )}
-                    onPress={() => navigation.navigate("About")}
-                />
-            </List.Section>
+                    </View>
+                </View>
+                <ListSection>
+                    <ListItem
+                        title="Settings"
+                        icon="cog-outline"
+                        onPress={() =>
+                            navigation.navigate("SettingsStack", {
+                                screen: "Settings",
+                            })
+                        }
+                        theme={theme}
+                    />
+                    <ListItem
+                        title="About"
+                        icon="information-outline"
+                        onPress={() =>
+                            navigation.navigate("SettingsStack", {
+                                screen: "About",
+                            })
+                        }
+                        theme={theme}
+                    />
+                </ListSection>
+            </View>
         </>
     );
 };

src/screens/More/Settings.js

@@ -1,25 +1,25 @@
 import React, { useState } from "react";
-import { View, Text } from "react-native";
-import { setStatusBarStyle } from "expo-status-bar";
-import { List, Modal, Portal } from "react-native-paper";
-import InputSpinner from "react-native-input-spinner";
-
+import { View } from "react-native";
 import { connect } from "react-redux";
+
 import { switchTheme } from "../../redux/theme/theme.actions";
 import {
     setDisplayMode,
     setItemsPerRow,
 } from "../../redux/settings/settings.actions";
-
-import { Appbar } from "../../components/common/Appbar";
-import {
-    DisplayCheckbox,
-    ThemeCheckbox,
-} from "../../components/settings/Checkbox";
-
 import { deleteAllHistory } from "../../database/queries/HistoryQueries";
 import { deleteNovelCache } from "../../database/queries/NovelQueries";
-// import { deleteDb } from "../../database/DBHelper";
+
+import { Appbar } from "../../components/Appbar";
+import {
+    Divider,
+    ListItem,
+    ListSection,
+    ListSubHeader,
+} from "../../components/List";
+import DisplayModeModal from "./components/DisplayModeModal";
+import GridSizeModal from "./components/GridSizeModal";
+import ThemeModal from "./components/ThemeModal";
 
 const SettingsScreen = ({
     navigation,
@@ -31,242 +31,104 @@ const SettingsScreen = ({
     setDisplayMode,
     setItemsPerRow,
 }) => {
-    const display = {
-        0: "Compact Grid",
-        1: "Comfortable Grid",
-        2: "List",
+    const displayModeLabel = (displayMode) => {
+        const label = {
+            0: "Compact Grid",
+            1: "Comfortable Grid",
+            2: "List",
+        };
+
+        return label[displayMode];
     };
 
-    const themes = [
-        { themeCode: 0, label: "AMOLED Dark Theme", statusBar: "light" },
-        { themeCode: 1, label: "Light Theme", statusBar: "dark" },
-        { themeCode: 2, label: "Dark Theme", statusBar: "light" },
-        { themeCode: 3, label: "Midnight Dusk Theme", statusBar: "light" },
-    ];
-
-    const desciptionStyles = {
-        color: theme.textColorSecondary,
-    };
-
-    const titleStyles = { color: theme.textColorPrimary };
-
-    /**
-     * Display Mode Modal
-     */
+    // Display Mode Modal
     const [displayModalVisible, setDisplayModalVisible] = useState(false);
     const showDisplayModal = () => setDisplayModalVisible(true);
     const hideDisplayModal = () => setDisplayModalVisible(false);
 
-    /**
-     * Change Theme Modal
-     */
+    // Theme Modal
     const [themeModalVisible, setthemeModalVisible] = useState(false);
     const showthemeModal = () => setthemeModalVisible(true);
     const hidethemeModal = () => setthemeModalVisible(false);
 
-    const [itemsModalVisible, setitemsModalVisible] = useState(false);
-    const showitemsModal = () => setitemsModalVisible(true);
-    const hideitemsModal = () => setitemsModalVisible(false);
+    // Grid Size Modal
+    const [gridSizeModalVisible, setGridSizeModalVisible] = useState(false);
+    const showGridSizeModal = () => setGridSizeModalVisible(true);
+    const hideGridSizeModal = () => setGridSizeModalVisible(false);
 
     return (
         <>
             <Appbar title="Settings" onBackAction={() => navigation.goBack()} />
-            <View style={{ flex: 1, backgroundColor: theme.colorPrimaryDark }}>
-                <List.Section
-                    style={{
-                        flex: 1,
-                        backgroundColor: theme.colorPrimaryDark,
-                    }}
-                >
-                    <List.Subheader
-                        style={{
-                            color: theme.colorAccentDark,
-                            paddingBottom: 5,
-                        }}
-                    >
-                        Data
-                    </List.Subheader>
-                    <List.Item
-                        titleStyle={titleStyles}
+            <View
+                style={{
+                    flex: 1,
+                    backgroundColor: theme.colorPrimaryDark,
+                    paddingVertical: 8,
+                }}
+            >
+                <ListSection>
+                    <ListSubHeader theme={theme}>Data</ListSubHeader>
+                    <ListItem
                         title="Clear database"
-                        descriptionStyle={desciptionStyles}
                         description="Delete history for novels not in your library"
                         onPress={() => deleteNovelCache()}
-                        rippleColor={theme.rippleColor}
+                        theme={theme}
                     />
-                    <List.Item
-                        titleStyle={titleStyles}
+                    <ListItem
                         title="Clear history"
-                        descriptionStyle={desciptionStyles}
                         description="Delete reading history for all novels"
                         onPress={() => deleteAllHistory()}
-                        rippleColor={theme.rippleColor}
+                        theme={theme}
                     />
-                    <List.Subheader
-                        style={{
-                            color: theme.colorAccentDark,
-                            paddingBottom: 5,
-                        }}
-                    >
-                        Display
-                    </List.Subheader>
-                    <List.Item
-                        titleStyle={titleStyles}
+                    <Divider theme={theme} />
+                    <ListSubHeader theme={theme}>Display</ListSubHeader>
+                    <ListItem
                         title="Display Mode"
-                        descriptionStyle={desciptionStyles}
-                        description={display[displayMode]}
+                        description={displayModeLabel(displayMode)}
                         onPress={showDisplayModal}
-                        rippleColor={theme.rippleColor}
+                        theme={theme}
                     />
-                    <Portal>
-                        <Modal
-                            visible={displayModalVisible}
-                            onDismiss={hideDisplayModal}
-                            contentContainerStyle={{
-                                backgroundColor: theme.colorPrimaryDark,
-                                padding: 20,
-                                margin: 20,
-                                borderRadius: 6,
-                            }}
-                        >
-                            <DisplayCheckbox
-                                value={1}
-                                displayMode={displayMode}
-                                onPress={() => setDisplayMode(1)}
-                            />
-                            <DisplayCheckbox
-                                value={0}
-                                displayMode={displayMode}
-                                onPress={() => setDisplayMode(0)}
-                            />
-                            <DisplayCheckbox
-                                value={2}
-                                displayMode={displayMode}
-                                onPress={() => setDisplayMode(2)}
-                            />
-                        </Modal>
-                    </Portal>
-                    <List.Item
-                        titleStyle={titleStyles}
+                    <ListItem
                         title="Items per row in library"
-                        descriptionStyle={desciptionStyles}
-                        description={itemsPerRow}
-                        onPress={showitemsModal}
-                        rippleColor={theme.rippleColor}
+                        description={`${itemsPerRow} items per row`}
+                        onPress={showGridSizeModal}
+                        theme={theme}
                     />
-                    <Portal>
-                        <Modal
-                            visible={itemsModalVisible}
-                            onDismiss={hideitemsModal}
-                            contentContainerStyle={{
-                                backgroundColor: theme.colorPrimaryDark,
-                                padding: 20,
-                                margin: 20,
-                                borderRadius: 6,
-                            }}
-                        >
-                            <Text
-                                style={{
-                                    color: theme.textColorPrimary,
-                                    fontSize: 18,
-                                    marginBottom: 10,
-                                }}
-                            >
-                                Items per row
-                            </Text>
-                            <InputSpinner
-                                style={{
-                                    paddingHorizontal: 16,
-                                    paddingVertical: 16,
-                                    elevation: 0,
-                                }}
-                                max={10}
-                                min={1}
-                                skin="paper"
-                                background={theme.colorPrimaryDark}
-                                colorMax={theme.colorAccentDark}
-                                colorLeft={theme.colorAccentDark}
-                                colorRight={theme.colorAccentDark}
-                                buttonTextColor={theme.textColorPrimary}
-                                colorPress={"white"}
-                                colorMin={theme.colorAccentDark}
-                                value={itemsPerRow}
-                                onChange={(num) => setItemsPerRow(num)}
-                                inputStyle={{
-                                    color: theme.textColorPrimary,
-                                }}
-                            />
-                        </Modal>
-                    </Portal>
-
-                    {/* <List.Subheader
-                        style={{
-                            color: theme.colorAccentDark,
-                            paddingBottom: 5,
-                        }}
-                    >
-                        Devloper options
-                    </List.Subheader>
-                    <List.Item
-                        titleStyle={titleStyles}
-                        title="Delete database"
-                        descriptionStyle={desciptionStyles}
-                        description="Delete entire database"
-                        rippleColor={theme.rippleColor}
-                        onPress={() => deleteDb()}
-                    /> */}
-                    <List.Subheader
-                        style={{
-                            color: theme.colorAccentDark,
-                            paddingBottom: 5,
-                        }}
-                    >
-                        Theme
-                    </List.Subheader>
-                    <List.Item
-                        titleStyle={titleStyles}
+                    <Divider theme={theme} />
+                    <ListSubHeader theme={theme}>Theme</ListSubHeader>
+                    <ListItem
                         title="Theme"
-                        descriptionStyle={desciptionStyles}
-                        description={themes[themeCode].label}
+                        description={theme.name}
                         onPress={showthemeModal}
-                        rippleColor={theme.rippleColor}
+                        theme={theme}
                     />
-                    <Portal>
-                        <Modal
-                            visible={themeModalVisible}
-                            onDismiss={hidethemeModal}
-                            contentContainerStyle={{
-                                backgroundColor: theme.colorPrimaryDark,
-                                padding: 20,
-                                margin: 20,
-                                borderRadius: 6,
-                            }}
-                        >
-                            {themes.map((item, index) => (
-                                <ThemeCheckbox
-                                    key={index}
-                                    label={themes[item.themeCode].label}
-                                    checked={
-                                        themeCode === item.themeCode
-                                            ? true
-                                            : false
-                                    }
-                                    onPress={() => {
-                                        switchTheme(item.themeCode);
-                                        setStatusBarStyle(item.statusBar);
-                                    }}
-                                />
-                            ))}
-                        </Modal>
-                    </Portal>
-                </List.Section>
+                </ListSection>
+                <DisplayModeModal
+                    displayMode={displayMode}
+                    displayModalVisible={displayModalVisible}
+                    hideDisplayModal={hideDisplayModal}
+                    setDisplayMode={setDisplayMode}
+                    theme={theme}
+                />
+                <GridSizeModal
+                    itemsPerRow={itemsPerRow}
+                    gridSizeModalVisible={gridSizeModalVisible}
+                    hideGridSizeModal={hideGridSizeModal}
+                    setItemsPerRow={setItemsPerRow}
+                    theme={theme}
+                />
+                <ThemeModal
+                    themeModalVisible={themeModalVisible}
+                    hidethemeModal={hidethemeModal}
+                    switchTheme={switchTheme}
+                    theme={theme}
+                />
             </View>
         </>
     );
 };
 
 const mapStateToProps = (state) => ({
-    themeCode: state.themeReducer.themeCode,
     theme: state.themeReducer.theme,
     displayMode: state.settingsReducer.displayMode,
     itemsPerRow: state.settingsReducer.itemsPerRow,

src/screens/More/components/DisplayModeModal.js

@@ -0,0 +1,59 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import { Portal, Modal, Checkbox } from "react-native-paper";
+
+const DisplayModeModal = ({
+    displayMode,
+    displayModalVisible,
+    setDisplayMode,
+    hideDisplayModal,
+    theme,
+}) => {
+    const displayModes = [
+        { displayMode: 0, label: "Compact Grid" },
+        { displayMode: 1, label: "Comfortable Grid" },
+        { displayMode: 2, label: "List" },
+    ];
+
+    const renderCheckboxes = () => {
+        return displayModes.map((mode) => (
+            <Checkbox.Item
+                key={mode.displayMode}
+                label={mode.label}
+                labelStyle={{ color: theme.textColorPrimary }}
+                status={
+                    displayMode === mode.displayMode ? "checked" : "unchecked"
+                }
+                mode="ios"
+                uncheckedColor={theme.textColorSecondary}
+                color={theme.colorAccentDark}
+                onPress={() => setDisplayMode(mode.displayMode)}
+            />
+        ));
+    };
+
+    return (
+        <Portal>
+            <Modal
+                visible={displayModalVisible}
+                onDismiss={hideDisplayModal}
+                contentContainerStyle={[
+                    styles.containerStyle,
+                    { backgroundColor: theme.colorPrimaryDark },
+                ]}
+            >
+                {renderCheckboxes()}
+            </Modal>
+        </Portal>
+    );
+};
+
+export default DisplayModeModal;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        padding: 20,
+        margin: 20,
+        borderRadius: 6,
+    },
+});

src/screens/More/components/GridSizeModal.js

@@ -0,0 +1,74 @@
+import React from "react";
+import { Text, StyleSheet } from "react-native";
+import { Portal, Modal } from "react-native-paper";
+import Slider from "@react-native-community/slider";
+
+const GridSizeModal = ({
+    itemsPerRow,
+    gridSizeModalVisible,
+    hideGridSizeModal,
+    setItemsPerRow,
+    theme,
+}) => {
+    return (
+        <Portal>
+            <Modal
+                visible={gridSizeModalVisible}
+                onDismiss={hideGridSizeModal}
+                contentContainerStyle={[
+                    styles.containerStyle,
+                    { backgroundColor: theme.colorPrimaryDark },
+                ]}
+            >
+                <Text
+                    style={[
+                        styles.modalHeader,
+                        { color: theme.textColorPrimary },
+                    ]}
+                >
+                    Grid size
+                </Text>
+                <Text
+                    style={[
+                        styles.modalDescription,
+                        { color: theme.textColorSecondary },
+                    ]}
+                >
+                    {`${itemsPerRow} per row`}
+                </Text>
+                <Slider
+                    style={styles.slider}
+                    value={itemsPerRow}
+                    minimumValue={1}
+                    maximumValue={5}
+                    step={1}
+                    minimumTrackTintColor={theme.colorAccentDark}
+                    maximumTrackTintColor="#000000"
+                    thumbTintColor={theme.colorAccentDark}
+                    onValueChange={(value) => setItemsPerRow(value)}
+                />
+            </Modal>
+        </Portal>
+    );
+};
+
+export default GridSizeModal;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        padding: 20,
+        margin: 20,
+        borderRadius: 6,
+    },
+    modalHeader: {
+        fontSize: 18,
+        marginBottom: 10,
+    },
+    modalDescription: {
+        marginBottom: 4,
+    },
+    slider: {
+        width: "100%",
+        height: 40,
+    },
+});

src/screens/More/components/ThemeModal.js

@@ -0,0 +1,60 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import { Portal, Modal, Checkbox } from "react-native-paper";
+
+import { setStatusBarStyle } from "expo-status-bar";
+
+const ThemeModal = ({
+    themeModalVisible,
+    hidethemeModal,
+    switchTheme,
+    theme,
+}) => {
+    const themes = [
+        { id: 0, name: "AMOLED Dark", statusBar: "light" },
+        { id: 1, name: "Light", statusBar: "dark" },
+        { id: 2, name: "Dark", statusBar: "light" },
+        { id: 3, name: "Midnight Dusk", statusBar: "light" },
+    ];
+
+    const renderThemeCheckboxes = () =>
+        themes.map((item) => (
+            <Checkbox.Item
+                key={item.id}
+                label={item.name}
+                labelStyle={{ color: theme.textColorPrimary }}
+                status={theme.id === item.id ? "checked" : "unchecked"}
+                mode="ios"
+                color={theme.colorAccentDark}
+                onPress={() => {
+                    switchTheme(item.id);
+                    setStatusBarStyle(item.statusBar);
+                }}
+            />
+        ));
+
+    return (
+        <Portal>
+            <Modal
+                visible={themeModalVisible}
+                onDismiss={hidethemeModal}
+                contentContainerStyle={[
+                    styles.containerStyle,
+                    { backgroundColor: theme.colorPrimaryDark },
+                ]}
+            >
+                {renderThemeCheckboxes()}
+            </Modal>
+        </Portal>
+    );
+};
+
+export default ThemeModal;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        padding: 20,
+        margin: 20,
+        borderRadius: 6,
+    },
+});

src/screens/Novel/Novel.js

@@ -1,5 +1,11 @@
-import React, { useEffect, useRef } from "react";
-import { StyleSheet, View, FlatList, RefreshControl } from "react-native";
+import React, { useEffect, useRef, useState } from "react";
+import {
+    StyleSheet,
+    View,
+    FlatList,
+    RefreshControl,
+    ToastAndroid,
+} from "react-native";
 import { Provider, Portal } from "react-native-paper";
 
 import ChapterCard from "./components/ChapterCard";
@@ -13,6 +19,8 @@ import {
     followNovelAction,
     sortAndFilterChapters,
     updateNovelAction,
+    downloadAllChaptersAction,
+    deleteAllChaptersAction,
 } from "../../redux/novel/novel.actions";
 
 const Novel = ({
@@ -26,6 +34,8 @@ const Novel = ({
     followNovelAction,
     sortAndFilterChapters,
     updateNovelAction,
+    downloadAllChaptersAction,
+    deleteAllChaptersAction,
 }) => {
     const {
         sourceId,
@@ -38,9 +48,14 @@ const Novel = ({
 
     let _panel = useRef(null); // Bottomsheet ref
 
+    const [sort, setSort] = useState("ORDER BY chapterId ASC");
+    const [filter, setFilter] = useState("");
+
     useEffect(() => {
-        getNovelAction(followed, sourceId, novelUrl, novelId);
-    }, []);
+        getNovelAction(followed, sourceId, novelUrl, novelId, sort, filter);
+    }, [getNovelAction, followNovelAction, sort, filter]);
+
+    let lastRead = !loading && chapters.find((obj) => obj.read === 0);
 
     const renderChapterCard = ({ item }) => (
         <ChapterCard
@@ -52,6 +67,7 @@ const Novel = ({
 
     const onRefresh = () => {
         updateNovelAction(sourceId, novelUrl, novelId);
+        ToastAndroid.show(`Updated ${novelName}`, ToastAndroid.SHORT);
     };
 
     return (
@@ -64,7 +80,7 @@ const Novel = ({
             >
                 <FlatList
                     data={!loading && chapters}
-                    keyExtractor={(item) => item.chapterUrl}
+                    keyExtractor={(item) => item.chapterId.toString()}
                     removeClippedSubviews={true}
                     maxToRenderPerBatch={5}
                     windowSize={15}
@@ -78,8 +94,18 @@ const Novel = ({
                             noOfChapters={chapters?.length}
                             followNovelAction={followNovelAction}
                             loading={loading}
+                            lastRead={lastRead}
                             bottomSheetRef={_panel}
-                            firstChapter={chapters[0]}
+                            downloadAllChapters={() =>
+                                downloadAllChaptersAction(
+                                    sourceId,
+                                    novelUrl,
+                                    chapters
+                                )
+                            }
+                            deleteAllChapters={() =>
+                                deleteAllChaptersAction(chapters)
+                            }
                         />
                     }
                     refreshControl={
@@ -96,6 +122,10 @@ const Novel = ({
                         novelUrl={novelUrl}
                         bottomSheetRef={_panel}
                         sortAndFilterChapters={sortAndFilterChapters}
+                        sort={sort}
+                        filter={filter}
+                        setSort={setSort}
+                        setFilter={setFilter}
                     />
                 </Portal>
             </View>
@@ -115,6 +145,8 @@ export default connect(mapStateToProps, {
     followNovelAction,
     sortAndFilterChapters,
     updateNovelAction,
+    downloadAllChaptersAction,
+    deleteAllChaptersAction,
 })(Novel);
 
 const styles = StyleSheet.create({

src/screens/Novel/components/BottomSheet.js

@@ -7,23 +7,14 @@ import { useSelector } from "react-redux";
 
 export const BottomSheet = ({
     bottomSheetRef,
-    sortAndFilterChapters,
+    sort,
+    filter,
+    setSort,
+    setFilter,
     novelUrl,
 }) => {
     const checkBoxStyle = { flexDirection: "row", alignItems: "center" };
 
-    const [chapterFlags, setChapterFlags] = useState({ sort: "", filter: "" });
-
-    const sortChapters = (sort) => {
-        setChapterFlags({ ...chapterFlags, sort: sort });
-        sortAndFilterChapters(novelUrl, chapterFlags.filter, sort);
-    };
-
-    const filterChapters = (filter) => {
-        setChapterFlags({ ...chapterFlags, filter: filter });
-        sortAndFilterChapters(novelUrl, filter, chapterFlags.sort);
-    };
-
     const theme = useSelector((state) => state.themeReducer.theme);
 
     return (
@@ -51,8 +42,8 @@ export const BottomSheet = ({
                 </List.Subheader>
                 <View>
                     <RadioButton.Group
-                        onValueChange={(newValue) => sortChapters(newValue)}
-                        value={chapterFlags.sort}
+                        onValueChange={(newValue) => setSort(newValue)}
+                        value={sort}
                     >
                         <View
                             style={{
@@ -88,7 +79,7 @@ export const BottomSheet = ({
                                 <RadioButton.Item
                                     uncheckedColor={theme.textColorHintDark}
                                     color={theme.colorAccentDark}
-                                    value=""
+                                    value="ORDER BY chapterId ASC"
                                 />
                                 <Text
                                     style={{
@@ -113,12 +104,10 @@ export const BottomSheet = ({
                 </List.Subheader>
                 <View style={checkBoxStyle}>
                     <Checkbox.Item
-                        status={
-                            chapterFlags.filter === "" ? "checked" : "unchecked"
-                        }
+                        status={filter === "" ? "checked" : "unchecked"}
                         uncheckedColor={theme.textColorHintDark}
                         color={theme.colorAccentDark}
-                        onPress={() => filterChapters("")}
+                        onPress={() => setFilter("")}
                     />
                     <Text style={{ color: theme.textColorPrimary }}>
                         Show all
@@ -127,13 +116,11 @@ export const BottomSheet = ({
                 <View style={checkBoxStyle}>
                     <Checkbox.Item
                         status={
-                            chapterFlags.filter === "AND `read`=1"
-                                ? "checked"
-                                : "unchecked"
+                            filter === "AND `read`=1" ? "checked" : "unchecked"
                         }
                         uncheckedColor={theme.textColorHintDark}
                         color={theme.colorAccentDark}
-                        onPress={() => filterChapters("AND `read`=1")}
+                        onPress={() => setFilter("AND `read`=1")}
                     />
                     <Text style={{ color: theme.textColorPrimary }}>
                         Show read chapters
@@ -142,13 +129,11 @@ export const BottomSheet = ({
                 <View style={checkBoxStyle}>
                     <Checkbox.Item
                         status={
-                            chapterFlags.filter === "AND `read`=0"
-                                ? "checked"
-                                : "unchecked"
+                            filter === "AND `read`=0" ? "checked" : "unchecked"
                         }
                         uncheckedColor={theme.textColorHintDark}
                         color={theme.colorAccentDark}
-                        onPress={() => filterChapters("AND `read`=0")}
+                        onPress={() => setFilter("AND `read`=0")}
                     />
                     <Text style={{ color: theme.textColorPrimary }}>
                         Show unread chapters
@@ -157,13 +142,13 @@ export const BottomSheet = ({
                 <View style={checkBoxStyle}>
                     <Checkbox.Item
                         status={
-                            chapterFlags.filter === "AND downloaded=1"
+                            filter === "AND downloaded=1"
                                 ? "checked"
                                 : "unchecked"
                         }
                         uncheckedColor={theme.textColorHintDark}
                         color={theme.colorAccentDark}
-                        onPress={() => filterChapters("AND downloaded=1")}
+                        onPress={() => setFilter("AND downloaded=1")}
                     />
                     <Text style={{ color: theme.textColorPrimary }}>
                         Show downloaded chapters

src/screens/Novel/components/ChapterCard.js

@@ -1,6 +1,6 @@
-import React from "react";
+import React, { useState } from "react";
 import { View, Text, ActivityIndicator, StyleSheet } from "react-native";
-import { TouchableRipple, IconButton } from "react-native-paper";
+import { TouchableRipple, IconButton, Menu } from "react-native-paper";
 import { useNavigation } from "@react-navigation/native";
 
 import {
@@ -14,12 +14,77 @@ const ChapterCard = ({
     chapter,
     extensionId,
     theme,
-    downloading,
+    // downloading,
     downloadChapterAction,
     deleteChapterAction,
 }) => {
     const navigation = useNavigation();
 
+    const [visible, setVisible] = useState(false);
+    const openMenu = () => setVisible(true);
+    const closeMenu = () => setVisible(false);
+
+    const displayDownloadButton = () => {
+        if (chapter.downloaded === 3) {
+            return (
+                <ActivityIndicator
+                    color={theme.textColorHintDark}
+                    size={25}
+                    style={{ margin: 3.5, padding: 5 }}
+                />
+            );
+        } else if (chapter.downloaded === 1) {
+            return (
+                <Menu
+                    visible={visible}
+                    onDismiss={closeMenu}
+                    anchor={
+                        <IconButton
+                            icon="check-circle"
+                            animated
+                            color={theme.textColorPrimary}
+                            size={25}
+                            onPress={openMenu}
+                            style={{ margin: 2 }}
+                        />
+                    }
+                    contentStyle={{ backgroundColor: theme.menuColor }}
+                >
+                    <Menu.Item
+                        onPress={() =>
+                            deleteChapterAction(
+                                chapter.chapterId,
+                                chapter.chapterName
+                            )
+                        }
+                        title="Delete"
+                        titleStyle={{ color: theme.textColorPrimary }}
+                    />
+                </Menu>
+            );
+        } else {
+            return (
+                <IconButton
+                    icon="arrow-down-circle-outline"
+                    animated
+                    color={theme.textColorHintDark}
+                    size={25}
+                    onPress={() => {
+                        downloadChapterAction(
+                            extensionId,
+                            novelUrl,
+                            chapter.chapterUrl,
+                            chapter.chapterName,
+                            chapter.chapterId
+                        );
+                        // console.log(downloading);
+                    }}
+                    style={{ margin: 2 }}
+                />
+            );
+        }
+    };
+
     return (
         <TouchableRipple
             style={styles.chapterCardContainer}
@@ -68,47 +133,7 @@ const ChapterCard = ({
                         </Text>
                     )}
                 </View>
-                <View>
-                    {downloading === chapter.chapterId ? (
-                        <ActivityIndicator
-                            color={theme.textColorHintDark}
-                            size={25}
-                            style={{ margin: 3.5, padding: 5 }}
-                        />
-                    ) : (
-                        <IconButton
-                            icon={
-                                chapter.downloaded
-                                    ? "check-circle"
-                                    : "arrow-down-circle-outline"
-                            }
-                            animated
-                            color={
-                                chapter.downloaded
-                                    ? theme.textColorPrimary
-                                    : theme.textColorHintDark
-                            }
-                            size={25}
-                            onPress={() => {
-                                if (!chapter.downloaded) {
-                                    downloadChapterAction(
-                                        extensionId,
-                                        novelUrl,
-                                        chapter.chapterUrl,
-                                        chapter.chapterName,
-                                        chapter.chapterId
-                                    );
-                                } else {
-                                    deleteChapterAction(
-                                        chapter.chapterId,
-                                        chapter.chapterName
-                                    );
-                                }
-                            }}
-                            style={{ margin: 2 }}
-                        />
-                    )}
-                </View>
+                <View>{displayDownloadButton()}</View>
             </>
         </TouchableRipple>
     );
@@ -116,7 +141,7 @@ const ChapterCard = ({
 
 const mapStateToProps = (state) => ({
     theme: state.themeReducer.theme,
-    downloading: state.novelReducer.downloading,
+    // downloading: state.novelReducer.downloading,
 });
 
 export default connect(mapStateToProps, {

src/screens/Novel/components/NovelHeader.js

@@ -8,7 +8,13 @@ import {
     FlatList,
     Share,
 } from "react-native";
-import { TouchableRipple, IconButton, Button, Chip } from "react-native-paper";
+import {
+    TouchableRipple,
+    IconButton,
+    Button,
+    Chip,
+    Menu,
+} from "react-native-paper";
 import { useNavigation } from "@react-navigation/native";
 import * as WebBrowser from "expo-web-browser";
 
@@ -23,7 +29,9 @@ const NovelInfoHeader = ({
     loading,
     bottomSheetRef,
     theme,
-    firstChapter,
+    lastRead,
+    downloadAllChapters,
+    deleteAllChapters,
 }) => {
     const navigation = useNavigation();
 
@@ -31,6 +39,10 @@ const NovelInfoHeader = ({
         !loading && novel.followed !== 1 ? true : false
     );
 
+    const [visible, setVisible] = useState(false);
+    const openMenu = () => setVisible(true);
+    const closeMenu = () => setVisible(false);
+
     const renderGenreChip = ({ item }) => (
         <Text
             style={[
@@ -143,9 +155,7 @@ const NovelInfoHeader = ({
 
                         <IconButton
                             onPress={() =>
-                                WebBrowser.openBrowserAsync(
-                                    novel.sourceUrl && novel.sourceUrl
-                                )
+                                WebBrowser.openBrowserAsync(novel.sourceUrl)
                             }
                             icon="earth"
                             color={theme.colorAccentDark}
@@ -153,14 +163,39 @@ const NovelInfoHeader = ({
                         />
                         <IconButton
                             onPress={() =>
-                                Share.share({
-                                    message: novel.sourceUrl,
-                                })
+                                Share.share({ message: novel.sourceUrl })
                             }
                             icon="share-variant"
                             color={theme.colorAccentDark}
                             size={21}
                         />
+
+                        <Menu
+                            visible={visible}
+                            onDismiss={closeMenu}
+                            anchor={
+                                <IconButton
+                                    icon="download"
+                                    color={theme.colorAccentDark}
+                                    size={21}
+                                    onPress={openMenu}
+                                />
+                            }
+                            contentStyle={{ backgroundColor: theme.menuColor }}
+                        >
+                            <Menu.Item
+                                title="Download all"
+                                style={{ backgroundColor: theme.menuColor }}
+                                titleStyle={{ color: theme.textColorPrimary }}
+                                onPress={downloadAllChapters}
+                            />
+                            <Menu.Item
+                                title="Delete downloads"
+                                style={{ backgroundColor: theme.menuColor }}
+                                titleStyle={{ color: theme.textColorPrimary }}
+                                onPress={deleteAllChapters}
+                            />
+                        </Menu>
                     </View>
 
                     {novel.novelSummary !== "" && (
@@ -217,35 +252,48 @@ const NovelInfoHeader = ({
                         renderItem={renderGenreChip}
                         showsHorizontalScrollIndicator={false}
                     />
-
-                    <Button
-                        color="white"
-                        style={[
-                            { backgroundColor: theme.colorAccentDark },
-                            styles.startButton,
-                        ]}
-                        uppercase={false}
-                        labelStyle={{ letterSpacing: 0 }}
-                        // onPress={() => {
-                        //     console.log(firstChapter.chapterName);
-                        //     navigation.navigate("ChapterItem", {
-                        //         chapterUrl:
-                        //             novel.lastRead.chapterUrl ??
-                        //             firstChapter.chapterUrl,
-                        //         novelUrl: novel.novelUrl,
-                        //         extensionId: novel.extensionId,
-                        //         chapterName:
-                        //             novel.lastRead.chapterUrl ??
-                        //             firstChapter.chapterName,
-                        //     });
-                        // }}
-                    >
-                        {/* {novel.lastRead
-                            ? `Continue reading ${novel.lastRead.chapterName}`
-                            : `Start reading ${firstChapter.chapterName}`} */}
-                        Start reading
-                    </Button>
-
+                    {noOfChapters > 0 &&
+                        (lastRead ? (
+                            <Button
+                                color="white"
+                                style={[
+                                    { backgroundColor: theme.colorAccentDark },
+                                    styles.startButton,
+                                ]}
+                                uppercase={false}
+                                labelStyle={{ letterSpacing: 0 }}
+                                onPress={() => {
+                                    navigation.navigate("ChapterItem", {
+                                        chapterId: lastRead.chapterId,
+                                        chapterUrl: lastRead.chapterUrl,
+                                        novelUrl: novel.novelUrl,
+                                        novelId: lastRead.novelId,
+                                        extensionId: novel.sourceId,
+                                        chapterName: lastRead.chapterName,
+                                    });
+                                }}
+                            >
+                                {novel.unread
+                                    ? `Start reading `
+                                    : `Continue reading `}
+                                {lastRead.chapterName}
+                            </Button>
+                        ) : (
+                            <Button
+                                color={theme.textColorPrimary}
+                                style={[
+                                    {
+                                        backgroundColor: theme.textColorPrimary,
+                                        opacity: 0.2,
+                                    },
+                                    styles.startButton,
+                                ]}
+                                uppercase={false}
+                                labelStyle={{ letterSpacing: 0 }}
+                            >
+                                All chapters read
+                            </Button>
+                        ))}
                     <TouchableRipple
                         style={styles.bottomsheet}
                         onPress={() =>

src/screens/Updates/Updates.js

@@ -1,3 +1,67 @@
-/**
- * Updates Screen
- */
+import React, { useState, useEffect, useCallback } from "react";
+import { useFocusEffect } from "@react-navigation/native";
+import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
+
+import { connect } from "react-redux";
+import EmptyView from "../../components/EmptyView";
+import { getUpdatesAction } from "../../redux/updates/updates.actions";
+import { Appbar } from "./components/Appbar";
+import UpdateCard from "./components/UpdateCard";
+
+const Updates = ({ theme, updates, loading, getUpdatesAction }) => {
+    useFocusEffect(
+        useCallback(() => {
+            getUpdatesAction();
+        }, [getUpdatesAction])
+    );
+
+    const renderUpdateCard = ({ item }) => <UpdateCard item={item} />;
+
+    return (
+        <>
+            <Appbar />
+            <View
+                style={[
+                    styles.container,
+                    { backgroundColor: theme.colorPrimaryDark },
+                ]}
+            >
+                <FlatList
+                    contentContainerStyle={{ flexGrow: 1, paddingVertical: 8 }}
+                    data={updates}
+                    keyExtractor={(item) => item.updateId.toString()}
+                    renderItem={renderUpdateCard}
+                    ListFooterComponent={
+                        loading && (
+                            <ActivityIndicator
+                                size="small"
+                                color={theme.colorAccentDark}
+                            />
+                        )
+                    }
+                    ListEmptyComponent={
+                        !loading && (
+                            <EmptyView
+                                icon="(˘･_･˘)"
+                                description="No recent updates"
+                            />
+                        )
+                    }
+                />
+            </View>
+        </>
+    );
+};
+
+const mapStateToProps = (state) => ({
+    theme: state.themeReducer.theme,
+    updates: state.updatesReducer.updates,
+    loading: state.updatesReducer.loading,
+});
+
+export default connect(mapStateToProps, { getUpdatesAction })(Updates);
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+    },
+});

src/screens/Updates/components/Appbar.js

@@ -0,0 +1,19 @@
+import React from "react";
+import { Appbar as MaterialAppbar } from "react-native-paper";
+
+import { useSelector } from "react-redux";
+import { updateAllNovels } from "../../../services/updates";
+
+export const Appbar = () => {
+    const theme = useSelector((state) => state.themeReducer.theme);
+
+    return (
+        <MaterialAppbar.Header style={{ backgroundColor: theme.colorPrimary }}>
+            <MaterialAppbar.Content
+                title="Updates"
+                titleStyle={{ color: theme.textColorPrimary }}
+            />
+            <MaterialAppbar.Action icon="reload" onPress={updateAllNovels} />
+        </MaterialAppbar.Header>
+    );
+};

src/screens/Updates/components/UpdateCard.js

@@ -0,0 +1,88 @@
+import React from "react";
+import { View, Text, Image, StyleSheet } from "react-native";
+import { TouchableRipple, Button } from "react-native-paper";
+import moment from "moment";
+
+import { useNavigation } from "@react-navigation/native";
+import { useSelector } from "react-redux";
+
+const UpdateCard = ({ item }) => {
+    const navigation = useNavigation();
+
+    const theme = useSelector((state) => state.themeReducer.theme);
+
+    return (
+        <TouchableRipple
+            style={styles.updateCard}
+            onPress={() =>
+                // console.log(item);
+                navigation.navigate("ChapterItem", {
+                    chapterId: item.chapterId,
+                    chapterUrl: item.chapterUrl,
+                    extensionId: item.sourceId,
+                    novelUrl: item.novelUrl,
+                    chapterName: item.chapterName,
+                    novelId: item.novelId,
+                })
+            }
+            rippleColor={theme.rippleColor}
+            borderless
+        >
+            <>
+                <Image
+                    source={{ uri: item.novelCover }}
+                    style={styles.updateIcon}
+                />
+                <View style={styles.extensionDetails}>
+                    <View>
+                        <Text
+                            style={{
+                                color: theme.textColorPrimary,
+                                fontSize: 14,
+                            }}
+                            numberOfLines={1}
+                        >
+                            {item.novelName}
+                        </Text>
+                        <View style={{ flexDirection: "row" }}>
+                            <Text
+                                style={{
+                                    color: theme.textColorPrimary,
+                                    fontSize: 12,
+                                }}
+                            >
+                                {`${item.chapterName} · ${moment(
+                                    item.updateTime
+                                ).calendar()}`}
+                            </Text>
+                        </View>
+                    </View>
+                </View>
+            </>
+        </TouchableRipple>
+    );
+};
+
+export default UpdateCard;
+
+const styles = StyleSheet.create({
+    updateCard: {
+        flexDirection: "row",
+        alignItems: "center",
+        paddingVertical: 8,
+        paddingHorizontal: 12,
+        // borderRadius: 4,
+    },
+    updateIcon: {
+        width: 42,
+        height: 42,
+        borderRadius: 4,
+    },
+    extensionDetails: {
+        flex: 1,
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        marginLeft: 16,
+    },
+});

src/screens/extensions/boxnovel/BoxNovel.js

@@ -1,138 +0,0 @@
-import React, { useEffect, useState, useRef } from "react";
-import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
-import { Provider, Portal } from "react-native-paper";
-
-import NovelCover from "../../../components/common/NovelCover";
-import { SearchAppbar } from "../../../components/common/Appbar";
-import { BottomSheet } from "./filters/BottomSheet";
-
-import { useSelector } from "react-redux";
-
-const BoxNovel = ({ navigation }) => {
-    const theme = useSelector((state) => state.themeReducer.theme);
-    const itemsPerRow = useSelector(
-        (state) => state.settingsReducer.itemsPerRow
-    );
-
-    const library = useSelector((state) => state.libraryReducer.novels);
-
-    const [loading, setLoading] = useState(true);
-
-    const [novels, setNovels] = useState([]);
-    const [sort, setSort] = useState("rating");
-
-    const [searchText, setSearchText] = useState("");
-
-    let bottomSheetRef = useRef(null);
-
-    const getNovels = () => {
-        fetch(
-            `https://lnreader-extensions.herokuapp.com/api/1/novels/1/?o=${sort}`
-        )
-            .then((response) => response.json())
-            .then((json) => {
-                setNovels(json);
-                setLoading(false);
-            });
-    };
-
-    const getSearchResults = (searchText) => {
-        setLoading(true);
-        fetch(
-            `https://lnreader-extensions.herokuapp.com/api/1/search/?s=${searchText}&?o=${sort}`
-        )
-            .then((response) => response.json())
-            .then((json) => {
-                setNovels(json);
-                setLoading(false);
-            });
-    };
-
-    const checkIFInLibrary = (id) => {
-        return library.some((obj) => obj.novelUrl === id);
-    };
-
-    useEffect(() => {
-        getNovels();
-    }, [sort]);
-
-    return (
-        <Provider>
-            <View
-                style={[
-                    styles.container,
-                    { backgroundColor: theme.colorPrimaryDark },
-                ]}
-            >
-                <SearchAppbar
-                    screen="Extension"
-                    placeholder="Search BoxNovel"
-                    searchText={searchText}
-                    setSearchText={setSearchText}
-                    getSearchResults={getSearchResults}
-                    getNovels={getNovels}
-                    setLoading={setLoading}
-                    onFilter={() =>
-                        bottomSheetRef.current.show({ velocity: -1.5 })
-                    }
-                />
-                {loading ? (
-                    <View style={{ flex: 1, justifyContent: "center" }}>
-                        <ActivityIndicator
-                            size={60}
-                            color={theme.colorAccentDark}
-                        />
-                    </View>
-                ) : (
-                    <FlatList
-                        contentContainerStyle={styles.list}
-                        numColumns={itemsPerRow}
-                        key={itemsPerRow}
-                        data={novels}
-                        showsVerticalScrollIndicator={false}
-                        keyExtractor={(item) => item.novelUrl}
-                        renderItem={({ item }) => (
-                            <NovelCover
-                                item={item}
-                                onPress={() => {
-                                    navigation.navigate("NovelItem", {
-                                        novelName: item.novelName,
-                                        novelCover: item.novelCover,
-                                        novelUrl: item.novelUrl,
-                                        sourceId: item.extensionId,
-                                    });
-                                }}
-                                libraryStatus={
-                                    checkIFInLibrary(item.novelUrl)
-                                        ? true
-                                        : false
-                                }
-                            />
-                        )}
-                    />
-                )}
-            </View>
-            <Portal>
-                <BottomSheet
-                    bottomSheetRef={bottomSheetRef}
-                    setSort={setSort}
-                    sort={sort}
-                    setLoading={setLoading}
-                />
-            </Portal>
-        </Provider>
-    );
-};
-
-export default BoxNovel;
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        padding: 4,
-    },
-
-    contentContainer: {
-        flex: 1,
-    },
-});

src/screens/extensions/boxnovel/filters/BottomSheet.js

@@ -1,94 +0,0 @@
-import React from "react";
-import { StyleSheet, View } from "react-native";
-import { List } from "react-native-paper";
-import Bottomsheet from "rn-sliding-up-panel";
-
-import { useSelector } from "react-redux";
-
-export const BottomSheet = ({ bottomSheetRef, setSort, sort, setLoading }) => {
-    const theme = useSelector((state) => state.themeReducer.theme);
-
-    const sorting = [
-        { label: "Latest", sortFlag: "latest" },
-        { label: "A-Z", sortFlag: "aplhabet" },
-        { label: "Rating", sortFlag: "rating" },
-        { label: "Trending", sortFlag: "trending" },
-        { label: "Most Views", sortFlag: "views" },
-        { label: "New", sortFlag: "new-manga" },
-    ];
-
-    return (
-        <Bottomsheet
-            ref={bottomSheetRef}
-            draggableRange={{ top: 370, bottom: 0 }}
-            snappingPoints={[0, 370]}
-        >
-            <View
-                style={[
-                    styles.contentContainer,
-                    { backgroundColor: theme.colorPrimary },
-                ]}
-            >
-                <View
-                    style={[
-                        styles.bottomSheetHandle,
-                        { backgroundColor: theme.textColorPrimary },
-                    ]}
-                />
-                <List.Section
-                    title="Sort"
-                    titleStyle={{
-                        color: theme.colorAccentDark,
-                        fontWeight: "bold",
-                    }}
-                    style={{ color: theme.colorAccentDark }}
-                    expanded
-                >
-                    {sorting.map((item, index) => (
-                        <List.Item
-                            key={index}
-                            right={() =>
-                                sort === item.sortFlag && (
-                                    <List.Icon
-                                        icon="arrow-up"
-                                        color={theme.colorAccentDark}
-                                        style={styles.sortArrow}
-                                    />
-                                )
-                            }
-                            title={item.label}
-                            titleStyle={{
-                                fontSize: 15,
-                                color: theme.textColorPrimary,
-                            }}
-                            onPress={() => {
-                                setLoading(true);
-                                setSort(item.sortFlag);
-                            }}
-                        />
-                    ))}
-                </List.Section>
-            </View>
-        </Bottomsheet>
-    );
-};
-
-const styles = StyleSheet.create({
-    contentContainer: {
-        flex: 1,
-        borderTopRightRadius: 8,
-        borderTopLeftRadius: 8,
-    },
-    bottomSheetHandle: {
-        opacity: 0.5,
-        height: 4,
-        width: 32,
-        borderRadius: 50,
-        top: 8,
-        alignSelf: "center",
-    },
-    sortArrow: {
-        marginVertical: 0,
-        paddingVertical: 0,
-    },
-});

src/services/updates.js

@@ -1,6 +1,8 @@
 import * as SQLite from "expo-sqlite";
+import { getLibrary } from "../database/queries/LibraryQueries";
 import { fetchNovel } from "../source/Source";
 const db = SQLite.openDatabase("lnreader.db");
+import { ToastAndroid } from "react-native";
 
 const updateNovelDetails = async (novel, novelId) => {
     db.transaction((tx) => {
@@ -37,11 +39,38 @@ export const updateNovel = async (extensionId, novelUrl, novelId) => {
                     chapter.releaseDate,
                     novelId,
                 ],
-                (txObj, res) => {},
+                (txObj, { insertId }) => {
+                    if (insertId !== -1) {
+                        tx.executeSql(
+                            "INSERT OR IGNORE INTO updates (chapterId, novelId, updateTime) values (?, ?, (datetime('now','localtime')))",
+                            [insertId, novelId],
+                            (txObj, res) => {
+                                console.log(
+                                    "Inserted Chapter Id -> " +
+                                        insertId +
+                                        " Novel Id " +
+                                        novelId
+                                );
+                            },
+                            (txObj, error) => console.log("Error ", error)
+                        );
+                    }
+                },
                 (txObj, error) => console.log("Error ", error)
             )
         );
     });
-
-    return novel;
+};
+
+export const updateAllNovels = async () => {
+    ToastAndroid.show("Updating library", ToastAndroid.SHORT);
+
+    const libraryNovels = await getLibrary();
+
+    libraryNovels.map((novel, index) =>
+        setTimeout(async () => {
+            updateNovel(novel.sourceId, novel.novelUrl, novel.novelId);
+            console.log(novel.novelName + " Updated");
+        }, 3000 * index)
+    );
 };

src/theme/theme.js

@@ -15,6 +15,8 @@ export const theme = {
  * Light Theme
  */
 export const lightTheme = {
+    id: 1,
+    name: "Light",
     colorPrimary: "#FFFFFF",
     colorPrimaryDark: "#FAFAFA",
     colorAccentDark: "#2979FF",
@@ -23,12 +25,17 @@ export const lightTheme = {
     textColorHintDark: "rgba(0,0,0,0.38)",
     rippleColor: "rgba(0,0,0,0.12)",
     searchBarColor: "#FFFFFF",
+    menuColor: "#FFFFFF",
+    dividerColor: "rgba(0,0,0,0.1)",
+    statusBar: "dark",
 };
 
 /**
  * Dark Theme
  */
 export const darkTheme = {
+    id: 2,
+    name: "Dark",
     colorPrimary: "#242529",
     colorPrimaryDark: "#202125",
     colorAccentDark: "#3399FF",
@@ -37,12 +44,17 @@ export const darkTheme = {
     textColorHintDark: "rgba(255,255,255,0.5)",
     rippleColor: "rgba(255,255,255,0.2)",
     searchBarColor: "#303135",
+    menuColor: "#242529",
+    dividerColor: "rgba(255,255,255,0.1)",
+    statusBar: "light",
 };
 
 /**
  * Amoled Dark Theme
  */
 export const amoledDarkTheme = {
+    id: 0,
+    name: "AMOLED Dark",
     colorPrimary: "#000000",
     colorPrimaryDark: "#000000",
     colorAccentDark: "#3399FF",
@@ -51,12 +63,17 @@ export const amoledDarkTheme = {
     textColorHintDark: "rgba(255,255,255,0.5)",
     rippleColor: "rgba(255,255,255,0.2)",
     searchBarColor: "#1F1F1F",
+    menuColor: "#242529",
+    dividerColor: "rgba(255,255,255,0.15)",
+    statusBar: "light",
 };
 
 /**
  * Midnight Dusk Theme
  */
 export const midnightDuskTheme = {
+    id: 3,
+    name: "Midnight Dusk",
     colorPrimary: "#201F27",
     colorPrimaryDark: "#16151D",
     colorAccentDark: "#F02475",
@@ -65,4 +82,7 @@ export const midnightDuskTheme = {
     textColorHintDark: "rgba(255,255,255,0.5)",
     rippleColor: "rgba(255,255,255,0.2)",
     searchBarColor: "#201F27",
+    menuColor: "#201F27",
+    dividerColor: "rgba(255,255,255,0.1)",
+    statusBar: "light",
 };

src/utils/constants.js

@@ -0,0 +1,11 @@
+const fonts = [
+    { fontFamily: "", name: "Original" },
+    { fontFamily: "arbutus-slab", name: "Arbutus Slab" },
+    { fontFamily: "domine", name: "Domine" },
+    { fontFamily: "lato", name: "Lato" },
+    { fontFamily: "noto-sans", name: "Noto Sans" },
+    { fontFamily: "open-sans", name: "Open Sans" },
+    { fontFamily: "pt-serif", name: "PT Serif" },
+];
+
+export { fonts };