v1.1.0

* Refactor

* Add migration

* Finish migration

* Add progress bar

.gitignore

@@ -11,3 +11,63 @@ web-build/
 
 # macOS
 .DS_Store
+
+# @generated expo-cli sync-2138f1e3e130677ea10ea873f6d498e3890e677b
+# The following patterns were generated by expo-cli
+
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# BUCK
+buck-out/
+\.buckd/
+*.keystore
+!debug.keystore
+
+# Bundle artifacts
+*.jsbundle
+
+# CocoaPods
+/ios/Pods/
+
+# Expo
+.expo/
+web-build/
+
+# @end expo-cli

App.js

@@ -1,18 +1,23 @@
 import React, { useEffect } from "react";
+import { StatusBar } from "react-native";
+
 import { useFonts } from "expo-font";
 import { Provider as PaperProvider } from "react-native-paper";
-import Main from "./src/Navigators/Main";
-
 import { Provider } from "react-redux";
 import { persistor, store } from "./src/redux/store";
 import { PersistGate } from "redux-persist/lib/integration/react";
-import { createDB, deleteDb } from "./src/Database/DBHelper";
-import { fonts } from "./src/Theme/fonts";
+
+import Main from "./src/navigators/Main";
+
+import { createDB, deleteDb } from "./src/database/DBHelper";
+import { fonts } from "./src/theme/fonts";
 
 const App = () => {
     const [loaded] = useFonts(fonts);
 
-    useEffect(() => createDB(), []);
+    useEffect(() => {
+        createDB();
+    }, []);
 
     if (!loaded) {
         return null;
@@ -22,6 +27,10 @@ const App = () => {
         <Provider store={store}>
             <PersistGate loading={null} persistor={persistor}>
                 <PaperProvider>
+                    <StatusBar
+                        translucent={true}
+                        backgroundColor="transparent"
+                    />
                     <Main />
                 </PaperProvider>
             </PersistGate>

android/app/BUCK

@@ -0,0 +1,55 @@
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
+lib_deps = []
+
+create_aar_targets(glob(["libs/*.aar"]))
+
+create_jar_targets(glob(["libs/*.jar"]))
+
+android_library(
+    name = "all-libs",
+    exported_deps = lib_deps,
+)
+
+android_library(
+    name = "app-code",
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
+    deps = [
+        ":all-libs",
+        ":build_config",
+        ":res",
+    ],
+)
+
+android_build_config(
+    name = "build_config",
+    package = "com.rajarsheechatterjee.LNReader",
+)
+
+android_resource(
+    name = "res",
+    package = "com.rajarsheechatterjee.LNReader",
+    res = "src/main/res",
+)
+
+android_binary(
+    name = "app",
+    keystore = "//android/keystores:debug",
+    manifest = "src/main/AndroidManifest.xml",
+    package_type = "debug",
+    deps = [
+        ":app-code",
+    ],
+)

android/app/build.gradle

@@ -0,0 +1,219 @@
+apply plugin: "com.android.application"
+
+import com.android.build.OutputFile
+
+/**
+ * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
+ * and bundleReleaseJsAndAssets).
+ * These basically call `react-native bundle` with the correct arguments during the Android build
+ * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
+ * bundle directly from the development server. Below you can see all the possible configurations
+ * and their defaults. If you decide to add a configuration block, make sure to add it before the
+ * `apply from: "../../node_modules/react-native/react.gradle"` line.
+ *
+ * project.ext.react = [
+ *   // the name of the generated asset file containing your JS bundle
+ *   bundleAssetName: "index.android.bundle",
+ *
+ *   // the entry file for bundle generation. If none specified and
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ *   // default. Can be overridden with ENTRY_FILE environment variable.
+ *   entryFile: "index.android.js",
+ *
+ *   // https://reactnative.dev/docs/performance#enable-the-ram-format
+ *   bundleCommand: "ram-bundle",
+ *
+ *   // whether to bundle JS and assets in debug mode
+ *   bundleInDebug: false,
+ *
+ *   // whether to bundle JS and assets in release mode
+ *   bundleInRelease: true,
+ *
+ *   // whether to bundle JS and assets in another build variant (if configured).
+ *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+ *   // The configuration property can be in the following formats
+ *   //         'bundleIn${productFlavor}${buildType}'
+ *   //         'bundleIn${buildType}'
+ *   // bundleInFreeDebug: true,
+ *   // bundleInPaidRelease: true,
+ *   // bundleInBeta: true,
+ *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
+ *   // the root of your project, i.e. where "package.json" lives
+ *   root: "../../",
+ *
+ *   // where to put the JS bundle asset in debug mode
+ *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+ *
+ *   // where to put the JS bundle asset in release mode
+ *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in debug mode
+ *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in release mode
+ *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+ *
+ *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
+ *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+ *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
+ *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+ *   // for example, you might want to remove it from here.
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"],
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
+ * ]
+ */
+
+project.ext.react = [
+    enableHermes: true
+]
+
+apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
+apply from: "../../node_modules/react-native/react.gradle"
+apply from: "../../node_modules/expo-constants/scripts/get-app-config-android.gradle"
+apply from: "../../node_modules/expo-updates/scripts/create-manifest-android.gradle"
+
+/**
+ * Set this to true to create two separate APKs instead of one:
+ *   - An APK that only works on ARM devices
+ *   - An APK that only works on x86 devices
+ * The advantage is the size of the APK is reduced by about 4MB.
+ * Upload all the APKs to the Play Store and people will download
+ * the correct one based on the CPU architecture of their device.
+ */
+def enableSeparateBuildPerCPUArchitecture = false
+
+/**
+ * Run Proguard to shrink the Java bytecode in release builds.
+ */
+def enableProguardInReleaseBuilds = false
+
+/**
+ * The preferred build flavor of JavaScriptCore.
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US.  Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+
+/**
+ * Whether to enable the Hermes VM.
+ *
+ * This should be set on project.ext.react and mirrored here.  If it is not set
+ * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
+ * and the benefits of using Hermes will therefore be sharply reduced.
+ */
+def enableHermes = project.ext.react.get("enableHermes", false);
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        applicationId 'com.rajarsheechatterjee.LNReader'
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.1.0"
+    }
+    splits {
+        abi {
+            reset()
+            enable enableSeparateBuildPerCPUArchitecture
+            universalApk false  // If true, also generate a universal APK
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+        }
+    }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+    }
+    buildTypes {
+        debug {
+            signingConfig signingConfigs.debug
+        }
+        release {
+            // Caution! In production, you need to generate your own keystore file.
+            // see https://reactnative.dev/docs/signed-apk-android.
+            signingConfig signingConfigs.debug
+            minifyEnabled enableProguardInReleaseBuilds
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+        }
+    }
+
+    // applicationVariants are e.g. debug, release
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            // For each separate APK per architecture, set a unique version code as described here:
+            // https://developer.android.com/studio/build/configure-apk-splits.html
+            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
+            def abi = output.getFilter(OutputFile.ABI)
+            if (abi != null) {  // null for the universal-debug, universal-release variants
+                output.versionCodeOverride =
+                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+            }
+
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+      exclude group:'com.facebook.fbjni'
+    }
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
+    }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+    addUnimodulesDependencies()
+
+    if (enableHermes) {
+        def hermesPath = "../../node_modules/hermes-engine/android/";
+        debugImplementation files(hermesPath + "hermes-debug.aar")
+        releaseImplementation files(hermesPath + "hermes-release.aar")
+    } else {
+        implementation jscFlavor
+    }
+}
+
+// Run this once to be able to run the application with BUCK
+// puts all compile dependencies into folder libs for BUCK to use
+task copyDownloadableDepsToLibs(type: Copy) {
+    from configurations.compile
+    into 'libs'
+}
+
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/build_defs.bzl

@@ -0,0 +1,19 @@
+"""Helper definitions to glob .aar and .jar targets"""
+
+def create_aar_targets(aarfiles):
+    for aarfile in aarfiles:
+        name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
+        lib_deps.append(":" + name)
+        android_prebuilt_aar(
+            name = name,
+            aar = aarfile,
+        )
+
+def create_jar_targets(jarfiles):
+    for jarfile in jarfiles:
+        name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
+        lib_deps.append(":" + name)
+        prebuilt_jar(
+            name = name,
+            binary_jar = jarfile,
+        )

android/app/proguard-rules.pro

@@ -0,0 +1,10 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:

android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+</manifest>

android/app/src/debug/java/com/lnreader/ReactNativeFlipper.java

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.lnreader;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      NetworkingModule.setCustomClientBuilder(
+          new NetworkingModule.CustomClientBuilder() {
+            @Override
+            public void apply(OkHttpClient.Builder builder) {
+              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+            }
+          });
+      client.addPlugin(networkFlipperPlugin);
+      client.start();
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,38 @@
+<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">
+    <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/FullScreenModule.java

@@ -0,0 +1,62 @@
+// FullScreenModule.java
+
+package com.rajarsheechatterjee.LNReader;
+
+import android.os.Build;
+import android.view.View;
+import android.view.WindowManager;
+import android.app.Activity;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+
+public class FullScreenModule extends ReactContextBaseJavaModule {
+    @Override
+    public String getName() {
+        return "FullScreen";
+    }
+
+    @ReactMethod
+    public void enable() {
+        UiThreadUtil.runOnUiThread(
+            new Runnable() {
+                @Override
+                public void run() {
+                    getCurrentActivity().getWindow().getDecorView().setSystemUiVisibility(
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                    );
+                }
+            }
+        );
+
+    }
+
+    @ReactMethod
+    public void disable() {
+        UiThreadUtil.runOnUiThread(
+            new Runnable() {
+                @Override
+                public void run() {
+                    getCurrentActivity().getWindow().getDecorView().setSystemUiVisibility(
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    );
+                }
+            }
+        );
+
+    }
+
+    FullScreenModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+}

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

@@ -0,0 +1,29 @@
+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 FullScreenPackage 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 FullScreenModule(reactContext));
+
+    return modules;
+  }
+
+}

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

@@ -0,0 +1,62 @@
+package com.rajarsheechatterjee.LNReader;
+import android.content.res.Configuration;
+import android.content.Intent;
+
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.os.Build;
+
+import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
+
+import expo.modules.splashscreen.singletons.SplashScreen;
+import expo.modules.splashscreen.SplashScreenImageResizeMode;
+
+
+public class MainActivity extends ReactActivity {
+
+    // Added automatically by Expo Config
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Intent intent = new Intent("onConfigurationChanged");
+        intent.putExtra("newConfig", newConfig);
+        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);
+
+  }
+
+
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    @Override
+    protected String getMainComponentName() {
+        return "main";
+    }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+            @Override
+            protected ReactRootView createRootView() {
+                return new RNGestureHandlerEnabledRootView(MainActivity.this);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,132 @@
+package com.rajarsheechatterjee.LNReader;
+
+import android.app.Application;
+import android.content.Context;
+import android.net.Uri;
+
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+import com.facebook.soloader.SoLoader;
+import com.rajarsheechatterjee.LNReader.generated.BasePackageList;
+
+import org.unimodules.adapters.react.ReactAdapterPackage;
+import org.unimodules.adapters.react.ModuleRegistryAdapter;
+import org.unimodules.adapters.react.ReactModuleRegistryProvider;
+import org.unimodules.core.interfaces.Package;
+import org.unimodules.core.interfaces.SingletonModule;
+import expo.modules.constants.ConstantsPackage;
+import expo.modules.permissions.PermissionsPackage;
+import expo.modules.filesystem.FileSystemPackage;
+import expo.modules.updates.UpdatesController;
+
+import com.facebook.react.bridge.JSIModulePackage;
+import com.swmansion.reanimated.ReanimatedJSIModulePackage;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Nullable;
+
+import com.rajarsheechatterjee.LNReader.FullScreenPackage;
+
+
+public class MainApplication extends Application implements ReactApplication {
+  private final ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(
+    new BasePackageList().getPackageList()
+  );
+
+  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+    @Override
+    public boolean getUseDeveloperSupport() {
+      return BuildConfig.DEBUG;
+    }
+
+    @Override
+    protected List<ReactPackage> getPackages() {
+      List<ReactPackage> packages = new PackageList(this).getPackages();
+      packages.add(new ModuleRegistryAdapter(mModuleRegistryProvider));
+      packages.add(new FullScreenPackage());
+      return packages;
+    }
+
+    @Override
+    protected String getJSMainModuleName() {
+      return "index";
+    }
+
+    @Override
+    protected JSIModulePackage getJSIModulePackage() {
+      return new ReanimatedJSIModulePackage();
+    }
+
+    @Override
+    protected @Nullable String getJSBundleFile() {
+      if (BuildConfig.DEBUG) {
+        return super.getJSBundleFile();
+      } else {
+        return UpdatesController.getInstance().getLaunchAssetFile();
+      }
+    }
+
+    @Override
+    protected @Nullable String getBundleAssetName() {
+      if (BuildConfig.DEBUG) {
+        return super.getBundleAssetName();
+      } else {
+        return UpdatesController.getInstance().getBundleAssetName();
+      }
+    }
+  };
+
+  @Override
+  public ReactNativeHost getReactNativeHost() {
+    return mReactNativeHost;
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    SoLoader.init(this, /* native exopackage */ false);
+
+    if (!BuildConfig.DEBUG) {
+      UpdatesController.initialize(this);
+    }
+
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+  }
+
+  /**
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+   *
+   * @param context
+   * @param reactInstanceManager
+   */
+  private static void initializeFlipper(
+      Context context, ReactInstanceManager reactInstanceManager) {
+    if (BuildConfig.DEBUG) {
+      try {
+        /*
+         We use reflection here to pick up the class that initializes Flipper,
+        since Flipper library is not available in release mode
+        */
+        Class<?> aClass = Class.forName("com.rajarsheechatterjee.LNReader.ReactNativeFlipper");
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
+      } catch (ClassNotFoundException e) {
+        e.printStackTrace();
+      } catch (NoSuchMethodException e) {
+        e.printStackTrace();
+      } catch (IllegalAccessException e) {
+        e.printStackTrace();
+      } catch (InvocationTargetException e) {
+        e.printStackTrace();
+      }
+    }
+  }
+}

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

@@ -0,0 +1,30 @@
+package com.rajarsheechatterjee.LNReader.generated;
+
+import java.util.Arrays;
+import java.util.List;
+import org.unimodules.core.interfaces.Package;
+
+public class BasePackageList {
+  public List<Package> getPackageList() {
+    return Arrays.<Package>asList(
+        new expo.modules.application.ApplicationPackage(),
+        new expo.modules.backgroundfetch.BackgroundFetchPackage(),
+        new expo.modules.constants.ConstantsPackage(),
+        new expo.modules.documentpicker.DocumentPickerPackage(),
+        new expo.modules.errorrecovery.ErrorRecoveryPackage(),
+        new expo.modules.filesystem.FileSystemPackage(),
+        new expo.modules.font.FontLoaderPackage(),
+        new expo.modules.imageloader.ImageLoaderPackage(),
+        new expo.modules.keepawake.KeepAwakePackage(),
+        new expo.modules.lineargradient.LinearGradientPackage(),
+        new expo.modules.notifications.NotificationsPackage(),
+        new expo.modules.permissions.PermissionsPackage(),
+        new expo.modules.sharing.SharingPackage(),
+        new expo.modules.splashscreen.SplashScreenPackage(),
+        new expo.modules.sqlite.SQLitePackage(),
+        new expo.modules.taskManager.TaskManagerPackage(),
+        new expo.modules.updates.UpdatesPackage(),
+        new expo.modules.webbrowser.WebBrowserPackage()
+    );
+  }
+}

android/app/src/main/res/drawable/splashscreen.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This file was created by '@expo/configure-splash-screen' and some of it's content shouldn't be modified by hand
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@color/splashscreen_background"/>
+</layer-list>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/iconBackground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/iconBackground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +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="colorPrimary">#023c69</color>
+  <color name="colorPrimaryDark">#00000000</color>
+  <color name="navigationBarColor">#000000</color>
+  <color name="notification_icon_color">#00adb5</color>
+</resources>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<resources>
+  <string name="app_name">LNReader</string>
+</resources>

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

@@ -0,0 +1,23 @@
+<?xml
+  version="1.0"
+  encoding="UTF-8"
+  standalone="yes"
+?>
+<resources>
+  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <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>
+    
+  </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>
+   
+  </style>
+</resources>

android/build.gradle

@@ -0,0 +1,38 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        buildToolsVersion = "29.0.3"
+        minSdkVersion = 21
+        compileSdkVersion = 30
+        targetSdkVersion = 30
+    }
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:4.1.0")
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        mavenLocal()
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url("$rootDir/../node_modules/react-native/android")
+        }
+        maven {
+            // Android JSC is installed from npm
+            url("$rootDir/../node_modules/jsc-android/dist")
+        }
+
+        google()
+        jcenter()
+        maven { url 'https://www.jitpack.io' }
+    }
+}

android/gradle.properties

@@ -0,0 +1,29 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.54.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/gradlew

@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -0,0 +1,103 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/settings.gradle

@@ -0,0 +1,9 @@
+rootProject.name = 'LNReader'
+
+apply from: '../node_modules/react-native-unimodules/gradle.groovy'
+includeUnimodulesProjects()
+
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
+applyNativeModulesSettingsGradle(settings)
+
+include ':app'

app.json

@@ -3,8 +3,8 @@
         "name": "LNReader",
         "slug": "LNReader",
         "scheme": "lnreader",
-        "version": "1.0.16",
-        "orientation": "portrait",
+        "version": "1.1.0",
+        "orientation": "default",
         "icon": "./assets/icon.png",
         "splash": {
             "image": "./assets/splash.png",
@@ -15,6 +15,10 @@
             "fallbackToCacheTimeout": 0,
             "enabled": false
         },
+        "notification": {
+            "icon": "./assets/notification.png",
+            "color": "#00adb5"
+        },
         "assetBundlePatterns": ["**/*"],
         "ios": {
             "supportsTablet": true
@@ -26,7 +30,11 @@
             },
             "package": "com.rajarsheechatterjee.LNReader"
         },
-
+        "androidStatusBar": {
+            "barStyle": "light-content",
+            "backgroundColor": "#00000000",
+            "translucent": true
+        },
         "androidNavigationBar": {
             "barStyle": "light-content",
             "backgroundColor": "#000000"

index.js

@@ -0,0 +1,9 @@
+import 'react-native-gesture-handler';
+import { registerRootComponent } from 'expo';
+
+import App from './App';
+
+// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
+// It also ensures that whether you load the app in Expo Go or in a native build,
+// the environment is set up appropriately
+registerRootComponent(App);

metro.config.js

@@ -0,0 +1,4 @@
+// Learn more https://docs.expo.io/guides/customizing-metro
+const { getDefaultConfig } = require('expo/metro-config');
+
+module.exports = getDefaultConfig(__dirname);

package.json

@@ -1,62 +1,73 @@
 {
-  "main": "node_modules/expo/AppEntry.js",
-  "scripts": {
-    "start": "expo start",
-    "android": "expo start --android",
-    "ios": "expo start --ios",
-    "web": "expo start --web",
-    "eject": "expo eject"
-  },
-  "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.13.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-app-loading": "^1.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-media-library": "~12.0.2",
-    "expo-permissions": "^12.0.1",
-    "expo-sharing": "~9.1.2",
-    "expo-sqlite": "~9.1.0",
-    "expo-status-bar": "~1.0.4",
-    "expo-web-browser": "~9.1.0",
-    "moment": "^2.29.1",
-    "qs": "^6.10.1",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-41.0.0.tar.gz",
-    "react-native-collapsible-header-views": "^1.1.2",
-    "react-native-easing-gradient": "^0.1.2",
-    "react-native-gesture-handler": "~1.10.2",
-    "react-native-offline": "^5.7.0",
-    "react-native-paper": "^4.5.0",
-    "react-native-picker-scrollview": "^1.0.1",
-    "react-native-reanimated": "~2.1.0",
-    "react-native-safe-area-context": "3.2.0",
-    "react-native-screens": "~3.0.0",
-    "react-native-vector-icons": "^7.1.0",
-    "react-native-web": "~0.13.12",
-    "react-native-webview": "11.2.3",
-    "react-redux": "^7.2.2",
-    "redux": "^4.0.5",
-    "redux-devtools-extension": "^2.13.9",
-    "redux-persist": "^6.0.0",
-    "redux-thunk": "^2.3.0",
-    "rn-sliding-up-panel": "^2.4.4",
-    "expo-notifications": "~0.11.6",
-    "expo-background-fetch": "~9.1.0",
-    "expo-task-manager": "~9.1.0"
-  },
-  "devDependencies": {
-    "@babel/core": "~7.9.0"
-  },
-  "private": true
+    "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-background-fetch": "~9.1.0",
+        "expo-document-picker": "^9.1.2",
+        "expo-file-system": "~11.0.2",
+        "expo-font": "~9.1.0",
+        "expo-linear-gradient": "~9.1.0",
+        "expo-linking": "~2.2.3",
+        "expo-notifications": "~0.11.6",
+        "expo-permissions": "^12.0.1",
+        "expo-sharing": "~9.1.2",
+        "expo-splash-screen": "~0.10.2",
+        "expo-sqlite": "~9.1.0",
+        "expo-status-bar": "~1.0.4",
+        "expo-task-manager": "~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-collapsible-header-views": "^1.1.2",
+        "react-native-device-info": "^8.1.3",
+        "react-native-easing-gradient": "^0.1.2",
+        "react-native-fast-image": "^8.3.4",
+        "react-native-fit-image": "^1.5.5",
+        "react-native-gesture-handler": "~1.10.2",
+        "react-native-immersive-mode": "^2.0.0",
+        "react-native-navigation-bar-color": "^2.0.1",
+        "react-native-offline": "^5.7.0",
+        "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-devtools-extension": "^2.13.9",
+        "redux-persist": "^6.0.0",
+        "redux-thunk": "^2.3.0",
+        "rn-sliding-up-panel": "^2.4.4"
+    },
+    "devDependencies": {
+        "@babel/core": "~7.9.0"
+    },
+    "private": true,
+    "name": "lnreader-eject",
+    "version": "1.0.0"
 }

src/Components/BottomSheetHandle.js

@@ -1,23 +0,0 @@
-import React from "react";
-import { View } from "react-native";
-import { useSelector } from "react-redux";
-
-const BottomSheetHandle = () => {
-    const theme = useSelector((state) => state.settingsReducer.theme);
-    return (
-        <>
-            <View
-                style={{
-                    backgroundColor: theme.textColorHint,
-                    height: 5,
-                    width: 30,
-                    borderRadius: 50,
-                    top: 10,
-                    alignSelf: "center",
-                }}
-            />
-        </>
-    );
-};
-
-export default BottomSheetHandle;

src/Components/ThemedComponents.js

@@ -1,8 +0,0 @@
-import React from "react";
-import { View, Text as RNText, Image, StyleSheet } from "react-native";
-
-const Text = () => {};
-
-export default UpdateCard;
-
-const styles = StyleSheet.create({});

src/Hooks/reduxHooks.js

@@ -1,84 +0,0 @@
-import { useEffect } from "react";
-import { useSelector } from "react-redux";
-
-const useTheme = () => {
-    const theme = useSelector((state) => state.settingsReducer.theme);
-
-    return theme;
-};
-
-const useReaderSettings = () => {
-    const readerSettings = useSelector((state) => state.settingsReducer.reader);
-
-    return readerSettings;
-};
-
-const useSettings = () => {
-    const { displayMode, itemsPerRow } = useSelector(
-        (state) => state.settingsReducer
-    );
-
-    return { displayMode, itemsPerRow };
-};
-
-const useLibrary = () => {
-    const library = useSelector((state) => state.libraryReducer.novels);
-
-    return library;
-};
-
-const useNovel = () => {
-    const novel = useSelector((state) => state.novelReducer);
-
-    return novel;
-};
-
-const findNovel = (novelId) => {
-    let novel = useSelector((state) => state.preferenceReducer.novelSettings);
-    novel = novel.find((novel) => novel.novelId === novelId);
-
-    return novel;
-};
-
-const usePreferences = (novelId) => {
-    let sort, filter;
-
-    const novel = findNovel(novelId);
-
-    if (novel) {
-        sort = novel.sort ?? "";
-        filter = novel.filter ?? "";
-    }
-
-    return { sort, filter };
-};
-
-const useContinueReading = (chapters, novelId) => {
-    let chapter, chapterId, novel;
-
-    novel = findNovel(novelId);
-
-    if (novel) {
-        chapterId = novel.lastRead;
-    }
-
-    if (chapterId) {
-        chapter = chapters.find((obj) => obj.chapterId === chapterId);
-    }
-
-    if (!chapter) {
-        chapter = chapters.find((obj) => obj.read === 0);
-    }
-
-    return chapter;
-};
-
-export {
-    useTheme,
-    useReaderSettings,
-    useLibrary,
-    useSettings,
-    usePreferences,
-    useContinueReading,
-    useNovel,
-};

src/Navigators/BottomNavigator.js

@@ -1,92 +0,0 @@
-import React from "react";
-import { createMaterialBottomTabNavigator } from "@react-navigation/material-bottom-tabs";
-import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
-import { useTheme } from "../Hooks/reduxHooks";
-
-import Library from "../Screens/Library/Library";
-import Updates from "../Screens/Updates/Updates";
-import History from "../Screens/History/History";
-import Browse from "../Screens/Browse/Browse";
-import More from "../Screens/More/More";
-
-const Tab = createMaterialBottomTabNavigator();
-
-const BottomNavigator = () => {
-    const theme = useTheme();
-
-    return (
-        <Tab.Navigator
-            // shifting={false}
-            barStyle={{ backgroundColor: theme.colorPrimary }}
-            activeColor={theme.colorAccent}
-        >
-            <Tab.Screen
-                name="Library"
-                component={Library}
-                options={{
-                    tabBarIcon: ({ color }) => (
-                        <MaterialCommunityIcons
-                            name="book-variant-multiple"
-                            color={color}
-                            size={24}
-                        />
-                    ),
-                }}
-            />
-            <Tab.Screen
-                name="Updates"
-                component={Updates}
-                options={{
-                    tabBarIcon: ({ color }) => (
-                        <MaterialCommunityIcons
-                            name="alert-decagram-outline"
-                            color={color}
-                            size={24}
-                        />
-                    ),
-                }}
-            />
-            <Tab.Screen
-                name="History"
-                component={History}
-                options={{
-                    tabBarIcon: ({ color }) => (
-                        <MaterialCommunityIcons
-                            name="history"
-                            color={color}
-                            size={24}
-                        />
-                    ),
-                }}
-            />
-            <Tab.Screen
-                name="Browse"
-                component={Browse}
-                options={{
-                    tabBarIcon: ({ color }) => (
-                        <MaterialCommunityIcons
-                            name="compass-outline"
-                            color={color}
-                            size={24}
-                        />
-                    ),
-                }}
-            />
-            <Tab.Screen
-                name="More"
-                component={More}
-                options={{
-                    tabBarIcon: ({ color }) => (
-                        <MaterialCommunityIcons
-                            name="dots-horizontal"
-                            color={color}
-                            size={24}
-                        />
-                    ),
-                }}
-            />
-        </Tab.Navigator>
-    );
-};
-
-export default BottomNavigator;

src/Navigators/Main.js

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

src/Navigators/More.js

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

src/Screens/Browse/components/GlobalSearchNovelCover.js

@@ -1,71 +0,0 @@
-import React from "react";
-import { StyleSheet, View, Text, ImageBackground } from "react-native";
-import { TouchableRipple } from "react-native-paper";
-
-import { useSettings, useTheme } from "../../../Hooks/reduxHooks";
-
-const GlobalSearchNovelCover = ({ item, onPress, libraryStatus }) => {
-    const theme = useTheme();
-
-    const comfortableTitle = () => (
-        <Text
-            numberOfLines={2}
-            style={[
-                styles.title,
-                {
-                    width: 115,
-                    color: theme.textColorPrimary,
-                    padding: 4,
-                    flexWrap: "wrap",
-                },
-            ]}
-        >
-            {item.novelName}
-        </Text>
-    );
-
-    return (
-        <View style={{ flex: 1 }}>
-            <TouchableRipple
-                borderless
-                centered
-                rippleColor={theme.rippleColor}
-                style={styles.opac}
-                onPress={onPress}
-            >
-                <>
-                    <ImageBackground
-                        source={{ uri: item.novelCover }}
-                        style={{ height: 150, width: 115 }}
-                        imageStyle={[
-                            { borderRadius: 4 },
-                            libraryStatus && { opacity: 0.5 },
-                        ]}
-                        progressiveRenderingEnabled={true}
-                    />
-                    {comfortableTitle()}
-                </>
-            </TouchableRipple>
-        </View>
-    );
-};
-
-export default GlobalSearchNovelCover;
-
-const styles = StyleSheet.create({
-    titleContainer: {
-        flex: 1,
-        justifyContent: "flex-end",
-        borderRadius: 4,
-    },
-    title: {
-        fontFamily: "pt-sans-bold",
-        fontSize: 14,
-        padding: 8,
-    },
-    opac: {
-        paddingHorizontal: 5,
-        paddingVertical: 4,
-        borderRadius: 4,
-    },
-});

src/Screens/Browse/components/GlobalSearchNovelList.js

@@ -1,55 +0,0 @@
-import React from "react";
-import { StyleSheet, FlatList, Text } from "react-native";
-import GlobalSearchNovelCover from "./GlobalSearchNovelCover";
-
-const GlobalSearchNovelList = ({ data, theme, library, navigation }) => {
-    const checkIFInLibrary = (sourceId, novelUrl) => {
-        return library.some(
-            (obj) => obj.novelUrl === novelUrl && obj.sourceId === sourceId
-        );
-    };
-
-    const renderItem = ({ item }) => (
-        <GlobalSearchNovelCover
-            item={item}
-            onPress={() =>
-                navigation.navigate("Novel", {
-                    ...item,
-                    sourceId: item.extensionId,
-                })
-            }
-            libraryStatus={checkIFInLibrary(item.extensionId, item.novelUrl)}
-        />
-    );
-
-    return (
-        <FlatList
-            contentContainerStyle={styles.flatListCont}
-            horizontal={true}
-            data={data}
-            keyExtractor={(item) => item.novelUrl}
-            renderItem={renderItem}
-            ListEmptyComponent={
-                <Text
-                    style={{
-                        color: theme.textColorSecondary,
-                        padding: 8,
-                        paddingVertical: 4,
-                    }}
-                >
-                    No results found
-                </Text>
-            }
-        />
-    );
-};
-
-export default GlobalSearchNovelList;
-
-const styles = StyleSheet.create({
-    flatListCont: {
-        flexGrow: 1,
-        paddingVertical: 8,
-        paddingHorizontal: 4,
-    },
-});

src/Screens/Chapter/Chapter.js

@@ -1,241 +0,0 @@
-import React, { useState, useEffect, useRef } from "react";
-import { StyleSheet, View, Text, ActivityIndicator } from "react-native";
-
-import { Appbar, Provider, Portal } from "react-native-paper";
-import { CollapsibleHeaderScrollView } from "react-native-collapsible-header-views";
-
-import BottomSheet from "./components/BottomSheet";
-
-import { insertHistoryAction } from "../../redux/history/history.actions";
-import {
-    getChapterAction,
-    markChapterReadAction,
-} from "../../redux/novel/novel.actions";
-
-import { connect, useSelector, useDispatch } from "react-redux";
-import { parseChapterNumber } from "../../Services/updates";
-import { updateChaptersRead } from "../../redux/tracker/tracker.actions";
-
-const ChapterItem = ({
-    route,
-    navigation,
-    theme,
-    insertHistoryAction,
-    getChapterAction,
-    chapter,
-    loading,
-    reader,
-}) => {
-    const {
-        chapterId,
-        extensionId,
-        chapterUrl,
-        novelUrl,
-        novelId,
-    } = route.params;
-
-    let _panel = useRef(null);
-
-    const dispatch = useDispatch();
-
-    const trackedNovels = useSelector(
-        (state) => state.trackerReducer.trackedNovels
-    );
-    const tracker = useSelector((state) => state.trackerReducer.tracker);
-
-    let isTracked = false;
-
-    if (!loading) {
-        isTracked = trackedNovels.find((obj) => obj.novelId === novelId);
-    }
-
-    useEffect(() => {
-        getChapterAction(extensionId, chapterUrl, novelUrl, chapterId);
-        insertHistoryAction(novelId, chapterId);
-    }, []);
-
-    const readerBackground = (val) => {
-        const backgroundColor = {
-            1: "#000000",
-            2: "#FFFFFF",
-            3: "#F4ECD8",
-        };
-
-        return backgroundColor[val];
-    };
-
-    const readerTextColor = (val) => {
-        const textColor = val === 1 ? "rgba(255,255,255,0.7)" : "#000000";
-
-        return textColor;
-    };
-
-    const chapterNumber = !loading && parseChapterNumber(chapter.chapterName);
-
-    const readerLineHeight = (val) => {
-        const lineHeight = {
-            12: 20,
-            14: 22,
-            16: 25,
-            18: 26,
-            20: 28,
-        };
-        return lineHeight[val];
-    };
-
-    const isCloseToBottom = ({
-        layoutMeasurement,
-        contentOffset,
-        contentSize,
-    }) => {
-        const paddingToBottom = 40;
-        return (
-            layoutMeasurement.height + contentOffset.y >=
-            contentSize.height - paddingToBottom
-        );
-    };
-
-    return (
-        <Provider>
-            <CollapsibleHeaderScrollView
-                headerContainerBackgroundColor="rgba(0,0,0,0.4)"
-                CollapsibleHeaderComponent={
-                    <Appbar.Header
-                        style={{
-                            backgroundColor: "transparent",
-                            elevation: 0,
-                        }}
-                    >
-                        <Appbar.BackAction
-                            onPress={() => navigation.goBack()}
-                            color="#FFFFFF"
-                            size={26}
-                            style={{ marginRight: 0 }}
-                        />
-                        <Appbar.Content
-                            title={loading ? "Chapter" : chapter.chapterName}
-                            titleStyle={{ color: "#FFFFFF" }}
-                        />
-                        {!loading && (
-                            <>
-                                <Appbar.Action
-                                    icon="chevron-left"
-                                    size={26}
-                                    disabled={!chapter.prevChapter}
-                                    onPress={() => {
-                                        navigation.replace("Chapter", {
-                                            chapterUrl: chapter.prevChapter,
-                                            chapterId: chapterId - 1,
-                                            extensionId,
-                                            novelUrl,
-                                            novelId,
-                                            chapterName: chapter.chapterName,
-                                        });
-                                    }}
-                                    color="#FFFFFF"
-                                />
-                                <Appbar.Action
-                                    icon="chevron-right"
-                                    size={26}
-                                    disabled={!chapter.nextChapter}
-                                    onPress={() => {
-                                        navigation.replace("Chapter", {
-                                            chapterUrl: chapter.nextChapter,
-                                            extensionId,
-                                            novelUrl,
-                                            novelId,
-                                            chapterId: chapterId + 1,
-                                            chapterName: chapter.chapterName,
-                                        });
-                                    }}
-                                    color="#FFFFFF"
-                                />
-                                <Appbar.Action
-                                    icon="dots-vertical"
-                                    size={26}
-                                    onPress={() =>
-                                        _panel.current.show({ velocity: -1.5 })
-                                    }
-                                    color="#FFFFFF"
-                                />
-                            </>
-                        )}
-                    </Appbar.Header>
-                }
-                headerHeight={100}
-                contentContainerStyle={[
-                    styles.container,
-                    { backgroundColor: readerBackground(reader.theme) },
-                ]}
-                onScroll={({ nativeEvent }) => {
-                    if (isCloseToBottom(nativeEvent)) {
-                        dispatch(markChapterReadAction(chapterId, novelId));
-                        if (
-                            isTracked &&
-                            chapterNumber &&
-                            chapterNumber >
-                                isTracked.my_list_status.num_chapters_read
-                        ) {
-                            dispatch(
-                                updateChaptersRead(
-                                    isTracked.id,
-                                    tracker.access_token,
-                                    chapterNumber
-                                )
-                            );
-                        }
-                    }
-                }}
-            >
-                {loading ? (
-                    <View style={{ flex: 1, justifyContent: "center" }}>
-                        <ActivityIndicator
-                            size={50}
-                            color={theme.colorAccent}
-                        />
-                    </View>
-                ) : (
-                    <Text
-                        style={[
-                            {
-                                paddingVertical: 15,
-                                fontSize: reader.textSize,
-                                color: readerTextColor(reader.theme),
-                                lineHeight: readerLineHeight(reader.textSize),
-                                textAlign: reader.textAlign,
-                                paddingHorizontal: `${reader.padding}%`,
-                            },
-                            reader.fontFamily && {
-                                fontFamily: reader.fontFamily,
-                            },
-                        ]}
-                    >
-                        {chapter.chapterText.trim()}
-                    </Text>
-                )}
-                <Portal>
-                    <BottomSheet bottomSheetRef={_panel} />
-                </Portal>
-            </CollapsibleHeaderScrollView>
-        </Provider>
-    );
-};
-
-const mapStateToProps = (state) => ({
-    theme: state.settingsReducer.theme,
-    chapter: state.novelReducer.chapter,
-    loading: state.novelReducer.chapterLoading,
-    reader: state.settingsReducer.reader,
-});
-
-export default connect(mapStateToProps, {
-    insertHistoryAction,
-    getChapterAction,
-})(ChapterItem);
-
-const styles = StyleSheet.create({
-    container: {
-        flexGrow: 1,
-        paddingVertical: 10,
-    },
-});

src/Screens/Chapter/components/BottomSheet.js

@@ -1,276 +0,0 @@
-import React from "react";
-import { Animated, StyleSheet, View, Text, Dimensions } from "react-native";
-import { ToggleButton, IconButton, Chip } from "react-native-paper";
-import Slider from "@react-native-community/slider";
-import Bottomsheet from "rn-sliding-up-panel";
-import { fonts } from "../../../Services/utils/constants";
-
-import { connect } from "react-redux";
-
-import {
-    setReaderFont,
-    updateReaderPadding,
-    updateReaderTextAlign,
-    updateReaderTextSize,
-    updateReaderTheme,
-} from "../../../redux/settings/settings.actions";
-import BottomSheetHandle from "../../../Components/BottomSheetHandle";
-
-const ChapterBottomSheet = ({
-    bottomSheetRef,
-    theme,
-    reader,
-    updateReaderTextSize,
-    updateReaderTheme,
-    updateReaderTextAlign,
-    updateReaderPadding,
-    setReaderFont,
-}) => {
-    return (
-        <Bottomsheet
-            animatedValue={new Animated.Value(0)}
-            ref={bottomSheetRef}
-            draggableRange={{ top: 400, bottom: 0 }}
-            snappingPoints={[0, 400]}
-            showBackdrop={false}
-        >
-            <View style={styles.contentContainer}>
-                <BottomSheetHandle />
-                <View style={styles.readerSettingsContainer}>
-                    <Text
-                        style={{
-                            color: "#FFFFFF",
-                            fontWeight: "bold",
-                        }}
-                    >
-                        Text Size
-                    </Text>
-                    <Slider
-                        style={{
-                            width: Dimensions.get("window").width,
-                            height: 40,
-                        }}
-                        value={reader.textSize}
-                        minimumValue={12}
-                        maximumValue={20}
-                        step={2}
-                        minimumTrackTintColor={theme.colorAccent}
-                        maximumTrackTintColor="#000000"
-                        thumbTintColor={theme.colorAccent}
-                        onValueChange={(value) => updateReaderTextSize(value)}
-                    />
-                    <View
-                        style={{
-                            flexDirection: "row",
-                            justifyContent: "center",
-                        }}
-                    >
-                        <View
-                            style={{
-                                justifyContent: "center",
-                                alignItems: "center",
-                            }}
-                        >
-                            <Text
-                                style={{
-                                    color: "#FFFFFF",
-                                    fontWeight: "bold",
-                                }}
-                            >
-                                Reader Theme
-                            </Text>
-                            <ToggleButton.Row
-                                onValueChange={(value) =>
-                                    updateReaderTheme(value)
-                                }
-                                value={reader.theme}
-                                style={{ marginTop: 10 }}
-                            >
-                                <ToggleButton
-                                    icon="format-text"
-                                    color="#FFFFFF"
-                                    value={1}
-                                    style={{
-                                        backgroundColor: "#000000",
-                                        marginHorizontal: 10,
-                                    }}
-                                />
-                                <ToggleButton
-                                    icon="format-text"
-                                    color="#000000"
-                                    value={2}
-                                    style={{
-                                        backgroundColor: "#FFFFFF",
-                                        marginHorizontal: 10,
-                                    }}
-                                />
-                                <ToggleButton
-                                    icon="format-text"
-                                    color="#000000"
-                                    value={3}
-                                    style={{
-                                        backgroundColor: "#F4ECD8",
-                                        marginHorizontal: 10,
-                                    }}
-                                />
-                            </ToggleButton.Row>
-                        </View>
-                        <View
-                            style={{
-                                justifyContent: "center",
-                                alignItems: "center",
-                            }}
-                        >
-                            <Text
-                                style={{
-                                    color: "#FFFFFF",
-                                    fontWeight: "bold",
-                                }}
-                            >
-                                Text Align
-                            </Text>
-                            <ToggleButton.Row
-                                onValueChange={(value) =>
-                                    updateReaderTextAlign(value ?? "left")
-                                }
-                                value={reader.textAlign}
-                                style={{ marginTop: 10 }}
-                            >
-                                <ToggleButton
-                                    icon="format-align-left"
-                                    color="#000000"
-                                    value="left"
-                                    style={{
-                                        backgroundColor: "#FFFFFF",
-                                        marginHorizontal: 10,
-                                    }}
-                                />
-                                <ToggleButton
-                                    icon="format-align-justify"
-                                    color="#000000"
-                                    value="justify"
-                                    style={{
-                                        backgroundColor: "#FFFFFF",
-                                        marginHorizontal: 10,
-                                    }}
-                                />
-                                <ToggleButton
-                                    icon="format-align-right"
-                                    color="#000000"
-                                    value="right"
-                                    style={{
-                                        backgroundColor: "#FFFFFF",
-                                        marginHorizontal: 10,
-                                    }}
-                                />
-                            </ToggleButton.Row>
-                        </View>
-                    </View>
-                    <Text
-                        style={{
-                            color: "#FFFFFF",
-                            fontWeight: "bold",
-                            marginTop: 10,
-                        }}
-                    >
-                        Padding
-                    </Text>
-                    <View
-                        style={{
-                            width: "100%",
-                            flexDirection: "row",
-                            justifyContent: "center",
-                            alignItems: "center",
-                        }}
-                    >
-                        <IconButton
-                            icon="minus"
-                            color={theme.colorAccent}
-                            size={26}
-                            disabled={reader.padding <= 0 ? true : false}
-                            onPress={() =>
-                                updateReaderPadding(reader.padding - 1)
-                            }
-                        />
-                        <Text
-                            style={{
-                                color: "#FFFFFF",
-                                paddingHorizontal: 50,
-                            }}
-                        >
-                            {`${reader.padding}%`}
-                        </Text>
-                        <IconButton
-                            icon="plus"
-                            color={theme.colorAccent}
-                            size={26}
-                            disabled={reader.padding >= 10 ? true : false}
-                            onPress={() =>
-                                updateReaderPadding(reader.padding + 1)
-                            }
-                        />
-                    </View>
-                    <Text
-                        style={{
-                            color: "#FFFFFF",
-                            fontWeight: "bold",
-                            marginTop: 10,
-                        }}
-                    >
-                        Font Style
-                    </Text>
-                    <View
-                        style={{
-                            flexDirection: "row",
-                            flexWrap: "wrap",
-                            justifyContent: "center",
-                        }}
-                    >
-                        {fonts.map((font, index) => (
-                            <Chip
-                                key={index}
-                                onPress={() => setReaderFont(font.fontFamily)}
-                                textStyle={{ fontFamily: font.fontFamily }}
-                                style={{
-                                    borderWidth: 0,
-                                    marginHorizontal: 5,
-                                    marginVertical: 5,
-                                }}
-                                selected={
-                                    reader.fontFamily === font.fontFamily
-                                        ? true
-                                        : false
-                                }
-                            >
-                                {font.name}
-                            </Chip>
-                        ))}
-                    </View>
-                </View>
-            </View>
-        </Bottomsheet>
-    );
-};
-
-const mapStateToProps = (state) => ({
-    theme: state.settingsReducer.theme,
-    reader: state.settingsReducer.reader,
-});
-
-export default connect(mapStateToProps, {
-    updateReaderTextSize,
-    updateReaderTheme,
-    updateReaderTextAlign,
-    updateReaderPadding,
-    setReaderFont,
-})(ChapterBottomSheet);
-
-const styles = StyleSheet.create({
-    contentContainer: {
-        flex: 1,
-        borderTopLeftRadius: 8,
-        borderTopRightRadius: 8,
-        backgroundColor: "rgba(0,0,0,0.4)",
-    },
-    readerSettingsContainer: { flex: 1, alignItems: "center", paddingTop: 30 },
-});

src/Screens/Extension/Extension.js

@@ -1,139 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { StyleSheet, View, ActivityIndicator } from "react-native";
-import * as WebBrowser from "expo-web-browser";
-
-import NovelCover from "../../Components/NovelCover";
-import EmptyView from "../../Components/EmptyView";
-
-import { Searchbar } from "../../Components/Searchbar";
-import { useTheme, useLibrary } from "../../Hooks/reduxHooks";
-import NovelList from "../../Components/NovelList";
-
-const Extension = ({ navigation, route }) => {
-    const { sourceId, sourceName, sourceUrl } = route.params;
-
-    const theme = useTheme();
-    const library = useLibrary();
-
-    const [loading, setLoading] = useState(true);
-    const [novels, setNovels] = useState();
-
-    const [searchText, setSearchText] = useState("");
-
-    const getSourceUrl = () => {
-        if (sourceId === 1) {
-            return `https://lnreader-extensions.vercel.app/api/1/novels/1/?o=rating`;
-        } else {
-            return `https://lnreader-extensions.vercel.app/api/${sourceId}/novels/`;
-        }
-    };
-
-    const getSearchUrl = () => {
-        if (sourceId === 1) {
-            return `https://lnreader-extensions.vercel.app/api/1/search/?s=${searchText}&?o=rating`;
-        } else {
-            return `https://lnreader-extensions.vercel.app/api/${sourceId}/search/?s=${searchText}`;
-        }
-    };
-
-    const getNovels = () => {
-        fetch(getSourceUrl())
-            .then((response) => response.json())
-            .then((json) => {
-                setNovels(json);
-                setLoading(false);
-            });
-    };
-
-    const clearSearchbar = () => {
-        getNovels();
-        setLoading(true);
-        setSearchText("");
-    };
-
-    const getSearchResults = () => {
-        setLoading(true);
-        fetch(getSearchUrl())
-            .then((response) => response.json())
-            .then((json) => {
-                setNovels(json);
-                setLoading(false);
-            });
-    };
-
-    const checkIFInLibrary = (sourceId, novelUrl) => {
-        return library.some(
-            (obj) => obj.novelUrl === novelUrl && obj.sourceId === sourceId
-        );
-    };
-
-    useEffect(() => {
-        getNovels();
-    }, []);
-
-    const renderItem = ({ item }) => (
-        <NovelCover
-            item={item}
-            onPress={() =>
-                navigation.navigate("Novel", {
-                    novelName: item.novelName,
-                    novelCover: item.novelCover,
-                    novelUrl: item.novelUrl,
-                    sourceId: item.extensionId,
-                })
-            }
-            libraryStatus={checkIFInLibrary(item.extensionId, item.novelUrl)}
-        />
-    );
-
-    const listEmptyComponent = () =>
-        novels.length === 0 && (
-            <EmptyView icon="(；￣Д￣)" description="No results found" />
-        );
-
-    return (
-        <View
-            style={[
-                styles.container,
-                { backgroundColor: theme.colorPrimaryDark },
-            ]}
-        >
-            <Searchbar
-                theme={theme}
-                placeholder={`Search ${sourceName}`}
-                left="arrow-left"
-                onPressLeft={() => navigation.goBack()}
-                searchText={searchText}
-                onChangeText={(text) => setSearchText(text)}
-                onSubmitEditing={getSearchResults}
-                clearSearchbar={clearSearchbar}
-                right="earth"
-                displayMenu={true}
-                onPressRight={() => WebBrowser.openBrowserAsync(sourceUrl)}
-            />
-
-            {loading ? (
-                <View style={{ flex: 1, justifyContent: "center" }}>
-                    <ActivityIndicator size={60} color={theme.colorAccent} />
-                </View>
-            ) : (
-                <NovelList
-                    data={novels}
-                    renderItem={renderItem}
-                    ListEmptyComponent={listEmptyComponent()}
-                />
-            )}
-        </View>
-    );
-};
-
-export default Extension;
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-    },
-    contentContainer: {
-        flex: 1,
-    },
-});

src/Screens/History/History.js

@@ -1,87 +0,0 @@
-import React, { useEffect } from "react";
-import { StyleSheet, View, FlatList, ActivityIndicator } from "react-native";
-
-import { Appbar } from "../../Components/Appbar";
-import HistoryCard from "./components/HistoryCard";
-
-import { connect } from "react-redux";
-import EmptyView from "../../Components/EmptyView";
-
-import {
-    getHistoryAction,
-    deleteHistoryAction,
-} from "../../redux/history/history.actions";
-
-const History = ({
-    navigation,
-    theme,
-    history,
-    loading,
-    getHistoryAction,
-    deleteHistoryAction,
-}) => {
-    useEffect(() => {
-        getHistoryAction();
-    }, [getHistoryAction]);
-
-    const renderHistoryCard = ({ item }) => (
-        <HistoryCard
-            item={item}
-            theme={theme}
-            deleteHistoryAction={deleteHistoryAction}
-            navigation={navigation}
-        />
-    );
-
-    return (
-        <>
-            <Appbar title="History" />
-            <View
-                style={[
-                    styles.container,
-                    { backgroundColor: theme.colorPrimaryDark },
-                ]}
-            >
-                <FlatList
-                    contentContainerStyle={{ flexGrow: 1, padding: 8 }}
-                    data={history}
-                    keyExtractor={(item) => item.novelUrl.toString()}
-                    renderItem={renderHistoryCard}
-                    ListFooterComponent={
-                        loading && (
-                            <ActivityIndicator
-                                size="small"
-                                color={theme.colorAccent}
-                            />
-                        )
-                    }
-                    ListEmptyComponent={
-                        !loading && (
-                            <EmptyView
-                                icon="(˘･_･˘)"
-                                description="Nothing read recently"
-                            />
-                        )
-                    }
-                />
-            </View>
-        </>
-    );
-};
-
-const mapStateToProps = (state) => ({
-    theme: state.settingsReducer.theme,
-    history: state.historyReducer.history,
-    loading: state.historyReducer.loading,
-});
-
-export default connect(mapStateToProps, {
-    getHistoryAction,
-    deleteHistoryAction,
-})(History);
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-    },
-});

src/Screens/History/components/HistoryCard.js

@@ -1,110 +0,0 @@
-import React from "react";
-
-import { StyleSheet, View, Text, Image } from "react-native";
-import { TouchableRipple, IconButton } from "react-native-paper";
-
-import moment from "moment";
-
-import { useDispatch } from "react-redux";
-import { setNovel } from "../../../redux/novel/novel.actions";
-
-const HistoryCard = ({ item, deleteHistoryAction, navigation, theme }) => {
-    const dispatch = useDispatch();
-    return (
-        <TouchableRipple
-            style={styles.historyCard}
-            rippleColor={theme.rippleColor}
-            borderless
-            onPress={() => {
-                navigation.navigate("Novel", item);
-                dispatch(setNovel(item));
-            }}
-        >
-            <>
-                <Image
-                    source={{ uri: item.novelCover }}
-                    style={styles.historyCover}
-                />
-                <View style={styles.historyText}>
-                    <View style={{ flex: 0.9 }}>
-                        <Text
-                            style={{
-                                color: theme.textColorPrimary,
-                                fontWeight: "bold",
-                                fontSize: 16,
-                            }}
-                            numberOfLines={1}
-                        >
-                            {item.novelName}
-                        </Text>
-                        <Text
-                            style={{
-                                color: theme.textColorSecondary,
-                                marginTop: 2,
-                            }}
-                            numberOfLines={1}
-                        >
-                            {`${item.chapterName} - ${moment(
-                                item.historyTimeRead
-                            ).calendar()}`}
-                        </Text>
-                    </View>
-                    <View
-                        style={{
-                            flexDirection: "row",
-                            alignItems: "center",
-                        }}
-                    >
-                        <IconButton
-                            icon="delete-outline"
-                            size={22}
-                            color={theme.textColorPrimary}
-                            style={{
-                                marginRight: 0,
-                            }}
-                            onPress={() => deleteHistoryAction(item.novelId)}
-                        />
-                        <IconButton
-                            icon="play"
-                            size={24}
-                            color={theme.textColorPrimary}
-                            style={{ marginRight: 10 }}
-                            onPress={() =>
-                                navigation.navigate("Chapter", {
-                                    chapterId: item.historyChapterId,
-                                    chapterUrl: item.chapterUrl,
-                                    extensionId: item.sourceId,
-                                    novelUrl: item.novelUrl,
-                                    novelId: item.novelId,
-                                    chapterName: item.chapterName,
-                                })
-                            }
-                        />
-                    </View>
-                </View>
-            </>
-        </TouchableRipple>
-    );
-};
-
-export default HistoryCard;
-
-const styles = StyleSheet.create({
-    historyCard: {
-        marginBottom: 15,
-        borderRadius: 4,
-        flexDirection: "row",
-        alignItems: "center",
-    },
-    historyCover: {
-        height: 80,
-        width: 57,
-        borderRadius: 4,
-    },
-    historyText: {
-        marginLeft: 15,
-        flex: 1,
-        flexDirection: "row",
-        justifyContent: "space-between",
-    },
-});

src/Screens/Library/Library.js

@@ -1,126 +0,0 @@
-import React, { useState, useEffect } from "react";
-import {
-    StyleSheet,
-    Text,
-    View,
-    RefreshControl,
-    ActivityIndicator,
-} from "react-native";
-import { useSelector, useDispatch } from "react-redux";
-
-import { Searchbar } from "../../Components/Searchbar";
-import NovelList from "../../Components/NovelList";
-import NovelCover from "../../Components/NovelCover";
-import EmptyView from "../../Components/EmptyView";
-
-import {
-    getLibraryAction,
-    searchLibraryAction,
-} from "../../redux/library/library.actions";
-import { updateLibraryAction } from "../../redux/updates/updates.actions";
-import { useTheme } from "../../Hooks/reduxHooks";
-import { setNovel } from "../../redux/novel/novel.actions";
-
-const LibraryScreen = ({ navigation }) => {
-    const theme = useTheme();
-    const dispatch = useDispatch();
-
-    const { loading, novels } = useSelector((state) => state.libraryReducer);
-
-    const [refreshing, setRefreshing] = useState(false);
-    const [searchText, setSearchText] = useState("");
-
-    useEffect(() => {
-        dispatch(getLibraryAction());
-    }, [getLibraryAction]);
-
-    const onRefresh = () => {
-        setRefreshing(true);
-        dispatch(updateLibraryAction());
-        setRefreshing(false);
-    };
-
-    const clearSearchbar = () => {
-        dispatch(getLibraryAction());
-        setSearchText("");
-    };
-
-    const onChangeText = (text) => {
-        setSearchText(text);
-        dispatch(searchLibraryAction(text));
-    };
-
-    const renderItem = ({ item }) => (
-        <NovelCover
-            item={item}
-            onPress={() => {
-                navigation.navigate("Novel", item);
-                dispatch(setNovel(item));
-            }}
-        />
-    );
-
-    const refreshControl = () => (
-        <RefreshControl
-            refreshing={refreshing}
-            onRefresh={onRefresh}
-            colors={["white"]}
-            progressBackgroundColor={theme.colorAccent}
-        />
-    );
-
-    const listEmptyComponent = () =>
-        searchText !== "" ? (
-            <Text style={[styles.emptySearch, { color: theme.colorAccent }]}>
-                {`"${searchText}" not in library`}
-            </Text>
-        ) : (
-            <EmptyView
-                icon="Σ(ಠ_ಠ)"
-                description="Your library is empty. Add series to your library from Browse."
-            />
-        );
-
-    return (
-        <>
-            <View
-                style={[
-                    styles.container,
-                    { backgroundColor: theme.colorPrimaryDark },
-                ]}
-            >
-                <Searchbar
-                    placeholder="Search Library"
-                    searchText={searchText}
-                    clearSearchbar={clearSearchbar}
-                    onChangeText={onChangeText}
-                    left="magnify"
-                    theme={theme}
-                />
-                {loading ? (
-                    <ActivityIndicator size="small" color={theme.colorAccent} />
-                ) : (
-                    <NovelList
-                        data={novels}
-                        renderItem={renderItem}
-                        refreshControl={refreshControl()}
-                        ListEmptyComponent={listEmptyComponent}
-                    />
-                )}
-            </View>
-        </>
-    );
-};
-
-export default LibraryScreen;
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-    },
-    emptySearch: {
-        marginTop: 8,
-        textAlign: "center",
-        paddingHorizontal: 16,
-    },
-});

src/Screens/More/More.js

@@ -1,74 +0,0 @@
-import React from "react";
-import { StyleSheet, View, Image } from "react-native";
-import { useSelector } from "react-redux";
-
-import { Appbar } from "../../Components/Appbar";
-import { ListItem, ListSection } from "../../Components/List";
-
-const MoreScreen = ({ navigation }) => {
-    const theme = useSelector((state) => state.settingsReducer.theme);
-
-    return (
-        <>
-            <Appbar title="More" style={{ elevation: 0 }} />
-            <View style={{ flex: 1, backgroundColor: theme.colorPrimaryDark }}>
-                <View style={{ overflow: "hidden", paddingBottom: 4 }}>
-                    <View
-                        style={{
-                            paddingTop: 20,
-                            paddingBottom: 30,
-                            alignItems: "center",
-                            backgroundColor: theme.colorPrimary,
-                            elevation: 4,
-                        }}
-                    >
-                        <Image
-                            source={require("../../../assets/logo.png")}
-                            style={{
-                                height: 60,
-                                width: 60,
-                                tintColor: theme.textColorPrimary,
-                            }}
-                        />
-                    </View>
-                </View>
-                <ListSection>
-                    <ListItem
-                        title="Settings"
-                        icon="cog-outline"
-                        onPress={() =>
-                            navigation.navigate("MoreStack", {
-                                screen: "Settings",
-                            })
-                        }
-                        theme={theme}
-                    />
-                    <ListItem
-                        title="Tracking"
-                        icon="sync"
-                        onPress={() =>
-                            navigation.navigate("MoreStack", {
-                                screen: "Trackers",
-                            })
-                        }
-                        theme={theme}
-                    />
-                    <ListItem
-                        title="About"
-                        icon="information-outline"
-                        onPress={() =>
-                            navigation.navigate("MoreStack", {
-                                screen: "About",
-                            })
-                        }
-                        theme={theme}
-                    />
-                </ListSection>
-            </View>
-        </>
-    );
-};
-
-export default MoreScreen;
-
-const styles = StyleSheet.create({});

src/Screens/More/Settings.js

@@ -1,166 +0,0 @@
-import React, { useState } from "react";
-import { View } from "react-native";
-import { connect, useDispatch } from "react-redux";
-
-import { switchTheme } from "../../redux/settings/settings.actions";
-import {
-    setDisplayMode,
-    setItemsPerRow,
-} from "../../redux/settings/settings.actions";
-import { deleteNovelCache } from "../../Database/queries/NovelQueries";
-
-import { Appbar } from "../../Components/Appbar";
-import {
-    Divider,
-    ListItem,
-    ListSection,
-    ListSubHeader,
-    InfoItem,
-} from "../../Components/List";
-import DisplayModeModal from "./components/DisplayModeModal";
-import GridSizeModal from "./components/GridSizeModal";
-import ThemeModal from "./components/ThemeModal";
-import { createBackup, restoreBackup } from "../../Services/backup";
-import { useTheme } from "../../Hooks/reduxHooks";
-import { restoreLibraryAction } from "../../redux/library/library.actions";
-import { clearAllHistoryAction } from "../../redux/history/history.actions";
-
-const SettingsScreen = ({
-    navigation,
-    displayMode,
-    itemsPerRow,
-    switchTheme,
-    setDisplayMode,
-    setItemsPerRow,
-}) => {
-    const displayModeLabel = (displayMode) => {
-        const label = {
-            0: "Compact Grid",
-            1: "Comfortable Grid",
-            2: "List",
-        };
-
-        return label[displayMode];
-    };
-
-    const theme = useTheme();
-
-    const dispatch = useDispatch();
-
-    // Display Mode Modal
-    const [displayModalVisible, setDisplayModalVisible] = useState(false);
-    const showDisplayModal = () => setDisplayModalVisible(true);
-    const hideDisplayModal = () => setDisplayModalVisible(false);
-
-    // Theme Modal
-    const [themeModalVisible, setthemeModalVisible] = useState(false);
-    const showthemeModal = () => setthemeModalVisible(true);
-    const hidethemeModal = () => setthemeModalVisible(false);
-
-    // Grid Size Modal
-    const [gridSizeModalVisible, setGridSizeModalVisible] = useState(false);
-    const showGridSizeModal = () => setGridSizeModalVisible(true);
-    const hideGridSizeModal = () => setGridSizeModalVisible(false);
-
-    return (
-        <>
-            <Appbar title="Settings" onBackAction={() => navigation.goBack()} />
-            <View
-                style={{
-                    flex: 1,
-                    backgroundColor: theme.colorPrimaryDark,
-                    paddingVertical: 8,
-                }}
-            >
-                <ListSection>
-                    <ListSubHeader theme={theme}>Data</ListSubHeader>
-                    <ListItem
-                        title="Clear database"
-                        description="Delete history for novels not in your library"
-                        onPress={() => deleteNovelCache()}
-                        theme={theme}
-                    />
-                    <ListItem
-                        title="Clear history"
-                        description="Delete reading history for all novels"
-                        onPress={() => dispatch(clearAllHistoryAction())}
-                        theme={theme}
-                    />
-                    <Divider theme={theme} />
-                    <ListSubHeader theme={theme}>Display</ListSubHeader>
-                    <ListItem
-                        title="Display Mode"
-                        description={displayModeLabel(displayMode)}
-                        onPress={showDisplayModal}
-                        theme={theme}
-                    />
-                    <ListItem
-                        title="Items per row in library"
-                        description={`${itemsPerRow} items per row`}
-                        onPress={showGridSizeModal}
-                        theme={theme}
-                    />
-                    <Divider theme={theme} />
-                    <ListSubHeader theme={theme}>Theme</ListSubHeader>
-                    <ListItem
-                        title="Theme"
-                        description={theme.name}
-                        onPress={showthemeModal}
-                        theme={theme}
-                    />
-                    <Divider theme={theme} />
-                    <ListSubHeader theme={theme}>Backup</ListSubHeader>
-                    <ListItem
-                        title="Create backup"
-                        description="Can be used to restore current library"
-                        onPress={createBackup}
-                        theme={theme}
-                    />
-                    <ListItem
-                        title="Restore backup"
-                        description="Restore library from backup file"
-                        onPress={() => dispatch(restoreLibraryAction())}
-                        theme={theme}
-                    />
-                    <InfoItem
-                        title="Create backup may not work on devices with Android 9 or lower."
-                        icon="information-outline"
-                        description="Restore library from backup file"
-                        theme={theme}
-                    />
-                </ListSection>
-                <DisplayModeModal
-                    displayMode={displayMode}
-                    displayModalVisible={displayModalVisible}
-                    hideDisplayModal={hideDisplayModal}
-                    setDisplayMode={setDisplayMode}
-                    theme={theme}
-                />
-                <GridSizeModal
-                    itemsPerRow={itemsPerRow}
-                    gridSizeModalVisible={gridSizeModalVisible}
-                    hideGridSizeModal={hideGridSizeModal}
-                    setItemsPerRow={setItemsPerRow}
-                    theme={theme}
-                />
-                <ThemeModal
-                    themeModalVisible={themeModalVisible}
-                    hidethemeModal={hidethemeModal}
-                    switchTheme={switchTheme}
-                    theme={theme}
-                />
-            </View>
-        </>
-    );
-};
-
-const mapStateToProps = (state) => ({
-    displayMode: state.settingsReducer.displayMode,
-    itemsPerRow: state.settingsReducer.itemsPerRow,
-});
-
-export default connect(mapStateToProps, {
-    switchTheme,
-    setDisplayMode,
-    setItemsPerRow,
-})(SettingsScreen);

src/Screens/Novel/Novel.js

@@ -1,146 +0,0 @@
-import React, { useEffect, useRef, useState } from "react";
-import { StyleSheet, View, FlatList, RefreshControl } from "react-native";
-import { Provider, Portal } from "react-native-paper";
-import {
-    useContinueReading,
-    useNovel,
-    usePreferences,
-    useTheme,
-} from "../../Hooks/reduxHooks";
-
-import ChapterItem from "./components/ChapterItem";
-import NovelInfoHeader from "./components/NovelHeader";
-import ChaptersSettingsSheet from "./components/ChaptersSettingsSheet";
-
-import { useDispatch } from "react-redux";
-
-import {
-    getNovelAction,
-    sortAndFilterChapters,
-    updateNovelAction,
-} from "../../redux/novel/novel.actions";
-import TrackSheet from "./components/Tracker/TrackSheet";
-import { showToast } from "../../Hooks/showToast";
-
-const Novel = ({ route, navigation }) => {
-    const item = route.params;
-    const {
-        sourceId,
-        novelUrl,
-        novelName,
-        novelCover,
-        followed,
-        novelId,
-    } = item;
-
-    const theme = useTheme();
-    const dispatch = useDispatch();
-    const { novel, chapters, loading, fetching } = useNovel();
-
-    let chaptersSettingsSheetRef = useRef(null);
-    let trackerSheetRef = useRef(null);
-
-    const { sort, filter } = usePreferences(
-        novelId || (!loading && novel.novelId)
-    );
-
-    let lastRead = useContinueReading(
-        chapters,
-        novelId || (!loading && novel.novelId)
-    );
-
-    useEffect(() => {
-        dispatch(
-            getNovelAction(followed, sourceId, novelUrl, novelId, sort, filter)
-        );
-    }, [getNovelAction]);
-
-    const onRefresh = () => {
-        dispatch(updateNovelAction(sourceId, novelUrl, novelId));
-        showToast(`Updated ${novelName}`);
-    };
-
-    const refreshControl = () => (
-        <RefreshControl
-            onRefresh={onRefresh}
-            refreshing={fetching}
-            colors={[theme.textColorPrimary]}
-            progressBackgroundColor={theme.colorPrimary}
-        />
-    );
-
-    const ListHeaderComponent = () => (
-        <NovelInfoHeader
-            item={item}
-            novel={novel}
-            theme={theme}
-            filter={filter}
-            loading={loading}
-            lastRead={lastRead}
-            dispatch={dispatch}
-            chapters={chapters}
-            navigation={navigation}
-            trackerSheetRef={trackerSheetRef}
-            chaptersSettingsSheetRef={chaptersSettingsSheetRef}
-        />
-    );
-
-    const renderItem = ({ item }) => (
-        <ChapterItem
-            theme={theme}
-            chapter={item}
-            novelUrl={novelUrl}
-            dispatch={dispatch}
-            sourceId={sourceId}
-            navigation={navigation}
-        />
-    );
-
-    return (
-        <Provider>
-            <View
-                style={[
-                    styles.container,
-                    { backgroundColor: theme.colorPrimaryDark },
-                ]}
-            >
-                <FlatList
-                    data={!loading && chapters}
-                    keyExtractor={(item) => item.chapterId.toString()}
-                    removeClippedSubviews={true}
-                    maxToRenderPerBatch={5}
-                    windowSize={15}
-                    initialNumToRender={7}
-                    renderItem={renderItem}
-                    ListHeaderComponent={ListHeaderComponent}
-                    refreshControl={refreshControl()}
-                />
-                {!loading && (
-                    <Portal>
-                        <ChaptersSettingsSheet
-                            novelUrl={novelUrl}
-                            bottomSheetRef={chaptersSettingsSheetRef}
-                            dispatch={dispatch}
-                            sortAndFilterChapters={sortAndFilterChapters}
-                            novelId={novelId || novel.novelId}
-                            savedSort={sort}
-                            savedFilter={filter}
-                        />
-                        <TrackSheet
-                            bottomSheetRef={trackerSheetRef}
-                            novelId={novelId || novel.novelId}
-                            novelName={novelName || novel.novelName}
-                            theme={theme}
-                        />
-                    </Portal>
-                )}
-            </View>
-        </Provider>
-    );
-};
-
-export default Novel;
-
-const styles = StyleSheet.create({
-    container: { flex: 1 },
-});

src/Screens/Novel/components/ChapterItem.js

@@ -1,151 +0,0 @@
-import React, { useState } from "react";
-import { View, Text, ActivityIndicator, StyleSheet } from "react-native";
-import { TouchableRipple, IconButton, Menu } from "react-native-paper";
-import { useNavigation } from "@react-navigation/native";
-
-import {
-    deleteChapterAction,
-    downloadChapterAction,
-} from "../../../redux/novel/novel.actions";
-
-const ChapterItem = ({
-    novelUrl,
-    chapter,
-    sourceId,
-    dispatch,
-    theme,
-    navigation,
-}) => {
-    const [visible, setVisible] = useState(false);
-    const openMenu = () => setVisible(true);
-    const closeMenu = () => setVisible(false);
-
-    const displayDownloadButton = () => {
-        if (chapter.downloaded === 3) {
-            return (
-                <ActivityIndicator
-                    color={theme.textColorHint}
-                    size={25}
-                    style={{ margin: 3.5, padding: 5 }}
-                />
-            );
-        } else if (chapter.downloaded === 1) {
-            return (
-                <Menu
-                    visible={visible}
-                    onDismiss={closeMenu}
-                    anchor={
-                        <IconButton
-                            icon="check-circle"
-                            animated
-                            color={theme.textColorPrimary}
-                            size={25}
-                            onPress={openMenu}
-                            style={{ margin: 2 }}
-                        />
-                    }
-                    contentStyle={{ backgroundColor: theme.menuColor }}
-                >
-                    <Menu.Item
-                        onPress={() =>
-                            dispatch(
-                                deleteChapterAction(
-                                    chapter.chapterId,
-                                    chapter.chapterName
-                                )
-                            )
-                        }
-                        title="Delete"
-                        titleStyle={{ color: theme.textColorPrimary }}
-                    />
-                </Menu>
-            );
-        } else {
-            return (
-                <IconButton
-                    icon="arrow-down-circle-outline"
-                    animated
-                    color={theme.textColorHint}
-                    size={25}
-                    onPress={() =>
-                        dispatch(
-                            downloadChapterAction(
-                                sourceId,
-                                novelUrl,
-                                chapter.chapterUrl,
-                                chapter.chapterName,
-                                chapter.chapterId
-                            )
-                        )
-                    }
-                    style={{ margin: 2 }}
-                />
-            );
-        }
-    };
-
-    return (
-        <TouchableRipple
-            style={styles.chapterCardContainer}
-            onPress={() =>
-                navigation.navigate("Chapter", {
-                    chapterId: chapter.chapterId,
-                    chapterUrl: chapter.chapterUrl,
-                    extensionId: sourceId,
-                    novelUrl: novelUrl,
-                    chapterName: chapter.chapterName,
-                    novelId: chapter.novelId,
-                })
-            }
-            rippleColor={theme.rippleColor}
-        >
-            <>
-                <View>
-                    <Text
-                        style={[
-                            {
-                                color: theme.textColorPrimary,
-                            },
-                            chapter.read === 1 && {
-                                color: theme.textColorHint,
-                            },
-                        ]}
-                        numberOfLines={1}
-                    >
-                        {chapter.chapterName.substring(0, 50)}
-                    </Text>
-                    {chapter.releaseDate && (
-                        <Text
-                            style={[
-                                {
-                                    color: theme.textColorSecondary,
-                                    marginTop: 5,
-                                    fontSize: 12,
-                                },
-                                chapter.read === 1 && {
-                                    color: theme.textColorHint,
-                                },
-                            ]}
-                            numberOfLines={1}
-                        >
-                            {chapter.releaseDate}
-                        </Text>
-                    )}
-                </View>
-                <View>{displayDownloadButton()}</View>
-            </>
-        </TouchableRipple>
-    );
-};
-
-export default ChapterItem;
-
-const styles = StyleSheet.create({
-    chapterCardContainer: {
-        paddingHorizontal: 15,
-        paddingVertical: 7,
-        flexDirection: "row",
-        justifyContent: "space-between",
-        alignItems: "center",
-    },
-});

src/Screens/Novel/components/ChaptersSettingsSheet.js

@@ -1,196 +0,0 @@
-import React, { useState } from "react";
-import { StyleSheet, View, Text, Animated } from "react-native";
-import { List, RadioButton, Checkbox } from "react-native-paper";
-import Bottomsheet from "rn-sliding-up-panel";
-
-import { useSelector } from "react-redux";
-
-const ChaptersSettingsSheet = ({
-    bottomSheetRef,
-    novelId,
-    sortAndFilterChapters,
-    dispatch,
-    savedSort,
-    savedFilter,
-}) => {
-    const [sort, setSort] = useState(savedSort || "ORDER BY chapterId ASC");
-    const [filter, setFilter] = useState(savedFilter || "");
-
-    const sortChapters = (val) => {
-        setSort(val);
-        dispatch(sortAndFilterChapters(novelId, val, filter));
-    };
-
-    const filterChapters = (val) => {
-        setFilter(val);
-        dispatch(sortAndFilterChapters(novelId, sort, val));
-    };
-
-    const checkBoxStyle = { flexDirection: "row", alignItems: "center" };
-
-    const theme = useSelector((state) => state.settingsReducer.theme);
-
-    const [animatedValue] = useState(new Animated.Value(0));
-
-    return (
-        <Bottomsheet
-            animatedValue={animatedValue}
-            ref={bottomSheetRef}
-            draggableRange={{ top: 370, bottom: 0 }}
-            snappingPoints={[0, 370]}
-        >
-            <View
-                style={[
-                    styles.contentContainer,
-                    {
-                        backgroundColor: theme.colorPrimary,
-                    },
-                ]}
-            >
-                <View style={styles.bottomSheetHandle} />
-                <List.Subheader
-                    style={{
-                        color: theme.textColorPrimary,
-                        fontSize: 20,
-                    }}
-                >
-                    Sort
-                </List.Subheader>
-                <View>
-                    <RadioButton.Group
-                        onValueChange={(newValue) =>
-                            sortChapters(newValue, filter)
-                        }
-                        value={sort}
-                    >
-                        <View
-                            style={{
-                                flexDirection: "row",
-                                alignItems: "center",
-                            }}
-                        >
-                            <View
-                                style={{
-                                    flexDirection: "row",
-                                    alignItems: "center",
-                                }}
-                            >
-                                <RadioButton.Item
-                                    uncheckedColor={theme.textColorHint}
-                                    color={theme.colorAccent}
-                                    value="ORDER BY chapterId DESC"
-                                />
-                                <Text
-                                    style={{
-                                        color: theme.textColorPrimary,
-                                    }}
-                                >
-                                    Newest to oldest
-                                </Text>
-                            </View>
-                            <View
-                                style={{
-                                    flexDirection: "row",
-                                    alignItems: "center",
-                                }}
-                            >
-                                <RadioButton.Item
-                                    uncheckedColor={theme.textColorHint}
-                                    color={theme.colorAccent}
-                                    value="ORDER BY chapterId ASC"
-                                />
-                                <Text
-                                    style={{
-                                        color: theme.textColorPrimary,
-                                    }}
-                                >
-                                    Oldest to newest
-                                </Text>
-                            </View>
-                        </View>
-                    </RadioButton.Group>
-                </View>
-
-                <List.Subheader
-                    style={{
-                        color: theme.textColorPrimary,
-                        fontSize: 20,
-                        paddingVertical: 10,
-                    }}
-                >
-                    Filter
-                </List.Subheader>
-                <View style={checkBoxStyle}>
-                    <Checkbox.Item
-                        status={filter === "" ? "checked" : "unchecked"}
-                        uncheckedColor={theme.textColorHint}
-                        color={theme.colorAccent}
-                        onPress={() => filterChapters("")}
-                    />
-                    <Text style={{ color: theme.textColorPrimary }}>
-                        Show all
-                    </Text>
-                </View>
-                <View style={checkBoxStyle}>
-                    <Checkbox.Item
-                        status={
-                            filter === "AND `read`=1" ? "checked" : "unchecked"
-                        }
-                        uncheckedColor={theme.textColorHint}
-                        color={theme.colorAccent}
-                        onPress={() => filterChapters("AND `read`=1")}
-                    />
-                    <Text style={{ color: theme.textColorPrimary }}>
-                        Show read chapters
-                    </Text>
-                </View>
-                <View style={checkBoxStyle}>
-                    <Checkbox.Item
-                        status={
-                            filter === "AND `read`=0" ? "checked" : "unchecked"
-                        }
-                        uncheckedColor={theme.textColorHint}
-                        color={theme.colorAccent}
-                        onPress={() => filterChapters("AND `read`=0")}
-                    />
-                    <Text style={{ color: theme.textColorPrimary }}>
-                        Show unread chapters
-                    </Text>
-                </View>
-                <View style={checkBoxStyle}>
-                    <Checkbox.Item
-                        status={
-                            filter === "AND downloaded=1"
-                                ? "checked"
-                                : "unchecked"
-                        }
-                        uncheckedColor={theme.textColorHint}
-                        color={theme.colorAccent}
-                        onPress={() => filterChapters("AND downloaded=1")}
-                    />
-                    <Text style={{ color: theme.textColorPrimary }}>
-                        Show downloaded chapters
-                    </Text>
-                </View>
-            </View>
-        </Bottomsheet>
-    );
-};
-
-export default ChaptersSettingsSheet;
-
-const styles = StyleSheet.create({
-    contentContainer: {
-        flex: 1,
-        borderTopRightRadius: 8,
-        borderTopLeftRadius: 8,
-    },
-    bottomSheetHandle: {
-        backgroundColor: "rgba(255,255,255,0.25)",
-        height: 4,
-        width: 50,
-        borderRadius: 50,
-        top: 10,
-        alignSelf: "center",
-    },
-});

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

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

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

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

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

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

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

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

src/Screens/Novel/components/NovelHeader.js

@@ -1,280 +0,0 @@
-import React, { useState } from "react";
-import { View, Text, StyleSheet, Image, FlatList, Share } from "react-native";
-import { TouchableRipple, IconButton, Button, Menu } from "react-native-paper";
-import { useNavigation } from "@react-navigation/native";
-import * as WebBrowser from "expo-web-browser";
-import { useSelector, useDispatch } from "react-redux";
-
-import {
-    downloadAllChaptersAction,
-    deleteAllChaptersAction,
-} from "../../../redux/novel/novel.actions";
-import { GenreChip } from "./Info/GenreChip";
-import NovelCoverImage from "./Info/NovelCoverImage";
-import FollowChip from "./Info/FollowChip";
-import TrackerChip from "./Info/TrackerChip";
-import NovelSummary from "./Info/NovelSummary";
-import ReadButton from "./Info/ReadButton";
-
-const NovelInfoHeader = ({
-    item,
-    novel,
-    theme,
-    filter,
-    loading,
-    dispatch,
-    chapters,
-    lastRead,
-    navigation,
-    trackerSheetRef,
-    chaptersSettingsSheetRef,
-}) => {
-    const [downloadMenu, showDownloadMenu] = useState(false);
-
-    const tracker = useSelector((state) => state.trackerReducer.tracker);
-    const trackedNovels = useSelector(
-        (state) => state.trackerReducer.trackedNovels
-    );
-
-    let isTracked = false;
-
-    if (!loading) {
-        isTracked = trackedNovels.find((obj) => obj.novelId === novel.novelId);
-    }
-
-    const getGenres = ({ item }) => <GenreChip theme={theme}>{item}</GenreChip>;
-
-    return (
-        <View style={{ flexGrow: 1 }}>
-            <NovelCoverImage source={{ uri: item.novelCover }} theme={theme}>
-                <View style={styles.detailsContainer}>
-                    <View>
-                        <Image
-                            source={{ uri: item.novelCover }}
-                            style={styles.logo}
-                        />
-                    </View>
-                    <View style={styles.nameContainer}>
-                        <Text
-                            numberOfLines={2}
-                            style={[
-                                styles.name,
-                                { color: theme.textColorPrimary },
-                            ]}
-                        >
-                            {item.novelName}
-                        </Text>
-                        <>
-                            <Text
-                                style={{
-                                    color: theme.textColorSecondary,
-                                    marginVertical: 3,
-                                    fontSize: 14,
-                                    fontWeight: "bold",
-                                }}
-                                numberOfLines={2}
-                            >
-                                {(item.author &&
-                                    item.author.replace(",", ", ")) ||
-                                    (!loading &&
-                                        novel.author.replace(",", ", "))}
-                            </Text>
-
-                            <Text
-                                style={{
-                                    color: theme.textColorSecondary,
-                                    marginVertical: 3,
-                                    fontSize: 14,
-                                }}
-                                numberOfLines={1}
-                            >
-                                {item.status || (!loading && novel.status)}
-                            </Text>
-                            <Text
-                                style={{
-                                    color: theme.textColorSecondary,
-                                    fontSize: 14,
-                                }}
-                                numberOfLines={1}
-                            >
-                                {item.source || (!loading && novel.source)}
-                            </Text>
-                        </>
-                    </View>
-                </View>
-            </NovelCoverImage>
-            {!loading && (
-                <>
-                    <View style={styles.buttonsContainer}>
-                        <FollowChip
-                            theme={theme}
-                            followed={novel.followed}
-                            novel={novel}
-                        />
-                        {tracker && (
-                            <TrackerChip
-                                theme={theme}
-                                isTracked={isTracked}
-                                trackerSheetRef={trackerSheetRef}
-                            />
-                        )}
-                        <IconButton
-                            onPress={() =>
-                                WebBrowser.openBrowserAsync(novel.sourceUrl)
-                            }
-                            icon="earth"
-                            color={theme.colorAccent}
-                            size={21}
-                        />
-                        <IconButton
-                            onPress={() =>
-                                Share.share({ message: novel.sourceUrl })
-                            }
-                            icon="share-variant"
-                            color={theme.colorAccent}
-                            size={21}
-                        />
-                        <Menu
-                            visible={downloadMenu}
-                            onDismiss={() => showDownloadMenu(false)}
-                            anchor={
-                                <IconButton
-                                    icon="download"
-                                    color={theme.colorAccent}
-                                    size={21}
-                                    onPress={() => showDownloadMenu(true)}
-                                />
-                            }
-                            contentStyle={{ backgroundColor: theme.menuColor }}
-                        >
-                            <Menu.Item
-                                title="Download all"
-                                style={{ backgroundColor: theme.menuColor }}
-                                titleStyle={{ color: theme.textColorPrimary }}
-                                onPress={() =>
-                                    dispatch(
-                                        downloadAllChaptersAction(
-                                            novel.sourceId,
-                                            novel.novelUrl,
-                                            chapters
-                                        )
-                                    )
-                                }
-                            />
-                            <Menu.Item
-                                title="Delete downloads"
-                                style={{ backgroundColor: theme.menuColor }}
-                                titleStyle={{ color: theme.textColorPrimary }}
-                                onPress={() =>
-                                    dispatch(deleteAllChaptersAction(chapters))
-                                }
-                            />
-                        </Menu>
-                    </View>
-                    <NovelSummary
-                        summary={novel.novelSummary}
-                        followed={novel.followed}
-                        theme={theme}
-                    />
-                    <FlatList
-                        style={
-                            novel.novelSummary === ""
-                                ? { marginTop: 20 }
-                                : { marginTop: 12 }
-                        }
-                        contentContainerStyle={styles.genreContainer}
-                        horizontal
-                        data={novel.genre.split(",")}
-                        keyExtractor={(item) => item}
-                        renderItem={getGenres}
-                        showsHorizontalScrollIndicator={false}
-                    />
-                    <ReadButton
-                        novel={novel}
-                        chapters={chapters}
-                        navigation={navigation}
-                        theme={theme}
-                        lastRead={lastRead}
-                    />
-                    <TouchableRipple
-                        style={styles.bottomsheet}
-                        onPress={() =>
-                            chaptersSettingsSheetRef.current.show({
-                                velocity: -1.5,
-                            })
-                        }
-                        rippleColor={theme.rippleColor}
-                    >
-                        <>
-                            <Text
-                                style={[
-                                    { color: theme.textColorPrimary },
-                                    styles.chapters,
-                                ]}
-                            >
-                                {`${chapters.length} Chapters`}
-                            </Text>
-                            <IconButton
-                                icon="filter-variant"
-                                color={
-                                    filter
-                                        ? theme.filterColor
-                                        : theme.textColorPrimary
-                                }
-                                size={24}
-                            />
-                        </>
-                    </TouchableRipple>
-                </>
-            )}
-        </View>
-    );
-};
-
-export default NovelInfoHeader;
-
-const styles = StyleSheet.create({
-    nameContainer: {
-        flex: 1,
-        marginHorizontal: 16,
-        paddingTop: 8,
-    },
-    detailsContainer: {
-        flex: 1,
-        flexDirection: "row",
-        margin: 16,
-        paddingTop: 90,
-    },
-    logo: {
-        height: 160,
-        width: 110,
-        margin: 3.2,
-        borderRadius: 6,
-    },
-    name: {
-        fontWeight: "bold",
-        fontSize: 18,
-    },
-    buttonsContainer: {
-        flexDirection: "row",
-        alignItems: "center",
-    },
-
-    chapters: {
-        paddingHorizontal: 16,
-        paddingVertical: 4,
-        fontSize: 16,
-        fontWeight: "bold",
-    },
-    bottomsheet: {
-        flexDirection: "row",
-        justifyContent: "space-between",
-        alignItems: "center",
-        paddingRight: 12,
-    },
-
-    genreContainer: {
-        paddingHorizontal: 15,
-        paddingBottom: 15,
-    },
-});

src/Screens/Updates/Updates.js

@@ -1,95 +0,0 @@
-import React, { useState, useEffect } from "react";
-import {
-    StyleSheet,
-    View,
-    FlatList,
-    ActivityIndicator,
-    RefreshControl,
-} from "react-native";
-import { useDispatch, useSelector } from "react-redux";
-import EmptyView from "../../Components/EmptyView";
-import {
-    getUpdatesAction,
-    updateLibraryAction,
-} from "../../redux/updates/updates.actions";
-import { Appbar } from "./components/Appbar";
-import UpdatesItem from "./components/UpdatesItem";
-import { useTheme } from "../../Hooks/reduxHooks";
-
-const Updates = ({ navigation }) => {
-    const theme = useTheme();
-    const dispatch = useDispatch();
-    const { updates, loading } = useSelector((state) => state.updatesReducer);
-
-    const [refreshing, setRefreshing] = useState(false);
-
-    useEffect(() => {
-        dispatch(getUpdatesAction());
-    }, [getUpdatesAction, updates]);
-
-    const onRefresh = async () => {
-        setRefreshing(true);
-        dispatch(updateLibraryAction());
-        setRefreshing(false);
-    };
-
-    const onPress = (item) =>
-        navigation.navigate("Chapter", {
-            chapterId: item.chapterId,
-            chapterUrl: item.chapterUrl,
-            extensionId: item.sourceId,
-            novelUrl: item.novelUrl,
-            chapterName: item.chapterName,
-            novelId: item.novelId,
-        });
-
-    const renderItem = ({ item }) => (
-        <UpdatesItem item={item} theme={theme} onPress={() => onPress(item)} />
-    );
-
-    const ListFooterComponent = () =>
-        loading && <ActivityIndicator size="small" color={theme.colorAccent} />;
-
-    const ListEmptyComponent = () =>
-        !loading && (
-            <EmptyView icon="(˘･_･˘)" description="No recent updates" />
-        );
-
-    const refreshControl = () => (
-        <RefreshControl
-            refreshing={refreshing}
-            onRefresh={onRefresh}
-            colors={["white"]}
-            progressBackgroundColor={theme.colorAccent}
-        />
-    );
-
-    return (
-        <>
-            <Appbar theme={theme} dispatch={dispatch} />
-            <View
-                style={[
-                    styles.container,
-                    { backgroundColor: theme.colorPrimaryDark },
-                ]}
-            >
-                <FlatList
-                    contentContainerStyle={styles.flatList}
-                    data={updates}
-                    keyExtractor={(item) => item.updateId.toString()}
-                    renderItem={renderItem}
-                    ListFooterComponent={ListFooterComponent()}
-                    ListEmptyComponent={ListEmptyComponent()}
-                    refreshControl={refreshControl()}
-                />
-            </View>
-        </>
-    );
-};
-
-export default Updates;
-
-const styles = StyleSheet.create({
-    container: { flex: 1 },
-    flatList: { flexGrow: 1, paddingVertical: 8 },
-});

src/Services/backup.js

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

src/components/Appbar.js

@@ -10,7 +10,7 @@ import Constants from "expo-constants";
 import { useNavigation } from "@react-navigation/native";
 import { useSelector } from "react-redux";
 
-export const Appbar = ({ title, onBackAction, style }) => {
+export const Appbar = ({ title, onBackAction, style, children }) => {
     const theme = useSelector((state) => state.settingsReducer.theme);
 
     return (
@@ -24,6 +24,7 @@ export const Appbar = ({ title, onBackAction, style }) => {
                 title={title}
                 titleStyle={{ color: theme.textColorPrimary }}
             />
+            {children}
         </MaterialAppbar.Header>
     );
 };

src/components/BottomSheetHandle.js

@@ -0,0 +1,17 @@
+import React from "react";
+import { View } from "react-native";
+
+const BottomSheetHandle = ({ theme }) => (
+    <View
+        style={{
+            backgroundColor: theme.textColorHint,
+            height: 5,
+            width: 30,
+            borderRadius: 50,
+            top: 10,
+            alignSelf: "center",
+        }}
+    />
+);
+
+export default BottomSheetHandle;

src/components/ColorPickerModal.js

@@ -0,0 +1,97 @@
+import React, { useState } from "react";
+import { StyleSheet, Text } from "react-native";
+
+import { Modal, Portal, TextInput } from "react-native-paper";
+
+const ColorPickerModal = ({
+    theme,
+    color,
+    title,
+    onSubmit,
+    hideModal,
+    modalVisible,
+}) => {
+    const [text, setText] = useState(color);
+    const [error, setError] = useState();
+
+    const onDismiss = () => {
+        hideModal();
+        setText();
+        setError();
+    };
+
+    const onChangeText = (text) => setText(text);
+
+    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");
+        }
+    };
+
+    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}
+                />
+                <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,
+    },
+});

src/components/Common.js

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

src/components/EmptyView.js

@@ -2,7 +2,7 @@ import React from "react";
 import { StyleSheet, Text, View } from "react-native";
 import { useSelector } from "react-redux";
 
-const EmptyView = ({ icon, description }) => {
+const EmptyView = ({ icon, description, style, children, iconStyle }) => {
     const theme = useSelector((state) => state.settingsReducer.theme);
 
     return (
@@ -11,6 +11,8 @@ const EmptyView = ({ icon, description }) => {
                 style={[
                     styles.emptyViewIcon,
                     { color: theme.textColorSecondary },
+                    style,
+                    iconStyle,
                 ]}
             >
                 {icon}
@@ -19,10 +21,12 @@ const EmptyView = ({ icon, description }) => {
                 style={[
                     styles.emptyViewText,
                     { color: theme.textColorSecondary },
+                    style,
                 ]}
             >
                 {description}
             </Text>
+            {children}
         </View>
     );
 };
@@ -37,7 +41,6 @@ const styles = StyleSheet.create({
     },
     emptyViewIcon: {
         fontSize: 45,
-        fontWeight: "bold",
     },
     emptyViewText: {
         fontWeight: "bold",

src/components/ErrorView.js

@@ -0,0 +1,28 @@
+import React from "react";
+import { Text, View } from "react-native";
+
+import { IconButton } from "react-native-paper";
+import { Row } from "./Common";
+
+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.textColorSecondary}
+                onPress={onRetry}
+            />
+            <Text style={{ color: theme.textColorPrimary }}>Retry</Text>
+        </EmptyView>
+    </View>
+);
+
+export default ErrorView;

src/components/Fullscreen.js

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

src/components/List.js

@@ -1,6 +1,8 @@
 import React from "react";
-import { StyleSheet } from "react-native";
+import { StyleSheet, View } from "react-native";
+
 import { List, Divider as PaperDivider } from "react-native-paper";
+import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
 
 const ListSection = ({ children }) => (
     <List.Section style={styles.listSection}>{children}</List.Section>
@@ -14,28 +16,44 @@ const ListSubHeader = ({ children, theme }) => (
     </List.Subheader>
 );
 
-const ListItem = ({ title, description, icon, onPress, theme, right }) => (
+const ListItem = ({
+    title,
+    description,
+    icon,
+    onPress,
+    theme,
+    right,
+    iconColor,
+    titleStyle,
+    style,
+}) => (
     <List.Item
         title={title}
-        titleStyle={{ color: theme.textColorPrimary }}
+        style={style}
+        titleStyle={[{ color: theme.textColorPrimary }, titleStyle]}
         description={description}
         descriptionStyle={{ color: theme.textColorSecondary }}
         descriptionNumberOfLines={1}
-        left={() =>
-            icon && (
-                <List.Icon
-                    color={theme.colorAccent}
-                    icon={icon}
-                    style={{ marginVertical: 0 }}
-                />
-            )
-        }
+        left={() => (
+            <View style={{ justifyContent: "center" }}>
+                {icon && (
+                    <List.Icon
+                        color={theme.colorAccent}
+                        icon={icon}
+                        style={{
+                            marginVertical: 0,
+                        }}
+                    />
+                )}
+            </View>
+        )}
         right={() =>
             right && (
-                <List.Icon
-                    color="#47a84a"
-                    icon={right}
-                    style={{ marginVertical: 0 }}
+                <MaterialCommunityIcons
+                    name={right}
+                    color={iconColor || "#47a84a"}
+                    size={23}
+                    style={{ marginRight: 16, textAlignVertical: "center" }}
                 />
             )
         }

src/components/ListView.js

@@ -1,5 +1,6 @@
 import React from "react";
 import { StyleSheet, View, Text, Image } from "react-native";
+import FastImage from "react-native-fast-image";
 import { TouchableRipple } from "react-native-paper";
 
 const ListView = ({ item, downloadBadge, unreadBadge, theme, onPress }) => {
@@ -12,7 +13,7 @@ const ListView = ({ item, downloadBadge, unreadBadge, theme, onPress }) => {
             onPress={onPress}
         >
             <>
-                <Image
+                <FastImage
                     source={{ uri: item.novelCover }}
                     style={styles.extensionIcon}
                 />

src/components/NewUpdateDialog.js

@@ -2,7 +2,7 @@ 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 { useTheme } from "../hooks/reduxHooks";
 
 const NewUpdateDialog = ({ newVersion }) => {
     const [newUpdateDialog, showNewUpdateDialog] = useState(true);

src/components/NovelCover.js

@@ -1,23 +1,27 @@
 import React from "react";
-import { StyleSheet, View, Text, ImageBackground, Image } from "react-native";
+import { StyleSheet, View, Text, useWindowDimensions } from "react-native";
 import { LinearGradient } from "expo-linear-gradient";
 import { TouchableRipple } from "react-native-paper";
 
 import { useSelector } from "react-redux";
-import { useSettings, useTheme } from "../Hooks/reduxHooks";
+import { useSettings, useTheme } from "../hooks/reduxHooks";
 import ListView from "./ListView";
+import FastImage from "react-native-fast-image";
+import { getDeviceOrientation } from "../services/utils/helpers";
 
 const NovelCover = ({ item, onPress, libraryStatus }) => {
     const theme = useTheme();
-    const { displayMode, itemsPerRow } = useSettings();
+    const { displayMode, novelsPerRow, showDownloadBadges, showUnreadBadges } =
+        useSettings();
 
-    const height = {
-        1: 550,
-        2: 280,
-        3: 180,
-        4: 140,
-        5: 100,
-    };
+    const window = useWindowDimensions();
+
+    const orientation = getDeviceOrientation();
+
+    const getNovelsPerRow = () =>
+        orientation === "landscape" ? 6 : novelsPerRow;
+
+    const getHeight = () => (window.width / getNovelsPerRow()) * (4 / 3);
 
     const comfortableTitle = () =>
         displayMode === 1 && (
@@ -53,6 +57,7 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
         );
 
     const unreadBadge = () =>
+        showUnreadBadges &&
         item.chaptersUnread && (
             <Text
                 style={[
@@ -61,6 +66,10 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
                         borderTopLeftRadius: 4,
                         borderBottomLeftRadius: 4,
                     },
+                    !showDownloadBadges && {
+                        borderRadius: 4,
+                    },
+                    { backgroundColor: theme.colorAccent },
                 ]}
             >
                 {item.chaptersUnread}
@@ -68,6 +77,7 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
         );
 
     const downloadBadge = () =>
+        showDownloadBadges &&
         item.chaptersDownloaded && (
             <Text
                 style={[
@@ -76,6 +86,9 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
                         borderTopRightRadius: 4,
                         borderBottomRightRadius: 4,
                     },
+                    !showUnreadBadges && {
+                        borderRadius: 4,
+                    },
                 ]}
             >
                 {item.chaptersDownloaded}
@@ -83,7 +96,7 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
         );
 
     return displayMode !== 2 ? (
-        <View style={{ flex: 1 / itemsPerRow }}>
+        <View style={{ flex: 1 / getNovelsPerRow() }}>
             <TouchableRipple
                 borderless
                 centered
@@ -92,21 +105,19 @@ const NovelCover = ({ item, onPress, libraryStatus }) => {
                 onPress={onPress}
             >
                 <>
-                    <ImageBackground
+                    <FastImage
                         source={{ uri: item.novelCover }}
-                        style={{ height: height[itemsPerRow] }}
-                        imageStyle={[
-                            { borderRadius: 4 },
+                        style={[
+                            { height: getHeight(), borderRadius: 4 },
                             libraryStatus && { opacity: 0.5 },
                         ]}
-                        progressiveRenderingEnabled={true}
                     >
                         <View style={{ flexDirection: "row", margin: 4 }}>
                             {downloadBadge()}
                             {unreadBadge()}
                         </View>
                         {compactTitle()}
-                    </ImageBackground>
+                    </FastImage>
                     {comfortableTitle()}
                 </>
             </TouchableRipple>
@@ -168,7 +179,6 @@ const styles = StyleSheet.create({
         fontSize: 12,
     },
     unreadBadge: {
-        backgroundColor: "#2979FF",
         color: "#FFFFFF",
         borderTopRightRadius: 4,
         borderBottomRightRadius: 4,

src/components/NovelList.js

@@ -1,32 +1,47 @@
 import React from "react";
-import { RefreshControl, StyleSheet, FlatList } from "react-native";
-import { useSettings } from "../Hooks/reduxHooks";
+import { StyleSheet, FlatList } from "react-native";
+
+import { useSettings } from "../hooks/reduxHooks";
+import { getDeviceOrientation } from "../services/utils/helpers";
 
 const NovelList = ({
     data,
+    onScroll,
+    onEndReached,
     renderItem,
     refreshControl,
     ListEmptyComponent,
+    ListFooterComponent,
 }) => {
-    const { displayMode, itemsPerRow } = useSettings();
-    const getItemsPerRow = () => {
+    const { displayMode, novelsPerRow } = useSettings();
+
+    const orientation = getDeviceOrientation();
+
+    const getNovelsPerRow = () => {
         if (displayMode === 2) {
             return 1;
+        }
+
+        if (orientation === "landscape") {
+            return 6;
         } else {
-            return itemsPerRow;
+            return novelsPerRow;
         }
     };
 
     return (
         <FlatList
             contentContainerStyle={styles.flatListCont}
-            numColumns={getItemsPerRow()}
-            key={getItemsPerRow()}
+            numColumns={getNovelsPerRow()}
+            key={[orientation, getNovelsPerRow()]}
             data={data}
             keyExtractor={(item) => item.novelUrl}
             renderItem={renderItem}
             refreshControl={refreshControl}
             ListEmptyComponent={ListEmptyComponent}
+            ListFooterComponent={ListFooterComponent}
+            onScroll={onScroll}
+            onEndReached={onEndReached}
         />
     );
 };

src/components/RadioButton.js

@@ -8,7 +8,7 @@ export const RadioButtonGroup = ({ children, value, onValueChange }) => (
     </MaterialRadioButton.Group>
 );
 
-export const RadioButton = ({ value, label, theme }) => (
+export const RadioButton = ({ value, label, theme, labelStyle }) => (
     <View style={styles.radioButtonContainer}>
         <MaterialRadioButton
             value={value}
@@ -16,7 +16,11 @@ export const RadioButton = ({ value, label, theme }) => (
             uncheckedColor={theme.textColorSecondary}
         />
         <Text
-            style={[styles.radioButtonLabel, { color: theme.textColorPrimary }]}
+            style={[
+                styles.radioButtonLabel,
+                { color: theme.textColorPrimary },
+                labelStyle,
+            ]}
         >
             {label}
         </Text>

src/components/Searchbar.js

@@ -1,60 +1,41 @@
 import React, { useRef } from "react";
-import { View, TextInput, StyleSheet } from "react-native";
+import { StyleSheet, View, TextInput, Text, StatusBar } from "react-native";
+
 import { TouchableRipple, IconButton } from "react-native-paper";
-import Constants from "expo-constants";
-import { useSettings } from "../Hooks/reduxHooks";
-import { useDispatch } from "react-redux";
-import { setDisplayMode } from "../redux/settings/settings.actions";
+import { Row } from "./Common";
 
 export const Searchbar = ({
     theme,
     placeholder,
     searchText,
-    left,
-    onPressLeft,
-    right,
-    displayMenu,
-    onPressRight,
+    backAction,
+    onBackAction,
     clearSearchbar,
     onChangeText,
     onSubmitEditing,
+    actions,
 }) => {
     const searchRef = useRef(null);
-    const dispatch = useDispatch();
-    const { displayMode } = useSettings();
-
-    const displayMenuIcon = () => {
-        const icons = {
-            0: "view-module",
-            1: "view-list",
-            2: "view-module",
-        };
-
-        return icons[displayMode];
-    };
-
-    const getDisplayMode = () =>
-        displayMode === 0 ? 1 : displayMode === 1 ? 2 : displayMode === 2 && 0;
 
     return (
         <TouchableRipple
             borderless
             onPress={() => searchRef.current.focus()}
             style={[
-                styles.searchAppbarContainer,
+                styles.searchbarContainer,
                 { backgroundColor: theme.searchBarColor },
             ]}
             rippleColor={theme.rippleColor}
         >
             <View style={styles.container}>
-                <View style={{ flex: 1, flexDirection: "row" }}>
-                    {left && (
+                <Row style={{ flex: 1 }}>
+                    {backAction && (
                         <IconButton
-                            icon={left}
+                            icon={backAction}
                             color={theme.textColorSecondary}
                             style={{ marginLeft: 0 }}
                             size={23}
-                            onPress={onPressLeft}
+                            onPress={onBackAction}
                         />
                     )}
                     <TextInput
@@ -69,7 +50,7 @@ export const Searchbar = ({
                         onSubmitEditing={onSubmitEditing}
                         defaultValue={searchText}
                     />
-                </View>
+                </Row>
                 {searchText !== "" && (
                     <IconButton
                         icon="close"
@@ -79,34 +60,25 @@ export const Searchbar = ({
                         onPress={clearSearchbar}
                     />
                 )}
-                {displayMenu && (
-                    <IconButton
-                        icon={displayMenuIcon()}
-                        color={theme.textColorSecondary}
-                        style={{ marginRight: 0 }}
-                        size={23}
-                        onPress={() =>
-                            dispatch(setDisplayMode(getDisplayMode()))
-                        }
-                    />
-                )}
-                {right && (
-                    <IconButton
-                        icon={right}
-                        color={theme.textColorSecondary}
-                        style={{ marginRight: 0 }}
-                        size={23}
-                        onPress={onPressRight}
-                    />
-                )}
+                {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>
     );
 };
 
 const styles = StyleSheet.create({
-    searchAppbarContainer: {
-        marginTop: Constants.statusBarHeight + 4,
+    searchbarContainer: {
+        marginTop: StatusBar.currentHeight + 4,
         height: 48,
         flexDirection: "row",
         alignItems: "center",
@@ -115,6 +87,7 @@ const styles = StyleSheet.create({
         borderRadius: 8,
         marginHorizontal: 12,
         elevation: 2,
+        backgroundColor: "white",
     },
     container: {
         flex: 1,

src/database/queries/ChapterQueries.js

@@ -1,4 +1,5 @@
 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 (?, ?, ?, ?)`;
@@ -40,6 +41,7 @@ const getChaptersQuery = (sort, filter) =>
     }`;
 
 export const getChapters = (novelId, sort, filter) => {
+    // console.log(getChaptersQuery(sort, filter));
     return new Promise((resolve, reject) =>
         db.transaction((tx) => {
             tx.executeSql(
@@ -56,7 +58,7 @@ export const getChapters = (novelId, sort, filter) => {
 
 const getChapterQuery = `SELECT * FROM downloads WHERE downloadChapterId = ?`;
 
-export const getChapter = async (chapterId) => {
+export const getChapterFromDB = async (chapterId) => {
     return new Promise((resolve, reject) =>
         db.transaction((tx) => {
             tx.executeSql(
@@ -71,6 +73,36 @@ export const getChapter = async (chapterId) => {
     );
 };
 
+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) => {
@@ -84,6 +116,19 @@ export const markChapterRead = async (chapterId) => {
     });
 };
 
+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 isChapterDownloadedQuery = `SELECT * FROM downloads WHERE downloadChapterId=?`;
 
 export const isChapterDownloaded = async (chapterId) => {
@@ -108,15 +153,14 @@ export const isChapterDownloaded = async (chapterId) => {
 const downloadChapterQuery = `INSERT INTO downloads (downloadChapterId, chapterName, chapterText, prevChapter, nextChapter) VALUES (?, ?, ?, ?, ?)`;
 
 export const downloadChapter = async (
-    extensionId,
+    sourceId,
     novelUrl,
     chapterUrl,
     chapterId
 ) => {
-    const downloadUrl = `https://lnreader-extensions.vercel.app/api/${extensionId}/novel/${novelUrl}${chapterUrl}`;
+    const source = getSource(sourceId);
 
-    const response = await fetch(downloadUrl);
-    const chapter = await response.json();
+    const chapter = await source.parseChapter(novelUrl, chapterUrl);
 
     db.transaction((tx) => {
         tx.executeSql(
@@ -147,7 +191,7 @@ export const deleteChapter = async (chapterId) => {
         tx.executeSql(
             updateIsDownloadedQuery,
             [chapterId],
-            (tx, res) => console.log(`Chaptermarked not downapdeod deleted`),
+            (tx, res) => {},
             (txObj, error) => console.log("Error ", error)
         );
         tx.executeSql(
@@ -179,3 +223,42 @@ export const getLastReadChapter = async (novelId) => {
         });
     });
 };
+
+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)
+        );
+    });
+};