Release v1.0.16

App.js

@@ -1,19 +1,16 @@
-import React, { useState, useEffect } from "react";
-import { StatusBar } from "expo-status-bar";
+import React, { useEffect } from "react";
 import { NavigationContainer } from "@react-navigation/native";
-import * as Font from "expo-font";
-import AppLoading from "expo-app-loading";
+import { useFonts } from "expo-font";
+import { Provider as PaperProvider } from "react-native-paper";
+import Main from "./src/Navigators/Main";
 
-import Router from "./src/navigation/Router";
-
-// Redux
 import { Provider } from "react-redux";
 import { persistor, store } from "./src/redux/store";
 import { PersistGate } from "redux-persist/lib/integration/react";
 import { createDB, deleteDb } from "./src/database/DBHelper";
 
-const getFonts = () =>
-    Font.loadAsync({
+const App = () => {
+    const [loaded] = useFonts({
         "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"),
@@ -23,33 +20,23 @@ const getFonts = () =>
         "pt-serif": require("./assets/fonts/PTSerif-Regular.ttf"),
     });
 
-const App = () => {
-    const [fontsLoaded, setFontsLoaded] = useState(false);
+    useEffect(() => createDB(), []);
 
-    useEffect(() => {
-        createDB();
-    }, []);
-
-    if (fontsLoaded) {
-        return (
-            <Provider store={store}>
-                <PersistGate loading={null} persistor={persistor}>
-                    <StatusBar />
-                    <NavigationContainer>
-                        <Router />
-                    </NavigationContainer>
-                </PersistGate>
-            </Provider>
-        );
-    } else {
-        return (
-            <AppLoading
-                startAsync={getFonts}
-                onError={() => warn(error)}
-                onFinish={() => setFontsLoaded(true)}
-            />
-        );
+    if (!loaded) {
+        return null;
     }
+
+    return (
+        <Provider store={store}>
+            <PersistGate loading={null} persistor={persistor}>
+                <PaperProvider>
+                    <NavigationContainer>
+                        <Main />
+                    </NavigationContainer>
+                </PaperProvider>
+            </PersistGate>
+        </Provider>
+    );
 };
 
 export default App;

app.json

@@ -2,7 +2,8 @@
     "expo": {
         "name": "LNReader",
         "slug": "LNReader",
-        "version": "1.0.0",
+        "scheme": "lnreader",
+        "version": "1.0.16",
         "orientation": "portrait",
         "icon": "./assets/icon.png",
         "splash": {

package.json

@@ -8,46 +8,51 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.13.2",
+    "@react-native-async-storage/async-storage": "^1.13.0",
     "@react-native-community/masked-view": "0.1.10",
-    "@react-native-community/netinfo": "^5.9.7",
-    "@react-native-community/slider": "^3.0.3",
+    "@react-native-community/netinfo": "6.0.0",
+    "@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": "^41.0.1",
     "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",
+    "expo-document-picker": "^9.1.2",
+    "expo-file-system": "~11.0.2",
+    "expo-font": "~9.1.0",
+    "expo-linear-gradient": "~9.1.0",
+    "expo-linking": "~2.2.3",
+    "expo-media-library": "~12.0.2",
+    "expo-permissions": "^12.0.1",
+    "expo-sharing": "~9.1.2",
+    "expo-sqlite": "~9.1.0",
+    "expo-status-bar": "~1.0.4",
+    "expo-web-browser": "~9.1.0",
     "moment": "^2.29.1",
+    "qs": "^6.10.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": "https://github.com/expo/react-native/archive/sdk-41.0.0.tar.gz",
     "react-native-collapsible-header-views": "^1.1.2",
-    "react-native-gesture-handler": "^1.8.0",
+    "react-native-gesture-handler": "~1.10.2",
     "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-picker-scrollview": "^1.0.1",
+    "react-native-reanimated": "~2.1.0",
+    "react-native-safe-area-context": "3.2.0",
+    "react-native-screens": "~3.0.0",
     "react-native-vector-icons": "^7.1.0",
     "react-native-web": "~0.13.12",
-    "react-native-webview": "11.0.0",
+    "react-native-webview": "11.2.3",
     "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"
+    "@babel/core": "~7.9.0"
   },
   "private": true
 }

src/Hooks/githubUpdateChecker.js

@@ -0,0 +1,46 @@
+import { useState, useEffect } from "react";
+
+export const githubUpdateChecker = () => {
+    const latestReleaseUrl =
+        "https://api.github.com/repos/rajarsheechatterjee/lnreader/releases/latest";
+
+    const [checking, setChecking] = useState(true);
+    const [latestRelease, setLatestRelease] = useState();
+
+    const checkForRelease = async () => {
+        let res = await fetch(latestReleaseUrl);
+        res = await res.json();
+
+        const release = {
+            tag_name: res.tag_name,
+            body: res.body,
+            downloadUrl: res.assets[0].browser_download_url,
+        };
+
+        setLatestRelease(release);
+        setChecking(false);
+    };
+
+    const isNewVersion = (versionTag) => {
+        let currentVersion = "v1.0.16";
+        const regex = /[^\\d.]/;
+
+        let newVersion = versionTag.replace(regex, "");
+        currentVersion = currentVersion.replace(regex, "");
+
+        return newVersion !== currentVersion;
+    };
+
+    useEffect(() => {
+        checkForRelease();
+    }, []);
+
+    if (!checking) {
+        const data = {
+            latestRelease,
+            isNewVersion: isNewVersion(latestRelease.tag_name),
+        };
+
+        return data;
+    }
+};

src/Hooks/setStatusBarStyle.js

@@ -0,0 +1,7 @@
+import { setStatusBarStyle as setExpoStatusBarStyle } from "expo-status-bar";
+import { useTheme } from "../Hooks/useTheme";
+
+export const setStatusBarStyle = () => {
+    const theme = useTheme();
+    setExpoStatusBarStyle(theme.id === 1 ? "dark" : "light");
+};

src/Hooks/showToast.js

@@ -0,0 +1,5 @@
+import { ToastAndroid } from "react-native";
+
+export const showToast = (message) => {
+    ToastAndroid.show(message, ToastAndroid.SHORT);
+};

src/Hooks/useLibrary.js

@@ -0,0 +1,7 @@
+import { useSelector } from "react-redux";
+
+export const useLibrary = () => {
+    const library = useSelector((state) => state.libraryReducer.novels);
+
+    return library;
+};

src/Hooks/useReaderSettings.js

@@ -0,0 +1,7 @@
+import { useSelector } from "react-redux";
+
+export const useReaderSettings = () => {
+    const readerSettings = useSelector((state) => state.settingsReducer.reader);
+
+    return readerSettings;
+};

src/Hooks/useTheme.js

@@ -0,0 +1,7 @@
+import { useSelector } from "react-redux";
+
+export const useTheme = () => {
+    const currentTheme = useSelector((state) => state.themeReducer.theme);
+
+    return currentTheme;
+};

src/Navigators/BottomNavigator.js

@@ -1,50 +1,18 @@
-import React, { useEffect } from "react";
-import {
-    createStackNavigator,
-    TransitionPresets,
-} from "@react-navigation/stack";
+import React from "react";
 import { createMaterialBottomTabNavigator } from "@react-navigation/material-bottom-tabs";
-import { Provider } from "react-native-paper";
-import { setStatusBarStyle } from "expo-status-bar";
-
 import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
+import { useTheme } from "../Hooks/useTheme";
 
-import Library from "../screens/Library/Library";
-import Updates from "../screens/Updates/Updates";
-import History from "../screens/History/History";
-import Browse from "../screens/Browse/Browse";
-
-import More from "../screens/More/More";
-import About from "../screens/More/About";
-import Settings from "../screens/More/Settings";
-
-import NovelItem from "../screens/Novel/Novel";
-import ChapterItem from "../screens/Chapter/Chapter";
-
-import Extension from "../screens/Extension/Extension";
-
-const Stack = createStackNavigator();
+import Library from "../Screens/Library/Library";
+import Updates from "../Screens/Updates/Updates";
+import History from "../Screens/History/History";
+import Browse from "../Screens/Browse/Browse";
+import More from "../Screens/More/More";
 
 const Tab = createMaterialBottomTabNavigator();
 
-const stackNavigatorConfig = {
-    headerShown: false,
-    ...TransitionPresets.RevealFromBottomAndroid,
-};
-
-const SettingsStack = () => {
-    return (
-        <Stack.Navigator screenOptions={stackNavigatorConfig}>
-            <Stack.Screen name="About" component={About} />
-            <Stack.Screen name="Settings" component={Settings} />
-        </Stack.Navigator>
-    );
-};
-
-import { useSelector } from "react-redux";
-
 const BottomNavigator = () => {
-    const theme = useSelector((state) => state.themeReducer.theme);
+    const theme = useTheme();
 
     return (
         <Tab.Navigator
@@ -53,7 +21,7 @@ const BottomNavigator = () => {
             activeColor={theme.colorAccentDark}
         >
             <Tab.Screen
-                name="My Library"
+                name="Library"
                 component={Library}
                 options={{
                     tabBarIcon: ({ color }) => (
@@ -65,7 +33,6 @@ const BottomNavigator = () => {
                     ),
                 }}
             />
-
             <Tab.Screen
                 name="Updates"
                 component={Updates}
@@ -122,39 +89,4 @@ const BottomNavigator = () => {
     );
 };
 
-const Router = () => {
-    const theme = useSelector((state) => state.themeReducer.theme);
-
-    useEffect(() => setStatusBarStyle(theme.id === 1 ? "dark" : "light"), []);
-
-    return (
-        <Provider>
-            <Stack.Navigator screenOptions={stackNavigatorConfig}>
-                <Stack.Screen name="Router" component={BottomNavigator} />
-                <Stack.Screen
-                    name="ChapterItem"
-                    component={ChapterItem}
-                    options={{ ...TransitionPresets.SlideFromRightIOS }}
-                />
-                <Stack.Screen
-                    name="NovelItem"
-                    component={NovelItem}
-                    options={{
-                        headerTitle: "",
-                        headerShown: true,
-                        headerTransparent: true,
-                        headerTintColor: "white",
-                    }}
-                />
-                <Stack.Screen name="SettingsStack" component={SettingsStack} />
-                <Stack.Screen name="Extension" component={Extension} />
-                {/* <Stack.Screen
-                    name="ExtensionStack"
-                    component={ExtensionStack}
-                /> */}
-            </Stack.Navigator>
-        </Provider>
-    );
-};
-
-export default Router;
+export default BottomNavigator;

src/Navigators/Main.js

@@ -0,0 +1,61 @@
+import React from "react";
+import {
+    createStackNavigator,
+    TransitionPresets,
+} from "@react-navigation/stack";
+
+import BottomNavigator from "./BottomNavigator";
+import Novel from "../Screens/Novel/Novel";
+import Chapter from "../Screens/Chapter/Chapter";
+import Extension from "../Screens/Extension/Extension";
+import MoreStack from "./More";
+
+import { setStatusBarStyle } from "../Hooks/setStatusBarStyle";
+import { View } from "react-native";
+import { useTheme } from "../Hooks/useTheme";
+import { githubUpdateChecker } from "../Hooks/githubUpdateChecker";
+import NewUpdateDialog from "../Components/NewUpdateDialog";
+
+const Stack = createStackNavigator();
+
+const stackNavigatorConfig = {
+    headerShown: false,
+};
+
+const MainNavigator = () => {
+    const theme = useTheme();
+    setStatusBarStyle();
+    const { isNewVersion, latestRelease } = githubUpdateChecker() || {};
+
+    return (
+        <View style={{ flex: 1, backgroundColor: theme.colorPrimary }}>
+            {isNewVersion && <NewUpdateDialog newVersion={latestRelease} />}
+            <Stack.Navigator screenOptions={stackNavigatorConfig}>
+                <Stack.Screen
+                    name="BottomNavigator"
+                    component={BottomNavigator}
+                />
+                <Stack.Screen
+                    name="Novel"
+                    component={Novel}
+                    options={{
+                        headerTitle: "",
+                        headerShown: true,
+                        headerTransparent: true,
+                        headerTintColor: "white",
+                        ...TransitionPresets.RevealFromBottomAndroid,
+                    }}
+                />
+                <Stack.Screen
+                    name="Chapter"
+                    component={Chapter}
+                    options={{ ...TransitionPresets.SlideFromRightIOS }}
+                />
+                <Stack.Screen name="MoreStack" component={MoreStack} />
+                <Stack.Screen name="Extension" component={Extension} />
+            </Stack.Navigator>
+        </View>
+    );
+};
+
+export default MainNavigator;

src/Navigators/More.js

@@ -0,0 +1,28 @@
+import React from "react";
+import { createStackNavigator } from "@react-navigation/stack";
+
+import About from "../Screens/More/About";
+import Settings from "../Screens/More/Settings";
+import Trackers from "../Screens/More/Trackers";
+import { View } from "react-native";
+import { useTheme } from "../Hooks/useTheme";
+
+const Stack = createStackNavigator();
+
+const stackNavigatorConfig = { headerShown: false };
+
+const MoreStack = () => {
+    const theme = useTheme();
+
+    return (
+        <View style={{ flex: 1, backgroundColor: theme.colorPrimary }}>
+            <Stack.Navigator screenOptions={stackNavigatorConfig}>
+                <Stack.Screen name="Settings" component={Settings} />
+                <Stack.Screen name="Trackers" component={Trackers} />
+                <Stack.Screen name="About" component={About} />
+            </Stack.Navigator>
+        </View>
+    );
+};
+
+export default MoreStack;

src/components/List.js

@@ -14,7 +14,7 @@ const ListSubHeader = ({ children, theme }) => (
     </List.Subheader>
 );
 
-const ListItem = ({ title, description, icon, onPress, theme }) => (
+const ListItem = ({ title, description, icon, onPress, theme, right }) => (
     <List.Item
         title={title}
         titleStyle={{ color: theme.textColorPrimary }}
@@ -30,6 +30,15 @@ const ListItem = ({ title, description, icon, onPress, theme }) => (
                 />
             )
         }
+        right={() =>
+            right && (
+                <List.Icon
+                    color="#47a84a"
+                    icon={right}
+                    style={{ marginVertical: 0 }}
+                />
+            )
+        }
         onPress={onPress}
         rippleColor={theme.rippleColor}
     />
@@ -44,7 +53,24 @@ const Divider = ({ theme }) => (
     />
 );
 
-export { ListSection, ListSubHeader, ListItem, Divider };
+const InfoItem = ({ title, description, icon, onPress, theme, right }) => (
+    <List.Item
+        title={title}
+        titleStyle={{ color: theme.textColorSecondary, fontSize: 14 }}
+        titleNumberOfLines={5}
+        left={() =>
+            icon && (
+                <List.Icon
+                    color={theme.textColorSecondary}
+                    icon={icon}
+                    style={{ marginVertical: 0 }}
+                />
+            )
+        }
+    />
+);
+
+export { ListSection, ListSubHeader, ListItem, Divider, InfoItem };
 
 const styles = StyleSheet.create({
     listSection: {

src/components/NewUpdateDialog.js

@@ -0,0 +1,80 @@
+import React, { useState } from "react";
+import { StyleSheet, View, Text } from "react-native";
+import { Portal, Modal, Button } from "react-native-paper";
+import * as Linking from "expo-linking";
+import { useTheme } from "../Hooks/useTheme";
+
+const NewUpdateDialog = ({ newVersion }) => {
+    const [newUpdateDialog, showNewUpdateDialog] = useState(true);
+
+    const theme = useTheme();
+
+    return (
+        <Portal>
+            <Modal
+                visible={newUpdateDialog}
+                onDismiss={() => showNewUpdateDialog(false)}
+                contentContainerStyle={[
+                    styles.containerStyle,
+                    { backgroundColor: theme.colorPrimaryDark },
+                ]}
+            >
+                <Text
+                    style={[
+                        styles.modalHeader,
+                        { color: theme.textColorPrimary },
+                    ]}
+                >
+                    {`New update available ${newVersion.tag_name}`}
+                </Text>
+                <Text style={{ color: theme.textColorSecondary, fontSize: 16 }}>
+                    {newVersion.body}
+                </Text>
+                <View
+                    style={{
+                        flexDirection: "row",
+                        marginTop: 30,
+                        justifyContent: "flex-end",
+                    }}
+                >
+                    <Button
+                        labelStyle={{
+                            color: theme.colorAccentDark,
+                            letterSpacing: 0,
+                            textTransform: "none",
+                        }}
+                        theme={{ colors: { primary: theme.colorAccentDark } }}
+                        onPress={() => showNewUpdateDialog(false)}
+                    >
+                        Cancel
+                    </Button>
+                    <Button
+                        labelStyle={{
+                            color: theme.colorAccentDark,
+                            letterSpacing: 0,
+                            textTransform: "none",
+                        }}
+                        theme={{ colors: { primary: theme.colorAccentDark } }}
+                        onPress={() => Linking.openURL(newVersion.downloadUrl)}
+                    >
+                        Install
+                    </Button>
+                </View>
+            </Modal>
+        </Portal>
+    );
+};
+
+export default NewUpdateDialog;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        padding: 20,
+        margin: 20,
+        borderRadius: 6,
+    },
+    modalHeader: {
+        fontSize: 20,
+        marginBottom: 10,
+    },
+});

src/components/NovelCover.js

@@ -148,24 +148,86 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
             style={styles.listView}
             onPress={onPress}
         >
-            <>
-                <Image
-                    source={{ uri: item.novelCover }}
-                    style={styles.extensionIcon}
-                />
-                <Text
+            <View
+                style={{
+                    flex: 1,
+                    flexDirection: "row",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                }}
+            >
+                <View
                     style={{
-                        flex: 1,
-                        color: theme.textColorPrimary,
-                        marginLeft: 16,
-                        fontSize: 15,
-                        paddingRight: 8,
+                        flexDirection: "row",
+                        alignItems: "center",
                     }}
-                    numberOfLines={1}
                 >
-                    {item.novelName}
-                </Text>
-            </>
+                    <Image
+                        source={{ uri: item.novelCover }}
+                        style={styles.extensionIcon}
+                    />
+                    <Text
+                        style={{
+                            color: theme.textColorPrimary,
+                            marginLeft: 16,
+                            fontSize: 15,
+                            paddingRight: 8,
+                        }}
+                        numberOfLines={1}
+                    >
+                        {item.novelName}
+                    </Text>
+                </View>
+                <View
+                    style={{
+                        flexDirection: "row",
+                        alignItems: "center",
+                    }}
+                >
+                    {item.chaptersDownloaded && (
+                        <Text
+                            style={[
+                                {
+                                    backgroundColor: "#47a84a",
+                                    color: "#FFFFFF",
+                                    borderTopLeftRadius: 4,
+                                    borderBottomLeftRadius: 4,
+                                    paddingTop: 2,
+                                    paddingHorizontal: 4,
+                                    fontSize: 12,
+                                },
+                                !item.chaptersUnread && {
+                                    borderTopRightRadius: 4,
+                                    borderBottomRightRadius: 4,
+                                },
+                            ]}
+                        >
+                            {item.chaptersDownloaded}
+                        </Text>
+                    )}
+                    {item.chaptersUnread && (
+                        <Text
+                            style={[
+                                {
+                                    backgroundColor: "#2979FF",
+                                    color: "#FFFFFF",
+                                    borderTopRightRadius: 4,
+                                    borderBottomRightRadius: 4,
+                                    paddingTop: 2,
+                                    paddingHorizontal: 4,
+                                    fontSize: 12,
+                                },
+                                !item.chaptersDownloaded && {
+                                    borderTopLeftRadius: 4,
+                                    borderBottomLeftRadius: 4,
+                                },
+                            ]}
+                        >
+                            {item.chaptersUnread}
+                        </Text>
+                    )}
+                </View>
+            </View>
         </TouchableRipple>
     );
 };

src/components/RadioButton.js

@@ -0,0 +1,36 @@
+import React from "react";
+import { StyleSheet, View, Text } from "react-native";
+import { RadioButton as MaterialRadioButton } from "react-native-paper";
+
+export const RadioButtonGroup = ({ children, value, onValueChange }) => (
+    <MaterialRadioButton.Group onValueChange={onValueChange} value={value}>
+        {children}
+    </MaterialRadioButton.Group>
+);
+
+export const RadioButton = ({ value, label, theme }) => (
+    <View style={styles.radioButtonContainer}>
+        <MaterialRadioButton
+            value={value}
+            color={theme.colorAccentDark}
+            uncheckedColor={theme.textColorSecondary}
+        />
+        <Text
+            style={[styles.radioButtonLabel, { color: theme.textColorPrimary }]}
+        >
+            {label}
+        </Text>
+    </View>
+);
+
+const styles = StyleSheet.create({
+    radioButtonContainer: {
+        flexDirection: "row",
+        alignItems: "center",
+        paddingVertical: 8,
+    },
+    radioButtonLabel: {
+        marginLeft: 16,
+        fontSize: 16,
+    },
+});

src/components/Searchbar.js

@@ -0,0 +1,93 @@
+import React, { useRef } from "react";
+import { View, TextInput, StyleSheet } from "react-native";
+import { TouchableRipple, IconButton } from "react-native-paper";
+import Constants from "expo-constants";
+
+export const Searchbar = ({
+    theme,
+    placeholder,
+    searchText,
+    left,
+    onPressLeft,
+    right,
+    onPressRight,
+    clearSearchbar,
+    onChangeText,
+    onSubmitEditing,
+}) => {
+    const searchRef = useRef(null);
+
+    return (
+        <TouchableRipple
+            borderless
+            onPress={() => searchRef.current.focus()}
+            style={[
+                styles.searchAppbarContainer,
+                { backgroundColor: theme.searchBarColor },
+            ]}
+        >
+            <View style={styles.container}>
+                <View style={{ flex: 1, flexDirection: "row" }}>
+                    {left && (
+                        <IconButton
+                            icon={left}
+                            color={theme.textColorSecondary}
+                            style={{ marginLeft: 0 }}
+                            size={23}
+                            onPress={onPressLeft}
+                        />
+                    )}
+                    <TextInput
+                        ref={searchRef}
+                        style={{
+                            fontSize: 16,
+                            color: theme.textColorSecondary,
+                        }}
+                        placeholder={placeholder}
+                        placeholderTextColor={theme.textColorSecondary}
+                        onChangeText={onChangeText}
+                        onSubmitEditing={onSubmitEditing}
+                        defaultValue={searchText}
+                    />
+                </View>
+                {searchText !== "" && (
+                    <IconButton
+                        icon="close"
+                        color={theme.textColorSecondary}
+                        style={{ marginRight: 0 }}
+                        size={23}
+                        onPress={clearSearchbar}
+                    />
+                )}
+                {right && (
+                    <IconButton
+                        icon="earth"
+                        color={theme.textColorSecondary}
+                        style={{ marginRight: 0 }}
+                        size={23}
+                        onPress={onPressRight}
+                    />
+                )}
+            </View>
+        </TouchableRipple>
+    );
+};
+
+const styles = StyleSheet.create({
+    searchAppbarContainer: {
+        marginTop: Constants.statusBarHeight + 8,
+        height: 48,
+        flexDirection: "row",
+        alignItems: "center",
+        paddingHorizontal: 16,
+        marginBottom: 12,
+        borderRadius: 8,
+        marginHorizontal: 12,
+        elevation: 2,
+    },
+    container: {
+        flex: 1,
+        flexDirection: "row",
+        justifyContent: "space-between",
+    },
+});

src/database/queries/ChapterQueries.js

@@ -35,7 +35,9 @@ export const insertChapters = async (novelId, chapters) => {
 };
 
 const getChaptersQuery = (sort, filter) =>
-    `SELECT * FROM chapters WHERE novelId = ? ${filter ?? ""} ${sort ?? ""}`;
+    `SELECT * FROM chapters WHERE novelId = ? ${filter ?? ""} ${
+        sort ?? "ORDER BY chapterId ASC"
+    }`;
 
 export const getChapters = (novelId, sort, filter) => {
     return new Promise((resolve, reject) =>
@@ -111,7 +113,7 @@ export const downloadChapter = async (
     chapterUrl,
     chapterId
 ) => {
-    const downloadUrl = `https://lnreader-extensions.herokuapp.com/api/${extensionId}/novel/${novelUrl}${chapterUrl}`;
+    const downloadUrl = `https://lnreader-extensions.vercel.app/api/${extensionId}/novel/${novelUrl}${chapterUrl}`;
 
     // console.log(downloadUrl);
 

src/database/queries/NovelQueries.js

@@ -1,6 +1,9 @@
 import * as SQLite from "expo-sqlite";
 const db = SQLite.openDatabase("lnreader.db");
 
+import { fetchChapters } from "../../Services/Source/source";
+import { insertChapters } from "./ChapterQueries";
+
 const insertNovelQuery = `INSERT INTO novels (novelUrl, sourceUrl, sourceId, source, novelName, novelCover, novelSummary, author, artist, status, genre) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
 export const insertNovel = async (novel) => {
@@ -85,3 +88,38 @@ export const deleteNovelCache = () => {
         );
     });
 };
+
+const restoreFromBackupQuery = `INSERT INTO novels (novelUrl, sourceUrl, sourceId, source, novelName, novelCover, novelSummary, author, artist, status, genre, followed, unread) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+
+export const restoreLibrary = async (novel) => {
+    return new Promise((resolve, reject) =>
+        db.transaction((tx) =>
+            tx.executeSql(
+                restoreFromBackupQuery,
+                [
+                    novel.novelUrl,
+                    novel.sourceUrl,
+                    novel.sourceId,
+                    novel.source,
+                    novel.novelName,
+                    novel.novelCover,
+                    novel.novelSummary,
+                    novel.author,
+                    novel.artist,
+                    novel.status,
+                    novel.genre,
+                    novel.followed,
+                    novel.unread,
+                ],
+                async (txObj, { insertId }) => {
+                    const chapters = await fetchChapters(
+                        novel.sourceId,
+                        novel.novelUrl
+                    );
+                    await insertChapters(insertId, chapters);
+                },
+                (txObj, error) => console.log("Error ", error)
+            )
+        )
+    );
+};

src/database/queries/UpdateQueries.js

@@ -1,7 +1,7 @@
 import * as SQLite from "expo-sqlite";
 const db = SQLite.openDatabase("lnreader.db");
 
-const getHistoryQuery = `
+const getUpdatesQuery = `
     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 
@@ -14,7 +14,7 @@ export const getUpdates = async () => {
     return new Promise((resolve, reject) => {
         db.transaction((tx) => {
             tx.executeSql(
-                getHistoryQuery,
+                getUpdatesQuery,
                 null,
                 (txObj, { rows: { _array } }) => {
                     resolve(_array);
@@ -24,3 +24,14 @@ export const getUpdates = async () => {
         });
     });
 };
+
+export const deleteNovelUpdates = (novelId) => {
+    db.transaction((tx) => {
+        tx.executeSql(
+            "DELETE FROM updates WHERE novelId = ?",
+            [novelId],
+            (txObj, res) => {},
+            (txObj, error) => console.log("Error ", error)
+        );
+    });
+};

src/redux/chapter/chapter.actions.js

@@ -9,7 +9,7 @@ import {
     CHAPTER_DELETED,
 } from "./chapter.types";
 
-import { fetchChapter } from "../../source/Source";
+import { fetchChapter } from "../../Services/Source/source";
 
 import {
     markChapterRead,
@@ -27,12 +27,9 @@ export const getChapterAction = (
 ) => async (dispatch) => {
     dispatch({ type: CHAPTER_LOADING });
 
-    const isDownloaded = await isChapterDownloaded(novelId);
-    let chapter;
+    let chapter = await getChapter(novelId);
 
-    if (isDownloaded) {
-        chapter = await getChapter(novelId);
-    } else {
+    if (!chapter) {
         chapter = await fetchChapter(extensionId, novelUrl, chapterUrl);
     }
     console.log(isDownloaded);

src/redux/library/library.reducer.js

@@ -1,4 +1,8 @@
-import { FOLLOW_NOVEL, UNFOLLOW_NOVEL } from "../novel/novel.types";
+import {
+    FOLLOW_NOVEL,
+    UNFOLLOW_NOVEL,
+    UPDATE_IN_LIBRARY,
+} from "../novel/novel.types";
 import {
     GET_LIBRARY_NOVELS,
     GET_LIBRARY_SEARCH_RESULTS,
@@ -17,18 +21,23 @@ const libraryReducer = (state = initialState, action) => {
         case GET_LIBRARY_NOVELS:
             return { ...state, novels: payload, loading: false };
         case GET_LIBRARY_SEARCH_RESULTS:
-            return { ...state, searchResults: payload, loading: false };
-        case FOLLOW_NOVEL:
+            return { ...state, novels: payload, loading: false };
+        // case FOLLOW_NOVEL:
+        //     return {
+        //         ...state,
+        //         novels: [...state.novels, { ...payload, followed: 1 }],
+        //     };
+        // case UNFOLLOW_NOVEL:
+        //     return {
+        //         ...state,
+        //         novels: state.novels.filter(
+        //             (novel) => novel.novelId !== payload
+        //         ),
+        //     };
+        case UPDATE_IN_LIBRARY:
             return {
                 ...state,
-                novels: [...state.novels, { ...payload, followed: 1 }],
-            };
-        case UNFOLLOW_NOVEL:
-            return {
-                ...state,
-                novels: state.novels.filter(
-                    (novel) => novel.novelId !== payload
-                ),
+                novels: [...state.novels, { novelUrl: payload.novelUrl }],
             };
         default:
             return state;

src/redux/novel/novel.actions.js

@@ -16,8 +16,8 @@ import {
     UPDATE_NOVEL,
 } from "./novel.types";
 
-import { updateNovel } from "../../services/updates";
-import { fetchChapter, fetchNovel } from "../../source/Source";
+import { updateNovel } from "../../Services/updates";
+import { fetchChapter, fetchNovel } from "../../Services/Source/source";
 import {
     followNovel,
     insertNovel,
@@ -32,6 +32,7 @@ import {
     downloadChapter,
     deleteChapter,
 } from "../../database/queries/ChapterQueries";
+import { deleteNovelUpdates } from "../../database/queries/UpdateQueries";
 
 export const setNovel = (novel) => async (dispatch) => {
     dispatch({ type: SET_NOVEL, payload: novel });
@@ -104,9 +105,13 @@ export const sortAndFilterChapters = (novelUrl, filter, sort) => async (
 export const followNovelAction = (novel) => async (dispatch) => {
     await followNovel(novel.followed, novel.novelId);
 
+    if (!novel.followNovel) {
+        deleteNovelUpdates(novel.novelId);
+    }
+
     dispatch({
         type: UPDATE_IN_LIBRARY,
-        payload: !novel.followed,
+        payload: { novelUrl: novel.novelUrl, followed: !novel.followed },
     });
 
     ToastAndroid.show(

src/redux/novel/novel.reducer.js

@@ -53,7 +53,7 @@ const novelReducer = (state = initialState, action) => {
         case UPDATE_IN_LIBRARY:
             return {
                 ...state,
-                novel: { ...state.novel, followed: payload },
+                novel: { ...state.novel, followed: payload.followed },
             };
         case UPDATE_NOVEL:
             return {

src/redux/source/source.actions.js

@@ -1,5 +1,5 @@
 import { GET_SOURCES } from "./source.types";
-import { fetchSources } from "../../source/Source";
+import { fetchSources } from "../../Services/Source/source";
 
 export const getSourcesAction = () => async (dispatch) => {
     const res = await fetchSources();

src/redux/store.js

@@ -10,6 +10,7 @@ import extensionReducer from "./source/source.reducers";
 import novelReducer from "./novel/novel.reducer";
 import historyReducer from "./history/history.reducer";
 import updatesReducer from "./updates/updates.reducer";
+import trackerReducer from "./tracker/tracker.reducer";
 
 const persistConfig = {
     key: "root",
@@ -27,6 +28,7 @@ const persistedReducer = persistReducer(
         novelReducer,
         historyReducer,
         updatesReducer,
+        trackerReducer,
     })
 );
 

src/redux/theme/theme.reducer.js

@@ -3,7 +3,7 @@ import {
     lightTheme,
     darkTheme,
     midnightDuskTheme,
-} from "../../theme/theme";
+} from "../../Theme/theme";
 
 const themes = {
     0: amoledDarkTheme,

src/redux/tracker/tracker.actions.js

@@ -0,0 +1,57 @@
+import { findListItem, updateItem } from "../../Services/Trackers/myAnimeList";
+import {
+    REMOVE_TRACKER,
+    SET_TRACKER,
+    TRACK_NOVEL,
+    UNTRACK_NOVEL,
+    UPDATE_TRACKER,
+    UPDATE_CHAPTERS_READ,
+} from "./tracker.types";
+
+import { updateMalChaptersRead } from "../../Services/Trackers/myAnimeList";
+
+export const setTracker = (res) => async (dispatch) => {
+    dispatch({
+        type: SET_TRACKER,
+        payload: res,
+    });
+};
+
+export const removeTracker = () => async (dispatch) => {
+    dispatch({ type: REMOVE_TRACKER });
+};
+
+export const trackNovel = (trackObj, accessToken) => async (dispatch) => {
+    let res = await findListItem(trackObj.id, accessToken);
+    trackObj.num_chapters = res.num_chapters;
+    trackObj.my_list_status = {
+        num_chapters_read: res.my_list_status.num_chapters_read,
+        score: res.my_list_status.score,
+        status: res.my_list_status.status,
+    };
+
+    dispatch({ type: TRACK_NOVEL, payload: trackObj });
+};
+
+export const updateTracker = (malId, accessToken, body) => async (dispatch) => {
+    let res = await updateItem(malId, accessToken, body);
+
+    dispatch({ type: UPDATE_TRACKER, payload: { malId, ...res } });
+};
+
+export const untrackNovel = (id) => async (dispatch) => {
+    dispatch({ type: UNTRACK_NOVEL, payload: id });
+};
+
+export const updateChaptersRead = (malId, accessToken, chaptersRead) => async (
+    dispatch
+) => {
+    let res = await updateMalChaptersRead(malId, accessToken, {
+        num_chapters_read: chaptersRead,
+    });
+
+    dispatch({
+        type: UPDATE_CHAPTERS_READ,
+        payload: { malId, chaptersRead: res },
+    });
+};

src/redux/tracker/tracker.reducer.js

@@ -0,0 +1,81 @@
+import {
+    REMOVE_TRACKER,
+    SET_TRACKER,
+    TRACK_NOVEL,
+    UNTRACK_NOVEL,
+    UPDATE_CHAPTERS_READ,
+    UPDATE_TRACKER,
+} from "./tracker.types";
+
+const initialState = {
+    tracker: null,
+    trackedNovels: [],
+};
+
+const trackerReducer = (state = initialState, action) => {
+    const { type, payload } = action;
+
+    switch (type) {
+        case SET_TRACKER:
+            return {
+                ...state,
+                tracker: { ...payload, name: "MyAnimeList" },
+            };
+        case REMOVE_TRACKER:
+            return {
+                ...state,
+                tracker: null,
+            };
+        case TRACK_NOVEL:
+            return {
+                ...state,
+                trackedNovels: state.trackedNovels.some(
+                    (obj) => obj.novelId === payload.novelId
+                )
+                    ? state.trackedNovels
+                    : [...state.trackedNovels, payload],
+            };
+        case UPDATE_TRACKER:
+            return {
+                ...state,
+                trackedNovels: state.trackedNovels.map((novel) =>
+                    novel.id === payload.malId
+                        ? {
+                              ...novel,
+                              my_list_status: {
+                                  num_chapters_read: payload.num_chapters_read,
+                                  status: payload.status,
+                                  score: payload.score,
+                              },
+                          }
+                        : novel
+                ),
+            };
+        case UNTRACK_NOVEL:
+            return {
+                ...state,
+                trackedNovels: state.trackedNovels.filter(
+                    (id) => id === payload
+                ),
+            };
+        case UPDATE_CHAPTERS_READ:
+            return {
+                ...state,
+                trackedNovels: state.trackedNovels.map((novel) =>
+                    novel.id === payload.malId
+                        ? {
+                              ...novel,
+                              my_list_status: {
+                                  ...novel.my_list_status,
+                                  num_chapters_read: payload.chaptersRead,
+                              },
+                          }
+                        : novel
+                ),
+            };
+        default:
+            return state;
+    }
+};
+
+export default trackerReducer;

src/redux/tracker/tracker.types.js

@@ -0,0 +1,9 @@
+export const SET_TRACKER = "SET_TRACKER";
+export const REMOVE_TRACKER = "REMOVE_TRACKER";
+
+export const TRACK_NOVEL = "TRACK_NOVEL";
+export const UNTRACK_NOVEL = "UNTRACK_NOVEL";
+
+export const UPDATE_TRACKER = "UPDATE_TRACKER";
+
+export const UPDATE_CHAPTERS_READ = "UPDATE_CHAPTERS_READ";

src/redux/updates/updates.actions.js

@@ -1,9 +1,20 @@
 import { GET_UPDATES } from "./updates.types";
 
 import { getUpdates } from "../../database/queries/UpdateQueries";
+import { updateAllNovels } from "../../Services/updates";
+import { showToast } from "../../Hooks/showToast";
 
 export const getUpdatesAction = () => async (dispatch) => {
     const updates = await getUpdates();
 
     dispatch({ type: GET_UPDATES, payload: updates });
 };
+
+export const updateLibraryAction = () => async (dispatch) => {
+    showToast("Updating library");
+
+    await updateAllNovels();
+    const updates = await getUpdates();
+
+    dispatch({ type: GET_UPDATES, payload: updates });
+};

src/screens/Browse/Browse.js

@@ -1,17 +1,40 @@
-import React, { useEffect } from "react";
-import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
-import { Appbar } from "../../components/Appbar";
+import React, { useEffect, useState } from "react";
+import {
+    StyleSheet,
+    View,
+    FlatList,
+    ActivityIndicator,
+    RefreshControl,
+} from "react-native";
+import { Appbar } from "../../Components/Appbar";
 import { connect } from "react-redux";
+import { useTheme } from "../../Hooks/useTheme";
 
 import { getSourcesAction } from "../../redux/source/source.actions";
 
 import ExtensionCard from "./components/ExtensionCard";
+import { showToast } from "../../Hooks/showToast";
+
+const Browse = ({ extensions, loading, getSourcesAction }) => {
+    const [refreshing, setRefreshing] = useState(false);
+
+    const theme = useTheme();
 
-const Browse = ({ theme, extensions, loading, getSourcesAction }) => {
     useEffect(() => {
         getSourcesAction();
     }, [getSourcesAction]);
 
+    const onRefresh = () => {
+        showToast("Updating extension list");
+        setRefreshing(true);
+        getSourcesAction();
+        setRefreshing(false);
+    };
+
+    const renderExtensionCard = ({ item }) => (
+        <ExtensionCard item={item} theme={theme} />
+    );
+
     return (
         <>
             <Appbar title="Browse" />
@@ -24,7 +47,7 @@ const Browse = ({ theme, extensions, loading, getSourcesAction }) => {
                 <FlatList
                     data={extensions}
                     keyExtractor={(item) => item.sourceId.toString()}
-                    renderItem={({ item }) => <ExtensionCard item={item} />}
+                    renderItem={renderExtensionCard}
                     ListEmptyComponent={
                         loading && (
                             <ActivityIndicator
@@ -34,6 +57,14 @@ const Browse = ({ theme, extensions, loading, getSourcesAction }) => {
                             />
                         )
                     }
+                    refreshControl={
+                        <RefreshControl
+                            refreshing={refreshing}
+                            onRefresh={onRefresh}
+                            colors={["white"]}
+                            progressBackgroundColor={theme.colorAccentDark}
+                        />
+                    }
                 />
             </View>
         </>
@@ -41,7 +72,6 @@ const Browse = ({ theme, extensions, loading, getSourcesAction }) => {
 };
 
 const mapStateToProps = (state) => ({
-    theme: state.themeReducer.theme,
     extensions: state.extensionReducer.extensions,
     loading: state.extensionReducer.loading,
 });
@@ -49,7 +79,5 @@ const mapStateToProps = (state) => ({
 export default connect(mapStateToProps, { getSourcesAction })(Browse);
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-    },
+    container: { flex: 1 },
 });

src/screens/Browse/components/ExtensionCard.js

@@ -1,29 +1,25 @@
 import React from "react";
 import { View, Text, Image, StyleSheet } from "react-native";
 import { TouchableRipple, Button } from "react-native-paper";
-
 import { useNavigation } from "@react-navigation/native";
-import { useSelector } from "react-redux";
 
-const ExtensionCard = ({ item }) => {
+const ExtensionCard = ({ item, theme }) => {
     const { sourceName, sourceCover, sourceLanguage, status } = item;
 
     const navigation = useNavigation();
 
-    const theme = useSelector((state) => state.themeReducer.theme);
+    const navigateToExtension = () =>
+        navigation.navigate("Extension", {
+            sourceId: item.sourceId,
+            sourceName: item.sourceName,
+            sourceUrl: item.sourceUrl,
+        });
 
     return (
         <TouchableRipple
             style={styles.extensionCard}
-            onPress={() =>
-                navigation.navigate("Extension", {
-                    sourceId: item.sourceId,
-                    sourceName: item.sourceName,
-                    sourceUrl: item.sourceUrl,
-                })
-            }
+            onPress={navigateToExtension}
             rippleColor={theme.rippleColor}
-            borderless
         >
             <>
                 <Image
@@ -50,31 +46,17 @@ const ExtensionCard = ({ item }) => {
                             >
                                 {sourceLanguage}
                             </Text>
-                            <Text
-                                style={{
-                                    color: "#D63B2F",
-                                    fontSize: 12,
-                                    marginLeft: 5,
-                                }}
-                            >
-                                {status === 0 && "(Not Working)"}
+                            <Text style={styles.sourceStatus}>
+                                {status === 0 && "• Down"}
                             </Text>
                         </View>
                     </View>
                     <View>
                         <Button
-                            labelStyle={{
-                                letterSpacing: 0,
-                            }}
+                            labelStyle={{ letterSpacing: 0 }}
                             uppercase={false}
                             color={theme.colorAccentDark}
-                            onPress={() =>
-                                navigation.navigate("Extension", {
-                                    sourceId: item.sourceId,
-                                    sourceName: item.sourceName,
-                                    sourceUrl: item.sourceUrl,
-                                })
-                            }
+                            onPress={navigateToExtension}
                         >
                             Browse
                         </Button>
@@ -107,4 +89,9 @@ const styles = StyleSheet.create({
         alignItems: "center",
         marginLeft: 16,
     },
+    sourceStatus: {
+        color: "#C14033",
+        fontSize: 12,
+        marginLeft: 5,
+    },
 });

src/screens/Chapter/Chapter.js

@@ -12,7 +12,9 @@ import {
     markChapterReadAction,
 } from "../../redux/novel/novel.actions";
 
-import { connect } from "react-redux";
+import { connect, useSelector, useDispatch } from "react-redux";
+import { parseChapterNumber } from "../../Services/updates";
+import { updateChaptersRead } from "../../redux/tracker/tracker.actions";
 
 const ChapterItem = ({
     route,
@@ -35,6 +37,19 @@ const ChapterItem = ({
 
     let _panel = useRef(null);
 
+    const dispatch = useDispatch();
+
+    const trackedNovels = useSelector(
+        (state) => state.trackerReducer.trackedNovels
+    );
+    const tracker = useSelector((state) => state.trackerReducer.tracker);
+
+    let isTracked = false;
+
+    if (!loading) {
+        isTracked = trackedNovels.find((obj) => obj.novelId === novelId);
+    }
+
     useEffect(() => {
         getChapterAction(extensionId, chapterUrl, novelUrl, chapterId);
         insertHistoryAction(novelId, chapterId);
@@ -56,6 +71,8 @@ const ChapterItem = ({
         return textColor;
     };
 
+    const chapterNumber = !loading && parseChapterNumber(chapter.chapterName);
+
     const readerLineHeight = (val) => {
         const lineHeight = {
             12: 20,
@@ -107,7 +124,7 @@ const ChapterItem = ({
                                     size={26}
                                     disabled={!chapter.prevChapter}
                                     onPress={() => {
-                                        navigation.replace("ChapterItem", {
+                                        navigation.replace("Chapter", {
                                             chapterUrl: chapter.prevChapter,
                                             chapterId: chapterId - 1,
                                             extensionId,
@@ -123,7 +140,7 @@ const ChapterItem = ({
                                     size={26}
                                     disabled={!chapter.nextChapter}
                                     onPress={() => {
-                                        navigation.replace("ChapterItem", {
+                                        navigation.replace("Chapter", {
                                             chapterUrl: chapter.nextChapter,
                                             extensionId,
                                             novelUrl,
@@ -154,6 +171,20 @@ const ChapterItem = ({
                 onScroll={({ nativeEvent }) => {
                     if (isCloseToBottom(nativeEvent)) {
                         markChapterReadAction(chapterId);
+                        if (
+                            isTracked &&
+                            chapterNumber &&
+                            chapterNumber >
+                                isTracked.my_list_status.num_chapters_read
+                        ) {
+                            dispatch(
+                                updateChaptersRead(
+                                    isTracked.id,
+                                    tracker.access_token,
+                                    chapterNumber
+                                )
+                            );
+                        }
                     }
                 }}
             >

src/screens/Chapter/components/BottomSheet.js

@@ -3,7 +3,7 @@ import { Animated, StyleSheet, View, Text, Dimensions } from "react-native";
 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 { fonts } from "../../../Services/utils/constants";
 
 import { connect } from "react-redux";
 
@@ -14,7 +14,7 @@ import {
     updateReaderTextSize,
     updateReaderTheme,
 } from "../../../redux/settings/settings.actions";
-import BottomSheetHandle from "../../../components/BottomSheetHandle";
+import BottomSheetHandle from "../../../Components/BottomSheetHandle";
 
 const ChapterBottomSheet = ({
     bottomSheetRef,

src/screens/Extension/Extension.js

@@ -3,17 +3,19 @@ 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/NovelCover";
-import EmptyView from "../../components/EmptyView";
-import { SearchAppbar } from "../../components/Appbar";
+import NovelCover from "../../Components/NovelCover";
+import EmptyView from "../../Components/EmptyView";
 
 import { useSelector } from "react-redux";
+import { Searchbar } from "../../Components/Searchbar";
+import { useTheme } from "../../Hooks/useTheme";
+import { useLibrary } from "../../Hooks/useLibrary";
 
 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 theme = useTheme();
+    const library = useLibrary();
     const itemsPerRow = useSelector(
         (state) => state.settingsReducer.itemsPerRow
     );
@@ -25,17 +27,17 @@ const Extension = ({ navigation, route }) => {
 
     const getSourceUrl = () => {
         if (sourceId === 1) {
-            return `https://lnreader-extensions.herokuapp.com/api/1/novels/1/?o=rating`;
+            return `https://lnreader-extensions.vercel.app/api/1/novels/1/?o=rating`;
         } else {
-            return `https://lnreader-extensions.herokuapp.com/api/${sourceId}/novels/`;
+            return `https://lnreader-extensions.vercel.app/api/${sourceId}/novels/`;
         }
     };
 
     const getSearchUrl = () => {
         if (sourceId === 1) {
-            return `https://lnreader-extensions.herokuapp.com/api/1/search/?s=${searchText}&?o=rating`;
+            return `https://lnreader-extensions.vercel.app/api/1/search/?s=${searchText}&?o=rating`;
         } else {
-            return `https://lnreader-extensions.herokuapp.com/api/${sourceId}/search/?s=${searchText}`;
+            return `https://lnreader-extensions.vercel.app/api/${sourceId}/search/?s=${searchText}`;
         }
     };
 
@@ -48,7 +50,7 @@ const Extension = ({ navigation, route }) => {
             });
     };
 
-    const getSearchResults = (searchText) => {
+    const getSearchResults = () => {
         setLoading(true);
         fetch(getSearchUrl())
             .then((response) => response.json())
@@ -74,15 +76,16 @@ const Extension = ({ navigation, route }) => {
                     { backgroundColor: theme.colorPrimaryDark },
                 ]}
             >
-                <SearchAppbar
-                    screen="Extension"
+                <Searchbar
+                    theme={theme}
                     placeholder={`Search ${sourceName}`}
+                    left="arrow-left"
+                    onPressLeft={() => navigation.goBack()}
                     searchText={searchText}
-                    setSearchText={setSearchText}
-                    getSearchResults={getSearchResults}
-                    getNovels={getNovels}
-                    setLoading={setLoading}
-                    openWebView={() => WebBrowser.openBrowserAsync(sourceUrl)}
+                    onChangeText={(text) => setSearchText(text)}
+                    onSubmitEditing={getSearchResults}
+                    right="earth"
+                    onPressRight={() => WebBrowser.openBrowserAsync(sourceUrl)}
                 />
 
                 {loading ? (
@@ -104,7 +107,7 @@ const Extension = ({ navigation, route }) => {
                             <NovelCover
                                 item={item}
                                 onPress={() =>
-                                    navigation.navigate("NovelItem", {
+                                    navigation.navigate("Novel", {
                                         novelName: item.novelName,
                                         novelCover: item.novelCover,
                                         novelUrl: item.novelUrl,

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/Appbar";
+import { Appbar } from "../../Components/Appbar";
 import HistoryCard from "./components/HistoryCard";
 
 import { connect } from "react-redux";
-import EmptyView from "../../components/EmptyView";
+import EmptyView from "../../Components/EmptyView";
 
 import {
     getHistoryAction,

src/screens/History/components/HistoryCard.js

@@ -16,11 +16,12 @@ const HistoryCard = ({ item, deleteHistoryAction, navigation }) => {
             rippleColor={theme.rippleColor}
             borderless
             onPress={() =>
-                navigation.navigate("NovelItem", {
+                navigation.navigate("Novel", {
                     novelName: item.novelName,
                     novelCover: item.novelCover,
                     extensionId: item.extensionId,
                     novelUrl: item.novelUrl,
+                    sourceId: item.sourceId,
                 })
             }
         >
@@ -74,7 +75,7 @@ const HistoryCard = ({ item, deleteHistoryAction, navigation }) => {
                             color={theme.textColorPrimary}
                             style={{ marginRight: 10 }}
                             onPress={() =>
-                                navigation.navigate("ChapterItem", {
+                                navigation.navigate("Chapter", {
                                     chapterId: item.historyChapterId,
                                     chapterUrl: item.chapterUrl,
                                     extensionId: item.sourceId,

src/screens/Library/Library.js

@@ -1,59 +1,65 @@
-import React, { useState, useCallback, useEffect } from "react";
+import React, { useState, useCallback } from "react";
 import {
     StyleSheet,
     Text,
     View,
     RefreshControl,
     ActivityIndicator,
-    ToastAndroid,
 } from "react-native";
 import { FlatList } from "react-native-gesture-handler";
 import { useFocusEffect } from "@react-navigation/native";
-import { connect } from "react-redux";
+import { connect, useDispatch } from "react-redux";
 
-import NovelCover from "../../components/NovelCover";
-import EmptyView from "../../components/EmptyView";
+import NovelCover from "../../Components/NovelCover";
+import EmptyView from "../../Components/EmptyView";
 
 import {
     getLibraryAction,
     searchLibraryAction,
 } from "../../redux/library/library.actions";
-import { SearchAppbar } from "../../components/Appbar";
+import { SearchAppbar } from "../../Components/Appbar";
 import { setNovel } from "../../redux/novel/novel.actions";
-import { updateAllNovels } from "../../services/updates";
+import { updateLibraryAction } from "../../redux/updates/updates.actions";
+import { useTheme } from "../../Hooks/useTheme";
+import { Searchbar } from "../../Components/Searchbar";
+
+const LibraryScreen = ({ navigation, novels, loading, itemsPerRow }) => {
+    const theme = useTheme();
+    const dispatch = useDispatch();
 
-const LibraryScreen = ({
-    navigation,
-    theme,
-    novels,
-    loading,
-    getLibraryAction,
-    searchLibraryAction,
-    setNovel,
-    searchResults,
-    itemsPerRow,
-}) => {
     const [refreshing, setRefreshing] = useState(false);
-
     const [searchText, setSearchText] = useState("");
 
-    useEffect(() => {
-        getLibraryAction();
-    }, [getLibraryAction, novels]);
+    useFocusEffect(
+        useCallback(() => {
+            setSearchText("");
+            dispatch(getLibraryAction());
+        }, [getLibraryAction])
+    );
 
-    /**
-     * TODO: fix refreshing
-     */
     const onRefresh = () => {
-        ToastAndroid.show("Updating library", ToastAndroid.SHORT);
         setRefreshing(true);
-        updateAllNovels();
+        dispatch(updateLibraryAction());
         setRefreshing(false);
     };
 
     const redirectToNovel = (item) => {
-        navigation.navigate("NovelItem", item);
-        setNovel(item);
+        navigation.navigate("Novel", item);
+        dispatch(setNovel(item));
+    };
+
+    const renderNovels = ({ item }) => (
+        <NovelCover item={item} onPress={() => redirectToNovel(item)} />
+    );
+
+    const clearSearchbar = () => {
+        dispatch(getLibraryAction());
+        setSearchText("");
+    };
+
+    const onChangeText = (text) => {
+        setSearchText(text);
+        dispatch(searchLibraryAction(text));
     };
 
     return (
@@ -64,13 +70,13 @@ const LibraryScreen = ({
                     { backgroundColor: theme.colorPrimaryDark },
                 ]}
             >
-                <SearchAppbar
-                    screen="Library"
+                <Searchbar
                     placeholder="Search Library"
-                    getNovels={getLibraryAction}
-                    getSearchResults={searchLibraryAction}
                     searchText={searchText}
-                    setSearchText={setSearchText}
+                    clearSearchbar={clearSearchbar}
+                    onChangeText={onChangeText}
+                    left="magnify"
+                    theme={theme}
                 />
                 {loading ? (
                     <ActivityIndicator
@@ -85,14 +91,9 @@ const LibraryScreen = ({
                         }}
                         numColumns={itemsPerRow}
                         key={itemsPerRow}
-                        data={!searchText ? novels : searchResults}
+                        data={novels}
                         keyExtractor={(item) => item.novelUrl}
-                        renderItem={({ item }) => (
-                            <NovelCover
-                                item={item}
-                                onPress={() => redirectToNovel(item)}
-                            />
-                        )}
+                        renderItem={renderNovels}
                         refreshControl={
                             <RefreshControl
                                 refreshing={refreshing}
@@ -126,18 +127,12 @@ const LibraryScreen = ({
 };
 
 const mapStateToProps = (state) => ({
-    theme: state.themeReducer.theme,
     itemsPerRow: state.settingsReducer.itemsPerRow,
     novels: state.libraryReducer.novels,
-    searchResults: state.libraryReducer.searchResults,
     loading: state.libraryReducer.loading,
 });
 
-export default connect(mapStateToProps, {
-    getLibraryAction,
-    searchLibraryAction,
-    setNovel,
-})(LibraryScreen);
+export default connect(mapStateToProps)(LibraryScreen);
 
 const styles = StyleSheet.create({
     container: {

src/screens/More/About.js

@@ -2,10 +2,10 @@ import React from "react";
 import { View } from "react-native";
 import * as Linking from "expo-linking";
 
-import { Appbar } from "../../components/Appbar";
+import { Appbar } from "../../Components/Appbar";
 
 import { useSelector } from "react-redux";
-import { Divider, ListItem, ListSection } from "../../components/List";
+import { Divider, ListItem, ListSection } from "../../Components/List";
 
 const AboutScreen = ({ navigation }) => {
     const theme = useSelector((state) => state.themeReducer.theme);
@@ -17,12 +17,12 @@ const AboutScreen = ({ navigation }) => {
                 <ListSection>
                     <ListItem
                         title="Version"
-                        description="Stable 1.0.13"
+                        description="Stable 1.0.16"
                         theme={theme}
                     />
                     <ListItem
                         title="Build Time"
-                        description="24-04-21 21:00 PM"
+                        description="03-05-21 20:45 PM"
                         theme={theme}
                     />
                     <ListItem

src/screens/More/More.js

@@ -2,8 +2,8 @@ import React from "react";
 import { StyleSheet, View, Image } from "react-native";
 import { useSelector } from "react-redux";
 
-import { Appbar } from "../../components/Appbar";
-import { ListItem, ListSection } from "../../components/List";
+import { Appbar } from "../../Components/Appbar";
+import { ListItem, ListSection } from "../../Components/List";
 
 const MoreScreen = ({ navigation }) => {
     const theme = useSelector((state) => state.themeReducer.theme);
@@ -37,17 +37,27 @@ const MoreScreen = ({ navigation }) => {
                         title="Settings"
                         icon="cog-outline"
                         onPress={() =>
-                            navigation.navigate("SettingsStack", {
+                            navigation.navigate("MoreStack", {
                                 screen: "Settings",
                             })
                         }
                         theme={theme}
                     />
+                    <ListItem
+                        title="Tracking"
+                        icon="sync"
+                        onPress={() =>
+                            navigation.navigate("MoreStack", {
+                                screen: "Trackers",
+                            })
+                        }
+                        theme={theme}
+                    />
                     <ListItem
                         title="About"
                         icon="information-outline"
                         onPress={() =>
-                            navigation.navigate("SettingsStack", {
+                            navigation.navigate("MoreStack", {
                                 screen: "About",
                             })
                         }

src/screens/More/Settings.js

@@ -10,21 +10,22 @@ import {
 import { deleteAllHistory } from "../../database/queries/HistoryQueries";
 import { deleteNovelCache } from "../../database/queries/NovelQueries";
 
-import { Appbar } from "../../components/Appbar";
+import { Appbar } from "../../Components/Appbar";
 import {
     Divider,
     ListItem,
     ListSection,
     ListSubHeader,
-} from "../../components/List";
+    InfoItem,
+} from "../../Components/List";
 import DisplayModeModal from "./components/DisplayModeModal";
 import GridSizeModal from "./components/GridSizeModal";
 import ThemeModal from "./components/ThemeModal";
+import { createBackup, restoreBackup } from "../../Services/backup";
+import { useTheme } from "../../Hooks/useTheme";
 
 const SettingsScreen = ({
     navigation,
-    theme,
-    themeCode,
     displayMode,
     itemsPerRow,
     switchTheme,
@@ -41,6 +42,8 @@ const SettingsScreen = ({
         return label[displayMode];
     };
 
+    const theme = useTheme();
+
     // Display Mode Modal
     const [displayModalVisible, setDisplayModalVisible] = useState(false);
     const showDisplayModal = () => setDisplayModalVisible(true);
@@ -102,6 +105,27 @@ const SettingsScreen = ({
                         onPress={showthemeModal}
                         theme={theme}
                     />
+                    <Divider theme={theme} />
+                    <ListSubHeader theme={theme}>Backup</ListSubHeader>
+                    <ListItem
+                        title="Create backup"
+                        description="Can be used to restore current library"
+                        onPress={createBackup}
+                        theme={theme}
+                    />
+                    <ListItem
+                        title="Restore backup"
+                        description="Restore library from backup file"
+                        onPress={restoreBackup}
+                        theme={theme}
+                    />
+                    <InfoItem
+                        title="Create backup may not work on devices with Android 9 or lower."
+                        icon="information-outline"
+                        description="Restore library from backup file"
+                        onPress={restoreBackup}
+                        theme={theme}
+                    />
                 </ListSection>
                 <DisplayModeModal
                     displayMode={displayMode}
@@ -129,7 +153,6 @@ const SettingsScreen = ({
 };
 
 const mapStateToProps = (state) => ({
-    theme: state.themeReducer.theme,
     displayMode: state.settingsReducer.displayMode,
     itemsPerRow: state.settingsReducer.itemsPerRow,
 });

src/screens/More/Trackers.js

@@ -0,0 +1,158 @@
+import React, { useState } from "react";
+import { View } from "react-native";
+import { Modal, Portal, Text, Button, Provider } from "react-native-paper";
+
+import * as WebBrowser from "expo-web-browser";
+import {
+    myAnimeListConfig,
+    getAccessToken,
+    malTokenWatcher,
+} from "../../Services/Trackers/myAnimeList";
+import { Appbar } from "../../Components/Appbar";
+
+import { useSelector, useDispatch } from "react-redux";
+import {
+    Divider,
+    ListItem,
+    ListSection,
+    ListSubHeader,
+} from "../../Components/List";
+import { removeTracker, setTracker } from "../../redux/tracker/tracker.actions";
+
+const TrackerScreen = ({ navigation }) => {
+    const theme = useSelector((state) => state.themeReducer.theme);
+    const tracker = useSelector((state) => state.trackerReducer.tracker);
+    const dispatch = useDispatch();
+
+    // Tracker Modal
+    const [visible, setVisible] = useState(false);
+    const showModal = () => setVisible(true);
+    const hideModal = () => setVisible(false);
+
+    return (
+        <Provider>
+            <Appbar title="Tacking" onBackAction={() => navigation.goBack()} />
+            <View
+                style={{
+                    flex: 1,
+                    backgroundColor: theme.colorPrimaryDark,
+                    paddingVertical: 8,
+                }}
+            >
+                <ListSection>
+                    <ListSubHeader theme={theme}>Services</ListSubHeader>
+                    <ListItem
+                        title="MyAnimeList"
+                        onPress={async () => {
+                            if (tracker) {
+                                showModal();
+                            } else {
+                                await WebBrowser.openAuthSessionAsync(
+                                    myAnimeListConfig.authUrl,
+                                    myAnimeListConfig.redirectUri
+                                ).then((res) => {
+                                    console.log(res.type);
+                                    if (res.type === "success") {
+                                        const { url } = res;
+
+                                        const codeExtractor = new RegExp(
+                                            /=([^&]+)/
+                                        );
+                                        let code = url.match(codeExtractor);
+
+                                        console.log(code);
+
+                                        if (code) {
+                                            code = code[1];
+                                            getAccessToken(
+                                                code,
+                                                myAnimeListConfig.codeChallenge
+                                            ).then((objects) => {
+                                                console.log(objects);
+                                                dispatch(setTracker(objects));
+                                            });
+                                        }
+                                    }
+                                });
+                            }
+                        }}
+                        right={tracker && "check"}
+                        theme={theme}
+                    />
+                    {tracker && tracker.expires_in < new Date(Date.now()) && (
+                        <>
+                            <Divider theme={theme} />
+                            <ListSubHeader theme={theme}>
+                                Settings
+                            </ListSubHeader>
+                            <ListItem
+                                title="Revalidate MyAnimeList"
+                                onPress={() => {
+                                    const res = malTokenWatcher(tracker);
+                                    dispatch(setTracker(res));
+                                }}
+                                theme={theme}
+                            />
+                        </>
+                    )}
+                </ListSection>
+
+                <Portal>
+                    <Modal
+                        visible={visible}
+                        onDismiss={hideModal}
+                        contentContainerStyle={{
+                            padding: 20,
+                            margin: 20,
+                            borderRadius: 6,
+                            backgroundColor: theme.colorPrimaryDark,
+                        }}
+                    >
+                        <Text
+                            style={{
+                                color: theme.textColorPrimary,
+                                fontSize: 20,
+                            }}
+                        >
+                            Log out from MyAnimeList?
+                        </Text>
+                        <View
+                            style={{
+                                flexDirection: "row",
+                                justifyContent: "flex-end",
+                            }}
+                        >
+                            <Button
+                                style={{ marginTop: 30 }}
+                                labelStyle={{
+                                    color: theme.colorAccentDark,
+                                    letterSpacing: 0,
+                                    textTransform: "none",
+                                }}
+                                onPress={hideModal}
+                            >
+                                Cancel
+                            </Button>
+                            <Button
+                                style={{ marginTop: 30 }}
+                                labelStyle={{
+                                    color: theme.colorAccentDark,
+                                    letterSpacing: 0,
+                                    textTransform: "none",
+                                }}
+                                onPress={() => {
+                                    dispatch(removeTracker());
+                                    hideModal();
+                                }}
+                            >
+                                Logout
+                            </Button>
+                        </View>
+                    </Modal>
+                </Portal>
+            </View>
+        </Provider>
+    );
+};
+
+export default TrackerScreen;

src/screens/More/components/GridSizeModal.js

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

src/screens/Novel/Novel.js

@@ -1,41 +1,31 @@
 import React, { useEffect, useRef, useState } from "react";
-import {
-    StyleSheet,
-    View,
-    FlatList,
-    RefreshControl,
-    ToastAndroid,
-} from "react-native";
+import { StyleSheet, View, FlatList, RefreshControl } from "react-native";
 import { Provider, Portal } from "react-native-paper";
+import { useTheme } from "../../Hooks/useTheme";
 
 import ChapterCard from "./components/ChapterCard";
 import NovelInfoHeader from "./components/NovelHeader";
-import { BottomSheet } from "./components/BottomSheet";
+import ChaptersSettingsSheet from "./components/ChaptersSettingsSheet";
 
 import { connect } from "react-redux";
 
 import {
     getNovelAction,
-    followNovelAction,
     sortAndFilterChapters,
     updateNovelAction,
-    downloadAllChaptersAction,
-    deleteAllChaptersAction,
 } from "../../redux/novel/novel.actions";
+import TrackSheet from "./components/Tracker/TrackSheet";
+import { showToast } from "../../Hooks/showToast";
 
 const Novel = ({
     route,
-    theme,
     novel,
     chapters,
     loading,
     getNovelAction,
     fetching,
-    followNovelAction,
     sortAndFilterChapters,
     updateNovelAction,
-    downloadAllChaptersAction,
-    deleteAllChaptersAction,
 }) => {
     const {
         sourceId,
@@ -46,16 +36,22 @@ const Novel = ({
         novelId,
     } = route.params;
 
-    let _panel = useRef(null); // Bottomsheet ref
+    const theme = useTheme();
+
+    let chaptersSettingsSheetRef = useRef(null);
+    let trackerSheetRef = useRef(null);
 
     const [sort, setSort] = useState("ORDER BY chapterId ASC");
     const [filter, setFilter] = useState("");
 
     useEffect(() => {
         getNovelAction(followed, sourceId, novelUrl, novelId, sort, filter);
-    }, [getNovelAction, followNovelAction, sort, filter]);
+    }, [getNovelAction, sort, filter]);
 
-    let lastRead = !loading && chapters.find((obj) => obj.read === 0);
+    const onRefresh = async () => {
+        await updateNovelAction(sourceId, novelUrl, novelId);
+        showToast(`Updated ${novelName}`);
+    };
 
     const renderChapterCard = ({ item }) => (
         <ChapterCard
@@ -65,11 +61,6 @@ const Novel = ({
         />
     );
 
-    const onRefresh = () => {
-        updateNovelAction(sourceId, novelUrl, novelId);
-        ToastAndroid.show(`Updated ${novelName}`, ToastAndroid.SHORT);
-    };
-
     return (
         <Provider>
             <View
@@ -88,24 +79,14 @@ const Novel = ({
                     renderItem={renderChapterCard}
                     ListHeaderComponent={
                         <NovelInfoHeader
-                            theme={theme}
-                            item={{ novelName, novelCover }}
-                            novel={novel}
-                            noOfChapters={chapters?.length}
-                            followNovelAction={followNovelAction}
                             loading={loading}
-                            lastRead={lastRead}
-                            bottomSheetRef={_panel}
-                            downloadAllChapters={() =>
-                                downloadAllChaptersAction(
-                                    sourceId,
-                                    novelUrl,
-                                    chapters
-                                )
-                            }
-                            deleteAllChapters={() =>
-                                deleteAllChaptersAction(chapters)
-                            }
+                            novelName={novelName}
+                            novelCover={novelCover}
+                            novel={novel}
+                            chapters={chapters}
+                            trackerSheetRef={trackerSheetRef}
+                            chaptersSettingsSheetRef={chaptersSettingsSheetRef}
+                            theme={theme}
                         />
                     }
                     refreshControl={
@@ -117,23 +98,30 @@ const Novel = ({
                         />
                     }
                 />
-                <Portal>
-                    <BottomSheet
-                        novelUrl={novelUrl}
-                        bottomSheetRef={_panel}
-                        sortAndFilterChapters={sortAndFilterChapters}
-                        sort={sort}
-                        filter={filter}
-                        setSort={setSort}
-                        setFilter={setFilter}
-                    />
-                </Portal>
+                {!loading && (
+                    <Portal>
+                        <ChaptersSettingsSheet
+                            novelUrl={novelUrl}
+                            bottomSheetRef={chaptersSettingsSheetRef}
+                            sortAndFilterChapters={sortAndFilterChapters}
+                            sort={sort}
+                            filter={filter}
+                            setSort={setSort}
+                            setFilter={setFilter}
+                        />
+                        <TrackSheet
+                            bottomSheetRef={trackerSheetRef}
+                            novelId={novel.novelId}
+                            novelName={novel.novelName}
+                            theme={theme}
+                        />
+                    </Portal>
+                )}
             </View>
         </Provider>
     );
 };
 const mapStateToProps = (state) => ({
-    theme: state.themeReducer.theme,
     novel: state.novelReducer.novel,
     chapters: state.novelReducer.chapters,
     loading: state.novelReducer.loading,
@@ -142,15 +130,11 @@ const mapStateToProps = (state) => ({
 
 export default connect(mapStateToProps, {
     getNovelAction,
-    followNovelAction,
+
     sortAndFilterChapters,
     updateNovelAction,
-    downloadAllChaptersAction,
-    deleteAllChaptersAction,
 })(Novel);
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-    },
+    container: { flex: 1 },
 });

src/screens/Novel/components/ChapterCard.js

@@ -89,7 +89,7 @@ const ChapterCard = ({
         <TouchableRipple
             style={styles.chapterCardContainer}
             onPress={() =>
-                navigation.navigate("ChapterItem", {
+                navigation.navigate("Chapter", {
                     chapterId: chapter.chapterId,
                     chapterUrl: chapter.chapterUrl,
                     extensionId,

src/screens/Novel/components/ChaptersSettingsSheet.js

@@ -1,11 +1,11 @@
 import React, { useState } from "react";
-import { StyleSheet, View, Text } from "react-native";
+import { StyleSheet, View, Text, Animated } from "react-native";
 import { List, RadioButton, Checkbox } from "react-native-paper";
 import Bottomsheet from "rn-sliding-up-panel";
 
 import { useSelector } from "react-redux";
 
-export const BottomSheet = ({
+const ChaptersSettingsSheet = ({
     bottomSheetRef,
     sort,
     filter,
@@ -17,8 +17,11 @@ export const BottomSheet = ({
 
     const theme = useSelector((state) => state.themeReducer.theme);
 
+    const [animatedValue] = useState(new Animated.Value(0));
+
     return (
         <Bottomsheet
+            animatedValue={animatedValue}
             ref={bottomSheetRef}
             draggableRange={{ top: 370, bottom: 0 }}
             snappingPoints={[0, 370]}
@@ -159,6 +162,8 @@ export const BottomSheet = ({
     );
 };
 
+export default ChaptersSettingsSheet;
+
 const styles = StyleSheet.create({
     contentContainer: {
         flex: 1,

src/screens/Novel/components/Info/FollowChip.js

@@ -0,0 +1,53 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import { Chip } from "react-native-paper";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { useDispatch } from "react-redux";
+
+import { followNovelAction } from "../../../../redux/novel/novel.actions";
+
+const FollowChip = ({ followed, novel, theme }) => {
+    const dispatch = useDispatch();
+
+    const getIconName = () => (followed ? "heart" : "heart-outline");
+
+    const getChipLabel = () => (followed ? "In Library" : "Add to library");
+
+    return (
+        <Chip
+            mode="outlined"
+            icon={() => (
+                <MaterialCommunityIcons
+                    name={getIconName()}
+                    size={21}
+                    color={theme.colorAccentDark}
+                />
+            )}
+            onPress={() => dispatch(followNovelAction(novel))}
+            style={[
+                { backgroundColor: theme.colorPrimaryDark },
+                styles.toggleFavourite,
+            ]}
+            textStyle={{
+                fontWeight: "bold",
+                color: theme.textColorPrimary,
+            }}
+        >
+            {getChipLabel()}
+        </Chip>
+    );
+};
+
+export default FollowChip;
+
+const styles = StyleSheet.create({
+    toggleFavourite: {
+        height: 32,
+        justifyContent: "center",
+        alignItems: "center",
+        marginLeft: 16,
+        paddingLeft: 4,
+        borderWidth: 0,
+        elevation: 0,
+    },
+});

src/screens/Novel/components/Info/GenreChip.js

@@ -0,0 +1,30 @@
+import React from "react";
+import { Text, StyleSheet } from "react-native";
+
+export const GenreChip = ({ children, theme }) => (
+    <Text
+        style={[
+            styles.genreChip,
+            {
+                color: theme.colorAccentDark,
+                borderColor: theme.colorAccentDark,
+                backgroundColor: theme.colorPrimary,
+            },
+        ]}
+    >
+        {children}
+    </Text>
+);
+
+const styles = StyleSheet.create({
+    genreChip: {
+        flex: 1,
+        justifyContent: "center",
+        paddingVertical: 2,
+        paddingHorizontal: 10,
+        marginHorizontal: 2,
+        fontSize: 13,
+        borderWidth: 1,
+        borderRadius: 50,
+    },
+});

src/screens/Novel/components/Info/NovelCoverImage.js

@@ -0,0 +1,24 @@
+import React from "react";
+import { View, ImageBackground, StyleSheet } from "react-native";
+
+import { LinearGradient } from "expo-linear-gradient";
+
+const NovelCoverImage = ({ children, source, theme }) => {
+    return (
+        <ImageBackground source={source} style={styles.background}>
+            <LinearGradient
+                colors={["rgba(0,0,0,0.2)", theme.colorPrimaryDark]}
+                style={styles.linearGradient}
+            >
+                {children}
+            </LinearGradient>
+        </ImageBackground>
+    );
+};
+
+export default NovelCoverImage;
+
+const styles = StyleSheet.create({
+    background: { height: 285 },
+    linearGradient: { height: 286 },
+});

src/screens/Novel/components/Info/NovelSummary.js

@@ -0,0 +1,66 @@
+import React, { useState } from "react";
+import { View, Text, StyleSheet } from "react-native";
+
+const NovelSummary = ({ summary, followed, theme }) => {
+    const [more, showMore] = useState(!followed);
+
+    return (
+        summary !== "" && (
+            <View style={styles.summaryContainer}>
+                <Text
+                    style={[
+                        { color: theme.textColorPrimary },
+                        styles.summaryHeader,
+                    ]}
+                >
+                    About
+                </Text>
+                <Text
+                    style={{
+                        color: theme.textColorSecondary,
+                        lineHeight: 20,
+                    }}
+                    numberOfLines={more ? 200 : 2}
+                    onPress={() => showMore(!more)}
+                    ellipsizeMode="clip"
+                >
+                    {summary}
+                </Text>
+                <Text
+                    style={[
+                        {
+                            color: theme.colorAccentDark,
+                            backgroundColor: theme.colorPrimaryDark,
+                        },
+                        styles.showMoreButton,
+                    ]}
+                    onPress={() => showMore(!more)}
+                >
+                    {more ? "Less" : "More"}
+                </Text>
+            </View>
+        )
+    );
+};
+
+export default NovelSummary;
+
+const styles = StyleSheet.create({
+    summaryContainer: {
+        paddingHorizontal: 16,
+        marginBottom: 8,
+    },
+    summaryHeader: {
+        marginTop: 5,
+        paddingVertical: 5,
+        fontSize: 15,
+        fontWeight: "bold",
+    },
+    showMoreButton: {
+        fontWeight: "bold",
+        position: "absolute",
+        bottom: 0,
+        right: 18,
+        paddingLeft: 6,
+    },
+});

src/screens/Novel/components/Info/ReadButton.js

@@ -0,0 +1,57 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import { Button } from "react-native-paper";
+
+const ReadButton = ({ navigation, novel, chapters, theme }) => {
+    const lastRead = chapters.find((obj) => obj.read === 0);
+
+    return (
+        chapters.length > 0 &&
+        (lastRead ? (
+            <Button
+                color="white"
+                style={[
+                    { backgroundColor: theme.colorAccentDark },
+                    styles.startButton,
+                ]}
+                uppercase={false}
+                labelStyle={{ letterSpacing: 0 }}
+                onPress={() => {
+                    navigation.navigate("Chapter", {
+                        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.textColorHintDark}
+                style={[
+                    styles.startButton,
+                    { backgroundColor: theme.colorDisabled },
+                ]}
+                uppercase={false}
+                labelStyle={{ letterSpacing: 0 }}
+            >
+                All chapters read
+            </Button>
+        ))
+    );
+};
+
+export default ReadButton;
+
+const styles = StyleSheet.create({
+    startButton: {
+        marginTop: 8,
+        marginBottom: 16,
+        marginHorizontal: 16,
+    },
+});

src/screens/Novel/components/Info/TrackerChip.js

@@ -0,0 +1,48 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import { Chip } from "react-native-paper";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+
+const TrackerChip = ({ isTracked, trackerSheetRef, theme }) => {
+    const getIconName = () => (isTracked ? "check" : "sync");
+
+    const getChipLabel = () => (isTracked ? "Tracked" : "Tracking");
+
+    return (
+        <Chip
+            mode="outlined"
+            icon={() => (
+                <MaterialCommunityIcons
+                    name={getIconName(isTracked)}
+                    size={21}
+                    color={theme.colorAccentDark}
+                />
+            )}
+            onPress={() => trackerSheetRef.current.show()}
+            style={[
+                styles.toggleFavourite,
+                { backgroundColor: theme.colorPrimaryDark },
+            ]}
+            textStyle={{
+                fontWeight: "bold",
+                color: theme.textColorPrimary,
+            }}
+        >
+            {getChipLabel()}
+        </Chip>
+    );
+};
+
+export default TrackerChip;
+
+const styles = StyleSheet.create({
+    toggleFavourite: {
+        height: 32,
+        justifyContent: "center",
+        alignItems: "center",
+        paddingLeft: 4,
+        marginLeft: 0,
+        borderWidth: 0,
+        elevation: 0,
+    },
+});

src/screens/Novel/components/NovelHeader.js

@@ -1,158 +1,122 @@
 import React, { useState } from "react";
-import {
-    View,
-    Text,
-    ImageBackground,
-    StyleSheet,
-    Image,
-    FlatList,
-    Share,
-} from "react-native";
-import {
-    TouchableRipple,
-    IconButton,
-    Button,
-    Chip,
-    Menu,
-} from "react-native-paper";
+import { View, Text, StyleSheet, Image, FlatList, Share } from "react-native";
+import { TouchableRipple, IconButton, Button, Menu } from "react-native-paper";
 import { useNavigation } from "@react-navigation/native";
 import * as WebBrowser from "expo-web-browser";
+import { useSelector, useDispatch } from "react-redux";
 
-import { LinearGradient } from "expo-linear-gradient";
-import { MaterialCommunityIcons } from "@expo/vector-icons";
+import {
+    downloadAllChaptersAction,
+    deleteAllChaptersAction,
+} from "../../../redux/novel/novel.actions";
+import { GenreChip } from "./Info/GenreChip";
+import NovelCoverImage from "./Info/NovelCoverImage";
+import FollowChip from "./Info/FollowChip";
+import TrackerChip from "./Info/TrackerChip";
+import NovelSummary from "./Info/NovelSummary";
+import ReadButton from "./Info/ReadButton";
 
 const NovelInfoHeader = ({
-    item,
-    novel,
-    noOfChapters,
-    followNovelAction,
+    novelName,
+    novelCover,
     loading,
-    bottomSheetRef,
+    novel,
+    chapters,
     theme,
-    lastRead,
-    downloadAllChapters,
-    deleteAllChapters,
+    chaptersSettingsSheetRef,
+    trackerSheetRef,
 }) => {
     const navigation = useNavigation();
+    const dispatch = useDispatch();
 
-    const [more, setMore] = useState(
-        !loading && novel.followed !== 1 ? true : false
+    const [downloadMenu, showDownloadMenu] = useState(false);
+
+    const tracker = useSelector((state) => state.trackerReducer.tracker);
+    const trackedNovels = useSelector(
+        (state) => state.trackerReducer.trackedNovels
     );
 
-    const [visible, setVisible] = useState(false);
-    const openMenu = () => setVisible(true);
-    const closeMenu = () => setVisible(false);
+    let isTracked = false;
 
-    const renderGenreChip = ({ item }) => (
-        <Text
-            style={[
-                styles.genre,
-                {
-                    color: theme.colorAccentDark,
-                    borderColor: theme.colorAccentDark,
-                    backgroundColor: theme.colorPrimary,
-                },
-            ]}
-        >
-            {item}
-        </Text>
-    );
+    if (!loading) {
+        isTracked = trackedNovels.find((obj) => obj.novelId === novel.novelId);
+    }
+
+    const getGenres = ({ item }) => <GenreChip theme={theme}>{item}</GenreChip>;
 
     return (
         <View style={{ flexGrow: 1 }}>
-            <ImageBackground
-                source={{ uri: item.novelCover }}
-                style={styles.background}
-            >
-                <LinearGradient
-                    colors={["rgba(0,0,0,0.2)", theme.colorPrimaryDark]}
-                    style={styles.linearGradient}
-                >
-                    <View style={styles.detailsContainer}>
-                        <View>
-                            <Image
-                                source={{ uri: item.novelCover }}
-                                style={styles.logo}
-                            />
-                        </View>
-                        <View style={styles.nameContainer}>
-                            <Text
-                                numberOfLines={2}
-                                style={[
-                                    styles.name,
-                                    { color: theme.textColorPrimary },
-                                ]}
-                            >
-                                {item.novelName}
-                            </Text>
-                            {!loading && (
-                                <>
-                                    <Text
-                                        style={{
-                                            color: theme.textColorSecondary,
-                                            marginVertical: 3,
-                                            fontSize: 14,
-                                            fontWeight: "bold",
-                                        }}
-                                        numberOfLines={2}
-                                    >
-                                        {novel.author.replace(",", ", ")}
-                                    </Text>
-
-                                    <Text
-                                        style={{
-                                            color: theme.textColorSecondary,
-                                            marginVertical: 3,
-                                            fontSize: 14,
-                                        }}
-                                        numberOfLines={1}
-                                    >
-                                        {novel.status}
-                                    </Text>
-                                    <Text
-                                        style={{
-                                            color: theme.textColorSecondary,
-                                            fontSize: 14,
-                                        }}
-                                        numberOfLines={1}
-                                    >
-                                        {novel.source}
-                                    </Text>
-                                </>
-                            )}
-                        </View>
+            <NovelCoverImage source={{ uri: novelCover }} theme={theme}>
+                <View style={styles.detailsContainer}>
+                    <View>
+                        <Image
+                            source={{ uri: novelCover }}
+                            style={styles.logo}
+                        />
                     </View>
-                </LinearGradient>
-            </ImageBackground>
+                    <View style={styles.nameContainer}>
+                        <Text
+                            numberOfLines={2}
+                            style={[
+                                styles.name,
+                                { color: theme.textColorPrimary },
+                            ]}
+                        >
+                            {novelName}
+                        </Text>
+                        {!loading && (
+                            <>
+                                <Text
+                                    style={{
+                                        color: theme.textColorSecondary,
+                                        marginVertical: 3,
+                                        fontSize: 14,
+                                        fontWeight: "bold",
+                                    }}
+                                    numberOfLines={2}
+                                >
+                                    {novel.author.replace(",", ", ")}
+                                </Text>
+
+                                <Text
+                                    style={{
+                                        color: theme.textColorSecondary,
+                                        marginVertical: 3,
+                                        fontSize: 14,
+                                    }}
+                                    numberOfLines={1}
+                                >
+                                    {novel.status}
+                                </Text>
+                                <Text
+                                    style={{
+                                        color: theme.textColorSecondary,
+                                        fontSize: 14,
+                                    }}
+                                    numberOfLines={1}
+                                >
+                                    {novel.source}
+                                </Text>
+                            </>
+                        )}
+                    </View>
+                </View>
+            </NovelCoverImage>
             {!loading && (
                 <>
                     <View style={styles.buttonsContainer}>
-                        <Chip
-                            mode="outlined"
-                            icon={() => (
-                                <MaterialCommunityIcons
-                                    name={
-                                        novel.followed
-                                            ? "heart"
-                                            : "heart-outline"
-                                    }
-                                    size={21}
-                                    color={theme.colorAccentDark}
-                                />
-                            )}
-                            onPress={() => followNovelAction(novel)}
-                            style={[
-                                { backgroundColor: theme.colorPrimaryDark },
-                                styles.toggleFavourite,
-                            ]}
-                            textStyle={{
-                                fontWeight: "bold",
-                                color: theme.textColorPrimary,
-                            }}
-                        >
-                            {novel.followed ? "In Library" : "Add to library"}
-                        </Chip>
-
+                        <FollowChip
+                            theme={theme}
+                            followed={novel.followed}
+                            novel={novel}
+                        />
+                        {tracker && (
+                            <TrackerChip
+                                theme={theme}
+                                isTracked={isTracked}
+                                trackerSheetRef={trackerSheetRef}
+                            />
+                        )}
                         <IconButton
                             onPress={() =>
                                 WebBrowser.openBrowserAsync(novel.sourceUrl)
@@ -169,16 +133,15 @@ const NovelInfoHeader = ({
                             color={theme.colorAccentDark}
                             size={21}
                         />
-
                         <Menu
-                            visible={visible}
-                            onDismiss={closeMenu}
+                            visible={downloadMenu}
+                            onDismiss={() => showDownloadMenu(false)}
                             anchor={
                                 <IconButton
                                     icon="download"
                                     color={theme.colorAccentDark}
                                     size={21}
-                                    onPress={openMenu}
+                                    onPress={() => showDownloadMenu(true)}
                                 />
                             }
                             contentStyle={{ backgroundColor: theme.menuColor }}
@@ -187,58 +150,31 @@ const NovelInfoHeader = ({
                                 title="Download all"
                                 style={{ backgroundColor: theme.menuColor }}
                                 titleStyle={{ color: theme.textColorPrimary }}
-                                onPress={downloadAllChapters}
+                                onPress={() =>
+                                    dispatch(
+                                        downloadAllChaptersAction(
+                                            novel.sourceId,
+                                            novel.novelUrl,
+                                            chapters
+                                        )
+                                    )
+                                }
                             />
                             <Menu.Item
                                 title="Delete downloads"
                                 style={{ backgroundColor: theme.menuColor }}
                                 titleStyle={{ color: theme.textColorPrimary }}
-                                onPress={deleteAllChapters}
+                                onPress={() =>
+                                    dispatch(deleteAllChaptersAction(chapters))
+                                }
                             />
                         </Menu>
                     </View>
-
-                    {novel.novelSummary !== "" && (
-                        <View
-                            style={{
-                                paddingHorizontal: 16,
-                                marginBottom: 8,
-                            }}
-                        >
-                            <Text
-                                style={[
-                                    { color: theme.textColorPrimary },
-                                    styles.summaryHeader,
-                                ]}
-                            >
-                                About
-                            </Text>
-                            <Text
-                                style={{
-                                    color: theme.textColorSecondary,
-                                    lineHeight: 20,
-                                }}
-                                numberOfLines={more ? 100 : 2}
-                                onPress={() => setMore(!more)}
-                                ellipsizeMode="clip"
-                            >
-                                {novel.novelSummary}
-                            </Text>
-                            <Text
-                                style={[
-                                    {
-                                        color: theme.colorAccentDark,
-                                        backgroundColor: theme.colorPrimaryDark,
-                                    },
-                                    styles.moreBtn,
-                                ]}
-                                onPress={() => setMore(!more)}
-                            >
-                                {more ? "Less " : "More "}
-                            </Text>
-                        </View>
-                    )}
-
+                    <NovelSummary
+                        summary={novel.novelSummary}
+                        followed={novel.followed}
+                        theme={theme}
+                    />
                     <FlatList
                         style={
                             novel.novelSummary === ""
@@ -247,57 +183,23 @@ const NovelInfoHeader = ({
                         }
                         contentContainerStyle={styles.genreContainer}
                         horizontal
-                        data={novel.genre && novel.genre.split(",")}
+                        data={novel.genre.split(",")}
                         keyExtractor={(item) => item}
-                        renderItem={renderGenreChip}
+                        renderItem={getGenres}
                         showsHorizontalScrollIndicator={false}
                     />
-                    {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>
-                        ))}
+                    <ReadButton
+                        novel={novel}
+                        chapters={chapters}
+                        navigation={navigation}
+                        theme={theme}
+                    />
                     <TouchableRipple
                         style={styles.bottomsheet}
                         onPress={() =>
-                            bottomSheetRef.current.show({ velocity: -1.5 })
+                            chaptersSettingsSheetRef.current.show({
+                                velocity: -1.5,
+                            })
                         }
                         rippleColor={theme.rippleColor}
                     >
@@ -308,7 +210,7 @@ const NovelInfoHeader = ({
                                     styles.chapters,
                                 ]}
                             >
-                                {noOfChapters + " Chapters"}
+                                {`${chapters.length} Chapters`}
                             </Text>
                             <IconButton
                                 icon="filter-variant"
@@ -331,12 +233,6 @@ const styles = StyleSheet.create({
         marginHorizontal: 16,
         paddingTop: 8,
     },
-    background: {
-        height: 285,
-    },
-    linearGradient: {
-        height: 286,
-    },
     detailsContainer: {
         flex: 1,
         flexDirection: "row",
@@ -349,16 +245,6 @@ const styles = StyleSheet.create({
         margin: 3.2,
         borderRadius: 6,
     },
-    genre: {
-        borderRadius: 50,
-        borderWidth: 1,
-        paddingHorizontal: 10,
-        marginHorizontal: 2,
-        fontSize: 13,
-        paddingVertical: 2,
-        justifyContent: "center",
-        flex: 1,
-    },
     name: {
         fontWeight: "bold",
         fontSize: 18,
@@ -367,16 +253,7 @@ const styles = StyleSheet.create({
         flexDirection: "row",
         alignItems: "center",
     },
-    toggleFavourite: {
-        height: 32,
-        justifyContent: "center",
-        alignItems: "center",
-        marginLeft: 16,
-        marginRight: 4,
-        paddingHorizontal: 4,
-        borderWidth: 0,
-        elevation: 0,
-    },
+
     chapters: {
         paddingHorizontal: 16,
         paddingVertical: 4,
@@ -389,24 +266,7 @@ const styles = StyleSheet.create({
         alignItems: "center",
         paddingRight: 12,
     },
-    summaryHeader: {
-        marginTop: 5,
-        paddingVertical: 5,
-        fontSize: 15,
-        fontWeight: "bold",
-    },
-    moreBtn: {
-        fontWeight: "bold",
-        position: "absolute",
-        bottom: 0,
-        right: 16,
-        paddingLeft: 6,
-    },
-    startButton: {
-        marginTop: 8,
-        marginBottom: 16,
-        marginHorizontal: 16,
-    },
+
     genreContainer: {
         paddingHorizontal: 15,
         paddingBottom: 15,

src/screens/Novel/components/Tracker/MyAnimeListCards.js

@@ -0,0 +1,194 @@
+import React from "react";
+import { StyleSheet, View, Text, Image } from "react-native";
+import { TouchableRipple, IconButton } from "react-native-paper";
+import { useDispatch } from "react-redux";
+import { untrackNovel } from "../../../../redux/tracker/tracker.actions";
+
+export const AddMalTrackingCard = ({ theme, setTrackSearchDialog }) => (
+    <View
+        style={[
+            styles.addCardContainer,
+            { backgroundColor: theme.colorPrimary },
+        ]}
+    >
+        <Image
+            source={require("../../../../../assets/mal.png")}
+            style={styles.trackerIcon}
+        />
+        <TouchableRipple
+            style={styles.rippleContainer}
+            borderless
+            onPress={() => setTrackSearchDialog(true)}
+            rippleColor={theme.colorAccentDark}
+        >
+            <Text
+                style={{
+                    flex: 1,
+                    textAlignVertical: "center",
+                    color: theme.colorAccentDark,
+                }}
+            >
+                Add Tracking
+            </Text>
+        </TouchableRipple>
+    </View>
+);
+
+export const MalTrackItemCard = ({
+    trackItem,
+    setTrackStatusDialog,
+    setTrackChaptersDialog,
+    setTrackScoreDialog,
+    getStatus,
+    theme,
+}) => {
+    const dispatch = useDispatch();
+
+    return (
+        <View
+            style={[
+                styles.cardContainer,
+                { backgroundColor: theme.colorPrimary },
+            ]}
+        >
+            <View
+                style={[
+                    styles.titleContainer,
+                    { borderBottomColor: theme.dividerColor },
+                ]}
+            >
+                <Image
+                    source={require("../../../../../assets/mal.png")}
+                    style={[styles.trackerIcon, { borderBottomLeftRadius: 0 }]}
+                />
+                <View style={styles.listItemContainer}>
+                    <Text
+                        style={[
+                            styles.listItem,
+                            { color: theme.textColorSecondary },
+                        ]}
+                    >
+                        {trackItem.title}
+                    </Text>
+                    <IconButton
+                        icon="close"
+                        color={theme.textColorSecondary}
+                        size={21}
+                        onPress={() => dispatch(untrackNovel(trackItem.id))}
+                    />
+                </View>
+            </View>
+            <View style={{ height: 50, flexDirection: "row" }}>
+                <TouchableRipple
+                    style={[
+                        styles.listItemLeft,
+                        { borderRightColor: theme.dividerColor },
+                    ]}
+                    borderless
+                    onPress={() => setTrackStatusDialog(true)}
+                    rippleColor={theme.rippleColor}
+                >
+                    <Text
+                        style={[
+                            styles.listItem,
+                            { color: theme.textColorSecondary },
+                        ]}
+                    >
+                        {getStatus(trackItem.my_list_status.status)}
+                    </Text>
+                </TouchableRipple>
+                <TouchableRipple
+                    style={{ flex: 1 }}
+                    borderless
+                    onPress={() => setTrackChaptersDialog(true)}
+                    rippleColor={theme.rippleColor}
+                >
+                    <Text
+                        style={[
+                            styles.listItem,
+                            { color: theme.textColorSecondary },
+                        ]}
+                    >
+                        {`${trackItem.my_list_status.num_chapters_read}/${
+                            trackItem.num_chapters !== 0
+                                ? trackItem.num_chapters
+                                : "-"
+                        }`}
+                    </Text>
+                </TouchableRipple>
+                <TouchableRipple
+                    style={[
+                        styles.listItemRight,
+                        { borderLeftColor: theme.dividerColor },
+                    ]}
+                    borderless
+                    onPress={() => setTrackScoreDialog(true)}
+                    rippleColor={theme.rippleColor}
+                >
+                    <Text
+                        style={[
+                            styles.listItem,
+                            { color: theme.textColorSecondary },
+                        ]}
+                    >
+                        {trackItem.my_list_status.score === 0
+                            ? "-"
+                            : trackItem.my_list_status.score}
+                    </Text>
+                </TouchableRipple>
+            </View>
+        </View>
+    );
+};
+
+const styles = StyleSheet.create({
+    trackerIcon: {
+        height: 50,
+        width: 50,
+        borderTopLeftRadius: 4,
+        borderBottomLeftRadius: 4,
+    },
+    rippleContainer: {
+        flex: 1,
+        alignItems: "center",
+        borderTopRightRadius: 4,
+        borderBottomRightRadius: 4,
+    },
+    addCardContainer: {
+        flexDirection: "row",
+        alignItems: "center",
+        margin: 8,
+        borderRadius: 4,
+        elevation: 2,
+    },
+    cardContainer: {
+        margin: 8,
+        elevation: 2,
+        borderRadius: 4,
+    },
+    titleContainer: {
+        flexDirection: "row",
+        alignItems: "center",
+        borderBottomWidth: 1,
+    },
+    listItemContainer: {
+        flex: 1,
+        flexDirection: "row",
+        borderTopRightRadius: 4,
+    },
+    listItem: {
+        flex: 1,
+        textAlign: "center",
+        textAlignVertical: "center",
+    },
+    listItemLeft: {
+        flex: 1,
+        borderRightWidth: 1,
+        borderBottomLeftRadius: 4,
+    },
+    listItemRight: {
+        flex: 1,
+        borderLeftWidth: 1,
+        borderBottomRightRadius: 4,
+    },
+});

src/screens/Novel/components/Tracker/SetTrackChaptersDialog.js

@@ -0,0 +1,67 @@
+import React, { useState } from "react";
+import { StyleSheet, Text } from "react-native";
+import { Modal, TextInput } from "react-native-paper";
+import {
+    RadioButton,
+    RadioButtonGroup,
+} from "../../../../Components/RadioButton";
+
+const SetTrackChaptersDialog = ({
+    trackItem,
+    trackChaptersDialog,
+    setTrackChaptersDialog,
+    updateTrackChapters,
+    theme,
+}) => {
+    const [trackChapters, setTrackChapters] = useState(
+        trackItem.my_list_status.num_chapters_read
+    );
+
+    return (
+        <Modal
+            visible={trackChaptersDialog}
+            onDismiss={() => setTrackChaptersDialog(false)}
+            contentContainerStyle={[
+                styles.containerStyle,
+                { backgroundColor: theme.colorPrimary },
+            ]}
+        >
+            <Text
+                style={[styles.dialogTitle, { color: theme.textColorPrimary }]}
+            >
+                Chapters
+            </Text>
+            <TextInput
+                value={trackChapters.toString()}
+                onChangeText={(text) => setTrackChapters(text ? +text : "")}
+                onSubmitEditing={() => updateTrackChapters(trackChapters)}
+                mode="outlined"
+                keyboardType="numeric"
+                theme={{
+                    colors: {
+                        primary: theme.colorAccentDark,
+                        placeholder: theme.textColorHintDark,
+                        text: theme.textColorPrimary,
+                        background: "transparent",
+                    },
+                }}
+                underlineColor={theme.textColorHintDark}
+                dense
+            />
+        </Modal>
+    );
+};
+
+export default SetTrackChaptersDialog;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        margin: 30,
+        padding: 20,
+        borderRadius: 8,
+    },
+    dialogTitle: {
+        fontSize: 18,
+        marginBottom: 16,
+    },
+});

src/screens/Novel/components/Tracker/SetTrackScoreDialog.js

@@ -0,0 +1,78 @@
+import React from "react";
+import { StyleSheet, Text } from "react-native";
+import { Modal } from "react-native-paper";
+import {
+    RadioButton,
+    RadioButtonGroup,
+} from "../../../../Components/RadioButton";
+
+const SetTrackScoreDialog = ({
+    trackItem,
+    trackScoreDialog,
+    setTrackScoreDialog,
+    updateTrackScore,
+    theme,
+}) => {
+    const getScoreLabel = (score) => {
+        const myanimeListScores = {
+            0: "No Score",
+            1: "Apalling",
+            2: "Horrible",
+            3: "Very Bad",
+            4: "Bad",
+            5: "Average",
+            6: "Fine",
+            7: "Good",
+            8: "Very Good",
+            9: "Great",
+            10: "Masterpiece",
+        };
+
+        return `(${score}) ${myanimeListScores[score]}`;
+    };
+
+    return (
+        <Modal
+            visible={trackScoreDialog}
+            onDismiss={() => setTrackScoreDialog(false)}
+            contentContainerStyle={[
+                styles.containerStyle,
+                { backgroundColor: theme.colorPrimary },
+            ]}
+            theme={{ colors: { backdrop: "rgba(0,0,0,0.25)" } }}
+        >
+            <Text
+                style={[styles.dialogTitle, { color: theme.textColorPrimary }]}
+            >
+                Score
+            </Text>
+            <RadioButtonGroup
+                onValueChange={updateTrackScore}
+                value={trackItem.my_list_status.score}
+            >
+                {[...Array(11).keys()].map((item, index) => (
+                    <RadioButton
+                        key={index}
+                        value={item}
+                        label={getScoreLabel(item)}
+                        theme={theme}
+                    />
+                ))}
+            </RadioButtonGroup>
+        </Modal>
+    );
+};
+
+export default SetTrackScoreDialog;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        margin: 30,
+        padding: 20,
+        borderRadius: 8,
+    },
+    dialogTitle: {
+        fontSize: 18,
+        marginBottom: 16,
+    },
+});

src/screens/Novel/components/Tracker/SetTrackStatusDialog.js

@@ -0,0 +1,67 @@
+import React from "react";
+import { StyleSheet, Text } from "react-native";
+import { Modal } from "react-native-paper";
+import {
+    RadioButton,
+    RadioButtonGroup,
+} from "../../../../Components/RadioButton";
+
+const SetTrackStatusDialog = ({
+    trackItem,
+    trackStatusDialog,
+    setTrackStatusDialog,
+    updateTrackStatus,
+    theme,
+}) => {
+    const myAnimeListStatus = {
+        reading: "Reading",
+        completed: "Completed",
+        on_hold: "On Hold",
+        dropped: "Dropped",
+        plan_to_read: "Plan to read",
+    };
+
+    return (
+        <Modal
+            visible={trackStatusDialog}
+            onDismiss={() => setTrackStatusDialog(false)}
+            contentContainerStyle={[
+                styles.containerStyle,
+                { backgroundColor: theme.colorPrimary },
+            ]}
+        >
+            <Text
+                style={[styles.dialogTitle, { color: theme.textColorPrimary }]}
+            >
+                Status
+            </Text>
+            <RadioButtonGroup
+                onValueChange={updateTrackStatus}
+                value={trackItem.my_list_status.status}
+            >
+                {Object.keys(myAnimeListStatus).map((key, index) => (
+                    <RadioButton
+                        key={index}
+                        value={key}
+                        label={myAnimeListStatus[key]}
+                        theme={theme}
+                    />
+                ))}
+            </RadioButtonGroup>
+        </Modal>
+    );
+};
+
+export default SetTrackStatusDialog;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        margin: 30,
+        padding: 20,
+        borderRadius: 8,
+    },
+    dialogTitle: {
+        fontSize: 18,
+        marginBottom: 16,
+    },
+});

src/screens/Novel/components/Tracker/TrackSearchDialog.js

@@ -0,0 +1,184 @@
+import React, { useEffect, useState } from "react";
+import { StyleSheet, Text, View, Image, ActivityIndicator } from "react-native";
+import { Button, Modal, TextInput, TouchableRipple } from "react-native-paper";
+import { searchNovels } from "../../../../Services/Trackers/myAnimeList";
+import { useSelector, useDispatch } from "react-redux";
+import { ScrollView } from "react-native-gesture-handler";
+import { trackNovel } from "../../../../redux/tracker/tracker.actions";
+
+const TrackSearchDialog = ({
+    trackSearchDialog,
+    setTrackSearchDialog,
+    novelId,
+    novelName,
+    theme,
+}) => {
+    const [loading, setLoading] = useState(true);
+    const [searchResults, setSearchResults] = useState([]);
+    const [searchText, setSearchText] = useState(novelName);
+
+    const [selectedNovel, setSelectedNovel] = useState();
+
+    const tracker = useSelector((state) => state.trackerReducer.tracker);
+
+    const dispatch = useDispatch();
+
+    const getSearchresults = async () => {
+        const res = await searchNovels(searchText, tracker.access_token);
+        setSearchResults(res);
+        setLoading(false);
+    };
+
+    useEffect(() => {
+        trackSearchDialog && getSearchresults();
+    }, [trackSearchDialog]);
+
+    const renderSearchResultCard = (item) => (
+        <TouchableRipple
+            style={[
+                { flexDirection: "row", borderRadius: 4, margin: 8 },
+                selectedNovel &&
+                    selectedNovel.id === item.node.id && {
+                        backgroundColor: theme.rippleColor,
+                    },
+            ]}
+            key={item.node.id}
+            onPress={() => setSelectedNovel(item.node)}
+            rippleColor={theme.rippleColor}
+            borderless
+        >
+            <>
+                <Image
+                    source={{ uri: item.node.main_picture.large }}
+                    style={{ height: 150, width: 100, borderRadius: 4 }}
+                />
+                <Text
+                    style={{
+                        flex: 1,
+                        color: theme.textColorPrimary,
+                        marginLeft: 20,
+                        fontSize: 16,
+                        flexWrap: "wrap",
+                        padding: 8,
+                        paddingLeft: 0,
+                    }}
+                >
+                    {item.node.title}
+                </Text>
+            </>
+        </TouchableRipple>
+    );
+
+    return (
+        <Modal
+            visible={trackSearchDialog}
+            onDismiss={() => setTrackSearchDialog(false)}
+            contentContainerStyle={[
+                styles.containerStyle,
+                { backgroundColor: theme.colorPrimary },
+            ]}
+            theme={{ colors: { backdrop: "rgba(0,0,0,0.25)" } }}
+        >
+            <TextInput
+                value={searchText}
+                onChangeText={(text) => setSearchText(text)}
+                onSubmitEditing={getSearchresults}
+                theme={{
+                    colors: {
+                        primary: theme.colorAccentDark,
+                        text: theme.textColorPrimary,
+                        background: "transparent",
+                    },
+                }}
+                underlineColor={theme.textColorHintDark}
+                right={
+                    <TextInput.Icon
+                        color={theme.textColorSecondary}
+                        icon="close"
+                        onPress={() => setSearchText("")}
+                    />
+                }
+            />
+            <ScrollView
+                style={{ flexGrow: 1, maxHeight: 500, marginVertical: 8 }}
+            >
+                {loading ? (
+                    <ActivityIndicator
+                        color={theme.colorAccentDark}
+                        size={45}
+                        style={{ margin: 16 }}
+                    />
+                ) : (
+                    searchResults &&
+                    searchResults.data &&
+                    searchResults.data.map((result) =>
+                        renderSearchResultCard(result)
+                    )
+                )}
+            </ScrollView>
+            <View
+                style={{
+                    flexDirection: "row",
+                    justifyContent: "space-between",
+                    marginTop: 30,
+                }}
+            >
+                <Button
+                    labelStyle={{
+                        color: theme.colorAccentDark,
+                        letterSpacing: 0,
+                        textTransform: "none",
+                    }}
+                    theme={{ colors: { primary: theme.colorAccentDark } }}
+                    onPress={() => setSelectedNovel(null)}
+                >
+                    Remove
+                </Button>
+                <View style={{ flexDirection: "row" }}>
+                    <Button
+                        labelStyle={{
+                            color: theme.colorAccentDark,
+                            letterSpacing: 0,
+                            textTransform: "none",
+                        }}
+                        theme={{ colors: { primary: theme.colorAccentDark } }}
+                        onPress={() => setTrackSearchDialog(false)}
+                    >
+                        Cancel
+                    </Button>
+                    <Button
+                        labelStyle={{
+                            color: theme.colorAccentDark,
+                            letterSpacing: 0,
+                            textTransform: "none",
+                        }}
+                        theme={{ colors: { primary: theme.colorAccentDark } }}
+                        onPress={() => {
+                            if (selectedNovel) {
+                                dispatch(
+                                    trackNovel(
+                                        { ...selectedNovel, novelId },
+                                        tracker.access_token
+                                    )
+                                );
+                            }
+                            setTrackSearchDialog(false);
+                        }}
+                    >
+                        OK
+                    </Button>
+                </View>
+            </View>
+        </Modal>
+    );
+};
+
+export default TrackSearchDialog;
+
+const styles = StyleSheet.create({
+    containerStyle: {
+        padding: 20,
+        margin: 20,
+        borderRadius: 6,
+    },
+});

src/screens/Novel/components/Tracker/TrackSheet.js

@@ -0,0 +1,180 @@
+import React, { useState, useEffect } from "react";
+import { StyleSheet, View, ToastAndroid } from "react-native";
+import { Portal } from "react-native-paper";
+import Bottomsheet from "rn-sliding-up-panel";
+
+import { useSelector, useDispatch } from "react-redux";
+import { updateTracker } from "../../../../redux/tracker/tracker.actions";
+
+import TrackSearchDialog from "./TrackSearchDialog";
+import SetTrackStatusDialog from "./SetTrackStatusDialog";
+import SetTrackScoreDialog from "./SetTrackScoreDialog";
+import SetTrackChaptersDialog from "./SetTrackChaptersDialog";
+import { AddMalTrackingCard, MalTrackItemCard } from "./MyAnimeListCards";
+
+const TrackSheet = ({ bottomSheetRef, novelId, novelName, theme }) => {
+    const tracker = useSelector((state) => state.trackerReducer.tracker);
+    const trackedNovels = useSelector(
+        (state) => state.trackerReducer.trackedNovels
+    );
+    const dispatch = useDispatch();
+
+    const [trackItem, setTrackItem] = useState();
+
+    useEffect(() => {
+        setTrackItem(trackedNovels.find((obj) => obj.novelId === novelId));
+    }, [trackedNovels, novelId]);
+
+    const [trackSearchDialog, setTrackSearchDialog] = useState(false);
+    const [trackStatusDialog, setTrackStatusDialog] = useState(false);
+    const [trackChaptersDialog, setTrackChaptersDialog] = useState(false);
+    const [trackScoreDialog, setTrackScoreDialog] = useState(false);
+
+    const getStatus = (status) => {
+        const myAnimeListStatus = {
+            reading: "Reading",
+            completed: "Completed",
+            on_hold: "On Hold",
+            dropped: "Dropped",
+            plan_to_read: "Plan to read",
+        };
+
+        return myAnimeListStatus[status];
+    };
+
+    const updateTrackChapters = (newChapters) => {
+        if (newChapters !== "") {
+            setTrackItem({
+                ...trackItem,
+                my_list_status: {
+                    ...trackItem.my_list_status,
+                    num_chapters_read: newChapters,
+                },
+            });
+
+            dispatch(
+                updateTracker(trackItem.id, tracker.access_token, {
+                    ...trackItem.my_list_status,
+                    num_chapters_read: newChapters,
+                })
+            );
+
+            setTrackChaptersDialog(false);
+        } else {
+            ToastAndroid.show("Enter a valid number", ToastAndroid.SHORT);
+        }
+    };
+
+    const updateTrackStatus = (newStatus) => {
+        setTrackItem({
+            ...trackItem,
+            my_list_status: {
+                ...trackItem.my_list_status,
+                status: newStatus,
+            },
+        });
+
+        dispatch(
+            updateTracker(trackItem.id, tracker.access_token, {
+                ...trackItem.my_list_status,
+                status: newStatus,
+            })
+        );
+
+        setTrackStatusDialog(false);
+    };
+
+    const updateTrackScore = (newScore) => {
+        setTrackItem({
+            ...trackItem,
+            my_list_status: {
+                ...trackItem.my_list_status,
+                score: newScore,
+            },
+        });
+
+        dispatch(
+            updateTracker(trackItem.id, tracker.access_token, {
+                ...trackItem.my_list_status,
+                score: newScore,
+            })
+        );
+
+        setTrackScoreDialog(false);
+    };
+
+    return (
+        <>
+            <Bottomsheet
+                ref={bottomSheetRef}
+                draggableRange={{ top: 120, bottom: 0 }}
+                snappingPoints={[0, 120]}
+                backdropOpacity={0.25}
+            >
+                <View
+                    style={[
+                        styles.contentContainer,
+                        { backgroundColor: theme.colorPrimary },
+                    ]}
+                >
+                    {!trackItem ? (
+                        <AddMalTrackingCard
+                            theme={theme}
+                            setTrackSearchDialog={setTrackSearchDialog}
+                        />
+                    ) : (
+                        <MalTrackItemCard
+                            trackItem={trackItem}
+                            setTrackStatusDialog={setTrackStatusDialog}
+                            setTrackChaptersDialog={setTrackChaptersDialog}
+                            setTrackScoreDialog={setTrackScoreDialog}
+                            theme={theme}
+                            getStatus={getStatus}
+                        />
+                    )}
+                </View>
+            </Bottomsheet>
+            <Portal>
+                {trackItem ? (
+                    <>
+                        <SetTrackStatusDialog
+                            trackItem={trackItem}
+                            trackStatusDialog={trackStatusDialog}
+                            setTrackStatusDialog={setTrackStatusDialog}
+                            updateTrackStatus={updateTrackStatus}
+                            theme={theme}
+                        />
+                        <SetTrackChaptersDialog
+                            trackItem={trackItem}
+                            trackChaptersDialog={trackChaptersDialog}
+                            setTrackChaptersDialog={setTrackChaptersDialog}
+                            updateTrackChapters={updateTrackChapters}
+                            theme={theme}
+                        />
+                        <SetTrackScoreDialog
+                            trackItem={trackItem}
+                            trackScoreDialog={trackScoreDialog}
+                            setTrackScoreDialog={setTrackScoreDialog}
+                            updateTrackScore={updateTrackScore}
+                            theme={theme}
+                        />
+                    </>
+                ) : (
+                    <TrackSearchDialog
+                        trackSearchDialog={trackSearchDialog}
+                        setTrackSearchDialog={setTrackSearchDialog}
+                        novelId={novelId}
+                        novelName={novelName}
+                        theme={theme}
+                    />
+                )}
+            </Portal>
+        </>
+    );
+};
+
+export default TrackSheet;
+
+const styles = StyleSheet.create({
+    contentContainer: { flex: 1 },
+});

src/screens/Updates/Updates.js

@@ -1,25 +1,42 @@
-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 React, { useState, useEffect } from "react";
+import {
+    StyleSheet,
+    View,
+    FlatList,
+    ActivityIndicator,
+    RefreshControl,
+} from "react-native";
+import { connect, useDispatch } from "react-redux";
+import EmptyView from "../../Components/EmptyView";
+import {
+    getUpdatesAction,
+    updateLibraryAction,
+} from "../../redux/updates/updates.actions";
 import { Appbar } from "./components/Appbar";
 import UpdateCard from "./components/UpdateCard";
+import { useTheme } from "../../Hooks/useTheme";
 
-const Updates = ({ theme, updates, loading, getUpdatesAction }) => {
-    useFocusEffect(
-        useCallback(() => {
-            getUpdatesAction();
-        }, [getUpdatesAction])
-    );
+const Updates = ({ updates, loading, getUpdatesAction }) => {
+    const theme = useTheme();
+    const dispatch = useDispatch();
+
+    const [refreshing, setRefreshing] = useState(false);
+
+    useEffect(() => {
+        getUpdatesAction();
+    }, [getUpdatesAction, updates]);
+
+    const onRefresh = async () => {
+        setRefreshing(true);
+        dispatch(updateLibraryAction());
+        setRefreshing(false);
+    };
 
     const renderUpdateCard = ({ item }) => <UpdateCard item={item} />;
 
     return (
         <>
-            <Appbar />
+            <Appbar theme={theme} />
             <View
                 style={[
                     styles.container,
@@ -47,6 +64,14 @@ const Updates = ({ theme, updates, loading, getUpdatesAction }) => {
                             />
                         )
                     }
+                    refreshControl={
+                        <RefreshControl
+                            refreshing={refreshing}
+                            onRefresh={onRefresh}
+                            colors={["white"]}
+                            progressBackgroundColor={theme.colorAccentDark}
+                        />
+                    }
                 />
             </View>
         </>
@@ -54,14 +79,12 @@ const Updates = ({ theme, updates, loading, getUpdatesAction }) => {
 };
 
 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,
-    },
+    container: { flex: 1 },
 });

src/screens/Updates/components/Appbar.js

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

src/screens/Updates/components/UpdateCard.js

@@ -16,7 +16,7 @@ const UpdateCard = ({ item }) => {
             style={styles.updateCard}
             onPress={() =>
                 // console.log(item);
-                navigation.navigate("ChapterItem", {
+                navigation.navigate("Chapter", {
                     chapterId: item.chapterId,
                     chapterUrl: item.chapterUrl,
                     extensionId: item.sourceId,

src/services/Source/source.js

@@ -1,15 +1,15 @@
 export const fetchSources = async () => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/`;
+    const url = `https://lnreader-extensions.vercel.app/api/`;
 
     let res = await fetch(url);
     let sources = await res.json();
-
+    // console.log(sources);
     return sources;
 };
 
 export const fetchNovel = async (sourceId, novelUrl) => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/${sourceId}/novel/${novelUrl}`;
-
+    const url = `https://lnreader-extensions.vercel.app/api/${sourceId}/novel/${novelUrl}`;
+    // console.log(url);
     let data = await fetch(url);
     let res = await data.json();
 
@@ -33,10 +33,23 @@ export const fetchNovel = async (sourceId, novelUrl) => {
 };
 
 export const fetchChapter = async (sourceId, novelUrl, chapterUrl) => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/${sourceId}/novel/${novelUrl}${chapterUrl}`;
+    const url = `https://lnreader-extensions.vercel.app/api/${sourceId}/novel/${novelUrl}${chapterUrl}`;
+
+    // console.log(url);
 
     let res = await fetch(url);
     let chapter = await res.json();
 
     return chapter;
 };
+
+export const fetchChapters = async (sourceId, novelUrl) => {
+    const url = `https://lnreader-extensions.vercel.app/api/${sourceId}/novel/${novelUrl}`;
+
+    let data = await fetch(url);
+    let res = await data.json();
+
+    const chapters = res.novelChapters;
+
+    return chapters;
+};

src/services/Trackers/myAnimeList.js

@@ -0,0 +1,171 @@
+import * as Linking from "expo-linking";
+import qs from "qs";
+
+const clientId = "d2f499825d64b0213bb77e78193ccbb1";
+
+const baseOAuthUrl = "https://myanimelist.net/v1/oauth2/authorize";
+const baseApiUrl = "https://api.myanimelist.net/v2";
+
+const pkceChallenger = () => {
+    const MAX_LENGTH = 88;
+    let code = "";
+
+    const codes =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+    const randomPicker = () => Math.floor(Math.random() * codes.length);
+
+    for (let index = 0; index < MAX_LENGTH; index++) {
+        code += codes.charAt(randomPicker());
+    }
+    return code;
+};
+
+const codeChallenge = pkceChallenger();
+
+const redirectUri = Linking.makeUrl();
+
+export const authUrl = `${baseOAuthUrl}?response_type=code&client_id=${clientId}&code_challenge_method=plain&code_challenge=${codeChallenge}`;
+
+const tokenUrl = `https://myanimelist.net/v1/oauth2/token`;
+
+export const myAnimeListConfig = {
+    clientId,
+    redirectUri,
+    authUrl,
+    codeChallenge,
+    tokenUrl,
+};
+
+export const getAccessToken = async (code, codeChallenge) => {
+    const headers = {
+        "Content-Type": "application/x-www-form-urlencoded",
+    };
+
+    const body = {
+        client_id: myAnimeListConfig.clientId,
+        grant_type: "authorization_code",
+        code,
+        code_verifier: codeChallenge,
+    };
+
+    const response = await fetch(myAnimeListConfig.tokenUrl, {
+        headers,
+        method: "POST",
+        body: qs.stringify(body),
+    });
+
+    let tokenResponse = await response.json();
+
+    tokenResponse = {
+        ...tokenResponse,
+        expires_in: new Date(Date.now() + tokenResponse.expires_in),
+    };
+
+    console.log(tokenResponse);
+
+    return tokenResponse;
+};
+
+export const searchNovels = async (novelName, bearerToken) => {
+    const searchrl = `${baseApiUrl}/manga?q=${novelName}`;
+
+    const headers = {
+        Authorization: "Bearer " + bearerToken,
+        "Content-Type": "application/x-www-form-urlencoded",
+    };
+
+    const res = await fetch(searchrl, { method: "GET", headers });
+    const searchResults = await res.json();
+
+    return searchResults;
+};
+
+export const findListItem = async (malId, bearerToken) => {
+    const url = `${baseApiUrl}/manga/${malId}?fields=id,num_chapters,my_list_status{start_date,finish_date}`;
+
+    const headers = {
+        Authorization: "Bearer " + bearerToken,
+        "Content-Type": "application/x-www-form-urlencoded",
+    };
+
+    const res = await fetch(url, { method: "GET", headers });
+    const listItem = await res.json();
+
+    if (!listItem.my_list_status) {
+        listItem.my_list_status = {
+            status: "reading",
+            score: 0,
+            num_chapters_read: 0,
+        };
+    }
+    return listItem;
+};
+
+export const updateItem = async (malId, bearerToken, body) => {
+    const url = `${baseApiUrl}/manga/${malId}/my_list_status`;
+
+    const headers = {
+        Authorization: "Bearer " + bearerToken,
+        "Content-Type": "application/x-www-form-urlencoded",
+    };
+
+    const res = await fetch(url, {
+        method: "PUT",
+        headers,
+        body: qs.stringify(body),
+    });
+
+    const listItem = await res.json();
+    console.log(listItem);
+    return listItem;
+};
+
+export const updateMalChaptersRead = async (malId, bearerToken, body) => {
+    const url = `${baseApiUrl}/manga/${malId}/my_list_status`;
+
+    const headers = {
+        Authorization: "Bearer " + bearerToken,
+        "Content-Type": "application/x-www-form-urlencoded",
+    };
+
+    const res = await fetch(url, {
+        method: "PUT",
+        headers,
+        body: qs.stringify(body),
+    });
+
+    const listItem = await res.json();
+    console.log(listItem.num_chapters_read);
+    return listItem.num_chapters_read;
+};
+
+const revalidateMalToken = async (refreshToken) => {
+    const headers = {
+        "Content-Type": "application/x-www-form-urlencoded",
+    };
+
+    const body = {
+        grant_type: "refresh_token",
+        refresh_token: refreshToken,
+    };
+
+    const res = await fetch(url, {
+        headers,
+        method: "POST",
+        body: qs.stringify(body),
+    });
+
+    let tokenResponse = res.json();
+
+    return tokenResponse;
+};
+
+export const malTokenWatcher = async (tracker) => {
+    if (tracker) {
+        const date = new Date(Date.now());
+        if (tracker.expires_in < date) {
+            return await revalidateMalToken(tracker.refresh_token);
+        }
+    }
+};

src/services/api.js

@@ -1,76 +0,0 @@
-/**
- * Fetch novel information from source
- */
-
-export const fetchNovelFromSource = async (extensionId, novelUrl) => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/${extensionId}/novel/${novelUrl}`;
-
-    let data = await fetch(url);
-
-    let res = await data.json();
-
-    const novel = {
-        novelUrl: res.novelUrl,
-        novelName: res.novelName,
-        novelCover: res.novelCover,
-        novelSummary: res.novelSummary,
-        "Author(s)": res["Author(s)"],
-        "Genre(s)": res["Genre(s)"],
-        Status: res.Status,
-        sourceUrl: res.sourceUrl,
-        source: res.sourceName,
-        unread: 1,
-        libraryStatus: 0,
-        lastRead: res.novelChapters[0].chapterUrl,
-        lastReadName: res.novelChapters[0].chapterName,
-        extensionId: res.extensionId,
-        novelChapters: res.novelChapters,
-    };
-
-    return novel;
-};
-
-/**
- * Fetch novel chapters froms source
- */
-
-export const fetchChaptersFromSource = async (extensionId, novelUrl) => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/${extensionId}/novel/${novelUrl}`;
-
-    const data = await fetch(url);
-    let res = await data.json();
-
-    const chapters = res.novelChapters;
-
-    return chapters;
-};
-
-/**
- * Fetch chapter from source
- */
-
-export const fetchChapterFromSource = async (
-    extensionId,
-    novelUrl,
-    chapterUrl
-) => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/${extensionId}/novel/${novelUrl}${chapterUrl}`;
-
-    let res = await fetch(url);
-    let chapter = await res.json();
-
-    return chapter;
-};
-
-/**
- * Fetch list of extensions
- */
-
-export const fetchExtensionList = async () => {
-    const url = `https://lnreader-extensions.herokuapp.com/api/`;
-
-    let res = await fetch(url);
-    let extensions = await res.json();
-
-    return extensions;
-};

src/services/backup.js

@@ -0,0 +1,46 @@
+import * as DocumentPicker from "expo-document-picker";
+import { Platform } from "react-native";
+import * as FileSystem from "expo-file-system";
+import { StorageAccessFramework } from "expo-file-system";
+
+import { getLibrary } from "../database/queries/LibraryQueries";
+import { restoreLibrary } from "../database/queries/NovelQueries";
+import { showToast } from "../Hooks/showToast";
+
+export const createBackup = async () => {
+    const novels = await getLibrary();
+
+    const permissions = await StorageAccessFramework.requestDirectoryPermissionsAsync();
+
+    if (!permissions.granted) {
+        return;
+    }
+
+    const uri = permissions.directoryUri;
+
+    if (uri) {
+        const fileUri = await StorageAccessFramework.createFileAsync(
+            uri,
+            "backup",
+            "application/json"
+        );
+
+        await StorageAccessFramework.writeAsStringAsync(
+            fileUri,
+            JSON.stringify(novels)
+        );
+
+        showToast("Backup created");
+    }
+};
+
+export const restoreBackup = async () => {
+    const backup = await DocumentPicker.getDocumentAsync();
+
+    if (backup.uri) {
+        let novels = await StorageAccessFramework.readAsStringAsync(backup.uri);
+        novels = await JSON.parse(novels);
+        await novels.map((novel) => restoreLibrary(novel));
+        showToast("Restored backup");
+    }
+};

src/services/updates.js

@@ -1,7 +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 { getLibrary } from "../database/queries/LibraryQueries";
+import { fetchChapters, fetchNovel } from "../Services/Source/source";
 import { ToastAndroid } from "react-native";
 
 const updateNovelDetails = async (novel, novelId) => {
@@ -62,15 +63,74 @@ export const updateNovel = async (extensionId, novelUrl, novelId) => {
     });
 };
 
-export const updateAllNovels = async () => {
-    ToastAndroid.show("Updating library", ToastAndroid.SHORT);
+export const updateNovelChapters = async (extensionId, novelUrl, novelId) => {
+    let chapters = await fetchChapters(extensionId, novelUrl);
 
+    db.transaction((tx) => {
+        chapters.map((chapter) =>
+            tx.executeSql(
+                "INSERT OR IGNORE INTO chapters (chapterUrl, chapterName, releaseDate, novelId) values (?, ?, ?, ?)",
+                [
+                    chapter.chapterUrl,
+                    chapter.chapterName,
+                    chapter.releaseDate,
+                    novelId,
+                ],
+                (txObj, { insertId }) => {
+                    if (insertId !== -1) {
+                        console.log(
+                            "Inserted Chapter " +
+                                chapter.chapterUrl +
+                                " Chapter Name " +
+                                chapter.chapterName +
+                                " Novel Id " +
+                                novelId
+                        );
+                        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)
+            )
+        );
+    });
+};
+
+export const updateAllNovels = async () => {
     const libraryNovels = await getLibrary();
 
     libraryNovels.map((novel, index) =>
         setTimeout(async () => {
-            updateNovel(novel.sourceId, novel.novelUrl, novel.novelId);
+            updateNovelChapters(novel.sourceId, novel.novelUrl, novel.novelId);
             console.log(novel.novelName + " Updated");
         }, 3000 * index)
     );
 };
+
+export const parseChapterNumber = (chapterName) => {
+    chapterName = chapterName.toLowerCase();
+    chapterName = chapterName.replace(/volume (\d+)/, "");
+
+    const basic = chapterName.match(/ch (\d+)/);
+
+    const occurrence = chapterName.match(/\d+/);
+
+    if (basic) {
+        return basic[0];
+    } else if (occurrence) {
+        return occurrence[0];
+    } else {
+        return 0;
+    }
+};

src/theme/theme.js

@@ -27,6 +27,7 @@ export const lightTheme = {
     searchBarColor: "#FFFFFF",
     menuColor: "#FFFFFF",
     dividerColor: "rgba(0,0,0,0.1)",
+    colorDisabled: "rgba(220,220,220,255)",
     statusBar: "dark",
 };
 
@@ -46,6 +47,7 @@ export const darkTheme = {
     searchBarColor: "#303135",
     menuColor: "#242529",
     dividerColor: "rgba(255,255,255,0.1)",
+    colorDisabled: "rgba(57,57,57,255)",
     statusBar: "light",
 };
 
@@ -65,6 +67,7 @@ export const amoledDarkTheme = {
     searchBarColor: "#1F1F1F",
     menuColor: "#242529",
     dividerColor: "rgba(255,255,255,0.15)",
+    colorDisabled: "rgba(33,33,33,255)",
     statusBar: "light",
 };
 
@@ -84,5 +87,6 @@ export const midnightDuskTheme = {
     searchBarColor: "#201F27",
     menuColor: "#201F27",
     dividerColor: "rgba(255,255,255,0.1)",
+    colorDisabled: "rgba(57,57,57,255)",
     statusBar: "light",
 };