fix: Backups (Closes #109, Closes #180)

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.editorconfig

@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf

.eslintrc.js

@@ -0,0 +1,19 @@
+module.exports = {
+  root: true,
+  extends: '@react-native-community',
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  overrides: [
+    {
+      files: ['*.js', '*.jsx', '*.ts', '*.tsx'],
+      rules: {
+        '@typescript-eslint/no-shadow': ['warn'],
+        'no-shadow': 'off',
+        'no-undef': 'off',
+        'react-native/no-inline-styles': 'warn',
+        'no-console': 'warn',
+        'react-hooks/exhaustive-deps': 'warn',
+      },
+    },
+  ],
+};

.gitattributes

@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

.github/workflows/build.yml

@@ -1,45 +1,35 @@
 name: CI
 on:
-    push:
-        branches:
-            - main
+  push:
+    branches:
+      - main
 jobs:
-    install-and-test:
-        name: Install dependencies
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Install npm dependencies
-              run: |
-                  npm install
+  build-android:
+    name: Build app
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Dependencies
+        run: |
+          npm install
 
-    build-android:
-        name: Build app
-        needs: install-and-test
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Install Dependencies
-              run: |
-                  npm install
+      - name: Cache Gradle Wrapper
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
 
-            - name: Cache Gradle Wrapper
-              uses: actions/cache@v2
-              with:
-                  path: ~/.gradle/wrapper
-                  key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Cache Gradle Dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-caches-
 
-            - name: Cache Gradle Dependencies
-              uses: actions/cache@v2
-              with:
-                  path: ~/.gradle/caches
-                  key: ${{ runner.os }}-gradle-caches-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-                  restore-keys: |
-                      ${{ runner.os }}-gradle-caches-
+      - name: Make Gradlew Executable
+        run: cd android && chmod +x ./gradlew
 
-            - name: Make Gradlew Executable
-              run: cd android && chmod +x ./gradlew
-
-            - name: Build Android Release
-              run: |
-                  cd android && ./gradlew assembleRelease --no-daemon
+      - name: Build Android Release
+        run: |
+          cd android && ./gradlew assembleRelease --no-daemon

.github/workflows/lint.yml

@@ -0,0 +1,12 @@
+name: Lint
+on: [push, pull_request]
+jobs:
+  build:
+    name: ESLint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install modules
+        run: npm i
+      - name: Run ESLint
+        run: npm run lint

.gitignore

@@ -70,4 +70,7 @@ buck-out/
 .expo/
 web-build/
 
-# @end expo-cli
+# @end expo-cli
+
+.vscode/
+src/sources/en/generators/

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.prettierignore

@@ -0,0 +1 @@
+**/node_modules

.prettierrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  tabWidth: 2,
+  bracketSpacing: true,
+  useTabs: false,
+  bracketSameLine: false,
+  singleQuote: true,
+  trailingComma: 'all',
+  arrowParens: 'avoid',
+  quoteProps: 'preserve',
+};

App.js

@@ -1,43 +1,39 @@
-import React, { useEffect } from "react";
-import { StatusBar } from "react-native";
+import { enableFreeze } from 'react-native-screens';
 
-import { useFonts } from "expo-font";
-import { Provider as PaperProvider } from "react-native-paper";
-import { Provider } from "react-redux";
-import { persistor, store } from "./src/redux/store";
-import { PersistGate } from "redux-persist/lib/integration/react";
-import * as SplashScreen from "expo-splash-screen";
+enableFreeze(true);
 
-import Main from "./src/navigators/Main";
+import React, { useEffect } from 'react';
+import { StatusBar } from 'react-native';
 
-import { createDB } from "./src/database/DBHelper";
-import { fonts } from "./src/theme/fonts";
+import { Provider as PaperProvider } from 'react-native-paper';
+import { Provider } from 'react-redux';
+import { persistor, store } from './src/redux/store';
+import { PersistGate } from 'redux-persist/lib/integration/react';
+import * as SplashScreen from 'expo-splash-screen';
+
+import Main from './src/navigators/Main';
+
+import { createDB } from './src/database/db';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
 
 const App = () => {
-    const [loaded] = useFonts(fonts);
+  useEffect(() => {
+    SplashScreen.preventAutoHideAsync();
+    createDB();
+  }, []);
 
-    useEffect(() => {
-        SplashScreen.preventAutoHideAsync();
-        createDB();
-    }, []);
-
-    if (!loaded) {
-        return null;
-    }
-
-    return (
-        <Provider store={store}>
-            <PersistGate loading={null} persistor={persistor}>
-                <PaperProvider>
-                    <StatusBar
-                        translucent={true}
-                        backgroundColor="transparent"
-                    />
-                    <Main />
-                </PaperProvider>
-            </PersistGate>
-        </Provider>
-    );
+  return (
+    <Provider store={store}>
+      <PersistGate loading={null} persistor={persistor}>
+        <SafeAreaProvider>
+          <PaperProvider>
+            <StatusBar translucent={true} backgroundColor="transparent" />
+            <Main />
+          </PaperProvider>
+        </SafeAreaProvider>
+      </PersistGate>
+    </Provider>
+  );
 };
 
 export default App;

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+rajarshee.adm@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -0,0 +1,40 @@
+# Contributing Guide
+
+Contributions are welcome and are greatly appreciated!
+
+## Setting up your environment
+
+After forking to your own github org or account, do the following steps to get started:
+
+```bash
+# clone your fork to your local machine
+git clone https://github.com/<your-account-name>/lnreader.git
+
+# step into local repo
+cd lnreader
+
+# install dependencies
+npm install
+
+# run metro for development
+npm start
+```
+
+### Developing on Android
+
+While the packager is running and you have an Android device or emulator connected to your computer, build and launch the Android app.
+
+```
+npm run android
+```
+
+### Style & Linting
+
+This codebase's linting rules are enforced using [ESLint](http://eslint.org/).
+
+It is recommended that you install an eslint plugin for your editor of choice when working on this
+codebase, however you can always check to see if the source code is compliant by running:
+
+```bash
+npm run lint
+```

README.md

@@ -17,6 +17,10 @@
   <a href="https://github.com/LNReader/lnreader/releases/latest">
     <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/LNReader/lnreader">
   </a>
+  <a href="https://github.com/LNReader/lnreader-preview/releases/latest">
+    <img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/LNReader/lnreader-preview?color=red&label=preview">
+  </a>
+  <a title="Crowdin" target="_blank" href="https://crowdin.com/project/lnreader"><img src="https://badges.crowdin.net/lnreader/localized.svg"></a>
   <a href="https://github.com/LNReader/lnreader/blob/main/LICENSE">
     <img alt="GitHub" src="https://img.shields.io/github/license/LNReader/lnreader">
   </a>
@@ -30,12 +34,15 @@
 </p>
 
 ## Download
+
 Get the app from our [releases page](https://github.com/rajarsheechatterjee/LNReader/releases).
 
 ## Sources
+
 LNReader does not have any affiliation with the content providers available.
 
 Source requests should be created at [LNReader/lnreader-sources](https://github.com/LNReader/lnreader-sources).
 
 ## License
+
 [MIT ](https://github.com/rajarsheechatterjee/lnreader/blob/main/LICENSE)

android/app/build.gradle

@@ -136,7 +136,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.1.4"
+        versionName "1.1.8"
     }
     splits {
         abi {
@@ -188,6 +188,10 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'
     }

android/app/proguard-rules.pro

@@ -8,3 +8,13 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
+-keep class com.facebook.hermes.unicode.** { *; }
+-keep class com.facebook.jni.** { *; }
+-keep public class com.dylanvann.fastimage.* {*;}
+-keep public class com.dylanvann.fastimage.** {*;}
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}

android/app/src/main/AndroidManifest.xml

@@ -1,38 +1,90 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.rajarsheechatterjee.LNReader">
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-  <uses-permission android:name="android.permission.VIBRATE"/>
-  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://exp.host/@rajarsheechatterjee/LNReader"/>
-    <meta-data android:name="expo.modules.updates.EXPO_SDK_VERSION" android:value="41.0.0"/>
-    <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
-    <meta-data android:name="expo.modules.notifications.default_notification_icon" android:resource="@drawable/notification_icon"/>
-    <meta-data android:name="expo.modules.notifications.default_notification_color" android:resource="@color/notification_icon_color"/>
-    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:screenOrientation="unspecified">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="lnreader"/>
-        <data android:scheme="com.rajarsheechatterjee.LNReader"/>
-      </intent-filter>
-    </activity>
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-    <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />
-  </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+  	package="com.rajarsheechatterjee.LNReader">
+
+	<!-- Internet -->
+  	<uses-permission android:name="android.permission.INTERNET"/>
+  	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+	<!-- Storage -->
+  	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+	<!-- For background jobs -->
+  	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+
+  	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  	<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+  	<uses-permission android:name="android.permission.VIBRATE"/>
+  	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+  	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+
+  	<application 
+	  	android:name=".MainApplication"
+		android:largeHeap="true"
+		android:label="@string/app_name"
+		android:icon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher_round"
+		android:allowBackup="true"
+		android:theme="@style/AppTheme"
+		android:usesCleartextTraffic="true">
+    
+		<meta-data
+			android:name="expo.modules.updates.EXPO_UPDATE_URL"
+			android:value="https://exp.host/@rajarsheechatterjee/LNReader"/>
+    	
+		<meta-data
+			android:name="expo.modules.updates.EXPO_SDK_VERSION"
+			android:value="41.0.0"/>
+    
+		<meta-data
+			android:name="expo.modules.updates.ENABLED"
+			android:value="false"/>
+	
+		<meta-data
+			android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH"
+			android:value="ALWAYS"/>
+	
+		<meta-data
+			android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS"
+			android:value="0"/>
+	
+		<meta-data
+			android:name="expo.modules.notifications.default_notification_icon"
+			android:resource="@drawable/notification_icon"/>
+	
+		<meta-data
+			android:name="expo.modules.notifications.default_notification_color"
+			android:resource="@color/notification_icon_color"/>
+    
+		<activity
+			android:name=".MainActivity"
+			android:label="@string/app_name"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+			android:launchMode="singleTask"
+			android:windowSoftInputMode="adjustResize"
+			android:theme="@style/Theme.App.SplashScreen"
+			android:screenOrientation="unspecified">
+			
+      		<intent-filter>
+      		  <action android:name="android.intent.action.MAIN"/>
+      		  <category android:name="android.intent.category.LAUNCHER"/>
+      		</intent-filter>
+      		
+			<intent-filter>
+      		  <action android:name="android.intent.action.VIEW"/>
+      		  <category android:name="android.intent.category.DEFAULT"/>
+      		  <category android:name="android.intent.category.BROWSABLE"/>
+      		  <data android:scheme="lnreader"/>
+      		  <data android:scheme="com.rajarsheechatterjee.LNReader"/>
+      		</intent-filter>
+		</activity>
+    	
+		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    
+		<service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />
+		
+  	</application>
+</manifest>

android/app/src/main/java/com/rajarsheechatterjee/LNReader/MainActivity.java

@@ -3,8 +3,11 @@ import android.content.res.Configuration;
 import android.content.Intent;
 
 import android.os.Bundle;
+import android.graphics.Color;
 import android.view.WindowManager;
 import android.os.Build;
+import android.view.View;
+import android.view.Window;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
@@ -26,19 +29,25 @@ public class MainActivity extends ReactActivity {
         sendBroadcast(intent);
     }
 
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    // SplashScreen.show(...) has to be called after super.onCreate(...)
-    // Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-        WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
-        layoutParams.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-        getWindow().setAttributes(layoutParams);
-    }
-    super.onCreate(savedInstanceState);
-    SplashScreen.show(this, SplashScreenImageResizeMode.COVER, ReactRootView.class, false);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+      // SplashScreen.show(...) has to be called after super.onCreate(...)
+      // Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+          WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+          layoutParams.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+          getWindow().setAttributes(layoutParams);
+      }
 
-  }
+      Window w = getWindow();
+      w.setStatusBarColor(Color.TRANSPARENT);
+      w.setNavigationBarColor(Color.TRANSPARENT);
+      w.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+
+      super.onCreate(null);
+      SplashScreen.show(this, SplashScreenImageResizeMode.COVER, ReactRootView.class, false);
+
+    }
 
 
     /**

android/app/src/main/java/com/rajarsheechatterjee/LNReader/MainApplication.java

@@ -46,6 +46,7 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       List<ReactPackage> packages = new PackageList(this).getPackages();
       packages.add(new ModuleRegistryAdapter(mModuleRegistryProvider));
+      packages.add(new NavigationBarColorPackage());
       return packages;
     }
 

android/app/src/main/java/com/rajarsheechatterjee/LNReader/generated/BasePackageList.java

@@ -13,9 +13,11 @@ public class BasePackageList {
         new expo.modules.errorrecovery.ErrorRecoveryPackage(),
         new expo.modules.filesystem.FileSystemPackage(),
         new expo.modules.font.FontLoaderPackage(),
+        new expo.modules.haptics.HapticsPackage(),
         new expo.modules.imageloader.ImageLoaderPackage(),
         new expo.modules.keepawake.KeepAwakePackage(),
         new expo.modules.lineargradient.LinearGradientPackage(),
+        new expo.modules.localization.LocalizationPackage(),
         new expo.modules.notifications.NotificationsPackage(),
         new expo.modules.permissions.PermissionsPackage(),
         new expo.modules.splashscreen.SplashScreenPackage(),

android/app/src/main/java/com/rajarsheechatterjee/NavigationBarColor/NavigationBarColorModule.java

@@ -0,0 +1,170 @@
+package com.rajarsheechatterjee.LNReader;
+
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.annotation.TargetApi;
+import android.graphics.Color;
+import android.os.Build;
+import android.app.Activity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import androidx.annotation.UiThread;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.bridge.WritableMap;
+import java.util.HashMap;
+import java.util.Map;
+import com.facebook.react.uimanager.IllegalViewOperationException;
+import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
+
+public class NavigationBarColorModule extends ReactContextBaseJavaModule {
+    public static final String REACT_CLASS = "NavigationBarColor";
+    private static final String ERROR_NO_ACTIVITY = "E_NO_ACTIVITY";
+    private static final String ERROR_NO_ACTIVITY_MESSAGE = "Tried to change the navigation bar while not attached to an Activity";
+    private static final String ERROR_API_LEVEL = "API_LEVEl";
+    private static final String ERROR_API_LEVEL_MESSAGE = "Only Android Oreo and above is supported";
+    private static ReactApplicationContext reactContext = null;
+    private static final int UI_FLAG_HIDE_NAV_BAR = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
+            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
+    public NavigationBarColorModule(ReactApplicationContext context) {
+        super(context);
+        reactContext = context;
+    }
+
+    public void setNavigationBarTheme(Activity activity, Boolean light) {
+        if (activity != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Window window = activity.getWindow();
+            int flags = window.getDecorView().getSystemUiVisibility();
+            if (light) {
+                flags |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+            } else {
+                flags &= ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+            }
+            window.getDecorView().setSystemUiVisibility(flags);
+        }
+    }
+
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public Map<String, Object> getConstants() {
+        final Map<String, Object> constants = new HashMap<>();
+        constants.put("EXAMPLE_CONSTANT", "example");
+
+        return constants;
+    }
+
+    @ReactMethod
+    public void changeNavigationBarColor(final String color, final Boolean light, final Boolean animated, final Promise promise) {
+        final WritableMap map = Arguments.createMap();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (getCurrentActivity() != null) {
+                try {
+                    final Window window = getCurrentActivity().getWindow();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (color.equals("transparent") || color.equals("translucent")) {
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+                                if (color.equals("transparent")) {
+                                    window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+                                } else {
+                                    window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+                                }
+                                setNavigationBarTheme(getCurrentActivity(), light);
+                                map.putBoolean("success", true);
+                                promise.resolve(map);
+                                return;
+                            } else {
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+                            }
+                            if (animated) {
+                                Integer colorFrom = window.getNavigationBarColor();
+                                Integer colorTo = Color.parseColor(String.valueOf(color));
+                                //window.setNavigationBarColor(colorTo);
+                                ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
+                                colorAnimation.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                                    @Override
+                                    public void onAnimationUpdate(ValueAnimator animator) {
+                                        window.setNavigationBarColor((Integer) animator.getAnimatedValue());
+                                    }
+                                });
+                                colorAnimation.start();
+                            } else {
+                                window.setNavigationBarColor(Color.parseColor(String.valueOf(color)));
+                            }
+                            setNavigationBarTheme(getCurrentActivity(), light);
+                            WritableMap map = Arguments.createMap();
+                            map.putBoolean("success", true);
+                            promise.resolve(map);
+                        }
+                    });
+                } catch (IllegalViewOperationException e) {
+                    map.putBoolean("success", false);
+                    promise.reject("error", e);
+                }
+
+            } else {
+                promise.reject(ERROR_NO_ACTIVITY, new Throwable(ERROR_NO_ACTIVITY_MESSAGE));
+
+            }
+        } else {
+            promise.reject(ERROR_API_LEVEL, new Throwable(ERROR_API_LEVEL_MESSAGE));
+        }
+    }
+
+    @ReactMethod
+    public void hideNavigationBar(Promise promise) {
+        try {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (getCurrentActivity() != null) {
+                        View decorView = getCurrentActivity().getWindow().getDecorView();
+                        decorView.setSystemUiVisibility(UI_FLAG_HIDE_NAV_BAR);
+                    }
+                }
+            });
+        } catch (IllegalViewOperationException e) {
+            WritableMap map = Arguments.createMap();
+            map.putBoolean("success", false);
+            promise.reject("error", e);
+        }
+    }
+
+    @ReactMethod
+    public void showNavigationBar(Promise promise) {
+        try {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (getCurrentActivity() != null) {
+                        Window w = getCurrentActivity().getWindow();
+                        w.setStatusBarColor(Color.TRANSPARENT);
+                        w.setNavigationBarColor(Color.TRANSPARENT);
+                        View decorView = w.getDecorView();
+                        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+                    }
+                }
+            });
+        } catch (IllegalViewOperationException e) {
+            WritableMap map = Arguments.createMap();
+            map.putBoolean("success", false);
+            promise.reject("error", e);
+        }
+    }
+}

android/app/src/main/java/com/rajarsheechatterjee/NavigationBarColor/NavigationBarColorPackage.java

@@ -0,0 +1,25 @@
+package com.rajarsheechatterjee.LNReader;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class NavigationBarColorPackage implements ReactPackage {
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+       List<NativeModule> modules = new ArrayList<>();
+
+       modules.add(new NavigationBarColorModule(reactContext));
+
+       return modules;
+   }
+}

android/app/src/main/res/values/colors.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <resources>
   <color name="iconBackground">#FFFFFF</color>
-  <color name="splashscreen_background">#000000</color>
+  <color name="splashscreen_background">#202125</color>
   <color name="colorPrimary">#023c69</color>
-  <color name="colorPrimaryDark">#00000000</color>
-  <color name="navigationBarColor">#000000</color>
+  <color name="colorPrimaryDark">#202125</color>
+  <color name="navigationBarColor">#202125</color>
   <color name="notification_icon_color">#00adb5</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -8,16 +8,16 @@
     <item name="android:textColor">#000000</item>
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="android:navigationBarColor">#000000</item>
-    <item name="android:statusBarColor">#000000</item>
+    <item name="android:navigationBarColor">#202125</item>
+    <item name="android:statusBarColor">#202125</item>
     
   </style>
   <style name="Theme.App.SplashScreen" parent="Theme.AppCompat.Light.NoActionBar">
     <!-- Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually -->
     <!-- Customize your splash screen theme here -->
     <item name="android:windowBackground">@drawable/splashscreen</item>
-    <item name="android:navigationBarColor">#000000</item>
-    <item name="android:statusBarColor">#000000</item>
+    <item name="android:navigationBarColor">#202125</item>
+    <item name="android:statusBarColor">#202125</item>
    
   </style>
 </resources>

app.json

@@ -1,11 +1,11 @@
 {
-    "expo": {
-        "name": "LNReader",
-        "slug": "LNReader",
-        "scheme": "lnreader",
-        "notification": {
-            "icon": "./assets/notification.png",
-            "color": "#00adb5"
-        }
+  "expo": {
+    "name": "LNReader",
+    "slug": "LNReader",
+    "scheme": "lnreader",
+    "notification": {
+      "icon": "./assets/notification.png",
+      "color": "#00adb5"
     }
+  }
 }

babel.config.js

@@ -1,4 +1,4 @@
-module.exports = function(api) {
+module.exports = function (api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],

crowdin.yml

@@ -0,0 +1,4 @@
+pull_request_title: 'chore: Update translations'
+files:
+  - source: /strings/languages/en/strings.json
+    translation: /strings/languages/%two_letters_code%/strings.json

jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  preset: 'react-native',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+};

package.json

@@ -1,72 +1,102 @@
 {
-    "scripts": {
-        "start": "react-native start",
-        "android": "react-native run-android",
-        "ios": "react-native run-ios",
-        "web": "expo start --web",
-        "eject": "expo eject"
-    },
-    "dependencies": {
-        "@react-native-async-storage/async-storage": "^1.13.0",
-        "@react-native-community/masked-view": "0.1.10",
-        "@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": "^41.0.1",
-        "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-notifications": "~0.11.6",
-        "expo-splash-screen": "^0.11.2",
-        "expo-sqlite": "~9.1.0",
-        "expo-updates": "~0.5.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": "^0.64.2",
-        "react-native-background-actions": "^2.6.1",
-        "react-native-cheerio": "^1.0.0-rc.4",
-        "react-native-device-info": "^8.1.3",
-        "react-native-easing-gradient": "^0.1.2",
-        "react-native-fast-image": "^8.3.4",
-        "react-native-gesture-handler": "~1.10.2",
-        "react-native-navigation-bar-color": "^2.0.1",
-        "react-native-pager-view": "^5.1.10",
-        "react-native-paper": "^4.5.0",
-        "react-native-reanimated": "^2.1.0",
-        "react-native-safe-area-context": "3.2.0",
-        "react-native-screens": "~3.0.0",
-        "react-native-swipe-gestures": "^1.0.5",
-        "react-native-tab-view": "^3.0.1",
-        "react-native-unimodules": "~0.13.3",
-        "react-native-vector-icons": "^7.1.0",
-        "react-native-web": "^0.16.5",
-        "react-native-webview": "^11.6.2",
-        "react-redux": "^7.2.2",
-        "redux": "^4.0.5",
-        "redux-persist": "^6.0.0",
-        "redux-thunk": "^2.3.0",
-        "rn-sliding-up-panel": "^2.4.4"
-    },
-    "devDependencies": {
-        "@babel/core": "~7.9.0"
-    },
-    "prettier": {
-        "tabWidth": 4,
-        "semi": true,
-        "singleQuote": false,
-        "quoteProps": "as-needed",
-        "trailingComma": "es5",
-        "bracketSpacing": true,
-        "arrowParens": "always"
-    },
-    "private": true,
-    "name": "lnreader",
-    "version": "1.0.0"
+  "name": "lnreader",
+  "version": "1.1.8",
+  "private": true,
+  "scripts": {
+    "android": "react-native run-android",
+    "ios": "react-native run-ios",
+    "start": "react-native start",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "prettier": "prettier --write \"./src/**/*.{js,jsx,ts,tsx}\"",
+    "buildRelease": "cd android && gradlew clean && gradlew assembleRelease",
+    "sources:madara": "node scripts/generateMadaraSource.cjs && prettier --write {src/sources/multisrc/madara/MadaraGenerator.ts,src/sources/sources.json}",
+    "source:generator": "node scripts/generateSource.cjs",
+    "strings": "node scripts/stringTypes.cjs",
+    "prepare": "husky install"
+  },
+  "dependencies": {
+    "@react-native-async-storage/async-storage": "^1.15.11",
+    "@react-native-community/masked-view": "^0.1.11",
+    "@react-native-community/netinfo": "^7.1.1",
+    "@react-native-community/slider": "^4.1.12",
+    "@react-navigation/material-bottom-tabs": "^6.0.9",
+    "@react-navigation/native": "^6.0.6",
+    "@react-navigation/stack": "^6.0.11",
+    "@reduxjs/toolkit": "^1.7.2",
+    "@types/react-native-vector-icons": "^6.4.10",
+    "cheerio": "^1.0.0-rc.10",
+    "expo": "^41.0.1",
+    "expo-document-picker": "^9.2.4",
+    "expo-file-system": "~11.0.2",
+    "expo-font": "~9.1.0",
+    "expo-haptics": "~10.0.0",
+    "expo-keep-awake": "~9.1.2",
+    "expo-linear-gradient": "~9.1.0",
+    "expo-linking": "~2.2.3",
+    "expo-localization": "~10.1.0",
+    "expo-notifications": "~0.11.6",
+    "expo-splash-screen": "^0.11.4",
+    "expo-sqlite": "~9.1.0",
+    "expo-updates": "~0.5.4",
+    "expo-web-browser": "~9.1.0",
+    "i18n-js": "^3.8.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.1",
+    "prop-types": "^15.7.2",
+    "qs": "^6.10.1",
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "react-native": "^0.64.3",
+    "react-native-background-actions": "^2.6.5",
+    "react-native-device-info": "^8.4.7",
+    "react-native-easing-gradient": "^1.0.0",
+    "react-native-fast-image": "^8.5.11",
+    "react-native-gesture-handler": "~1.10.2",
+    "react-native-pager-view": "^5.4.9",
+    "react-native-paper": "^4.10.1",
+    "react-native-reanimated": "^2.2.4",
+    "react-native-render-html": "^6.3.4",
+    "react-native-safe-area-context": "^3.2.0",
+    "react-native-screens": "^3.9.0",
+    "react-native-skeleton-placeholder": "^5.0.0",
+    "react-native-swipe-gestures": "^1.0.5",
+    "react-native-tab-view": "^3.1.1",
+    "react-native-tts": "^4.1.0",
+    "react-native-unimodules": "^0.13.3",
+    "react-native-vector-icons": "^9.0.0",
+    "react-native-web": "^0.17.5",
+    "react-native-webview": "^11.14.3",
+    "react-redux": "^7.2.6",
+    "redux": "^4.1.2",
+    "redux-persist": "^6.0.0",
+    "redux-thunk": "^2.4.0",
+    "rn-sliding-up-panel": "^2.4.4",
+    "sanitize-html": "^2.7.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.16.0",
+    "@react-native-community/eslint-config": "^3.0.1",
+    "@types/i18n-js": "^3.8.2",
+    "@types/jest": "^27.4.0",
+    "@types/lodash": "^4.14.179",
+    "@types/react-native": "^0.66.15",
+    "@types/react-test-renderer": "^17.0.1",
+    "@types/sanitize-html": "^2.6.2",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
+    "eslint": "^7.32.0",
+    "eslint-plugin-react-native": "^3.11.0",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.3.7",
+    "typescript": "^4.5.5"
+  },
+  "resolutions": {
+    "@types/react": "^17"
+  },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx}": [
+      "eslint --fix",
+      "prettier --check"
+    ]
+  }
 }

react-native-congfig.js

@@ -0,0 +1,7 @@
+module.exports = {
+  project: {
+    ios: {},
+    android: {},
+  },
+  assets: ['./assets/fonts/'],
+};

scripts/generateMadaraSource.cjs

@@ -0,0 +1,60 @@
+const path = require('path');
+const fs = require('fs');
+
+const MadaraSources = require('../src/sources/multisrc/madara/MadaraSources.json');
+const AllSources = require('../src/sources/sources.json');
+
+const getScraperName = scraperName => {
+  let name = scraperName.replace(/\./g, 'Dot').replace('1st', 'First');
+
+  return name;
+};
+
+let content =
+  "/**\n * This file is auto-generated\n */\n\nimport MadaraScraper from './MadaraScraper';\n\n";
+
+MadaraSources.forEach(source => {
+  content =
+    content +
+    `export const ${getScraperName(
+      source.sourceName,
+    )}Scraper = new MadaraScraper(${source.sourceId}, "${source.baseUrl}", "${
+      source.sourceName
+    }", ${source.options ? JSON.stringify(source.options) : ''});\n\n`;
+});
+
+fs.writeFile(
+  path.resolve(process.cwd(), 'src/sources/multisrc/madara/MadaraGenerator.ts'),
+  content,
+  error => {
+    if (error) {
+      console.log(error);
+    }
+  },
+);
+
+MadaraSources.forEach(madaraSource => {
+  if (!AllSources.some(source => source.sourceId === madaraSource.sourceId)) {
+    let allSourcesContent = AllSources;
+
+    allSourcesContent.push({
+      sourceId: madaraSource.sourceId,
+      sourceName: madaraSource.sourceName,
+      icon: `https://github.com/LNReader/lnreader-sources/blob/main/multisrc/madara/icons/${madaraSource.sourceName.toLowerCase()}.png?raw=true`,
+      url: madaraSource.baseUrl,
+      lang: madaraSource.options.lang || 'English',
+    });
+
+    allSourcesContent = JSON.stringify(allSourcesContent);
+
+    fs.writeFile(
+      path.resolve(process.cwd(), 'src/sources/sources.json'),
+      allSourcesContent,
+      error => {
+        if (error) {
+          console.log(error);
+        }
+      },
+    );
+  }
+});

scripts/generateSource.cjs

@@ -0,0 +1,328 @@
+/**
+ * This script can be used to generate sources
+ */
+
+const fs = require('fs');
+const path = require('path');
+const prettier = require('prettier');
+const prettierConfig = require('../.prettierrc');
+
+const AllSources = require('../src/sources/sources.json');
+
+const getLanguageCode = language => {
+  const codes = {
+    English: 'en',
+    Arabic: 'ar',
+    French: 'fr',
+    Turkish: 'tr',
+    Chinese: 'cn',
+    Japanese: 'jp',
+    Vietnamese: 'vi',
+  };
+
+  return codes[language];
+};
+
+try {
+  if (process.argv[2]) {
+    const source = JSON.parse(
+      fs.readFileSync(path.resolve(process.cwd(), process.argv[2]), 'utf8'),
+    );
+
+    const isDuplicate = AllSources.some(
+      item => item.sourceId === source.sourceId,
+    );
+
+    const content = `
+    import * as cheerio from 'cheerio';
+    import { isUrlAbsolute } from '../../utils/isAbsoluteUrl';
+    ${
+      source?.options?.imports?.toaster
+        ? "import { showToast } from '../../hooks/showToast'"
+        : ''
+    };
+    import {
+      SourceChapter,
+      SourceChapterItem,
+      SourceNovel,
+      SourceNovelItem,
+    } from '../types';
+    
+    const sourceId = ${source.sourceId};
+    const sourceName = "${source.sourceName}";
+    const baseUrl = "${source.baseUrl}";
+    
+    ${
+      !source.popularNovels.url.includes('${page}')
+        ? '// eslint-disable-next-line @typescript-eslint/no-unused-vars'
+        : ''
+    }
+    const popularNovels = async (page: number) => {
+      const totalPages = ${source.popularNovels.totalPages};
+      const url = \`${source.popularNovels.url}\`;
+    
+      const result = await fetch(url);
+      const body = await result.text();
+    
+      const loadedCheerio = cheerio.load(body);
+    
+      const novels: SourceNovelItem[] = [];
+    
+      loadedCheerio('${
+        source.popularNovels.selectors.novelList
+      }').each(function () {
+        let novelUrl = loadedCheerio(this).find('${
+          source.popularNovels.selectors.novelUrl
+        }').attr('href');
+    
+        if (novelUrl && !isUrlAbsolute(novelUrl)) {
+          novelUrl = baseUrl + novelUrl;
+        }
+    
+        if (novelUrl) {
+          const novelName = loadedCheerio(this).find('${
+            source.popularNovels.selectors.novelName
+          }').text().trim();
+          let novelCover = loadedCheerio(this).find('${
+            source.popularNovels.selectors.novelCover
+          }').attr('src');
+    
+          if (novelCover && !isUrlAbsolute(novelCover)) {
+            novelCover = baseUrl + novelCover;
+          }
+    
+          const novel = {
+            sourceId,
+            novelUrl,
+            novelName,
+            novelCover,
+          };
+    
+          novels.push(novel);
+        }
+      });
+    
+      return { totalPages, novels };
+    };
+    
+    const parseNovelAndChapters = async (novelUrl: string) => {
+      const url = novelUrl;
+    
+      const result = await fetch(url);
+      const body = await result.text();
+    
+      let loadedCheerio = cheerio.load(body);
+    
+      const novel: SourceNovel = {
+        sourceId,
+        sourceName,
+        url: novelUrl,
+        novelUrl,
+        chapters: [],
+      };
+    
+      novel.novelName = loadedCheerio('${
+        source.novelAndChapters.selectors.novelName
+      }').text();
+    
+      let novelCover = loadedCheerio('${
+        source.novelAndChapters.selectors.novelCover
+      }').attr('src');
+    
+      novel.novelCover = novelCover
+        ? isUrlAbsolute(novelCover)
+          ? novelCover
+          : baseUrl + novelCover
+        : undefined;
+    
+      novel.summary = loadedCheerio('${
+        source.novelAndChapters.selectors.summary
+      }').text().trim();
+    
+      novel.author = loadedCheerio('${
+        source.novelAndChapters.selectors.author
+      }').text().trim();
+    
+      novel.genre = loadedCheerio('${
+        source.novelAndChapters.selectors.genre
+      }').text().trim()${source?.options?.status?.replace || ''};
+
+    
+      novel.status = loadedCheerio('${
+        source.novelAndChapters.selectors.status
+      }').text().trim();
+    
+      loadedCheerio('${
+        source.novelAndChapters.selectors.chapterList
+      }').each(function () {
+        let chapterUrl = loadedCheerio(this).find('a').attr('href');
+    
+        if (chapterUrl && !isUrlAbsolute(chapterUrl)) {
+          chapterUrl = baseUrl + chapterUrl;
+        }
+    
+        if (chapterUrl) {
+          const chapterName = loadedCheerio(this).find('${
+            source.novelAndChapters.selectors.chapterName
+          }').text().trim();
+          const releaseDate = ${
+            source.novelAndChapters.selectors.releaseDate
+              ? `loadedCheerio(this).find('${source.novelAndChapters.selectors.releaseDate}').text();`
+              : null
+          }
+    
+          const chapter: SourceChapterItem = {
+            chapterName,
+            releaseDate,
+            chapterUrl,
+          };
+    
+          novel.chapters?.push(chapter);
+        }
+      });
+    
+      return novel;
+    };
+    
+    const parseChapter = async (novelUrl: string, chapterUrl: string) => {
+      const url = chapterUrl;
+    
+      const result = await fetch(url);
+      const body = await result.text();
+    
+      const loadedCheerio = cheerio.load(body);
+    
+      const chapterName = loadedCheerio('${
+        source.chapter.selectors.chapterName
+      }').text();
+      const chapterText = loadedCheerio('${
+        source.chapter.selectors.chapterText
+      }').html() || '';
+    
+      const chapter: SourceChapter = {
+        sourceId,
+        novelUrl,
+        chapterUrl,
+        chapterName,
+        chapterText,
+      };
+    
+      return chapter;
+    };
+    
+    ${
+      !source.search.url.includes('${searchTerm}')
+        ? '// eslint-disable-next-line @typescript-eslint/no-unused-vars'
+        : ''
+    }
+    const searchNovels = async (searchTerm: string) => {
+    ${
+      source.search
+        ? `
+      const url = \`${source.search.url}\`;
+    
+      const result = await fetch(url);
+      const body = await result.text();
+    
+      const loadedCheerio = cheerio.load(body);
+    
+      const novels: SourceNovelItem[] = [];
+    
+      loadedCheerio('${source.search.selectors.novelList}').each(function () {
+        let novelUrl = loadedCheerio(this).find('${source.search.selectors.novelUrl}').attr('href');
+
+        if (novelUrl && !isUrlAbsolute(novelUrl)) {
+          novelUrl = baseUrl + novelUrl;
+        }
+  
+        if (novelUrl) {
+          const novelName = loadedCheerio(this).find('${source.search.selectors.novelName}').text();
+          let novelCover = loadedCheerio(this).find('${source.search.selectors.novelCover}').attr('src');
+    
+          if (novelCover && !isUrlAbsolute(novelCover)) {
+            novelCover = baseUrl + novelCover;
+          }
+    
+          novels.push({
+            sourceId,
+            novelUrl,
+            novelName,
+            novelCover,
+          });
+        }
+      });
+    
+      return novels;`
+        : `
+      showToast('Search is not available in this source')
+      
+      return [];
+      `
+    }
+    };
+    
+    const ${source.sourceName}Scraper = {
+      popularNovels,
+      parseNovelAndChapters,
+      parseChapter,
+      searchNovels,
+    };
+    
+    export default ${source.sourceName}Scraper;
+    
+    `;
+
+    const formatContent = prettier.format(content, {
+      parser: 'typescript',
+      ...prettierConfig,
+    });
+
+    fs.writeFile(
+      path.resolve(
+        process.cwd(),
+        `src/sources/${getLanguageCode(source.lang)}/${source.sourceName}.ts`,
+      ),
+      formatContent,
+      error => {
+        if (error) {
+          console.log(error);
+        }
+      },
+    );
+
+    if (!isDuplicate) {
+      let allSourcesContent = AllSources;
+
+      allSourcesContent.push({
+        sourceId: source.sourceId,
+        sourceName: source.sourceName,
+        icon: `https://github.com/LNReader/lnreader-sources/blob/main/src/${getLanguageCode(
+          source.lang,
+        )}/${source.sourceName.toLowerCase()}/icon.png?raw=true`,
+        url: source.baseUrl,
+        lang: source.lang || 'English',
+      });
+
+      allSourcesContent = prettier.format(JSON.stringify(allSourcesContent), {
+        parser: 'json',
+        ...prettierConfig,
+      });
+
+      fs.writeFile(
+        path.resolve(process.cwd(), 'src/sources/sources.json'),
+        allSourcesContent,
+        error => {
+          if (error) {
+            console.log(error);
+          }
+        },
+      );
+    } else {
+      console.log('Source with same id already exists');
+    }
+  } else {
+    console.log('Template path not provided');
+  }
+} catch (e) {
+  console.log(e);
+}

scripts/stringTypes.cjs

@@ -0,0 +1,44 @@
+const fs = require('fs');
+const path = require('path');
+const prettier = require('prettier');
+const prettierConfig = require('../.prettierrc');
+
+const flatten = (obj, target, prefix) => {
+  (target = target || {}), (prefix = prefix || '');
+
+  Object.keys(obj).forEach(function (key) {
+    if (typeof obj[key] === 'object' && obj[key] !== null) {
+      flatten(obj[key], target, prefix + key + '.');
+    } else {
+      return (target[prefix + key] = 'string');
+    }
+  });
+
+  return target;
+};
+
+const strings = fs.readFileSync(
+  path.resolve(process.cwd(), 'strings/languages/en/strings.json'),
+  'utf8',
+);
+
+const stringTypes = `/**\n * This file is auto-generated\n */\n\n
+
+export interface StringMap ${JSON.stringify(flatten(JSON.parse(strings)))}
+
+`;
+
+const formatContent = prettier.format(stringTypes, {
+  parser: 'typescript',
+  ...prettierConfig,
+});
+
+fs.writeFile(
+  path.resolve(process.cwd(), 'strings/types/index.ts'),
+  formatContent,
+  err => {
+    if (err) {
+      console.log(err);
+    }
+  },
+);

src/components/Actionbar/Actionbar.js

@@ -1,42 +1,47 @@
-import React from "react";
-import { Dimensions, StyleSheet, View } from "react-native";
+import React from 'react';
+import { Dimensions, StyleSheet, View } from 'react-native';
 
-import { IconButton } from "react-native-paper";
+import { IconButton } from 'react-native-paper';
 
-export const Actionbar = ({ actions, theme }) => {
+export const Actionbar = ({ active, actions, theme, style }) => {
+  if (active) {
     return (
-        <View
-            style={[
-                styles.actionbarContainer,
-                { backgroundColor: theme.colorPrimary },
-            ]}
-        >
-            {actions.map(
-                (action, index) =>
-                    action.icon && (
-                        <IconButton
-                            key={index}
-                            icon={action.icon}
-                            color={theme.textColorPrimary}
-                            onPress={action.onPress}
-                        />
-                    )
-            )}
-        </View>
+      <View
+        style={[
+          styles.actionbarContainer,
+          { backgroundColor: theme.colorPrimary },
+          style,
+        ]}
+      >
+        {actions.map(
+          (action, index) =>
+            action.icon && (
+              <IconButton
+                key={index}
+                icon={action.icon}
+                color={theme.textColorPrimary}
+                onPress={action.onPress}
+              />
+            ),
+        )}
+      </View>
     );
+  } else {
+    return null;
+  }
 };
 
 const styles = StyleSheet.create({
-    actionbarContainer: {
-        position: "absolute",
-        width: Dimensions.get("window").width - 32,
-        bottom: 0,
-        margin: 16,
-        borderRadius: 6,
-        flexDirection: "row",
-        justifyContent: "space-between",
-        paddingHorizontal: 8,
-        paddingVertical: 4,
-        elevation: 2,
-    },
+  actionbarContainer: {
+    position: 'absolute',
+    width: Dimensions.get('window').width - 32,
+    bottom: 0,
+    margin: 16,
+    borderRadius: 6,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    paddingHorizontal: 8,
+    paddingVertical: 4,
+    elevation: 2,
+  },
 });

src/components/Appbar.js

@@ -1,24 +1,30 @@
-import React from "react";
+import React from 'react';
+import PropTypes from 'prop-types';
 
-import { Appbar as MaterialAppbar } from "react-native-paper";
+import { Appbar as MaterialAppbar } from 'react-native-paper';
 
-import { useTheme } from "../hooks/reduxHooks";
+import { useTheme } from '../hooks/reduxHooks';
+import { ViewPropTypes } from 'react-native';
 
 export const Appbar = ({ title, onBackAction, style, children }) => {
-    const theme = useTheme();
+  const theme = useTheme();
 
-    return (
-        <MaterialAppbar.Header
-            style={[{ backgroundColor: theme.colorPrimary }, style]}
-        >
-            {onBackAction && (
-                <MaterialAppbar.BackAction onPress={onBackAction} />
-            )}
-            <MaterialAppbar.Content
-                title={title}
-                titleStyle={{ color: theme.textColorPrimary }}
-            />
-            {children}
-        </MaterialAppbar.Header>
-    );
+  return (
+    <MaterialAppbar.Header
+      style={[{ backgroundColor: theme.colorPrimary }, style]}
+    >
+      {onBackAction && <MaterialAppbar.BackAction onPress={onBackAction} />}
+      <MaterialAppbar.Content
+        title={title}
+        titleStyle={{ color: theme.textColorPrimary }}
+      />
+      {children}
+    </MaterialAppbar.Header>
+  );
+};
+
+Appbar.propTypes = {
+  title: PropTypes.string,
+  onBackAction: PropTypes.func,
+  style: ViewPropTypes.style,
 };

src/components/Appbar/Appbar.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import { StatusBar } from 'react-native';
+
+import { Appbar as PaperAppbar } from 'react-native-paper';
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface AppbarProps {
+  title: string;
+  handleGoBack: () => void;
+  theme: ThemeTypeV1;
+}
+
+const Appbar: React.FC<AppbarProps> = ({ title, handleGoBack, theme }) => (
+  <PaperAppbar.Header
+    style={{ backgroundColor: theme.colorPrimary }}
+    statusBarHeight={StatusBar.currentHeight}
+  >
+    {handleGoBack && <PaperAppbar.BackAction onPress={handleGoBack} />}
+    <PaperAppbar.Content
+      title={title}
+      titleStyle={{ color: theme.textColorPrimary }}
+    />
+  </PaperAppbar.Header>
+);
+
+export default Appbar;

src/components/BottomSheetHandle.js

@@ -1,17 +1,17 @@
-import React from "react";
-import { View } from "react-native";
+import React from 'react';
+import { View } from 'react-native';
 
 const BottomSheetHandle = ({ theme }) => (
-    <View
-        style={{
-            backgroundColor: "rgba(255,255,255,0.4)",
-            height: 4,
-            width: 40,
-            borderRadius: 50,
-            top: 8,
-            alignSelf: "center",
-        }}
-    />
+  <View
+    style={{
+      backgroundColor: `${theme.textColorPrimary}66`,
+      height: 4,
+      width: 40,
+      borderRadius: 50,
+      top: 8,
+      alignSelf: 'center',
+    }}
+  />
 );
 
 export default BottomSheetHandle;

src/components/Button/Button.tsx

@@ -0,0 +1,87 @@
+import { Pressable, StyleSheet, Text, View } from 'react-native';
+import React from 'react';
+
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+export enum ButtonVariation {
+  DEFAULT = 'default',
+  OUTLINED = 'outlined',
+  CLEAR = 'clear',
+}
+
+interface Props {
+  variation?: ButtonVariation;
+  title: string;
+  textColor?: string;
+  onPress?: () => void;
+  margin?: number;
+  theme: ThemeTypeV1;
+}
+
+const Button: React.FC<Props> = ({
+  variation = ButtonVariation.DEFAULT,
+  title,
+  textColor,
+  margin = 0,
+  onPress,
+  theme,
+}) => {
+  return (
+    <View
+      style={[
+        styles.button,
+        { margin },
+        variation === 'outlined'
+          ? {
+              ...styles.outlined,
+              borderColor: theme.textColorHint,
+            }
+          : variation !== 'clear' && {
+              backgroundColor: theme.colorAccent,
+            },
+      ]}
+    >
+      <Pressable
+        style={styles.pressable}
+        onPress={onPress}
+        android_ripple={{ color: theme.rippleColor }}
+      >
+        <Text
+          style={{
+            color: textColor
+              ? textColor
+              : variation === 'outlined'
+              ? theme.colorAccent
+              : variation === 'default'
+              ? theme.colorButtonText
+              : theme.textColorPrimary,
+          }}
+          numberOfLines={1}
+        >
+          {title}
+        </Text>
+      </Pressable>
+    </View>
+  );
+};
+
+export default Button;
+
+const styles = StyleSheet.create({
+  button: {
+    minHeight: 40,
+    justifyContent: 'center',
+    borderRadius: 50,
+    overflow: 'hidden',
+  },
+  pressable: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingVertical: 8,
+    paddingHorizontal: 24,
+  },
+  outlined: {
+    borderWidth: 1,
+  },
+});

src/components/Checkbox/Checkbox.js

@@ -1,85 +1,63 @@
-import React from "react";
-import { Pressable, StyleSheet, Text, View } from "react-native";
+import React from 'react';
+import { Pressable, StyleSheet, Text } from 'react-native';
+import { Checkbox as PaperCheckbox } from 'react-native-paper';
 
-import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
-export const Checkbox = ({ label, status, onPress, theme }) => (
-    <View
-        style={[
-            styles.checkboxContainer,
-            status && { backgroundColor: theme.rippleColor },
-        ]}
-    >
-        <Pressable
-            android_ripple={{ color: theme.rippleColor }}
-            style={styles.pressable}
-            onPress={onPress}
-        >
-            <Text
-                style={{
-                    color: status ? theme.colorAccent : theme.textColorPrimary,
-                }}
-            >
-                {label}
-            </Text>
-            {status && (
-                <MaterialCommunityIcons
-                    name="check"
-                    color={theme.colorAccent}
-                    size={21}
-                    style={styles.icon}
-                />
-            )}
-        </Pressable>
-    </View>
+export const Checkbox = ({ label, status, onPress, disabled, theme }) => (
+  <Pressable
+    android_ripple={{ color: theme.rippleColor }}
+    style={styles.pressable}
+    onPress={onPress}
+    disabled={disabled}
+  >
+    <PaperCheckbox
+      status={
+        status === 'indeterminate'
+          ? 'indeterminate'
+          : status
+          ? 'checked'
+          : 'unchecked'
+      }
+      onPress={onPress}
+      color={theme.colorAccent}
+      uncheckedColor={theme.textColorSecondary}
+      disabled={disabled}
+    />
+    <Text style={{ color: theme.textColorPrimary, marginLeft: 12 }}>
+      {label}
+    </Text>
+  </Pressable>
 );
 
 export const SortItem = ({ label, status, onPress, theme }) => (
-    <View
-        style={[
-            styles.checkboxContainer,
-            status && { backgroundColor: theme.rippleColor },
-        ]}
-    >
-        <Pressable
-            android_ripple={{ color: theme.rippleColor }}
-            style={styles.pressable}
-            onPress={onPress}
-        >
-            <Text
-                style={{
-                    color: status ? theme.colorAccent : theme.textColorPrimary,
-                }}
-            >
-                {label}
-            </Text>
-            {status && (
-                <MaterialCommunityIcons
-                    name={status === "asc" ? "arrow-up" : "arrow-down"}
-                    color={theme.colorAccent}
-                    size={21}
-                    style={styles.icon}
-                />
-            )}
-        </Pressable>
-    </View>
+  <Pressable
+    android_ripple={{ color: theme.rippleColor }}
+    style={[styles.pressable, { paddingVertical: 16, paddingLeft: 64 }]}
+    onPress={onPress}
+  >
+    {status && (
+      <MaterialCommunityIcons
+        name={status === 'asc' ? 'arrow-up' : 'arrow-down'}
+        color={theme.colorAccent}
+        size={21}
+        style={styles.icon}
+      />
+    )}
+    <Text style={{ color: theme.textColorPrimary }}>{label}</Text>
+  </Pressable>
 );
 
 const styles = StyleSheet.create({
-    checkboxContainer: {
-        borderRadius: 8,
-        overflow: "hidden",
-        marginVertical: 4,
-    },
-    pressable: {
-        paddingHorizontal: 16,
-        paddingVertical: 12,
-        flexDirection: "row",
-        justifyContent: "space-between",
-    },
-    icon: {
-        position: "absolute",
-        right: 16,
-        alignSelf: "center",
-    },
+  pressable: {
+    paddingHorizontal: 16,
+    paddingVertical: 6,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  icon: {
+    position: 'absolute',
+    left: 24,
+    alignSelf: 'center',
+  },
 });

src/components/Chip/Chip.tsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
+
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface ChipProps {
+  label: string;
+  theme: ThemeTypeV1;
+}
+
+const Chip: React.FC<ChipProps> = ({ label, theme }) => (
+  <View style={[styles.chipContainer, { backgroundColor: theme.colorPrimary }]}>
+    <Pressable
+      android_ripple={{ color: theme.rippleColor }}
+      style={styles.pressable}
+    >
+      <Text style={[styles.label, { color: theme.textColorSecondary }]}>
+        {label}
+      </Text>
+    </Pressable>
+  </View>
+);
+
+export default Chip;
+
+const styles = StyleSheet.create({
+  chipContainer: {
+    overflow: 'hidden',
+    borderRadius: 8,
+    height: 28,
+    marginRight: 8,
+  },
+  pressable: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingHorizontal: 16,
+  },
+  label: {
+    fontSize: 12,
+  },
+});

src/components/ColorPickerModal.js

@@ -1,98 +1,148 @@
-import React, { useState } from "react";
-import { StyleSheet, Text } from "react-native";
+import React, { useState } from 'react';
+import { FlatList, Pressable, StyleSheet, Text, View } from 'react-native';
 
-import { Modal, Portal, TextInput } from "react-native-paper";
+import { Modal, Portal, TextInput } from 'react-native-paper';
 
 const ColorPickerModal = ({
-    theme,
-    color,
-    title,
-    onSubmit,
-    hideModal,
-    modalVisible,
-    showAccentColors,
+  theme,
+  color,
+  title,
+  onSubmit,
+  hideModal,
+  modalVisible,
+  showAccentColors,
 }) => {
-    const [text, setText] = useState(color);
-    const [error, setError] = useState();
+  const [text, setText] = useState(color);
+  const [error, setError] = useState();
 
-    const onDismiss = () => {
-        hideModal();
-        setText();
-        setError();
-    };
+  const onDismiss = () => {
+    hideModal();
+    setText();
+    setError();
+  };
 
-    const onChangeText = (text) => setText(text);
+  const onChangeText = txt => setText(txt);
 
-    const onSubmitEditing = () => {
-        const re = /^#([0-9a-f]{6}|[0-9a-f]{3})$/i;
+  const onSubmitEditing = () => {
+    const re = /^#([0-9a-f]{6}|[0-9a-f]{3})$/i;
 
-        if (text.match(re)) {
-            onSubmit(text);
-            hideModal();
-        } else {
-            setError("Enter a valid hex color code");
-        }
-    };
+    if (text.match(re)) {
+      onSubmit(text);
+      hideModal();
+    } else {
+      setError('Enter a valid hex color code');
+    }
+  };
 
-    const textInputTheme = {
-        colors: {
-            primary: color,
-            placeholder: theme.textColorHint,
-            text: theme.textColorPrimary,
-            background: "transparent",
-        },
-    };
+  const textInputTheme = {
+    colors: {
+      primary: color,
+      placeholder: theme.textColorHint,
+      text: theme.textColorPrimary,
+      background: 'transparent',
+    },
+  };
 
-    return (
-        <Portal>
-            <Modal
-                visible={modalVisible}
-                onDismiss={onDismiss}
-                contentContainerStyle={[
-                    styles.modalContainer,
-                    { backgroundColor: theme.colorPrimary },
-                ]}
-            >
-                <Text
-                    style={[
-                        styles.modalTitle,
-                        { color: theme.textColorPrimary },
-                    ]}
-                >
-                    {title}
-                </Text>
-                <TextInput
-                    value={text}
-                    defaultValue={color}
-                    placeholder="Hex Color Code (E.g. #3399FF)"
-                    onChangeText={onChangeText}
-                    onSubmitEditing={onSubmitEditing}
-                    mode="outlined"
-                    theme={textInputTheme}
-                    underlineColor={theme.textColorHint}
-                    dense
-                    error={error}
+  const accentColors = [
+    '#EF5350',
+    '#EC407A',
+    '#AB47BC',
+    '#7E57C2',
+    '#5C6BC0',
+    '#42A5F5',
+    '#29B6FC',
+    '#26C6DA',
+    '#26A69A',
+    '#66BB6A',
+    '#9CCC65',
+    '#D4E157',
+    '#FFEE58',
+    '#FFCA28',
+    '#FFA726',
+    '#FF7043',
+    '#8D6E63',
+    '#BDBDBD',
+    '#78909C',
+    '#000000',
+  ];
+
+  return (
+    <Portal>
+      <Modal
+        visible={modalVisible}
+        onDismiss={onDismiss}
+        contentContainerStyle={[
+          styles.modalContainer,
+          { backgroundColor: theme.colorPrimary },
+        ]}
+      >
+        <Text style={[styles.modalTitle, { color: theme.textColorPrimary }]}>
+          {title}
+        </Text>
+        {showAccentColors && (
+          <FlatList
+            contentContainerStyle={{ marginBottom: 8 }}
+            data={accentColors}
+            numColumns={4}
+            keyExtractor={item => item}
+            renderItem={({ item }) => (
+              <View
+                style={{
+                  borderRadius: 4,
+                  overflow: 'hidden',
+                  backgroundColor: item,
+                  flex: 1 / 4,
+                  height: 40,
+                  marginHorizontal: 4,
+                  marginVertical: 4,
+                }}
+              >
+                <Pressable
+                  style={{ flex: 1 }}
+                  android_ripple={{
+                    color: 'rgba(0,0,0,0.12)',
+                  }}
+                  onPress={() => {
+                    onSubmit(item);
+                    hideModal();
+                  }}
                 />
-                <Text style={styles.errorText}>{error}</Text>
-            </Modal>
-        </Portal>
-    );
+              </View>
+            )}
+          />
+        )}
+        <TextInput
+          value={text}
+          defaultValue={color}
+          placeholder="Hex Color Code (E.g. #3399FF)"
+          onChangeText={onChangeText}
+          onSubmitEditing={onSubmitEditing}
+          mode="outlined"
+          theme={textInputTheme}
+          underlineColor={theme.textColorHint}
+          dense
+          error={error}
+        />
+        <Text style={styles.errorText}>{error}</Text>
+      </Modal>
+    </Portal>
+  );
 };
 
 export default ColorPickerModal;
 
 const styles = StyleSheet.create({
-    modalContainer: {
-        margin: 30,
-        padding: 20,
-        borderRadius: 8,
-    },
-    modalTitle: {
-        fontSize: 18,
-        marginBottom: 16,
-    },
-    errorText: {
-        color: "#FF0033",
-        paddingTop: 8,
-    },
+  modalContainer: {
+    margin: 30,
+    padding: 20,
+    borderRadius: 8,
+  },
+  modalTitle: {
+    fontSize: 18,
+    marginBottom: 16,
+  },
+  errorText: {
+    color: '#FF0033',
+    paddingTop: 8,
+  },
 });

src/components/Common.js

@@ -1,21 +1,32 @@
-import React from "react";
-import { View, Text, Image, StyleSheet } from "react-native";
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
-const ScreenContainer = ({ children, theme }) => (
-    <View style={{ flex: 1, backgroundColor: theme.colorPrimaryDark }}>
-        {children}
+const ScreenContainer = ({ children, theme }) => {
+  const { bottom } = useSafeAreaInsets();
+
+  return (
+    <View
+      style={{
+        flex: 1,
+        backgroundColor: theme.colorPrimaryDark,
+        paddingBottom: bottom,
+      }}
+    >
+      {children}
     </View>
-);
+  );
+};
 
 const Row = ({ children, style }) => (
-    <View style={[styles.row, style]}>{children}</View>
+  <View style={[styles.row, style]}>{children}</View>
 );
 
 export { ScreenContainer, Row };
 
 const styles = StyleSheet.create({
-    row: {
-        flexDirection: "row",
-        alignItems: "center",
-    },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
 });

src/components/Common/CrossFadeView.js

@@ -0,0 +1,110 @@
+/* eslint-disable no-bitwise */
+
+import PropTypes from 'prop-types';
+import React, { PureComponent, Children } from 'react';
+import { View, Animated, StyleSheet } from 'react-native';
+
+export default class FadeView extends PureComponent {
+  static defaultProps = {
+    animationDuration: 225,
+
+    active: false,
+    removeHiddenSubviews: true,
+  };
+
+  static propTypes = {
+    animationDuration: PropTypes.number,
+
+    active: PropTypes.bool,
+    removeHiddenSubviews: PropTypes.bool,
+
+    children: PropTypes.oneOfType([
+      PropTypes.arrayOf(PropTypes.node),
+      PropTypes.node,
+    ]),
+  };
+
+  constructor(props) {
+    super(props);
+
+    this.renderChild = this.renderChild.bind(this);
+    this.mounted = false;
+
+    let { active } = this.props;
+
+    this.state = {
+      progress: new Animated.Value(Number(active)),
+      animating: false,
+    };
+  }
+
+  componentDidMount() {
+    this.mounted = true;
+  }
+
+  componentWillUnmount() {
+    this.mounted = false;
+  }
+
+  UNSAFE_componentWillReceiveProps({ active, animationDuration }) {
+    let { progress } = this.state;
+
+    if (active ^ this.props.active) {
+      this.setState({ animating: true });
+
+      Animated.timing(progress, {
+        toValue: Number(active),
+        duration: animationDuration,
+        useNativeDriver: true,
+      }).start(() => {
+        if (this.mounted) {
+          this.setState({ animating: false });
+        }
+      });
+    }
+  }
+
+  renderChild(child, index) {
+    let { active, removeHiddenSubviews } = this.props;
+    let { animating, progress } = this.state;
+
+    let opacity = progress.interpolate({
+      inputRange: [0, 1],
+      outputRange: index ? [0, 1] : [1, 0],
+    });
+
+    let hidden = active ^ !!index;
+
+    if (removeHiddenSubviews) {
+      if (!animating && hidden) {
+        return null;
+      }
+    }
+
+    let pointerEvents = hidden ? 'none' : 'box-none';
+
+    return (
+      <Animated.View
+        style={[styles.container, { opacity }]}
+        pointerEvents={pointerEvents}
+      >
+        {child}
+      </Animated.View>
+    );
+  }
+
+  render() {
+    let { children, ...props } = this.props;
+
+    return <View {...props}>{Children.map(children, this.renderChild)}</View>;
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    // ...StyleSheet.absoluteFillObject,
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});

src/components/Common/ToggleButton.js

@@ -1,72 +1,64 @@
-import React from "react";
-import { Pressable, View } from "react-native";
-import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
+import React from 'react';
+import { Pressable, View } from 'react-native';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 export const ToggleButton = ({ icon, selected, theme, color, onPress }) => (
-    <View
-        style={{
-            borderRadius: 8,
-            overflow: "hidden",
-            marginHorizontal: 4,
-        }}
+  <View
+    style={{
+      borderRadius: 8,
+      overflow: 'hidden',
+      marginHorizontal: 4,
+    }}
+  >
+    <Pressable
+      android_ripple={{ color: theme.rippleColor }}
+      style={{
+        padding: 10,
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+      onPress={onPress}
     >
-        <Pressable
-            android_ripple={{ color: theme.rippleColor }}
-            style={{
-                padding: 10,
-                alignItems: "center",
-                justifyContent: "center",
-            }}
-            onPress={onPress}
-        >
-            <MaterialCommunityIcons
-                name={icon}
-                color={
-                    selected
-                        ? theme.colorAccent
-                        : color
-                        ? color
-                        : theme.textColorPrimary
-                }
-                size={24}
-            />
-        </Pressable>
-    </View>
+      <MaterialCommunityIcons
+        name={icon}
+        color={
+          selected ? theme.colorAccent : color ? color : theme.textColorPrimary
+        }
+        size={24}
+      />
+    </Pressable>
+  </View>
 );
 
 export const ToggleColorButton = ({
-    selected,
-    backgroundColor,
-    textColor,
-    onPress,
+  selected,
+  backgroundColor,
+  textColor,
+  onPress,
 }) => (
-    <View
-        style={{
-            borderRadius: 50,
-            overflow: "hidden",
-            marginHorizontal: 6,
-            height: 44,
-            width: 44,
-        }}
+  <View
+    style={{
+      borderRadius: 50,
+      overflow: 'hidden',
+      marginHorizontal: 6,
+      height: 44,
+      width: 44,
+    }}
+  >
+    <Pressable
+      android_ripple={{ color: textColor }}
+      style={{
+        flex: 1,
+        padding: 10,
+        backgroundColor: backgroundColor,
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+      onPress={onPress}
     >
-        <Pressable
-            android_ripple={{ color: textColor }}
-            style={{
-                flex: 1,
-                padding: 10,
-                backgroundColor: backgroundColor,
-                alignItems: "center",
-                justifyContent: "center",
-            }}
-            onPress={onPress}
-        >
-            {selected && (
-                <MaterialCommunityIcons
-                    name="check"
-                    color={textColor}
-                    size={24}
-                />
-            )}
-        </Pressable>
-    </View>
+      {selected && (
+        <MaterialCommunityIcons name="check" color={textColor} size={24} />
+      )}
+    </Pressable>
+  </View>
 );

src/components/Container/Container.tsx

@@ -0,0 +1,28 @@
+import React, { ReactNode } from 'react';
+import { StyleSheet, View } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
+interface Props {
+  children: ReactNode;
+}
+
+const Container: React.FC<Props> = ({ children }) => {
+  const { bottom } = useSafeAreaInsets();
+
+  const containerStyle = [
+    styles.container,
+    {
+      paddingBottom: bottom,
+    },
+  ];
+
+  return <View style={containerStyle}>{children}</View>;
+};
+
+export default Container;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+});

src/components/Dialog/Dialog.js

@@ -0,0 +1,8 @@
+/* eslint-disable no-unused-vars */
+
+import React from 'react';
+import { StyleSheet } from 'react-native';
+
+export const Dialog = ({ visible, theme }) => {};
+
+const styles = StyleSheet.create({});

src/components/EmptyView.js

@@ -1,51 +1,47 @@
-import React from "react";
-import { StyleSheet, Text, View } from "react-native";
-import { useSelector } from "react-redux";
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+import { useSelector } from 'react-redux';
 
 const EmptyView = ({ icon, description, style, children, iconStyle }) => {
-    const theme = useSelector((state) => state.settingsReducer.theme);
+  const theme = useSelector(state => state.settingsReducer.theme);
 
-    return (
-        <View style={styles.emptyViewContainer}>
-            <Text
-                style={[
-                    styles.emptyViewIcon,
-                    { color: theme.textColorHint },
-                    style,
-                    iconStyle,
-                ]}
-            >
-                {icon}
-            </Text>
-            <Text
-                style={[
-                    styles.emptyViewText,
-                    { color: theme.textColorHint },
-                    style,
-                ]}
-            >
-                {description}
-            </Text>
-            {children}
-        </View>
-    );
+  return (
+    <View style={styles.emptyViewContainer}>
+      <Text
+        style={[
+          styles.emptyViewIcon,
+          { color: theme.textColorHint },
+          style,
+          iconStyle,
+        ]}
+      >
+        {icon}
+      </Text>
+      <Text
+        style={[styles.emptyViewText, { color: theme.textColorHint }, style]}
+      >
+        {description}
+      </Text>
+      {children}
+    </View>
+  );
 };
 
 export default EmptyView;
 
 const styles = StyleSheet.create({
-    emptyViewContainer: {
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-    },
-    emptyViewIcon: {
-        fontSize: 45,
-    },
-    emptyViewText: {
-        fontWeight: "bold",
-        marginTop: 10,
-        textAlign: "center",
-        paddingHorizontal: 30,
-    },
+  emptyViewContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  emptyViewIcon: {
+    fontSize: 45,
+  },
+  emptyViewText: {
+    fontWeight: 'bold',
+    marginTop: 10,
+    textAlign: 'center',
+    paddingHorizontal: 30,
+  },
 });

src/components/EmptyView/EmptyView.tsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { StyleSheet, View, Text } from 'react-native';
+
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface EmptyViewProps {
+  icon?: string;
+  description: string;
+  theme: ThemeTypeV1;
+}
+
+const EmptyView: React.FC<EmptyViewProps> = ({ icon, description, theme }) => (
+  <View style={styles.container}>
+    {icon ? (
+      <Text style={[styles.icon, { color: theme.textColorHint }]}>{icon}</Text>
+    ) : null}
+    <Text style={[styles.text, { color: theme.textColorHint }]}>
+      {description}
+    </Text>
+  </View>
+);
+
+export default EmptyView;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  icon: {
+    fontSize: 40,
+    fontWeight: 'bold',
+  },
+  text: {
+    marginTop: 16,
+  },
+});

src/components/ErrorScreenV2/ErrorScreenV2.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+import { Container } from '..';
+
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface ErrorScreenProps {
+  error?: string;
+  theme: ThemeTypeV1;
+}
+
+const ErrorScreen: React.FC<ErrorScreenProps> = ({ error, theme }) => {
+  return (
+    <Container>
+      <View style={styles.container}>
+        <Text style={[styles.icon, { color: theme.textColorHint }]}>ಥ_ಥ</Text>
+        <Text style={[styles.error, { color: theme.textColorHint }]}>
+          {error}
+        </Text>
+      </View>
+    </Container>
+  );
+};
+
+export default ErrorScreen;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  icon: {
+    fontSize: 44,
+  },
+  error: {
+    marginTop: 16,
+  },
+});

src/components/ErrorView.js

@@ -1,28 +1,28 @@
-import React from "react";
-import { Text, View } from "react-native";
+import React from 'react';
+import { Text, View } from 'react-native';
 
-import { IconButton } from "react-native-paper";
-import { Row } from "./Common";
+import { IconButton } from 'react-native-paper';
+// import {Row} from './Common';
 
-import EmptyView from "./EmptyView";
+import EmptyView from './EmptyView';
 
 const ErrorView = ({ theme, onRetry, error, openWebView }) => (
-    <View style={{ flex: 1, justifyContent: "center" }}>
-        <EmptyView
-            icon="(；￣Д￣)"
-            description={error}
-            style={{ color: theme.textColorSecondary }}
-        >
-            <IconButton
-                icon="reload"
-                size={25}
-                style={{ margin: 0, marginTop: 24 }}
-                color={theme.text}
-                onPress={onRetry}
-            />
-            <Text style={{ color: theme.textColorPrimary }}>Retry</Text>
-        </EmptyView>
-    </View>
+  <View style={{ flex: 1, justifyContent: 'center' }}>
+    <EmptyView
+      icon="(；￣Д￣)"
+      description={error}
+      style={{ color: theme.textColorSecondary }}
+    >
+      <IconButton
+        icon="reload"
+        size={25}
+        style={{ margin: 0, marginTop: 24 }}
+        color={theme.text}
+        onPress={onRetry}
+      />
+      <Text style={{ color: theme.textColorPrimary }}>Retry</Text>
+    </EmptyView>
+  </View>
 );
 
 export default ErrorView;

src/components/ErrorView/ErrorView.js

@@ -1,75 +1,75 @@
-import React from "react";
-import { Pressable, StyleSheet, Text, View } from "react-native";
-import { IconButton } from "react-native-paper";
+import React from 'react';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
+import { IconButton } from 'react-native-paper';
 
-const icons = ["(･o･;)", "Σ(ಠ_ಠ)", "ಥ_ಥ", "(˘･_･˘)", "(；￣Д￣)", "(･Д･。"];
+// const icons = ['(･o･;)', 'Σ(ಠ_ಠ)', 'ಥ_ಥ', '(˘･_･˘)', '(；￣Д￣)', '(･Д･。'];
 
 export const ErrorView = ({ errorName, actions, theme }) => (
-    <View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
-        <Text style={[styles.emptyViewIcon, { color: theme.textColorHint }]}>
-            {/* {icons[Math.floor(Math.random() * 5)]} */}
-            ಥ_ಥ
-        </Text>
-        <Text style={[styles.emptyViewText, { color: theme.textColorHint }]}>
-            {errorName}
-        </Text>
-        <View style={{ flexDirection: "row" }}>
-            {actions.map((action) => (
-                <View
-                    style={{
-                        borderRadius: 4,
-                        overflow: "hidden",
-                        margin: 16,
-                    }}
-                >
-                    <Pressable
-                        android_ripple={{
-                            color: theme.rippleColor,
-                            borderless: false,
-                        }}
-                        onPress={action.onPress}
-                        style={{
-                            justifyContent: "center",
-                            alignItems: "center",
-                            paddingBottom: 8,
-                            paddingHorizontal: 20,
-                            minWidth: 100,
-                        }}
-                    >
-                        <IconButton
-                            icon={action.icon}
-                            color={theme.textColorHint}
-                            size={24}
-                            style={{ margin: 0 }}
-                        />
-                        <Text
-                            style={{
-                                fontSize: 12,
-                                color: theme.textColorHint,
-                            }}
-                        >
-                            {action.name}
-                        </Text>
-                    </Pressable>
-                </View>
-            ))}
+  <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+    <Text style={[styles.emptyViewIcon, { color: theme.textColorHint }]}>
+      {/* {icons[Math.floor(Math.random() * 5)]} */}
+      ಥ_ಥ
+    </Text>
+    <Text style={[styles.emptyViewText, { color: theme.textColorHint }]}>
+      {errorName}
+    </Text>
+    <View style={{ flexDirection: 'row' }}>
+      {actions.map(action => (
+        <View
+          style={{
+            borderRadius: 4,
+            overflow: 'hidden',
+            margin: 16,
+          }}
+        >
+          <Pressable
+            android_ripple={{
+              color: theme.rippleColor,
+              borderless: false,
+            }}
+            onPress={action.onPress}
+            style={{
+              justifyContent: 'center',
+              alignItems: 'center',
+              paddingBottom: 8,
+              paddingHorizontal: 20,
+              minWidth: 100,
+            }}
+          >
+            <IconButton
+              icon={action.icon}
+              color={theme.textColorHint}
+              size={24}
+              style={{ margin: 0 }}
+            />
+            <Text
+              style={{
+                fontSize: 12,
+                color: theme.textColorHint,
+              }}
+            >
+              {action.name}
+            </Text>
+          </Pressable>
         </View>
+      ))}
     </View>
+  </View>
 );
 
 const styles = StyleSheet.create({
-    emptyViewContainer: {
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-    },
-    emptyViewIcon: {
-        fontSize: 45,
-    },
-    emptyViewText: {
-        fontWeight: "bold",
-        marginTop: 10,
-        textAlign: "center",
-        paddingHorizontal: 30,
-    },
+  emptyViewContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  emptyViewIcon: {
+    fontSize: 45,
+  },
+  emptyViewText: {
+    fontWeight: 'bold',
+    marginTop: 10,
+    textAlign: 'center',
+    paddingHorizontal: 30,
+  },
 });

src/components/Fullscreen.js

@@ -1,2 +0,0 @@
-import { NativeModules } from "react-native";
-module.exports = NativeModules.FullScreen;

src/components/IconButton/IconButton.js

@@ -0,0 +1,42 @@
+import React from 'react';
+import { Pressable, StyleSheet, ViewPropTypes } from 'react-native';
+import PropTypes from 'prop-types';
+
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+
+export const IconButton = ({
+  icon,
+  size,
+  color,
+  onPress,
+  containerStyle,
+  theme,
+}) => (
+  <Pressable
+    style={[styles.container, containerStyle]}
+    android_ripple={{ color: theme.rippleColor, borderless: true, radius: 20 }}
+    onPress={onPress}
+  >
+    <MaterialCommunityIcons name={icon} size={size} color={color} />
+  </Pressable>
+);
+
+IconButton.defaultProps = {
+  size: 24,
+  color: '#FFFFFF',
+};
+
+IconButton.propTypes = {
+  icon: PropTypes.string.isRequired,
+  size: PropTypes.number.isRequired,
+  color: PropTypes.string,
+  onPress: PropTypes.func,
+  containerStyle: ViewPropTypes.style,
+  theme: PropTypes.object.isRequired,
+};
+
+const styles = StyleSheet.create({
+  container: {
+    margin: 6,
+  },
+});

src/components/IconButtonV2/IconButtonV2.tsx

@@ -0,0 +1,54 @@
+import React from 'react';
+import { Pressable, StyleSheet, View, ViewStyle } from 'react-native';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+type Props = {
+  name: string;
+  color?: string;
+  size?: number;
+  disabled?: boolean;
+  padding?: number;
+  onPress?: () => void;
+  theme: ThemeTypeV1;
+  style?: ViewStyle;
+};
+
+const IconButton: React.FC<Props> = ({
+  name,
+  color,
+  size = 24,
+  padding = 8,
+  onPress,
+  disabled,
+  theme,
+  style,
+}) => (
+  <View style={[styles.container, style]}>
+    <Pressable
+      style={[styles.pressable, { padding }]}
+      onPress={onPress}
+      disabled={disabled}
+      android_ripple={{ color: theme.rippleColor }}
+    >
+      <MaterialCommunityIcons
+        name={name}
+        size={size}
+        color={disabled ? theme.textColorHint : color || theme.textColorPrimary}
+      />
+    </Pressable>
+  </View>
+);
+
+export default IconButton;
+
+const styles = StyleSheet.create({
+  container: {
+    borderRadius: 50,
+    overflow: 'hidden',
+  },
+  pressable: {
+    padding: 8,
+  },
+});

src/components/List.js

@@ -1,143 +1,131 @@
-import React from "react";
-import { Pressable, StyleSheet, Text, View } from "react-native";
+import React from 'react';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
 
-import { List as PaperList, Divider as PaperDivider } from "react-native-paper";
-import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
+import { List as PaperList, Divider as PaperDivider } from 'react-native-paper';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 const ListSection = ({ children }) => (
-    <PaperList.Section style={styles.listSection}>{children}</PaperList.Section>
+  <PaperList.Section style={styles.listSection}>{children}</PaperList.Section>
 );
 
 const ListSubHeader = ({ children, theme }) => (
-    <PaperList.Subheader
-        style={[styles.listSubHeader, { color: theme.colorAccent }]}
-    >
-        {children}
-    </PaperList.Subheader>
+  <PaperList.Subheader
+    style={[styles.listSubHeader, { color: theme.colorAccent }]}
+  >
+    {children}
+  </PaperList.Subheader>
 );
 
 const ListItem = ({
-    title,
-    description,
-    icon,
-    onPress,
-    theme,
-    right,
-    iconColor,
-    titleStyle,
-    style,
+  title,
+  description,
+  icon,
+  onPress,
+  theme,
+  right,
+  iconColor,
+  titleStyle,
+  style,
 }) => (
-    <PaperList.Item
-        title={title}
-        style={style}
-        titleStyle={[{ color: theme.textColorPrimary }, titleStyle]}
-        description={description}
-        descriptionStyle={{ color: theme.textColorSecondary }}
-        descriptionNumberOfLines={1}
-        left={() => (
-            <View style={{ justifyContent: "center" }}>
-                {icon && (
-                    <PaperList.Icon
-                        color={theme.colorAccent}
-                        icon={icon}
-                        style={{
-                            marginVertical: 0,
-                        }}
-                    />
-                )}
-            </View>
+  <PaperList.Item
+    title={title}
+    style={style}
+    titleStyle={[{ color: theme.textColorPrimary }, titleStyle]}
+    description={description}
+    descriptionStyle={{ color: theme.textColorSecondary }}
+    descriptionNumberOfLines={1}
+    left={() => (
+      <View style={{ justifyContent: 'center' }}>
+        {icon && (
+          <PaperList.Icon
+            color={theme.colorAccent}
+            icon={icon}
+            style={{
+              marginVertical: 0,
+            }}
+          />
         )}
-        right={() =>
-            right && (
-                <MaterialCommunityIcons
-                    name={right}
-                    color={iconColor || "#47a84a"}
-                    size={23}
-                    style={{ marginRight: 16, textAlignVertical: "center" }}
-                />
-            )
-        }
-        onPress={onPress}
-        rippleColor={theme.rippleColor}
-    />
+      </View>
+    )}
+    right={() =>
+      right && (
+        <MaterialCommunityIcons
+          name={right}
+          color={iconColor || '#47a84a'}
+          size={23}
+          style={{ marginRight: 16, textAlignVertical: 'center' }}
+        />
+      )
+    }
+    onPress={onPress}
+    rippleColor={theme.rippleColor}
+  />
 );
 
 const Divider = ({ theme }) => (
-    <PaperDivider style={{ backgroundColor: theme.dividerColor, height: 1 }} />
+  <PaperDivider style={{ backgroundColor: theme.dividerColor, height: 1 }} />
 );
 
 const InfoItem = ({ title, icon, theme }) => (
-    <PaperList.Item
-        title={title}
-        titleStyle={{ color: theme.textColorSecondary, fontSize: 14 }}
-        titleNumberOfLines={5}
-        left={() =>
-            icon && (
-                <PaperList.Icon
-                    color={theme.textColorSecondary}
-                    icon={icon}
-                    style={{ marginVertical: 0 }}
-                />
-            )
-        }
-    />
+  <PaperList.Item
+    title={title}
+    titleStyle={{ color: theme.textColorSecondary, fontSize: 14 }}
+    titleNumberOfLines={5}
+    left={() =>
+      icon && <PaperList.Icon color={theme.textColorSecondary} icon={icon} />
+    }
+  />
 );
 
 const ColorItem = ({ title, description, theme, onPress }) => (
-    <Pressable
-        style={{
-            padding: 16,
-            flexDirection: "row",
-            justifyContent: "space-between",
-            alignItems: "center",
-        }}
-        android_ripple={{ color: theme.rippleColor }}
-        onPress={onPress}
-    >
-        <View>
-            <Text style={{ color: theme.textColorPrimary, fontSize: 16 }}>
-                {title}
-            </Text>
-            <Text style={{ color: theme.textColorSecondary }}>
-                {description}
-            </Text>
-        </View>
-        <View
-            style={{
-                backgroundColor: description,
-                height: 24,
-                width: 24,
-                borderRadius: 50,
-                marginRight: 16,
-            }}
-        />
-    </Pressable>
+  <Pressable
+    style={{
+      padding: 16,
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+    }}
+    android_ripple={{ color: theme.rippleColor }}
+    onPress={onPress}
+  >
+    <View>
+      <Text style={{ color: theme.textColorPrimary, fontSize: 16 }}>
+        {title}
+      </Text>
+      <Text style={{ color: theme.textColorSecondary }}>{description}</Text>
+    </View>
+    <View
+      style={{
+        backgroundColor: description,
+        height: 24,
+        width: 24,
+        borderRadius: 50,
+        marginRight: 16,
+      }}
+    />
+  </Pressable>
 );
 
 const Icon = ({ icon, theme }) => (
-    <PaperList.Icon
-        color={theme.colorAccent}
-        icon={icon}
-        style={{ margin: 0 }}
-    />
+  <PaperList.Icon color={theme.colorAccent} icon={icon} style={{ margin: 0 }} />
 );
 
 export const List = {
-    Section: ListSection,
-    SubHeader: ListSubHeader,
-    Item: ListItem,
-    Divider,
-    InfoItem,
-    ColorItem,
-    Icon,
+  Section: ListSection,
+  SubHeader: ListSubHeader,
+  Item: ListItem,
+  Divider,
+  InfoItem,
+  ColorItem,
+  Icon,
 };
 
 const styles = StyleSheet.create({
-    listSection: {
-        flex: 1,
-        marginVertical: 0,
-    },
-    listSubHeader: {
-        paddingBottom: 5,
-    },
+  listSection: {
+    flex: 1,
+    marginVertical: 0,
+  },
+  listSubHeader: {
+    paddingBottom: 5,
+  },
 });

src/components/List/List.tsx

@@ -0,0 +1,109 @@
+import React, { ReactNode } from 'react';
+import { StyleSheet, View } from 'react-native';
+
+import { List as PaperList, Divider as PaperDivider } from 'react-native-paper';
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface ListItemProps {
+  title: string;
+  description?: string | null;
+  icon?: string;
+  onPress?: () => void;
+  theme: ThemeTypeV1;
+}
+
+const Section = ({ children }: { children: ReactNode }) => (
+  <PaperList.Section style={styles.listSection}>{children}</PaperList.Section>
+);
+
+const SubHeader = ({
+  children,
+  theme,
+}: {
+  children: ReactNode;
+  theme: ThemeTypeV1;
+}) => (
+  <PaperList.Subheader style={{ color: theme.colorAccent }}>
+    {children}
+  </PaperList.Subheader>
+);
+
+const Item: React.FC<ListItemProps> = ({
+  title,
+  description,
+  icon,
+  onPress,
+  theme,
+}) => (
+  <PaperList.Item
+    title={title}
+    titleStyle={{ color: theme.textColorPrimary }}
+    description={description}
+    descriptionStyle={{ color: theme.textColorSecondary }}
+    left={() => (
+      <View style={styles.iconContainer}>
+        {icon && (
+          <PaperList.Icon
+            color={theme.colorAccent}
+            icon={icon}
+            style={styles.icon}
+          />
+        )}
+      </View>
+    )}
+    onPress={onPress}
+    rippleColor={theme.rippleColor}
+  />
+);
+
+const Divider = ({ theme }: { theme: ThemeTypeV1 }) => (
+  <PaperDivider
+    style={[styles.divider, { backgroundColor: theme.dividerColor }]}
+  />
+);
+
+const InfoItem = ({
+  title,
+  icon,
+  theme,
+}: {
+  title: string;
+  icon: string;
+  theme: ThemeTypeV1;
+}) => (
+  <PaperList.Item
+    title={title}
+    titleStyle={[{ color: theme.textColorSecondary }, styles.infoItem]}
+    titleNumberOfLines={5}
+    left={() =>
+      icon && <PaperList.Icon color={theme.textColorSecondary} icon={icon} />
+    }
+  />
+);
+
+export default {
+  Section,
+  SubHeader,
+  Item,
+  Divider,
+  InfoItem,
+};
+
+const styles = StyleSheet.create({
+  listSection: {
+    flex: 1,
+    marginVertical: 0,
+  },
+  divider: {
+    height: 1,
+  },
+  iconContainer: {
+    justifyContent: 'center',
+  },
+  icon: {
+    marginVertical: 0,
+  },
+  infoItem: {
+    fontSize: 14,
+  },
+});

src/components/ListView.js

@@ -1,80 +1,77 @@
-import React from "react";
-import { StyleSheet, View, Text, Pressable } from "react-native";
+import React from 'react';
+import { StyleSheet, View, Text, Pressable } from 'react-native';
 
-import FastImage from "react-native-fast-image";
+import FastImage from 'react-native-fast-image';
+import { defaultCoverUri } from '../sources/helpers/constants';
+import { coverPlaceholderColor } from '../theme/colors';
 
 const ListView = ({
-    item,
-    downloadBadge,
-    unreadBadge,
-    inLibraryBadge,
-    theme,
-    onPress,
-    isSelected,
-    onLongPress,
+  item,
+  downloadBadge,
+  unreadBadge,
+  inLibraryBadge,
+  theme,
+  onPress,
+  isSelected,
+  onLongPress,
 }) => {
-    return (
-        <Pressable
-            android_ripple={{ color: theme.rippleColor }}
-            style={[
-                styles.listView,
-                isSelected && { backgroundColor: theme.rippleColor },
-            ]}
-            onPress={onPress}
-            onLongPress={onLongPress}
-        >
-            <FastImage
-                source={{
-                    uri:
-                        item.novelCover && !item.novelCover.startsWith("/")
-                            ? item.novelCover
-                            : "https://github.com/LNReader/lnreader-sources/blob/main/src/coverNotAvailable.jpg?raw=true",
-                }}
-                style={[
-                    styles.extensionIcon,
-                    inLibraryBadge && { opacity: 0.5 },
-                ]}
-            />
-            <Text
-                style={[{ color: theme.textColorPrimary }, styles.novelName]}
-                numberOfLines={1}
-            >
-                {item.novelName}
-            </Text>
-            <View style={styles.badgeContainer}>
-                {downloadBadge}
-                {unreadBadge}
-                {inLibraryBadge}
-            </View>
-        </Pressable>
-    );
+  return (
+    <Pressable
+      android_ripple={{ color: theme.rippleColor }}
+      style={[
+        styles.listView,
+        isSelected && { backgroundColor: theme.rippleColor },
+      ]}
+      onPress={onPress}
+      onLongPress={onLongPress}
+    >
+      <FastImage
+        source={{
+          uri: item.novelCover,
+        }}
+        style={[styles.extensionIcon, inLibraryBadge && { opacity: 0.5 }]}
+      />
+      <Text
+        style={[{ color: theme.textColorPrimary }, styles.novelName]}
+        numberOfLines={1}
+      >
+        {item.novelName}
+      </Text>
+      <View style={styles.badgeContainer}>
+        {downloadBadge}
+        {unreadBadge}
+        {inLibraryBadge}
+      </View>
+    </Pressable>
+  );
 };
 
 export default ListView;
 
 const styles = StyleSheet.create({
-    listView: {
-        flex: 1,
-        flexDirection: "row",
-        alignItems: "center",
-        paddingVertical: 8,
-        paddingHorizontal: 12,
-    },
-    extensionIcon: {
-        width: 40,
-        height: 40,
-        borderRadius: 4,
-    },
-    novelName: {
-        flex: 1,
-        marginLeft: 16,
-        fontSize: 15,
-        paddingRight: 8,
-        flexWrap: "wrap",
-    },
-    badgeContainer: {
-        flexDirection: "row",
-        justifyContent: "flex-end",
-        alignItems: "flex-end",
-    },
+  listView: {
+    flex: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingVertical: 8,
+    paddingHorizontal: 12,
+  },
+  extensionIcon: {
+    width: 40,
+    height: 40,
+    borderRadius: 4,
+    backgroundColor: coverPlaceholderColor,
+  },
+  novelName: {
+    flex: 1,
+    marginLeft: 16,
+    fontSize: 15,
+    paddingRight: 8,
+    flexWrap: 'wrap',
+  },
+  badgeContainer: {
+    flexDirection: 'row',
+    justifyContent: 'flex-end',
+    alignItems: 'flex-end',
+  },
 });

src/components/LoadingScreen/LoadingScreen.js

@@ -1,8 +1,8 @@
-import React from "react";
-import { ActivityIndicator, View } from "react-native";
+import React from 'react';
+import { ActivityIndicator, View } from 'react-native';
 
 export const LoadingScreen = ({ theme }) => (
-    <View style={{ flex: 1, justifyContent: "center" }}>
-        <ActivityIndicator size={50} color={theme.colorAccent} />
-    </View>
+  <View style={{ flex: 1, justifyContent: 'center' }}>
+    <ActivityIndicator size={50} color={theme.colorAccent} />
+  </View>
 );

src/components/LoadingScreenV2/LoadingScreenV2.tsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import { StyleSheet, ActivityIndicator } from 'react-native';
+
+import { Container } from '..';
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+const LoadingScreen: React.FC<{ theme: ThemeTypeV1 }> = ({ theme }) => (
+  <Container>
+    <ActivityIndicator
+      size={50}
+      color={theme.colorAccent}
+      style={styles.indicator}
+    />
+  </Container>
+);
+
+export default LoadingScreen;
+
+const styles = StyleSheet.create({
+  indicator: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});

src/components/NewUpdateDialog.js

@@ -1,80 +1,75 @@
-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/reduxHooks";
+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/reduxHooks';
 
 const NewUpdateDialog = ({ newVersion }) => {
-    const [newUpdateDialog, showNewUpdateDialog] = useState(true);
+  const [newUpdateDialog, showNewUpdateDialog] = useState(true);
 
-    const theme = useTheme();
+  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.colorAccent,
-                            letterSpacing: 0,
-                            textTransform: "none",
-                        }}
-                        theme={{ colors: { primary: theme.colorAccent } }}
-                        onPress={() => showNewUpdateDialog(false)}
-                    >
-                        Cancel
-                    </Button>
-                    <Button
-                        labelStyle={{
-                            color: theme.colorAccent,
-                            letterSpacing: 0,
-                            textTransform: "none",
-                        }}
-                        theme={{ colors: { primary: theme.colorAccent } }}
-                        onPress={() => Linking.openURL(newVersion.downloadUrl)}
-                    >
-                        Install
-                    </Button>
-                </View>
-            </Modal>
-        </Portal>
-    );
+  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.colorAccent,
+              letterSpacing: 0,
+              textTransform: 'none',
+            }}
+            theme={{ colors: { primary: theme.colorAccent } }}
+            onPress={() => showNewUpdateDialog(false)}
+          >
+            Cancel
+          </Button>
+          <Button
+            labelStyle={{
+              color: theme.colorAccent,
+              letterSpacing: 0,
+              textTransform: 'none',
+            }}
+            theme={{ colors: { primary: theme.colorAccent } }}
+            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,
-    },
+  containerStyle: {
+    padding: 20,
+    margin: 20,
+    borderRadius: 6,
+  },
+  modalHeader: {
+    fontSize: 20,
+    marginBottom: 10,
+  },
 });

src/components/NovelCover.js

@@ -1,322 +1,314 @@
-import React, { useCallback } from "react";
+import React, { memo, useCallback } from 'react';
 import {
-    StyleSheet,
-    View,
-    Text,
-    useWindowDimensions,
-    Pressable,
-} from "react-native";
+  StyleSheet,
+  View,
+  Text,
+  useWindowDimensions,
+  Pressable,
+} from 'react-native';
 
-import { LinearGradient } from "expo-linear-gradient";
-import FastImage from "react-native-fast-image";
+import { LinearGradient } from 'expo-linear-gradient';
+import FastImage from 'react-native-fast-image';
 
-import ListView from "./ListView";
+import ListView from './ListView';
 
-import { getDeviceOrientation } from "../services/utils/helpers";
-import { useSettings } from "../hooks/reduxHooks";
+import { useDeviceOrientation } from '../services/utils/helpers';
+import { useSettings } from '../hooks/reduxHooks';
+import { defaultCoverUri } from '../sources/helpers/constants';
+import { coverPlaceholderColor } from '../theme/colors';
 
 const NovelCover = ({
-    item,
-    onPress,
-    libraryStatus,
-    theme,
-    isSelected,
-    onLongPress,
-    selectedNovels,
+  item,
+  onPress,
+  libraryStatus,
+  theme,
+  isSelected,
+  onLongPress,
+  selectedNovels,
 }) => {
-    const { displayMode, novelsPerRow, showDownloadBadges, showUnreadBadges } =
-        useSettings();
+  const { displayMode, novelsPerRow, showDownloadBadges, showUnreadBadges } =
+    useSettings();
 
-    const window = useWindowDimensions();
+  const window = useWindowDimensions();
 
-    const orientation = getDeviceOrientation();
+  const orientation = useDeviceOrientation();
 
-    const getNovelsPerRow = () =>
-        orientation === "landscape" ? 6 : novelsPerRow;
+  const getNovelsPerRow = () =>
+    orientation === 'landscape' ? 6 : novelsPerRow;
 
-    const getHeight = useCallback(
-        () => (window.width / getNovelsPerRow()) * (4 / 3),
-        []
-    );
+  const getHeight = useCallback(
+    () => (window.width / getNovelsPerRow()) * (4 / 3),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [],
+  );
 
-    const selectNovel = () => onLongPress && onLongPress(item.novelId);
+  const selectNovel = () => onLongPress && onLongPress(item.novelId);
 
-    return displayMode !== 2 ? (
-        <View
-            style={[
-                {
-                    flex: 1 / getNovelsPerRow(),
-                    borderRadius: 6,
-                    overflow: "hidden",
-                    margin: 2,
-                },
-                isSelected && {
-                    backgroundColor: theme.colorAccent,
-                    opacity: 0.8,
-                },
-            ]}
-        >
-            <Pressable
-                android_ripple={{ color: theme.colorAccent }}
-                style={styles.opac}
-                onPress={
-                    selectedNovels && selectedNovels.length > 0
-                        ? selectNovel
-                        : onPress
-                }
-                onLongPress={selectNovel}
-            >
-                <>
-                    <View style={styles.badgeContainer}>
-                        {libraryStatus && <InLibraryBadge theme={theme} />}
-                        {showDownloadBadges && item.chaptersDownloaded && (
-                            <DownloadBadge
-                                showUnreadBadges={showUnreadBadges}
-                                chaptersDownloaded={item.chaptersDownloaded}
-                                chaptersUnread={item.chaptersUnread}
-                            />
-                        )}
-                        {showUnreadBadges && item.chaptersUnread && (
-                            <UnreadBadge
-                                theme={theme}
-                                chaptersDownloaded={item.chaptersDownloaded}
-                                chaptersUnread={item.chaptersUnread}
-                                showDownloadBadges={showDownloadBadges}
-                            />
-                        )}
-                    </View>
-                    <FastImage
-                        source={{
-                            uri:
-                                item.novelCover &&
-                                !item.novelCover.startsWith("/")
-                                    ? item.novelCover
-                                    : "https://github.com/LNReader/lnreader-sources/blob/main/src/coverNotAvailable.jpg?raw=true",
-                        }}
-                        style={[
-                            { height: getHeight(), borderRadius: 4 },
-                            libraryStatus && { opacity: 0.5 },
-                        ]}
-                    />
-                    <View style={styles.compactTitleContainer}>
-                        {displayMode === 0 && (
-                            <CompactTitle novelName={item.novelName} />
-                        )}
-                    </View>
-                    {displayMode === 1 && (
-                        <ComfortableTitle
-                            novelName={item.novelName}
-                            theme={theme}
-                        />
-                    )}
-                </>
-            </Pressable>
+  const uri = item.novelCover;
+
+  return displayMode !== 2 ? (
+    <View
+      style={[
+        {
+          flex: 1 / getNovelsPerRow(),
+          borderRadius: 6,
+          overflow: 'hidden',
+          margin: 2,
+        },
+        isSelected && {
+          backgroundColor: theme.colorAccent,
+          opacity: 0.8,
+        },
+      ]}
+    >
+      <Pressable
+        android_ripple={{ color: theme.colorAccent }}
+        style={styles.opac}
+        onPress={
+          selectedNovels && selectedNovels.length > 0 ? selectNovel : onPress
+        }
+        onLongPress={selectNovel}
+      >
+        <View style={styles.badgeContainer}>
+          {libraryStatus && <InLibraryBadge theme={theme} />}
+          {showDownloadBadges && item.chaptersDownloaded && (
+            <DownloadBadge
+              showUnreadBadges={showUnreadBadges}
+              chaptersDownloaded={item.chaptersDownloaded}
+              chaptersUnread={item.chaptersUnread}
+            />
+          )}
+          {showUnreadBadges && item.chaptersUnread && (
+            <UnreadBadge
+              theme={theme}
+              chaptersDownloaded={item.chaptersDownloaded}
+              chaptersUnread={item.chaptersUnread}
+              showDownloadBadges={showDownloadBadges}
+            />
+          )}
         </View>
-    ) : (
-        <ListView
-            item={item}
-            downloadBadge={
-                showDownloadBadges &&
-                item.chaptersDownloaded && (
-                    <DownloadBadge
-                        showUnreadBadges={showUnreadBadges}
-                        chaptersDownloaded={item.chaptersDownloaded}
-                        chaptersUnread={item.chaptersUnread}
-                    />
-                )
-            }
-            unreadBadge={
-                showUnreadBadges &&
-                item.chaptersUnread && (
-                    <UnreadBadge
-                        theme={theme}
-                        chaptersDownloaded={item.chaptersDownloaded}
-                        chaptersUnread={item.chaptersUnread}
-                        showDownloadBadges={showDownloadBadges}
-                    />
-                )
-            }
-            inLibraryBadge={libraryStatus && <InLibraryBadge theme={theme} />}
-            theme={theme}
-            onPress={
-                selectedNovels && selectedNovels.length > 0
-                    ? selectNovel
-                    : onPress
-            }
-            onLongPress={selectNovel}
-            isSelected={isSelected}
+        <FastImage
+          source={{ uri }}
+          style={[
+            {
+              height: getHeight(),
+              borderRadius: 4,
+              backgroundColor: coverPlaceholderColor,
+            },
+            libraryStatus && { opacity: 0.5 },
+          ]}
         />
-    );
+        <View style={styles.compactTitleContainer}>
+          {displayMode === 0 && <CompactTitle novelName={item.novelName} />}
+        </View>
+        {displayMode === 1 && (
+          <ComfortableTitle novelName={item.novelName} theme={theme} />
+        )}
+      </Pressable>
+    </View>
+  ) : (
+    <ListView
+      item={item}
+      downloadBadge={
+        showDownloadBadges &&
+        item.chaptersDownloaded && (
+          <DownloadBadge
+            showUnreadBadges={showUnreadBadges}
+            chaptersDownloaded={item.chaptersDownloaded}
+            chaptersUnread={item.chaptersUnread}
+          />
+        )
+      }
+      unreadBadge={
+        showUnreadBadges &&
+        item.chaptersUnread && (
+          <UnreadBadge
+            theme={theme}
+            chaptersDownloaded={item.chaptersDownloaded}
+            chaptersUnread={item.chaptersUnread}
+            showDownloadBadges={showDownloadBadges}
+          />
+        )
+      }
+      inLibraryBadge={libraryStatus && <InLibraryBadge theme={theme} />}
+      theme={theme}
+      onPress={
+        selectedNovels && selectedNovels.length > 0 ? selectNovel : onPress
+      }
+      onLongPress={selectNovel}
+      isSelected={isSelected}
+    />
+  );
 };
 
-export default NovelCover;
+export default memo(NovelCover);
 
 const ComfortableTitle = ({ theme, novelName }) => (
-    <Text
-        numberOfLines={2}
-        style={[
-            styles.title,
-            {
-                color: theme.textColorPrimary,
-                padding: 4,
-            },
-        ]}
-    >
-        {novelName}
-    </Text>
+  <Text
+    numberOfLines={2}
+    style={[
+      styles.title,
+      {
+        color: theme.textColorPrimary,
+        padding: 4,
+      },
+    ]}
+  >
+    {novelName}
+  </Text>
 );
 
 const CompactTitle = ({ novelName }) => (
-    <View style={styles.titleContainer}>
-        <LinearGradient
-            colors={["transparent", "rgba(0,0,0,0.7)"]}
-            style={styles.linearGradient}
-        >
-            <Text
-                numberOfLines={2}
-                style={[
-                    styles.title,
-                    {
-                        color: "rgba(255,255,255,1)",
-                        textShadowColor: "rgba(0, 0, 0, 0.75)",
-                        textShadowOffset: { width: -1, height: 1 },
-                        textShadowRadius: 10,
-                    },
-                ]}
-            >
-                {novelName}
-            </Text>
-        </LinearGradient>
-    </View>
+  <View style={styles.titleContainer}>
+    <LinearGradient
+      colors={['transparent', 'rgba(0,0,0,0.7)']}
+      style={styles.linearGradient}
+    >
+      <Text
+        numberOfLines={2}
+        style={[
+          styles.title,
+          {
+            color: 'rgba(255,255,255,1)',
+            textShadowColor: 'rgba(0, 0, 0, 0.75)',
+            textShadowOffset: { width: -1, height: 1 },
+            textShadowRadius: 10,
+          },
+        ]}
+      >
+        {novelName}
+      </Text>
+    </LinearGradient>
+  </View>
 );
 
 const InLibraryBadge = ({ theme }) => (
-    <Text
-        style={[
-            styles.inLibraryBadge,
-            {
-                backgroundColor: theme.colorAccent,
-                color: theme.colorButtonText,
-                borderRadius: 4,
-            },
-        ]}
-    >
-        In library
-    </Text>
+  <Text
+    style={[
+      styles.inLibraryBadge,
+      {
+        backgroundColor: theme.colorAccent,
+        color: theme.colorButtonText,
+        borderRadius: 4,
+      },
+    ]}
+  >
+    In library
+  </Text>
 );
 
 const UnreadBadge = ({
-    chaptersDownloaded,
-    chaptersUnread,
-    showDownloadBadges,
-    theme,
+  chaptersDownloaded,
+  chaptersUnread,
+  showDownloadBadges,
+  theme,
 }) => (
-    <Text
-        style={[
-            styles.unreadBadge,
-            !chaptersDownloaded && {
-                borderTopLeftRadius: 4,
-                borderBottomLeftRadius: 4,
-            },
-            !showDownloadBadges && {
-                borderRadius: 4,
-            },
-            {
-                backgroundColor: theme.colorAccent,
-                color: theme.colorButtonText,
-            },
-        ]}
-    >
-        {chaptersUnread}
-    </Text>
+  <Text
+    style={[
+      styles.unreadBadge,
+      !chaptersDownloaded && {
+        borderTopLeftRadius: 4,
+        borderBottomLeftRadius: 4,
+      },
+      !showDownloadBadges && {
+        borderRadius: 4,
+      },
+      {
+        backgroundColor: theme.colorAccent,
+        color: theme.colorButtonText,
+      },
+    ]}
+  >
+    {chaptersUnread}
+  </Text>
 );
 
 const DownloadBadge = ({
-    chaptersDownloaded,
-    showUnreadBadges,
-    chaptersUnread,
+  chaptersDownloaded,
+  showUnreadBadges,
+  chaptersUnread,
 }) => (
-    <Text
-        style={[
-            styles.downloadBadge,
-            !chaptersUnread && {
-                borderTopRightRadius: 4,
-                borderBottomRightRadius: 4,
-            },
-            !showUnreadBadges && {
-                borderRadius: 4,
-            },
-        ]}
-    >
-        {chaptersDownloaded}
-    </Text>
+  <Text
+    style={[
+      styles.downloadBadge,
+      !chaptersUnread && {
+        borderTopRightRadius: 4,
+        borderBottomRightRadius: 4,
+      },
+      !showUnreadBadges && {
+        borderRadius: 4,
+      },
+    ]}
+  >
+    {chaptersDownloaded}
+  </Text>
 );
 
 const styles = StyleSheet.create({
-    titleContainer: {
-        flex: 1,
-        borderRadius: 4,
-    },
-    title: {
-        fontFamily: "pt-sans-bold",
-        fontSize: 14,
-        padding: 8,
-    },
-    linearGradient: {
-        borderRadius: 4,
-    },
-    opac: {
-        padding: 4.8,
-        borderRadius: 4,
-        flex: 1,
-    },
-    extensionIcon: {
-        width: 42,
-        height: 42,
-        borderRadius: 4,
-    },
-    listView: {
-        flex: 1,
-        paddingVertical: 8,
-        paddingHorizontal: 12,
-        flexDirection: "row",
-        alignItems: "center",
-        borderRadius: 4,
-    },
+  titleContainer: {
+    flex: 1,
+    borderRadius: 4,
+  },
+  title: {
+    fontFamily: 'pt-sans-bold',
+    fontSize: 14,
+    padding: 8,
+  },
+  linearGradient: {
+    borderRadius: 4,
+  },
+  opac: {
+    padding: 4.8,
+    borderRadius: 4,
+    flex: 1,
+  },
+  extensionIcon: {
+    width: 42,
+    height: 42,
+    borderRadius: 4,
+  },
+  listView: {
+    flex: 1,
+    paddingVertical: 8,
+    paddingHorizontal: 12,
+    flexDirection: 'row',
+    alignItems: 'center',
+    borderRadius: 4,
+  },
 
-    downloadBadge: {
-        backgroundColor: "#2979FF",
-        color: "#FFFFFF",
-        borderTopLeftRadius: 4,
-        borderBottomLeftRadius: 4,
-        paddingTop: 2,
-        paddingHorizontal: 4,
-        fontSize: 12,
-    },
-    unreadBadge: {
-        color: "#FFFFFF",
-        borderTopRightRadius: 4,
-        borderBottomRightRadius: 4,
-        paddingTop: 2,
-        paddingHorizontal: 4,
-        fontSize: 12,
-    },
-    inLibraryBadge: {
-        paddingVertical: 2,
-        paddingHorizontal: 4,
-        fontSize: 12,
-    },
-    compactTitleContainer: {
-        position: "absolute",
-        bottom: 4,
-        left: 4,
-        right: 4,
-    },
-    badgeContainer: {
-        position: "absolute",
-        zIndex: 1,
-        top: 8,
-        left: 8,
-        flexDirection: "row",
-    },
+  downloadBadge: {
+    backgroundColor: '#2979FF',
+    color: '#FFFFFF',
+    borderTopLeftRadius: 4,
+    borderBottomLeftRadius: 4,
+    paddingTop: 2,
+    paddingHorizontal: 4,
+    fontSize: 12,
+  },
+  unreadBadge: {
+    color: '#FFFFFF',
+    borderTopRightRadius: 4,
+    borderBottomRightRadius: 4,
+    paddingTop: 2,
+    paddingHorizontal: 4,
+    fontSize: 12,
+  },
+  inLibraryBadge: {
+    paddingVertical: 2,
+    paddingHorizontal: 4,
+    fontSize: 12,
+  },
+  compactTitleContainer: {
+    position: 'absolute',
+    bottom: 4,
+    left: 4,
+    right: 4,
+  },
+  badgeContainer: {
+    position: 'absolute',
+    zIndex: 1,
+    top: 10,
+    left: 10,
+    flexDirection: 'row',
+  },
 });

src/components/NovelCover/NovelCover.tsx

@@ -0,0 +1,180 @@
+import React from 'react';
+import {
+  Pressable,
+  PressableProps,
+  StyleSheet,
+  Text,
+  View,
+} from 'react-native';
+import FastImage from 'react-native-fast-image';
+import { useAppearanceSettings, useLibrarySettings } from '../../redux/hooks';
+
+import { LibraryNovelInfo, NovelInfo } from '../../database/types';
+import { SourceNovelItem } from '../../sources/types';
+import { ThemeType } from '../../theme/types';
+import {
+  UnreadBadge,
+  DownloadsBadge,
+  InLibraryBadge,
+} from './NovelCoverBadges';
+import { DisplayModes } from '../../redux/settings/settingsSlice';
+import { LinearGradient } from 'expo-linear-gradient';
+import { useDeviceOrientation, useNovelCoverHeight } from '../../hooks';
+import { DeviceOrientation } from '../../hooks/useDeviceOrientation';
+
+interface Props extends PressableProps {
+  item: LibraryNovelInfo | SourceNovelItem | NovelInfo;
+  isSelected: boolean;
+  theme: ThemeType;
+  showInLibraryBadge?: boolean;
+}
+
+const NovelItem: React.FC<Props> = props => {
+  const { item, showInLibraryBadge = false, theme, isSelected = false } = props;
+
+  const { displayMode } = useAppearanceSettings();
+  const { novelsPerRowLandscape, novelsPerRowPotrait } =
+    useAppearanceSettings();
+  const { showUnreadBadge, showDownloadsBadge } = useLibrarySettings();
+
+  const orientation = useDeviceOrientation();
+
+  const coverHeight = useNovelCoverHeight();
+
+  const coverSelectedStyle = {
+    backgroundColor: theme.primary,
+    opacity: 0.8,
+  };
+
+  return (
+    <View
+      style={[
+        {
+          flex:
+            1 /
+            (orientation === DeviceOrientation.POTRAIT
+              ? novelsPerRowPotrait
+              : novelsPerRowLandscape),
+        },
+        styles.container,
+        isSelected && coverSelectedStyle,
+      ]}
+    >
+      <Pressable
+        style={styles.pressable}
+        android_ripple={{ color: theme.rippleColor }}
+        {...props}
+      >
+        <View style={styles.badgeContainer}>
+          {'chaptersDownloaded' in item &&
+          item.chaptersDownloaded &&
+          showDownloadsBadge ? (
+            <DownloadsBadge
+              unreadCount={item.chaptersUnread}
+              downloadCount={item.chaptersDownloaded}
+              showUnreadBadge={showUnreadBadge}
+              theme={theme}
+            />
+          ) : null}
+          {'chaptersUnread' in item &&
+          item.chaptersUnread &&
+          showUnreadBadge ? (
+            <UnreadBadge
+              unreadCount={item.chaptersUnread}
+              downloadCount={item.chaptersDownloaded}
+              showDownloadsBadge={showDownloadsBadge}
+              theme={theme}
+            />
+          ) : null}
+        </View>
+        {showInLibraryBadge ? <InLibraryBadge theme={theme} /> : null}
+        <FastImage
+          source={{ uri: item.novelCover }}
+          style={[
+            { height: coverHeight },
+            styles.image,
+            showInLibraryBadge && styles.inLibrary,
+          ]}
+        >
+          {displayMode === DisplayModes.Compact ? (
+            <CompactTitle name={item.novelName} />
+          ) : null}
+        </FastImage>
+        {displayMode === DisplayModes.Comfortable ? (
+          <Text
+            numberOfLines={2}
+            style={[{ color: theme.textColorPrimary }, styles.title]}
+          >
+            {item.novelName}
+          </Text>
+        ) : null}
+      </Pressable>
+    </View>
+  );
+};
+
+export default NovelItem;
+
+const CompactTitle = ({ name }: { name: string }) => (
+  <View style={styles.compactTitleContainer}>
+    <LinearGradient
+      colors={['transparent', 'rgba(0,0,0,0.7)']}
+      style={styles.linearGradient}
+    >
+      <Text numberOfLines={2} style={[styles.title, styles.compactTitle]}>
+        {name}
+      </Text>
+    </LinearGradient>
+  </View>
+);
+
+const styles = StyleSheet.create({
+  container: {
+    overflow: 'hidden',
+    borderRadius: 6,
+    margin: 2,
+  },
+  pressable: {
+    flex: 1,
+    padding: 4,
+  },
+  badgeContainer: {
+    position: 'absolute',
+    zIndex: 1,
+    top: 12,
+    left: 12,
+    flexDirection: 'row',
+  },
+  image: {
+    borderRadius: 4,
+  },
+  inLibrary: {
+    opacity: 0.5,
+  },
+  title: {
+    padding: 4,
+    fontSize: 12,
+  },
+  compactTitleContainer: {
+    position: 'absolute',
+    bottom: 0,
+    left: 0,
+    right: 0,
+    flex: 1,
+    borderRadius: 4,
+  },
+  linearGradient: {
+    borderRadius: 4,
+    padding: 4,
+    paddingTop: 16,
+  },
+  compactTitle: {
+    color: 'rgba(255,255,255,1)',
+    textShadowColor: 'rgba(0, 0, 0, 0.75)',
+    textShadowOffset: {
+      width: -1,
+      height: 1,
+    },
+    textShadowRadius: 10,
+  },
+});

src/components/NovelCover/NovelCoverBadges.tsx

@@ -0,0 +1,104 @@
+import React from 'react';
+import { StyleSheet, Text } from 'react-native';
+
+import { ThemeType } from '../../theme/types';
+
+interface UnreadBadgeProps {
+  unreadCount: number;
+  downloadCount: number;
+  showDownloadsBadge: boolean;
+  theme: ThemeType;
+}
+
+const UnreadBadge: React.FC<UnreadBadgeProps> = ({
+  unreadCount,
+  downloadCount,
+  showDownloadsBadge,
+  theme,
+}) => (
+  <Text
+    style={[
+      styles.unreadBadge,
+      (!downloadCount || !showDownloadsBadge) && styles.borderLeftRadius,
+      { backgroundColor: theme.primary, color: theme.onPrimary },
+    ]}
+  >
+    {unreadCount}
+  </Text>
+);
+
+interface DownloadsBadgeProps {
+  unreadCount: number;
+  downloadCount: number;
+  showUnreadBadge: boolean;
+  theme: ThemeType;
+}
+
+const DownloadsBadge: React.FC<DownloadsBadgeProps> = ({
+  unreadCount,
+  downloadCount,
+  showUnreadBadge,
+  theme,
+}) => (
+  <Text
+    style={[
+      styles.downloadBadge,
+      (!unreadCount || !showUnreadBadge) && styles.borderRightRadius,
+      { backgroundColor: theme.tertiary, color: theme.onTertiary },
+    ]}
+  >
+    {downloadCount}
+  </Text>
+);
+
+interface InLibraryBadgeProps {
+  theme: ThemeType;
+}
+
+const InLibraryBadge: React.FC<InLibraryBadgeProps> = ({ theme }) => (
+  <Text
+    style={[
+      styles.inLibraryBadge,
+      { backgroundColor: theme.primary, color: theme.onPrimary },
+    ]}
+  >
+    In library
+  </Text>
+);
+
+export { UnreadBadge, DownloadsBadge, InLibraryBadge };
+
+const styles = StyleSheet.create({
+  borderLeftRadius: {
+    borderTopLeftRadius: 4,
+    borderBottomLeftRadius: 4,
+  },
+  borderRightRadius: {
+    borderTopRightRadius: 4,
+    borderBottomRightRadius: 4,
+  },
+  unreadBadge: {
+    borderTopRightRadius: 4,
+    borderBottomRightRadius: 4,
+    paddingVertical: 2,
+    paddingHorizontal: 4,
+    fontSize: 12,
+  },
+  downloadBadge: {
+    borderTopLeftRadius: 4,
+    borderBottomLeftRadius: 4,
+    paddingVertical: 2,
+    paddingHorizontal: 4,
+    fontSize: 12,
+  },
+  inLibraryBadge: {
+    position: 'absolute',
+    top: 12,
+    right: 12,
+    borderRadius: 4,
+    paddingVertical: 2,
+    paddingHorizontal: 4,
+    fontSize: 12,
+    zIndex: 2,
+  },
+});

src/components/NovelList.js

@@ -1,61 +1,61 @@
-import React, { useCallback } from "react";
-import { StyleSheet, FlatList } from "react-native";
+import React, { useCallback } from 'react';
+import { StyleSheet, FlatList } from 'react-native';
 
-import { useSettings } from "../hooks/reduxHooks";
-import { getDeviceOrientation } from "../services/utils/helpers";
+import { useSettings } from '../hooks/reduxHooks';
+import { useDeviceOrientation } from '../services/utils/helpers';
 
 const NovelList = ({
-    data,
-    onScroll,
-    onEndReached,
-    renderItem,
-    refreshControl,
-    ListEmptyComponent,
-    ListFooterComponent,
+  data,
+  onScroll,
+  onEndReached,
+  renderItem,
+  refreshControl,
+  ListEmptyComponent,
+  ListFooterComponent,
 }) => {
-    const { displayMode, novelsPerRow } = useSettings();
+  const { displayMode, novelsPerRow } = useSettings();
 
-    const orientation = getDeviceOrientation();
+  const orientation = useDeviceOrientation();
 
-    const getNovelsPerRow = () => {
-        if (displayMode === 2) {
-            return 1;
-        }
+  const getNovelsPerRow = () => {
+    if (displayMode === 2) {
+      return 1;
+    }
 
-        if (orientation === "landscape") {
-            return 6;
-        } else {
-            return novelsPerRow;
-        }
-    };
+    if (orientation === 'landscape') {
+      return 6;
+    } else {
+      return novelsPerRow;
+    }
+  };
 
-    const keyExtractor = useCallback((item) => item.novelUrl, []);
+  const keyExtractor = useCallback(item => item.sourceId + item.novelUrl, []);
 
-    return (
-        <FlatList
-            contentContainerStyle={[
-                styles.flatListCont,
-                displayMode !== 2 && { paddingHorizontal: 4 },
-            ]}
-            numColumns={getNovelsPerRow()}
-            key={[orientation, getNovelsPerRow()]}
-            data={data}
-            keyExtractor={keyExtractor}
-            renderItem={renderItem}
-            refreshControl={refreshControl}
-            ListEmptyComponent={ListEmptyComponent}
-            ListFooterComponent={ListFooterComponent}
-            onScroll={onScroll}
-            onEndReached={onEndReached}
-        />
-    );
+  return (
+    <FlatList
+      contentContainerStyle={[
+        styles.flatListCont,
+        displayMode !== 2 && { paddingHorizontal: 4 },
+      ]}
+      numColumns={getNovelsPerRow()}
+      key={[orientation, getNovelsPerRow()]}
+      data={data}
+      keyExtractor={keyExtractor}
+      renderItem={renderItem}
+      refreshControl={refreshControl}
+      ListEmptyComponent={ListEmptyComponent}
+      ListFooterComponent={ListFooterComponent}
+      onScroll={onScroll}
+      onEndReached={onEndReached}
+    />
+  );
 };
 
 export default NovelList;
 
 const styles = StyleSheet.create({
-    flatListCont: {
-        flexGrow: 1,
-        paddingVertical: 8,
-    },
+  flatListCont: {
+    flexGrow: 1,
+    paddingBottom: 56,
+  },
 });

src/components/NovelList/NovelList.tsx

@@ -0,0 +1,40 @@
+import React from 'react';
+import { FlatList, FlatListProps, StyleSheet } from 'react-native';
+
+import { useAppearanceSettings } from '../../redux/hooks';
+import { useDeviceOrientation } from '../../hooks';
+
+import { LibraryNovelInfo, NovelInfo } from '../../database/types';
+import { SourceNovelItem } from '../../sources/types';
+import { DeviceOrientation } from '../../hooks/useDeviceOrientation';
+
+const NovelList: React.FC<
+  FlatListProps<SourceNovelItem | NovelInfo | LibraryNovelInfo>
+> = props => {
+  const orientation = useDeviceOrientation();
+
+  const { novelsPerRowPotrait, novelsPerRowLandscape } =
+    useAppearanceSettings();
+
+  return (
+    <FlatList
+      contentContainerStyle={styles.container}
+      numColumns={
+        orientation === DeviceOrientation.LANDSCAPE
+          ? novelsPerRowLandscape
+          : novelsPerRowPotrait
+      }
+      key={[orientation, novelsPerRowPotrait] as any}
+      {...props}
+    />
+  );
+};
+
+export default NovelList;
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    padding: 4,
+  },
+});

src/components/RadioButton.js

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

src/components/RadioButton/RadioButton.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import { Pressable, StyleSheet, Text } from 'react-native';
+import { RadioButton as PaperRadioButton } from 'react-native-paper';
+
+export const RadioButton = ({
+  label,
+  status,
+  onPress,
+  style,
+  labelStyle,
+  theme,
+}) => (
+  <Pressable
+    android_ripple={{ color: theme.rippleColor }}
+    style={[styles.pressable, style]}
+    onPress={onPress}
+  >
+    <PaperRadioButton
+      status={status ? 'checked' : 'unchecked'}
+      onPress={onPress}
+      color={theme.colorAccent}
+      uncheckedColor={theme.textColorSecondary}
+    />
+    <Text
+      style={[labelStyle, { color: theme.textColorPrimary, marginLeft: 12 }]}
+    >
+      {label}
+    </Text>
+  </Pressable>
+);
+
+const styles = StyleSheet.create({
+  pressable: {
+    paddingHorizontal: 16,
+    paddingVertical: 6,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  icon: {
+    position: 'absolute',
+    left: 24,
+    alignSelf: 'center',
+  },
+});

src/components/Searchbar/Searchbar.js

@@ -1,97 +1,96 @@
-import React, { useRef } from "react";
-import { StyleSheet, View, TextInput, Text, StatusBar } from "react-native";
+import React, { useRef } from 'react';
+import {
+  StyleSheet,
+  View,
+  TextInput,
+  StatusBar,
+  Pressable,
+} from 'react-native';
 
-import { TouchableRipple, IconButton } from "react-native-paper";
-import { Row } from "../Common";
+import { Row } from '../Common';
+import { IconButton } from '../IconButton/IconButton';
 
 export const Searchbar = ({
-    theme,
-    placeholder,
-    searchText,
-    backAction,
-    onBackAction,
-    clearSearchbar,
-    onChangeText,
-    onSubmitEditing,
-    actions,
+  theme,
+  placeholder,
+  searchText,
+  backAction,
+  onBackAction,
+  clearSearchbar,
+  onChangeText,
+  onSubmitEditing,
+  actions,
 }) => {
-    const searchRef = useRef(null);
+  const searchRef = useRef(null);
 
-    return (
-        <TouchableRipple
-            borderless
-            onPress={() => searchRef.current.focus()}
-            style={[
-                styles.searchbarContainer,
-                { backgroundColor: theme.searchBarColor },
-            ]}
-            rippleColor={theme.rippleColor}
-        >
-            <View style={styles.container}>
-                <Row style={{ flex: 1 }}>
-                    {backAction && (
-                        <IconButton
-                            icon={backAction}
-                            color={theme.textColorSecondary}
-                            style={{ marginLeft: 0 }}
-                            size={23}
-                            onPress={onBackAction}
-                        />
-                    )}
-                    <TextInput
-                        ref={searchRef}
-                        style={{
-                            fontSize: 16,
-                            color: theme.textColorSecondary,
-                        }}
-                        placeholder={placeholder}
-                        placeholderTextColor={theme.textColorSecondary}
-                        onChangeText={onChangeText}
-                        onSubmitEditing={onSubmitEditing}
-                        defaultValue={searchText}
-                    />
-                </Row>
-                {searchText !== "" && (
-                    <IconButton
-                        icon="close"
-                        color={theme.textColorSecondary}
-                        style={{ marginRight: 0 }}
-                        size={23}
-                        onPress={clearSearchbar}
-                    />
-                )}
-                {actions &&
-                    actions.map((action, index) => (
-                        <IconButton
-                            key={index}
-                            icon={action.icon}
-                            color={action.color ?? theme.textColorSecondary}
-                            style={{ marginRight: 0 }}
-                            size={23}
-                            onPress={action.onPress}
-                        />
-                    ))}
-            </View>
-        </TouchableRipple>
-    );
+  return (
+    <View style={styles.searchBar}>
+      <Pressable
+        onPress={() => searchRef.current.focus()}
+        style={[styles.pressable, { backgroundColor: theme.searchBarColor }]}
+        android_ripple={{ color: theme.rippleColor }}
+      >
+        <Row style={{ flex: 1 }}>
+          {backAction && (
+            <IconButton
+              icon={backAction}
+              color={theme.textColorPrimary}
+              onPress={onBackAction}
+              theme={theme}
+              containerStyle={{ marginLeft: 0 }}
+            />
+          )}
+          <TextInput
+            ref={searchRef}
+            style={{
+              fontSize: 16,
+              color: theme.textColorPrimary,
+              marginLeft: 4,
+            }}
+            placeholder={placeholder}
+            placeholderTextColor={theme.textColorSecondary}
+            onChangeText={onChangeText}
+            onSubmitEditing={onSubmitEditing}
+            defaultValue={searchText}
+          />
+        </Row>
+        {searchText !== '' && (
+          <IconButton
+            icon="close"
+            color={theme.textColorPrimary}
+            onPress={clearSearchbar}
+            theme={theme}
+          />
+        )}
+        {actions &&
+          actions.map((action, index) => (
+            <IconButton
+              key={index}
+              icon={action.icon}
+              color={action.color ?? theme.textColorPrimary}
+              onPress={action.onPress}
+              theme={theme}
+              containerStyle={{ marginRight: 0, marginLeft: 16 }}
+            />
+          ))}
+      </Pressable>
+    </View>
+  );
 };
 
 const styles = StyleSheet.create({
-    searchbarContainer: {
-        marginTop: StatusBar.currentHeight + 8,
-        height: 46,
-        flexDirection: "row",
-        alignItems: "center",
-        paddingHorizontal: 12,
-        marginBottom: 6,
-        borderRadius: 8,
-        marginHorizontal: 12,
-        elevation: 2,
-    },
-    container: {
-        flex: 1,
-        flexDirection: "row",
-        justifyContent: "space-between",
-        alignItems: "center",
-    },
+  searchBar: {
+    marginTop: StatusBar.currentHeight + 8,
+    marginBottom: 8,
+    marginHorizontal: 16,
+    height: 46,
+    borderRadius: 50,
+    overflow: 'hidden',
+  },
+  pressable: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    paddingHorizontal: 16,
+  },
 });

src/components/SearchbarV2/SearchbarV2.tsx

@@ -0,0 +1,130 @@
+import React, { useRef } from 'react';
+import { Pressable, StyleSheet, View, TextInput } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
+import { IconButtonV2 } from '..';
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface RightIcon {
+  iconName: string;
+  color?: string;
+  onPress: () => void;
+}
+
+interface SearcbarProps {
+  searchText: string;
+  placeholder: string;
+  onChangeText?: (text: string) => void;
+  onSubmitEditing?: () => void;
+  leftIcon: string;
+  rightIcons?: RightIcon[];
+  handleBackAction?: () => void;
+  clearSearchbar: () => void;
+  onLeftIconPress?: () => void;
+  theme: ThemeTypeV1;
+}
+
+const Searchbar: React.FC<SearcbarProps> = ({
+  searchText,
+  placeholder,
+  onChangeText,
+  onSubmitEditing,
+  leftIcon,
+  rightIcons,
+  handleBackAction,
+  clearSearchbar,
+  onLeftIconPress,
+  theme,
+}) => {
+  const searchbarRef = useRef<any>(null);
+  const focusSearchbar = () => searchbarRef.current.focus();
+
+  const { top } = useSafeAreaInsets();
+  const marginTop = top + 8;
+
+  return (
+    <View
+      style={[
+        styles.searchbarContainer,
+        { marginTop, backgroundColor: theme.searchBarColor },
+      ]}
+    >
+      <Pressable
+        onPress={focusSearchbar}
+        android_ripple={{ color: theme.rippleColor }}
+        style={[styles.searchbar]}
+      >
+        <IconButtonV2
+          name={handleBackAction ? 'arrow-left' : leftIcon}
+          color={theme.textColorPrimary}
+          onPress={() => {
+            if (handleBackAction) {
+              handleBackAction();
+            } else if (onLeftIconPress) {
+              onLeftIconPress();
+            }
+          }}
+          theme={theme}
+        />
+
+        <TextInput
+          ref={searchbarRef}
+          style={[styles.textInput, { color: theme.textColorPrimary }]}
+          placeholder={placeholder}
+          placeholderTextColor={theme.textColorSecondary}
+          onChangeText={onChangeText}
+          onSubmitEditing={onSubmitEditing}
+          defaultValue={searchText}
+        />
+        {searchText !== '' ? (
+          <IconButtonV2
+            name="close"
+            color={theme.textColorPrimary}
+            onPress={clearSearchbar}
+            theme={theme}
+          />
+        ) : null}
+        {rightIcons?.map((icon, index) => (
+          <IconButtonV2
+            key={index}
+            name={icon.iconName}
+            color={icon.color || theme.textColorPrimary}
+            onPress={icon.onPress}
+            theme={theme}
+          />
+        ))}
+      </Pressable>
+    </View>
+  );
+};
+
+export default Searchbar;
+
+const styles = StyleSheet.create({
+  searchbarContainer: {
+    marginHorizontal: 16,
+    marginBottom: 16,
+    minHeight: 46,
+    borderRadius: 50,
+    overflow: 'hidden',
+    zIndex: 1,
+  },
+  searchbar: {
+    flex: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: 8,
+  },
+  textInput: {
+    flex: 1,
+    fontSize: 16,
+    marginHorizontal: 8,
+  },
+  icon: {
+    marginHorizontal: 8,
+  },
+  searchIconContainer: {
+    borderRadius: 50,
+    overflow: 'hidden',
+  },
+});

src/components/Switch/Switch.js

@@ -1,56 +1,53 @@
-import React from "react";
-import { Pressable, StyleSheet, View, Text } from "react-native";
+import React from 'react';
+import { Pressable, StyleSheet, View, Text } from 'react-native';
 
-import { Switch, List } from "react-native-paper";
+import { Switch, List } from 'react-native-paper';
 
 const SwitchSetting = ({ label, description, onPress, theme, icon, value }) => (
-    <Pressable
-        android_ripple={{ color: theme.rippleColor }}
-        style={styles.container}
-        onPress={onPress}
-    >
-        <View style={{ flexDirection: "row", flex: 1 }}>
-            {icon && (
-                <List.Icon
-                    color={theme.colorAccent}
-                    icon={icon}
-                    style={{ margin: 0 }}
-                />
-            )}
-            <View style={[icon && { marginLeft: 16 }]}>
-                <Text
-                    style={{
-                        color: theme.textColorPrimary,
-                        fontSize: 16,
-                        flex: 1,
-                        textAlignVertical: "center",
-                    }}
-                >
-                    {label}
-                </Text>
-                {description && (
-                    <Text style={{ color: theme.textColorSecondary }}>
-                        {description}
-                    </Text>
-                )}
-            </View>
-        </View>
-        <Switch
-            value={value}
-            onValueChange={onPress}
-            color={theme.colorAccent}
-            style={{ marginRight: 8 }}
+  <Pressable
+    android_ripple={{ color: theme.rippleColor }}
+    style={[styles.container, { paddingVertical: description ? 16 : 12 }]}
+    onPress={onPress}
+  >
+    <View style={{ flexDirection: 'row', flex: 1 }}>
+      {icon && (
+        <List.Icon
+          color={theme.colorAccent}
+          icon={icon}
+          style={{ margin: 0 }}
         />
-    </Pressable>
+      )}
+      <View style={[icon && { marginLeft: 16 }]}>
+        <Text
+          style={{
+            color: theme.textColorPrimary,
+            fontSize: 16,
+            flex: 1,
+            textAlignVertical: 'center',
+          }}
+        >
+          {label}
+        </Text>
+        {description && (
+          <Text style={{ color: theme.textColorSecondary }}>{description}</Text>
+        )}
+      </View>
+    </View>
+    <Switch
+      value={value}
+      onValueChange={onPress}
+      color={theme.colorAccent}
+      style={{ marginLeft: 8 }}
+    />
+  </Pressable>
 );
 
 export default SwitchSetting;
 
 const styles = StyleSheet.create({
-    container: {
-        paddingHorizontal: 16,
-        paddingVertical: 12,
-        flexDirection: "row",
-        justifyContent: "space-between",
-    },
+  container: {
+    paddingHorizontal: 16,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
 });

src/components/SwitchItem/SwitchItem.tsx

@@ -0,0 +1,63 @@
+import React from 'react';
+import { Pressable, StyleSheet, View, Text } from 'react-native';
+
+import { Switch } from 'react-native-paper';
+import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+
+interface SwitchItemProps {
+  value: boolean;
+  label: string;
+  description?: string;
+  onPress: () => void;
+  theme: ThemeTypeV1;
+}
+
+const SwitchItem: React.FC<SwitchItemProps> = ({
+  label,
+  description,
+  onPress,
+  theme,
+  value,
+}) => (
+  <Pressable
+    android_ripple={{ color: theme.rippleColor }}
+    style={[styles.container]}
+    onPress={onPress}
+  >
+    <View style={styles.labelContainer}>
+      <Text style={[{ color: theme.textColorPrimary }, styles.label]}>
+        {label}
+      </Text>
+      {description ? (
+        <Text style={{ color: theme.textColorSecondary }}>{description}</Text>
+      ) : null}
+    </View>
+    <Switch
+      value={value}
+      onValueChange={onPress}
+      color={theme.colorAccent}
+      style={styles.switch}
+    />
+  </Pressable>
+);
+
+export default SwitchItem;
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    paddingHorizontal: 16,
+    paddingVertical: 12,
+  },
+  labelContainer: {
+    flex: 1,
+  },
+  label: {
+    fontSize: 16,
+    textAlignVertical: 'center',
+  },
+  switch: {
+    marginLeft: 8,
+  },
+});

src/components/ThemePicker/ThemePicker.js

@@ -0,0 +1,172 @@
+import React from 'react';
+import { View, Text, /* StyleSheet, */ Pressable } from 'react-native';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+
+export const ThemePicker = ({ theme, currentTheme, onPress }) => (
+  <View
+    style={{
+      justifyContent: 'center',
+      alignItems: 'center',
+      marginRight: 16,
+    }}
+  >
+    <View
+      style={{
+        backgroundColor: theme.colorPrimaryDark,
+        borderWidth: 3.6,
+        borderColor:
+          currentTheme.id === theme.id
+            ? theme.colorAccent
+            : currentTheme.colorPrimaryDark,
+        width: 95,
+        height: 140,
+        borderRadius: 16,
+        overflow: 'hidden',
+        elevation: 1,
+      }}
+    >
+      <Pressable style={{ flex: 1 }} onPress={onPress}>
+        {currentTheme.id === theme.id && (
+          <MaterialCommunityIcons
+            name="check"
+            color={theme.colorButtonText}
+            size={15}
+            style={{
+              backgroundColor: theme.colorAccent,
+              position: 'absolute',
+              top: 5,
+              right: 5,
+              elevation: 2,
+              borderRadius: 50,
+              padding: 1.6,
+            }}
+          />
+        )}
+        <View
+          style={{
+            height: 20,
+            backgroundColor: theme.colorPrimary,
+            elevation: 1,
+            justifyContent: 'center',
+          }}
+        >
+          <View
+            style={{
+              backgroundColor: theme.textColorPrimary,
+              width: 44,
+              height: 10,
+              marginLeft: 8,
+              borderRadius: 50,
+            }}
+          />
+        </View>
+        <View style={{ padding: 8 }}>
+          <View
+            style={{
+              height: 18,
+              backgroundColor: theme.textColorSecondary,
+              borderRadius: 4,
+            }}
+          />
+          <View style={{ paddingVertical: 4, flexDirection: 'row' }}>
+            <View
+              style={{
+                height: 10,
+                width: 44,
+                backgroundColor: theme.textColorPrimary,
+                borderRadius: 50,
+              }}
+            />
+            <View
+              style={{
+                height: 10,
+                width: 16,
+                marginLeft: 4,
+                backgroundColor: theme.colorAccent,
+                borderRadius: 50,
+              }}
+            />
+          </View>
+          <View style={{ flexDirection: 'row' }}>
+            <View
+              style={{
+                height: 10,
+                width: 24,
+                backgroundColor: theme.textColorSecondary,
+                borderRadius: 50,
+              }}
+            />
+            <View
+              style={{
+                height: 10,
+                width: 24,
+                backgroundColor: theme.textColorSecondary,
+                borderRadius: 50,
+                marginLeft: 4,
+              }}
+            />
+          </View>
+        </View>
+        <View
+          style={{
+            position: 'absolute',
+            bottom: 0,
+            left: 0,
+            right: 0,
+            height: 24,
+            backgroundColor: theme.colorPrimary,
+            justifyContent: 'center',
+          }}
+        >
+          <View
+            style={{
+              flex: 1,
+              justifyContent: 'space-between',
+              alignItems: 'center',
+              flexDirection: 'row',
+              paddingHorizontal: 16,
+            }}
+          >
+            <View
+              style={{
+                height: 12,
+                width: 12,
+                borderRadius: 50,
+                backgroundColor: theme.textColorPrimary,
+                opacity: 0.54,
+              }}
+            />
+            <View
+              style={{
+                height: 12,
+                width: 12,
+                borderRadius: 50,
+                backgroundColor: theme.colorAccent,
+              }}
+            />
+            <View
+              style={{
+                height: 12,
+                width: 12,
+                borderRadius: 50,
+                backgroundColor: theme.textColorPrimary,
+                opacity: 0.54,
+              }}
+            />
+          </View>
+        </View>
+      </Pressable>
+    </View>
+    <Text
+      style={{
+        color: currentTheme.textColorPrimary,
+        fontSize: 12,
+        paddingVertical: 4,
+      }}
+    >
+      {theme.name}
+    </Text>
+  </View>
+);
+
+// const styles = StyleSheet.create({});

src/components/Typography/Typography.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Text as NativeText, TextPropTypes } from 'react-native';
+
+const Text = ({ type, children, style, theme }) => {
+  const color =
+    type === 'primary'
+      ? theme.textColorPrimary
+      : type === 'secondary'
+      ? theme.textColorSecondary
+      : theme.textColorHint;
+
+  return <NativeText style={[style, { color }]}>{children}</NativeText>;
+};
+
+Text.propType = {
+  style: TextPropTypes.style,
+  type: PropTypes.oneOf(['primary', 'secondary', 'hint']),
+  theme: PropTypes.object.isRequired,
+};

src/components/index.ts

@@ -0,0 +1,12 @@
+export { default as IconButtonV2 } from './IconButtonV2/IconButtonV2';
+export { default as SearchbarV2 } from './SearchbarV2/SearchbarV2';
+export { default as LoadingScreenV2 } from './LoadingScreenV2/LoadingScreenV2';
+export { default as Container } from './Container/Container';
+export { default as ErrorScreenV2 } from './ErrorScreenV2/ErrorScreenV2';
+export { default as EmptyView } from './EmptyView/EmptyView';
+export { default as NovelList } from './NovelList/NovelList';
+export { default as Chip } from './Chip/Chip';
+export { default as Button } from './Button/Button';
+export { default as Appbar } from './Appbar/Appbar';
+export { default as SwitchItem } from './SwitchItem/SwitchItem';
+export { default as List } from './List/List';

src/database/DBHelper.js

@@ -1,55 +0,0 @@
-import * as SQLite from "expo-sqlite";
-import {
-    createNovelTableQuery,
-    createUrlIndexQuery,
-    createLibraryIndexQuery,
-} from "./tables/NovelTable";
-import {
-    createChapterTableQuery,
-    createNovelIdIndexQuery,
-    createUnreadChaptersIndexQuery,
-} from "./tables/ChapterTable";
-import {
-    createHistoryTableQuery,
-    createChapterIdIndexQuery,
-} from "./tables/HistoryTable";
-import { createDownloadTableQuery } from "./tables/DownloadTable";
-import {
-    createUpdatesTableQuery,
-    updatesSeedDataQuery,
-} from "./tables/UpdateTable";
-
-/**
- * Database Version = 2
- */
-
-const dbName = "lnreader.db";
-
-const db = SQLite.openDatabase(dbName);
-
-export const createDB = () => {
-    db.transaction((tx) => {
-        tx.executeSql(createNovelTableQuery);
-        tx.executeSql(createChapterTableQuery);
-        tx.executeSql(createHistoryTableQuery);
-        tx.executeSql(createDownloadTableQuery);
-        tx.executeSql(createUpdatesTableQuery);
-
-        //Db indexes
-        tx.executeSql(createUrlIndexQuery);
-        tx.executeSql(createLibraryIndexQuery);
-        tx.executeSql(createNovelIdIndexQuery);
-        tx.executeSql(createUnreadChaptersIndexQuery);
-        tx.executeSql(createChapterIdIndexQuery);
-    });
-};
-
-export const deleteDb = () => {
-    db.transaction((tx) => {
-        tx.executeSql("DROP TABLE novels");
-        tx.executeSql("DROP TABLE chapters");
-        tx.executeSql("DROP TABLE history");
-        tx.executeSql("DROP TABLE downloads");
-        tx.executeSql("DROP TABLE updates");
-    });
-};

src/database/db.ts

@@ -0,0 +1,50 @@
+import * as SQLite from 'expo-sqlite';
+import {
+  createNovelTableQuery,
+  createUrlIndexQuery,
+  createLibraryIndexQuery,
+} from './tables/NovelTable';
+import {
+  createChapterTableQuery,
+  createNovelIdIndexQuery,
+  createUnreadChaptersIndexQuery,
+} from './tables/ChapterTable';
+import {
+  createHistoryTableQuery,
+  createChapterIdIndexQuery,
+} from './tables/HistoryTable';
+import { createDownloadTableQuery } from './tables/DownloadTable';
+import { createUpdatesTableQuery } from './tables/UpdateTable';
+
+const dbName = 'lnreader.db';
+
+const db = SQLite.openDatabase(dbName);
+
+export const createDB = () => {
+  db.transaction(tx => {
+    tx.executeSql(createNovelTableQuery);
+    tx.executeSql(createChapterTableQuery);
+    tx.executeSql(createHistoryTableQuery);
+    tx.executeSql(createDownloadTableQuery);
+    tx.executeSql(createUpdatesTableQuery);
+
+    /**
+     * Indexes
+     */
+    tx.executeSql(createUrlIndexQuery);
+    tx.executeSql(createLibraryIndexQuery);
+    tx.executeSql(createNovelIdIndexQuery);
+    tx.executeSql(createUnreadChaptersIndexQuery);
+    tx.executeSql(createChapterIdIndexQuery);
+  });
+};
+
+export const deleteDb = () => {
+  db.transaction(tx => {
+    tx.executeSql('DROP TABLE novels');
+    tx.executeSql('DROP TABLE chapters');
+    tx.executeSql('DROP TABLE history');
+    tx.executeSql('DROP TABLE downloads');
+    tx.executeSql('DROP TABLE updates');
+  });
+};

src/database/queries/ChapterQueries.js

@@ -1,311 +0,0 @@
-import * as SQLite from "expo-sqlite";
-import { getSource } from "../../sources/sources";
-const db = SQLite.openDatabase("lnreader.db");
-
-const insertChaptersQuery = `INSERT INTO chapters (chapterUrl, chapterName, releaseDate, novelId) values (?, ?, ?, ?)`;
-
-export const insertChapters = async (novelId, chapters) => {
-    db.transaction((tx) => {
-        chapters.map(
-            (chapter) =>
-                tx.executeSql(
-                    insertChaptersQuery,
-                    [
-                        chapter.chapterUrl,
-                        chapter.chapterName,
-                        chapter.releaseDate,
-                        novelId,
-                    ],
-                    (txObj, res) => {},
-                    (txObj, error) => {}
-                    // console.log(
-                    //     "Error ",
-                    //     error,
-                    //     " Chapter URL: ",
-                    //     chapter.chapterUrl,
-                    //     " Novel ID ",
-                    //     novelId
-                    // )
-                ),
-            (txObj, res) => {
-                console.log("Success");
-            },
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-const getChaptersQuery = (sort = "ORDER BY chapterId ASC", filter = "") =>
-    `SELECT * FROM chapters WHERE novelId = ? ${filter} ${sort}`;
-
-export const getChapters = (novelId, sort, filter) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                getChaptersQuery(sort, filter),
-                [novelId],
-                (txObj, { rows: { _array } }) => {
-                    resolve(_array);
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
-};
-
-const getChapterQuery = `SELECT * FROM downloads WHERE downloadChapterId = ?`;
-
-export const getChapterFromDB = async (chapterId) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                getChapterQuery,
-                [chapterId],
-                (tx, results) => {
-                    resolve(results.rows.item(0));
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
-};
-
-export const getNextChapterFromDB = async (novelId, chapterId) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                `SELECT * FROM chapters WHERE novelId = ? AND chapterId > ?`,
-                [novelId, chapterId],
-                (tx, results) => {
-                    resolve(results.rows.item(0));
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
-};
-
-export const getPrevChapterFromDB = async (novelId, chapterId) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                `SELECT * FROM chapters WHERE novelId = ? AND chapterId < ?`,
-                [novelId, chapterId],
-                (tx, results) => {
-                    resolve(results.rows.item(results.rows.length - 1));
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
-};
-
-const markChapterReadQuery = `UPDATE chapters SET \`read\` = 1 WHERE chapterId = ?`;
-
-export const markChapterRead = async (chapterId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            markChapterReadQuery,
-            [chapterId],
-            (tx, res) => {},
-            (tx, error) => console.log(error)
-        );
-    });
-};
-
-const markChapterUnreadQuery = `UPDATE chapters SET \`read\` = 0 WHERE chapterId = ?`;
-
-export const markChapterUnread = async (chapterId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            markChapterUnreadQuery,
-            [chapterId],
-            (tx, res) => {},
-            (tx, error) => console.log(error)
-        );
-    });
-};
-
-const markAllChaptersReadQuery = `UPDATE chapters SET \`read\` = 1 WHERE novelId = ?`;
-
-export const markAllChaptersRead = async (novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            markAllChaptersReadQuery,
-            [novelId],
-            (tx, res) => {},
-            (tx, error) => console.log(error)
-        );
-    });
-};
-
-const markAllChaptersUnreadQuery = `UPDATE chapters SET \`read\` = 0 WHERE novelId = ?`;
-
-export const markAllChaptersUnread = async (novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            markAllChaptersUnreadQuery,
-            [novelId],
-            (tx, res) => {},
-            (tx, error) => console.log(error)
-        );
-    });
-};
-
-const isChapterDownloadedQuery = `SELECT * FROM downloads WHERE downloadChapterId=?`;
-
-export const isChapterDownloaded = async (chapterId) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                isChapterDownloadedQuery,
-                [chapterId],
-                (txObj, res) => {
-                    if (res.rows.length !== 0) {
-                        resolve(true);
-                    } else {
-                        resolve(false);
-                    }
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
-};
-
-const downloadChapterQuery = `INSERT INTO downloads (downloadChapterId, chapterName, chapterText) VALUES (?, ?, ?)`;
-
-export const downloadChapter = async (
-    sourceId,
-    novelUrl,
-    chapterUrl,
-    chapterId
-) => {
-    const source = getSource(sourceId);
-
-    const chapter = await source.parseChapter(novelUrl, chapterUrl);
-
-    db.transaction((tx) => {
-        tx.executeSql(
-            `UPDATE chapters SET downloaded = 1 WHERE chapterId = ?`,
-            [chapterId]
-        );
-        tx.executeSql(
-            downloadChapterQuery,
-            [chapterId, chapter.chapterName, chapter.chapterText],
-            (tx, res) => {
-                // console.log(`Downloaded Chapter ${chapter.chapterUrl}`);
-            },
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-export const deleteChapter = async (chapterId) => {
-    const updateIsDownloadedQuery = `UPDATE chapters SET downloaded = 0 WHERE chapterId=?`;
-    const deleteChapterQuery = `DELETE FROM downloads WHERE downloadChapterId=?`;
-
-    db.transaction((tx) => {
-        tx.executeSql(
-            updateIsDownloadedQuery,
-            [chapterId],
-            (tx, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
-        tx.executeSql(
-            deleteChapterQuery,
-            [chapterId],
-            (tx, res) => console.log(`Chapter deleted`),
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-const getLastReadChapterQuery = `
-    SELECT chapters.*
-    FROM history
-    JOIN chapters
-    ON history.historyChapterId = chapters.chapterId
-    WHERE history.historyNovelId = ?
-`;
-
-export const getLastReadChapter = async (novelId) => {
-    return new Promise((resolve, reject) => {
-        db.transaction((tx) => {
-            tx.executeSql(
-                getLastReadChapterQuery,
-                [novelId],
-                (tx, { rows }) => resolve(rows.item(0)),
-                (txObj, error) => console.log("Error ", error)
-            );
-        });
-    });
-};
-
-const bookmarkChapterQuery = `UPDATE chapters SET bookmark = ? WHERE chapterId = ?`;
-
-export const bookmarkChapter = async (bookmark, chapterId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            bookmarkChapterQuery,
-            [!bookmark, chapterId],
-            (tx, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-const markPreviuschaptersReadQuery = `UPDATE chapters SET \`read\` = 1 WHERE chapterId < ? AND novelId = ?`;
-
-export const markPreviuschaptersRead = async (chapterId, novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            markPreviuschaptersReadQuery,
-            [chapterId, novelId],
-            (tx, res) => {},
-            (tx, error) => console.log(error)
-        );
-    });
-};
-
-const markPreviousChaptersUnreadQuery = `UPDATE chapters SET \`read\` = 0 WHERE chapterId < ? AND novelId = ?`;
-
-export const markPreviousChaptersUnread = async (chapterId, novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            markPreviousChaptersUnreadQuery,
-            [chapterId, novelId],
-            (tx, res) => {},
-            (tx, error) => console.log(error)
-        );
-    });
-};
-
-const getDownloadedChaptersQuery = `
-    SELECT chapters.*, novels.sourceId, novels.novelName, novels.novelCover, novels.novelUrl
-    FROM chapters
-    JOIN novels
-    ON chapters.novelId = novels.novelId
-    WHERE chapters.downloaded = 1`;
-
-export const getDownloadedChapters = () => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                getDownloadedChaptersQuery,
-                null,
-                (txObj, { rows: { _array } }) => {
-                    resolve(_array);
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
-};
-
-export const deleteDownloads = async () => {
-    db.transaction((tx) => {
-        tx.executeSql(`UPDATE chapters SET downloaded = 0`);
-        tx.executeSql("DELETE FROM downloads; VACCUM;");
-    });
-};

src/database/queries/ChapterQueries.ts

@@ -0,0 +1,399 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+import * as SQLite from 'expo-sqlite';
+import { showToast } from '../../hooks/showToast';
+import { sourceManager } from '../../sources/sourceManager';
+import { ChapterItem } from '../types';
+const db = SQLite.openDatabase('lnreader.db');
+
+const insertChaptersQuery =
+  'INSERT INTO chapters (chapterUrl, chapterName, releaseDate, novelId) values (?, ?, ?, ?)';
+
+export const insertChapters = async (novelId, chapters) => {
+  db.transaction(tx => {
+    chapters.map(
+      chapter =>
+        tx.executeSql(
+          insertChaptersQuery,
+          [
+            chapter.chapterUrl,
+            chapter.chapterName,
+            chapter.releaseDate,
+            novelId,
+          ],
+          (txObj, res) => {},
+          (txObj, error) => {},
+          // console.log(
+          //     "Error ",
+          //     error,
+          //     " Chapter URL: ",
+          //     chapter.chapterUrl,
+          //     " Novel ID ",
+          //     novelId
+          // )
+        ),
+      (txObj, res) => {
+        // console.log('Success');
+      },
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
+};
+
+const getChaptersQuery = (sort = 'ORDER BY chapterId ASC', filter = '') =>
+  `SELECT * FROM chapters WHERE novelId = ? ${filter} ${sort}`;
+
+export const getChapters = (novelId, sort, filter) => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getChaptersQuery(sort, filter),
+        [novelId],
+        (txObj, { rows: { _array } }) => {
+          resolve(_array);
+        },
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    }),
+  );
+};
+
+const getChapterQuery = 'SELECT * FROM downloads WHERE downloadChapterId = ?';
+
+export const getChapterFromDB = async chapterId => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getChapterQuery,
+        [chapterId],
+        (txObj, results) => {
+          resolve(results.rows.item(0));
+        },
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    }),
+  );
+};
+
+const getPrevChapterQuery = `
+  SELECT
+    *
+  FROM
+    chapters
+  WHERE
+    novelId = ?
+  AND
+    chapterId < ?
+  `;
+
+export const getPrevChapter = (
+  novelId: number,
+  chapterId: number,
+): Promise<ChapterItem> => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getPrevChapterQuery,
+        [novelId, chapterId],
+        (txObj, results) => resolve(results.rows.item(results.rows.length - 1)),
+        (txObj, error) => showToast(error.message),
+      );
+    }),
+  );
+};
+
+const getNextChapterQuery = `
+  SELECT
+    *
+  FROM
+    chapters
+  WHERE
+    novelId = ?
+  AND
+  chapterId > ?
+  `;
+
+export const getNextChapter = (
+  novelId: number,
+  chapterId: number,
+): Promise<ChapterItem> => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getNextChapterQuery,
+        [novelId, chapterId],
+        (txObj, results) => resolve(results.rows.item(0)),
+        (txObj, error) => showToast(error.message),
+      );
+    }),
+  );
+};
+
+const markChapterReadQuery =
+  'UPDATE chapters SET `read` = 1 WHERE chapterId = ?';
+
+export const markChapterRead = async chapterId => {
+  db.transaction(tx => {
+    tx.executeSql(
+      markChapterReadQuery,
+      [chapterId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log(error)
+      },
+    );
+  });
+};
+
+const markChapterUnreadQuery =
+  'UPDATE chapters SET `read` = 0 WHERE chapterId = ?';
+
+export const markChapterUnread = async chapterId => {
+  db.transaction(tx => {
+    tx.executeSql(
+      markChapterUnreadQuery,
+      [chapterId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log(error)
+      },
+    );
+  });
+};
+
+const markAllChaptersReadQuery =
+  'UPDATE chapters SET `read` = 1 WHERE novelId = ?';
+
+export const markAllChaptersRead = async novelId => {
+  db.transaction(tx => {
+    tx.executeSql(
+      markAllChaptersReadQuery,
+      [novelId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log(error)
+      },
+    );
+  });
+};
+
+const markAllChaptersUnreadQuery =
+  'UPDATE chapters SET `read` = 0 WHERE novelId = ?';
+
+export const markAllChaptersUnread = async novelId => {
+  db.transaction(tx => {
+    tx.executeSql(
+      markAllChaptersUnreadQuery,
+      [novelId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log(error)
+      },
+    );
+  });
+};
+
+const isChapterDownloadedQuery =
+  'SELECT * FROM downloads WHERE downloadChapterId=?';
+
+export const isChapterDownloaded = async chapterId => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        isChapterDownloadedQuery,
+        [chapterId],
+        (txObj, res) => {
+          if (res.rows.length !== 0) {
+            resolve(true);
+          } else {
+            resolve(false);
+          }
+        },
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    }),
+  );
+};
+
+const downloadChapterQuery =
+  'INSERT INTO downloads (downloadChapterId, chapterName, chapterText) VALUES (?, ?, ?)';
+
+export const downloadChapter = async (
+  sourceId,
+  novelUrl,
+  chapterUrl,
+  chapterId,
+) => {
+  const source = sourceManager(sourceId);
+
+  const chapter = await source.parseChapter(novelUrl, chapterUrl);
+
+  db.transaction(tx => {
+    tx.executeSql('UPDATE chapters SET downloaded = 1 WHERE chapterId = ?', [
+      chapterId,
+    ]);
+    tx.executeSql(
+      downloadChapterQuery,
+      [chapterId, chapter.chapterName, chapter.chapterText],
+      (txObj, res) => {
+        // console.log(`Downloaded Chapter ${chapter.chapterUrl}`);
+      },
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
+};
+
+export const deleteChapter = async chapterId => {
+  const updateIsDownloadedQuery =
+    'UPDATE chapters SET downloaded = 0 WHERE chapterId=?';
+  const deleteChapterQuery = 'DELETE FROM downloads WHERE downloadChapterId=?';
+
+  db.transaction(tx => {
+    tx.executeSql(
+      updateIsDownloadedQuery,
+      [chapterId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+    tx.executeSql(
+      deleteChapterQuery,
+      [chapterId],
+      (txObj, res) => {
+        // console.log('Chapter deleted');
+      },
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
+};
+
+const getLastReadChapterQuery = `
+    SELECT chapters.*
+    FROM history
+    JOIN chapters
+    ON history.historyChapterId = chapters.chapterId
+    WHERE history.historyNovelId = ?
+`;
+
+export const getLastReadChapter = async novelId => {
+  return new Promise((resolve, reject) => {
+    db.transaction(tx => {
+      tx.executeSql(
+        getLastReadChapterQuery,
+        [novelId],
+        (txObj, { rows }) => resolve(rows.item(0)),
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    });
+  });
+};
+
+const bookmarkChapterQuery =
+  'UPDATE chapters SET bookmark = ? WHERE chapterId = ?';
+
+export const bookmarkChapter = async (bookmark, chapterId) => {
+  db.transaction(tx => {
+    tx.executeSql(
+      bookmarkChapterQuery,
+      [!bookmark, chapterId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
+};
+
+const markPreviuschaptersReadQuery =
+  'UPDATE chapters SET `read` = 1 WHERE chapterId < ? AND novelId = ?';
+
+export const markPreviuschaptersRead = async (chapterId, novelId) => {
+  db.transaction(tx => {
+    tx.executeSql(
+      markPreviuschaptersReadQuery,
+      [chapterId, novelId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log(error)
+      },
+    );
+  });
+};
+
+const markPreviousChaptersUnreadQuery =
+  'UPDATE chapters SET `read` = 0 WHERE chapterId < ? AND novelId = ?';
+
+export const markPreviousChaptersUnread = async (chapterId, novelId) => {
+  db.transaction(tx => {
+    tx.executeSql(
+      markPreviousChaptersUnreadQuery,
+      [chapterId, novelId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log(error)
+      },
+    );
+  });
+};
+
+const getDownloadedChaptersQuery = `
+    SELECT chapters.*, novels.sourceId, novels.novelName, novels.novelCover, novels.novelUrl
+    FROM chapters
+    JOIN novels
+    ON chapters.novelId = novels.novelId
+    WHERE chapters.downloaded = 1`;
+
+export const getDownloadedChapters = () => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getDownloadedChaptersQuery,
+        null,
+        (txObj, { rows: { _array } }) => {
+          resolve(_array);
+        },
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    }),
+  );
+};
+
+export const deleteDownloads = async () => {
+  db.transaction(tx => {
+    tx.executeSql('UPDATE chapters SET downloaded = 0');
+    tx.executeSql('DELETE FROM downloads; VACCUM;');
+  });
+};
+
+export const updateChapterDownloadedQuery = `
+  UPDATE 
+    chapters 
+  SET 
+    downloaded = 1
+  WHERE 
+    chapterId = ?`;
+
+export const updateChapterDeletedQuery = `
+  UPDATE 
+    chapters 
+  SET 
+    downloaded = 0
+  WHERE 
+    chapterId = ?`;

src/database/queries/DownloadQueries.ts

@@ -0,0 +1,85 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+import * as SQLite from 'expo-sqlite';
+import { showToast } from '../../hooks/showToast';
+import { sourceManager } from '../../sources/sourceManager';
+import { DownloadedChapter } from '../types';
+
+import {
+  updateChapterDeletedQuery,
+  updateChapterDownloadedQuery,
+} from './ChapterQueries';
+
+const db = SQLite.openDatabase('lnreader.db');
+
+const downloadChapterQuery = `
+  INSERT INTO 
+      downloads (downloadChapterId, chapterName, chapterText)
+  VALUES
+    (?, ?, ?)
+	`;
+
+export const fetchAndInsertChapterInDb = async (
+  sourceId: number,
+  novelUrl: string,
+  chapterId: number,
+  chapterUrl: string,
+) => {
+  const chapter = await sourceManager(sourceId).parseChapter(
+    novelUrl,
+    chapterUrl,
+  );
+
+  db.transaction(tx => {
+    tx.executeSql(updateChapterDownloadedQuery, [chapterId]);
+    tx.executeSql(
+      downloadChapterQuery,
+      [chapterId, chapter.chapterName, chapter.chapterText],
+      (txObj, res) => {},
+      (_txObj, error) => showToast(error),
+    );
+  });
+};
+
+const deleteChapterFromDbQuery = `
+  DELETE FROM 
+    downloads
+  WHERE
+    downloadChapterId = ?
+	`;
+
+export const deleteChapterFromDb = (chapterId: number) => {
+  db.transaction(tx => {
+    tx.executeSql(updateChapterDeletedQuery, [chapterId]);
+    tx.executeSql(
+      deleteChapterFromDbQuery,
+      [chapterId],
+      (txObj, res) => {},
+      (_txObj, error) => showToast(error.message),
+    );
+  });
+};
+
+const getChapterFromDbQuery = `
+  SELECT 
+    * 
+  FROM 
+    downloads 
+  WHERE 
+    downloadChapterId = ?
+  `;
+
+export const getChapterFromDb = async (
+  chapterId: number,
+): Promise<DownloadedChapter> => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getChapterFromDbQuery,
+        [chapterId],
+        (txObj, results) => resolve(results.rows.item(0)),
+        (txObj, error) => reject(error),
+      );
+    }),
+  );
+};

src/database/queries/HistoryQueries.js

@@ -1,5 +1,7 @@
-import * as SQLite from "expo-sqlite";
-const db = SQLite.openDatabase("lnreader.db");
+import * as SQLite from 'expo-sqlite';
+const db = SQLite.openDatabase('lnreader.db');
+
+import { showToast } from '../../hooks/showToast';
 
 const getHistoryQuery = `
     SELECT history.*, chapters.*, novels.*
@@ -14,49 +16,54 @@ const getHistoryQuery = `
     `;
 
 export const getHistoryFromDb = async () => {
-    return new Promise((resolve, reject) => {
-        db.transaction((tx) => {
-            tx.executeSql(
-                getHistoryQuery,
-                null,
-                (txObj, { rows: { _array } }) => {
-                    resolve(_array);
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        });
+  return new Promise((resolve, reject) => {
+    db.transaction(tx => {
+      tx.executeSql(
+        getHistoryQuery,
+        null,
+        (txObj, { rows: { _array } }) => {
+          resolve(_array);
+        },
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
     });
+  });
 };
 
 // const insertHistoryQuery =
 
 export const insertHistory = async (novelId, chapterId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            "INSERT OR REPLACE INTO history (historyNovelId, historyChapterId, historyTimeRead) VALUES (?, ?, (datetime('now','localtime')))",
-            [novelId, chapterId],
-            (txObj, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
-        tx.executeSql("UPDATE novels SET unread = 0 WHERE novelId = ?", [
-            novelId,
-        ]);
-    });
+  db.transaction(tx => {
+    tx.executeSql(
+      "INSERT OR REPLACE INTO history (historyNovelId, historyChapterId, historyTimeRead) VALUES (?, ?, (datetime('now','localtime')))",
+      [novelId, chapterId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+    tx.executeSql('UPDATE novels SET unread = 0 WHERE novelId = ?', [novelId]);
+  });
 };
 
-export const deleteHistory = async (historyId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            "DELETE FROM history WHERE historyId = ?",
-            [historyId],
-            (txObj, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
+export const deleteChapterHistory = async historyId => {
+  db.transaction(tx => {
+    tx.executeSql(
+      'DELETE FROM history WHERE historyId = ?',
+      [historyId],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
 };
 
 export const deleteAllHistory = async () => {
-    db.transaction((tx) => {
-        tx.executeSql("DELETE FROM history; VACCUM;");
-    });
+  db.transaction(tx => {
+    tx.executeSql('DELETE FROM history; VACCUM;');
+  });
+  showToast('History deleted.');
 };

src/database/queries/LibraryQueries.js

@@ -1,5 +1,5 @@
-import * as SQLite from "expo-sqlite";
-const db = SQLite.openDatabase("lnreader.db");
+import * as SQLite from 'expo-sqlite';
+const db = SQLite.openDatabase('lnreader.db');
 
 const getLibraryQuery = (sort, filter) => `
     SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded
@@ -18,28 +18,30 @@ const getLibraryQuery = (sort, filter) => `
         GROUP BY chapters.novelId
     ) AS D
     ON novels.novelId = D.novelId
-    WHERE novels.followed = 1 ${filter ? "AND " + filter : ""}
-    ${sort ? "ORDER BY " + sort : ""}
+    WHERE novels.followed = 1 ${filter ? 'AND ' + filter : ''}
+    ${sort ? 'ORDER BY ' + sort : ''}
     `;
 
 export const getLibrary = (sort, filter) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                getLibraryQuery(sort, filter),
-                null,
-                (txObj, { rows: { _array } }) => {
-                    // console.log(_array);
-                    resolve(_array);
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        getLibraryQuery(sort, filter),
+        null,
+        (txObj, { rows: { _array } }) => {
+          // console.log(_array);
+          resolve(_array);
+        },
+        (txObj, error) => {
+          // console.log('Error ', error);
+        },
+      );
+    }),
+  );
 };
 
 const searchLibraryQuery = (searchText, sort, filter) =>
-    `
+  `
     SELECT novels.*, C.chaptersUnread, D.chaptersDownloaded
     FROM novels
     LEFT JOIN (
@@ -57,19 +59,21 @@ const searchLibraryQuery = (searchText, sort, filter) =>
     ) AS D
     ON novels.novelId = D.novelId
     WHERE novels.followed = 1 AND novelName LIKE '%${searchText}%'  ${
-        filter ? "AND " + filter : ""
-    }
-    ${sort ? "ORDER BY " + sort : ""} `;
+    filter ? 'AND ' + filter : ''
+  }
+    ${sort ? 'ORDER BY ' + sort : ''} `;
 
 export const searchLibrary = (searchText, sort, filter) => {
-    return new Promise((resolve, reject) => {
-        db.transaction((tx) => {
-            tx.executeSql(
-                searchLibraryQuery(searchText, sort, filter),
-                null,
-                (txObj, { rows: { _array } }) => resolve(_array),
-                (txObj, error) => console.log("Error ", error)
-            );
-        });
+  return new Promise((resolve, reject) => {
+    db.transaction(tx => {
+      tx.executeSql(
+        searchLibraryQuery(searchText, sort, filter),
+        null,
+        (txObj, { rows: { _array } }) => resolve(_array),
+        (txObj, error) => {
+          // console.log('Error ', error);
+        },
+      );
     });
+  });
 };

src/database/queries/NovelQueries.js

@@ -1,242 +1,266 @@
-import * as SQLite from "expo-sqlite";
-const db = SQLite.openDatabase("lnreader.db");
+import * as SQLite from 'expo-sqlite';
+const db = SQLite.openDatabase('lnreader.db');
 
-import BackgroundService from "react-native-background-actions";
-import * as DocumentPicker from "expo-document-picker";
+import BackgroundService from 'react-native-background-actions';
+import * as DocumentPicker from 'expo-document-picker';
 
-import { fetchChapters, fetchNovel } from "../../services/Source/source";
-import { insertChapters } from "./ChapterQueries";
+import { fetchChapters, fetchNovel } from '../../services/Source/source';
+import { insertChapters } from './ChapterQueries';
 
-import { showToast } from "../../hooks/showToast";
+import { showToast } from '../../hooks/showToast';
 
-const insertNovelQuery = `INSERT INTO novels (novelUrl, sourceUrl, sourceId, source, novelName, novelCover, novelSummary, author, artist, status, genre) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+const insertNovelQuery =
+  'INSERT INTO novels (novelUrl, sourceUrl, sourceId, source, novelName, novelCover, novelSummary, author, artist, status, genre) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 
-export const insertNovel = async (novel) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) =>
-            tx.executeSql(
-                insertNovelQuery,
-                [
-                    novel.novelUrl,
-                    novel.sourceUrl,
-                    novel.sourceId,
-                    novel.source,
-                    novel.novelName,
-                    novel.novelCover,
-                    novel.novelSummary,
-                    novel.author,
-                    novel.artist,
-                    novel.status,
-                    novel.genre,
-                ],
-                (txObj, { insertId }) => resolve(insertId),
-                (txObj, error) => console.log("Error ", error)
-            )
-        )
-    );
+export const insertNovel = async novel => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx =>
+      tx.executeSql(
+        insertNovelQuery,
+        [
+          novel.novelUrl,
+          novel.sourceUrl,
+          novel.sourceId,
+          novel.source,
+          novel.novelName,
+          novel.novelCover || '',
+          novel.novelSummary,
+          novel.author,
+          novel.artist,
+          novel.status,
+          novel.genre,
+        ],
+        (txObj, { insertId }) => resolve(insertId),
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      ),
+    ),
+  );
 };
 
 export const followNovel = async (followed, novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            "UPDATE novels SET followed = ? WHERE novelId = ?",
-            [!followed, novelId],
-            (tx, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-export const unfollowNovel = async (novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            "UPDATE novels SET followed = 0 WHERE novelId = ?",
-            [novelId],
-            (tx, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-const checkNovelInCacheQuery = `SELECT * FROM novels WHERE novelUrl=? LIMIT 1`;
-
-export const checkNovelInCache = (novelUrl) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                checkNovelInCacheQuery,
-                [novelUrl],
-                (txObj, res) => {
-                    if (res.rows.length !== 0) {
-                        resolve(true);
-                    } else {
-                        resolve(false);
-                    }
-                },
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
+  db.transaction(tx => {
+    tx.executeSql(
+      'UPDATE novels SET followed = ? WHERE novelId = ?',
+      [!followed, novelId],
+      (txo, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
     );
+  });
+};
+
+export const unfollowNovel = async novelId => {
+  db.transaction(tx => {
+    tx.executeSql(
+      'UPDATE novels SET followed = 0 WHERE novelId = ?',
+      [novelId],
+      (txo, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
+};
+
+const checkNovelInCacheQuery = 'SELECT * FROM novels WHERE novelUrl=? LIMIT 1';
+
+export const checkNovelInCache = novelUrl => {
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        checkNovelInCacheQuery,
+        [novelUrl],
+        (txObj, res) => {
+          if (res.rows.length !== 0) {
+            resolve(true);
+          } else {
+            resolve(false);
+          }
+        },
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    }),
+  );
 };
 
 export const getNovel = async (sourceId, novelUrl) => {
-    return new Promise((resolve, reject) =>
-        db.transaction((tx) => {
-            tx.executeSql(
-                `SELECT * FROM novels WHERE novelUrl = ? AND sourceId = ?`,
-                [novelUrl, sourceId],
-                (txObj, { rows }) => resolve(rows.item(0)),
-                (txObj, error) => console.log("Error ", error)
-            );
-        })
-    );
+  return new Promise((resolve, reject) =>
+    db.transaction(tx => {
+      tx.executeSql(
+        'SELECT * FROM novels WHERE novelUrl = ? AND sourceId = ?',
+        [novelUrl, sourceId],
+        (txObj, { rows }) => resolve(rows.item(0)),
+        (txObj, error) => {
+          // console.log('Error ', error)
+        },
+      );
+    }),
+  );
 };
 
 export const deleteNovelCache = () => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            "DELETE FROM novels WHERE followed = 0",
-            null,
-            (txObj, res) => showToast("Entries deleted"),
-            (txObj, error) => console.log("Error ", error)
-        );
-    });
-};
-
-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)
-            )
-        )
+  db.transaction(tx => {
+    tx.executeSql(
+      'DELETE FROM novels WHERE followed = 0',
+      null,
+      (txObj, res) => showToast('Entries deleted'),
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
     );
+  });
 };
 
-const migrateNovelQuery = `INSERT INTO novels (novelUrl, sourceUrl, sourceId, source, novelName, novelCover, novelSummary, author, artist, status, genre, followed) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+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);
+
+          if (chapters) {
+            await insertChapters(insertId, chapters);
+
+            resolve();
+          }
+        },
+        (txObj, error) => {
+          resolve();
+        },
+      ),
+    );
+  });
+};
+
+const migrateNovelQuery =
+  'INSERT INTO novels (novelUrl, sourceUrl, sourceId, source, novelName, novelCover, novelSummary, author, artist, status, genre, followed) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 
 export const migrateNovel = async (sourceId, novelUrl) => {
-    try {
-        const novel = await fetchNovel(sourceId, novelUrl);
+  try {
+    const novel = await fetchNovel(sourceId, novelUrl);
 
-        const options = {
-            taskName: "Migration",
-            taskTitle: `Migrating ${novel.novelName} to new source`,
-            taskDesc: novel.source,
-            taskIcon: {
-                name: "notification_icon",
-                type: "drawable",
-            },
-            color: "#00adb5",
-            parameters: {
-                delay: 1000,
-            },
-            progressBar: {
-                max: 1,
-                value: 0,
-                indeterminate: true,
-            },
-        };
+    const options = {
+      taskName: 'Migration',
+      taskTitle: `Migrating ${novel.novelName} to new source`,
+      taskDesc: novel.source,
+      taskIcon: {
+        name: 'notification_icon',
+        type: 'drawable',
+      },
+      color: '#00adb5',
+      parameters: {
+        delay: 1000,
+      },
+      progressBar: {
+        max: 1,
+        value: 0,
+        indeterminate: true,
+      },
+    };
 
-        const veryIntensiveTask = async () => {
-            await new Promise(async (resolve) => {
-                db.transaction((tx) =>
-                    tx.executeSql(
-                        migrateNovelQuery,
-                        [
-                            novel.novelUrl,
-                            novel.sourceUrl,
-                            novel.sourceId,
-                            novel.source,
-                            novel.novelName,
-                            novel.novelCover,
-                            novel.novelSummary,
-                            novel.author,
-                            novel.artist,
-                            novel.status,
-                            novel.genre,
-                            1,
-                        ],
-                        async (txObj, { insertId }) => {
-                            const chapters = await fetchChapters(
-                                novel.sourceId,
-                                novel.novelUrl
-                            );
-                            await insertChapters(insertId, chapters);
-                            resolve();
-                        },
-                        (txObj, error) => console.log("Error ", error)
-                    )
-                );
-            });
-        };
+    const veryIntensiveTask = async () => {
+      await new Promise(async resolve => {
+        db.transaction(tx =>
+          tx.executeSql(
+            migrateNovelQuery,
+            [
+              novel.novelUrl,
+              novel.sourceUrl,
+              novel.sourceId,
+              novel.source,
+              novel.novelName,
+              novel.novelCover,
+              novel.novelSummary,
+              novel.author,
+              novel.artist,
+              novel.status,
+              novel.genre,
+              1,
+            ],
+            async (txObj, { insertId }) => {
+              const chapters = await fetchChapters(
+                novel.sourceId,
+                novel.novelUrl,
+              );
+              await insertChapters(insertId, chapters);
+              resolve();
+            },
+            (txObj, error) => {
+              // console.log('Error ', error)
+            },
+          ),
+        );
+      });
+    };
 
-        await BackgroundService.start(veryIntensiveTask, options);
-        await BackgroundService.updateNotification({
-            progressBar: { value: 1, indeterminate: false },
-        });
-        await BackgroundService.stop();
-    } catch (error) {
-        showToast(error.message);
-    }
+    await BackgroundService.start(veryIntensiveTask, options);
+    await BackgroundService.updateNotification({
+      progressBar: { value: 1, indeterminate: false },
+    });
+  } catch (error) {
+    showToast(error.message);
+  }
 };
 
 export const updateNovelInfo = async (info, novelId) => {
-    db.transaction((tx) => {
-        tx.executeSql(
-            "UPDATE novels SET novelName = ?, novelSummary = ?, author = ?, genre = ?, status = ? WHERE novelId = ?",
-            [
-                info.novelName,
-                info.novelSummary,
-                info.author,
-                info.genre,
-                info.status,
-                novelId,
-            ],
-            (txObj, res) => {},
-            (txObj, error) => console.log("Error ", error)
-        );
+  db.transaction(tx => {
+    tx.executeSql(
+      'UPDATE novels SET novelName = ?, novelSummary = ?, author = ?, genre = ?, status = ? WHERE novelId = ?',
+      [
+        info.novelName,
+        info.novelSummary,
+        info.author,
+        info.genre,
+        info.status,
+        novelId,
+      ],
+      (txObj, res) => {},
+      (txObj, error) => {
+        // console.log('Error ', error)
+      },
+    );
+  });
+};
+
+export const pickCustomNovelCover = async novelId => {
+  const image = await DocumentPicker.getDocumentAsync({ type: 'image/*' });
+
+  if (image.type === 'success' && image.uri) {
+    const uri = 'file://' + image.uri;
+
+    db.transaction(tx => {
+      tx.executeSql(
+        'UPDATE novels SET novelCover = ? WHERE novelId = ?',
+        [uri, novelId],
+        (txObj, res) => {},
+        (txObj, error) => showToast(`Error: ${error}`),
+      );
     });
-};
-
-export const setCustomNovelCover = async (novelId) => {
-    const image = await DocumentPicker.getDocumentAsync({ type: "image/*" });
-
-    if (image.uri) {
-        db.transaction((tx) => {
-            tx.executeSql(
-                "UPDATE novels SET novelCover = ? WHERE novelId = ?",
-                [image.uri, novelId],
-                (txObj, res) => {},
-                (txObj, error) => console.log("Error ", error)
-            );
-        });
-
-        return image.uri;
-    }
+
+    return image.uri;
+  }
 };

src/database/queries/UpdateQueries.js

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

src/database/queries/UpdateQueries.ts

@@ -0,0 +1,104 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+import * as SQLite from 'expo-sqlite';
+import { showToast } from '../../hooks/showToast';
+import { Update } from '../types';
+
+const db = SQLite.openDatabase('lnreader.db');
+
+const getUpdatesFromDbQuery = `
+    SELECT 
+      chapters.chapterId, 
+      chapters.read, 
+      chapters.downloaded, 
+      chapters.chapterUrl, 
+      chapters.chapterName,
+      chapters.bookmark,
+      chapters.releaseDate,
+      novels.novelUrl, 
+      novels.novelId, 
+      novels.novelCover, 
+      novels.novelName, 
+      novels.sourceId, 
+      updates.updateTime, 
+      updates.updateId
+    FROM 
+      updates 
+    JOIN 
+      chapters 
+    ON 
+      updates.chapterId = chapters.chapterId
+    JOIN 
+      novels
+    ON 
+      updates.novelId = novels.novelId
+    WHERE 
+      date(updates.updateTime) > date('now','-3 months')
+    ORDER BY 
+      updates.updateTime DESC
+    `;
+
+export const getUpdatesFromDb = async (): Promise<Update[]> => {
+  return new Promise((resolve, reject) => {
+    db.transaction(tx => {
+      tx.executeSql(
+        getUpdatesFromDbQuery,
+        [],
+        (txObj, { rows: { _array } }) => resolve(_array),
+        (txObj, error) => reject(error),
+      );
+    });
+  });
+};
+
+const insertChapterUpdateQuery = `
+  INSERT OR IGNORE INTO 
+    updates 
+    (chapterId, novelId, updateTime) 
+  VALUES 
+    (?, ?, (datetime('now','localtime')))`;
+
+export const insertChapterUpdate = async (
+  chapterId: number,
+  novelId: number,
+) => {
+  db.transaction(tx => {
+    tx.executeSql(
+      insertChapterUpdateQuery,
+      [chapterId, novelId],
+      (txOBJ, res) => {},
+      (txOBJ, error) => showToast(error.message),
+    );
+  });
+};
+
+const deleteUpdateFromDbQuery = `
+    DELETE FROM 
+      updates 
+    WHERE 
+      novelId = ?`;
+
+export const deleteUpdateFromDb = (novelId: number) => {
+  db.transaction(tx => {
+    tx.executeSql(
+      deleteUpdateFromDbQuery,
+      [novelId],
+      (txObj, res) => {},
+      (txObj, error) => showToast(error.message),
+    );
+  });
+};
+const clearUpdatesQuery = `
+	DELETE FROM updates;
+	VACCUM;
+	`;
+
+export const clearUpdates = () =>
+  db.transaction(tx =>
+    tx.executeSql(
+      clearUpdatesQuery,
+      [],
+      () => showToast('Updates cleared.'),
+      (txObj, error) => showToast(error.message),
+    ),
+  );

src/database/tables/ChapterTable.js

@@ -1,4 +1,4 @@
-export const createChapterTableQuery = `
+const createChapterTableQuery = `
     CREATE TABLE IF NOT EXISTS chapters(
     chapterId INTEGER PRIMARY KEY AUTOINCREMENT,
     chapterUrl TEXT,
@@ -13,6 +13,18 @@ export const createChapterTableQuery = `
     ON DELETE CASCADE
     )`;
 
-export const createNovelIdIndexQuery = `CREATE INDEX IF NOT EXISTS chapterNovelIdIndex ON chapters(novelId)`;
+const createNovelIdIndexQuery = `
+    CREATE INDEX
+    IF NOT EXISTS
+    chapterNovelIdIndex ON chapters(novelId)`;
 
-export const createUnreadChaptersIndexQuery = `CREATE INDEX IF NOT EXISTS chapterUnreadByNovelIndex ON chapters(novelId, \`read\`) WHERE \`read\`=0`;
+const createUnreadChaptersIndexQuery = `
+    CREATE INDEX 
+    IF NOT EXISTS 
+    chapterUnreadByNovelIndex ON chapters(novelId, \`read\`) WHERE \`read\`=0`;
+
+export {
+  createChapterTableQuery,
+  createNovelIdIndexQuery,
+  createUnreadChaptersIndexQuery,
+};

src/database/tables/HistoryTable.js

@@ -8,4 +8,5 @@ export const createHistoryTableQuery = `
     ON DELETE CASCADE
     )`;
 
-export const createChapterIdIndexQuery = `CREATE INDEX IF NOT EXISTS historyChapterIdIndex ON history(historyChapterId)`;
+export const createChapterIdIndexQuery =
+  'CREATE INDEX IF NOT EXISTS historyChapterIdIndex ON history(historyChapterId)';

src/database/tables/NovelTable.js

@@ -6,7 +6,7 @@ export const createNovelTableQuery = `
     sourceId INTEGER NOT NULL,
     source TEXT NOT NULL,
     novelName TEXT NOT NULL,
-    novelCover TEXT NOT NULL, 
+    novelCover TEXT, 
     novelSummary TEXT, 
     author TEXT, 
     artist TEXT, 
@@ -16,6 +16,8 @@ export const createNovelTableQuery = `
     unread INTEGER DEFAULT 1
     )`;
 
-export const createUrlIndexQuery = `CREATE INDEX IF NOT EXISTS novelUrlIndex ON novels(novelUrl)`;
+export const createUrlIndexQuery =
+  'CREATE INDEX IF NOT EXISTS novelUrlIndex ON novels(novelUrl)';
 
-export const createLibraryIndexQuery = `CREATE INDEX IF NOT EXISTS novelFollowedIndex ON novels(followed)`;
+export const createLibraryIndexQuery =
+  'CREATE INDEX IF NOT EXISTS novelFollowedIndex ON novels(followed)';

src/database/types/index.ts

@@ -0,0 +1,68 @@
+export interface NovelInfo {
+  novelId: number;
+  sourceUrl: string;
+  novelUrl: string;
+  sourceId: number;
+  source: string;
+  novelName: string;
+  novelCover?: string;
+  novelSummary?: string;
+  genre?: string;
+  author?: string;
+  status?: string;
+  followed: number;
+}
+
+export interface LibraryNovelInfo extends NovelInfo {
+  chaptersUnread: number;
+  chaptersDownloaded: number;
+}
+
+export interface ChapterItem {
+  chapterId: number;
+  novelId: number;
+  chapterUrl: string;
+  chapterName: string;
+  releaseDate?: string;
+  read: number;
+  bookmark: number;
+  downloaded: number;
+}
+
+export interface DownloadedChapter {
+  downloadId: number;
+  downloadChapterId: number;
+  chapterName: string | null;
+  chapterText: string;
+}
+
+export interface History {
+  historyId: number;
+  sourceId: number;
+  novelId: number;
+  chapterId: number;
+  novelName: string;
+  novelUrl: string;
+  novelCover: string;
+  chapterName: string;
+  chapterUrl: string;
+  historyTimeRead: string;
+  bookmark: number;
+}
+
+export interface Update {
+  updateId: number;
+  sourceId: number;
+  novelId: number;
+  novelName: string;
+  novelUrl: string;
+  novelCover: string;
+  chapterId: number;
+  chapterUrl: string;
+  chapterName: string;
+  downloaded: number;
+  read: number;
+  updateTime: string;
+  bookmark: number;
+  releaseDate: string;
+}