Release v1.1.14

Closes LNReader/lnreader-sources#405

.github/ISSUE_TEMPLATE/report_issue.yml

@@ -0,0 +1,94 @@
+# Cloned from tachiyomi
+
+name: Issue report
+description: Report an issue in LNReader
+labels: [Bug]
+body:
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide an example of the issue.
+      placeholder: |
+        Example:
+          1. First step
+          2. Second step
+          3. Issue here
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: Explain what you should expect to happen.
+      placeholder: |
+        Example:
+          "This should happen..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: Explain what actually happens.
+      placeholder: |
+        Example:
+          "This happened instead..."
+    validations:
+      required: true
+
+  - type: input
+    id: lnreader-version
+    attributes:
+      label: LNReader version
+      description: You can find your LNReader version in **More → About**.
+      placeholder: |
+        Example: "1.1.14"
+    validations:
+      required: true
+
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: You can find this somewhere in your Android settings.
+      placeholder: |
+        Example: "Android 11"
+    validations:
+      required: true
+
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      description: List your device and model.
+      placeholder: |
+        Example: "Google Pixel 5"
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: If this is an issue with a source, I should be opening an issue in the [sources repository](https://github.com/lnreader/lnreader-sources/issues/new/choose).
+          required: true
+        - label: I have updated the app to version **[1.1.14](https://github.com/lnreader/lnreader/releases/latest)**.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -0,0 +1,40 @@
+# Cloned from tachiyomi
+
+name: Feature request
+description: Suggest a feature to improve LNReader
+labels: [Feature Request]
+body:
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe your suggested feature
+      description: How can LNReader be improved?
+      placeholder: |
+        Example:
+          "It should work like this..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: If this is an issue with a source, I should be opening an issue in the [sources repository](https://github.com/LNReader/lnreader-sources/issues/new/choose).
+          required: true
+        - label: I have updated the app to version **[1.1.14](https://github.com/LNReader/lnreader/releases/latest)**.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true

.github/workflows/build.yml

@@ -5,13 +5,13 @@ on:
       - main
 jobs:
   build-android:
-    name: Build app
+    name: Build App
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Install Dependencies
         run: |
-          npm install
+          npm install --legacy-peer-deps
 
       - name: Cache Gradle Wrapper
         uses: actions/cache@v2
@@ -33,3 +33,14 @@ jobs:
       - name: Build Android Release
         run: |
           cd android && ./gradlew assembleRelease --no-daemon
+
+      - name: Set Env
+        run: |
+          set -x
+          echo "COMMIT_COUNT=$(git rev-list --count HEAD)" >> $GITHUB_ENV
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: LNReader-r${{ env.COMMIT_COUNT }}
+          path: android/app/build/outputs/apk/release/app-release.apk

.github/workflows/issue_moderator.yml

@@ -0,0 +1,31 @@
+# Cloned from tachiyomi
+
+name: Issue moderator
+
+on:
+  issues:
+    types: [opened, edited, reopened]
+  issue_comment:
+    types: [created]
+
+jobs:
+  moderate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Moderate issues
+        uses: tachiyomiorg/issue-moderator-action@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          auto-close-rules: |
+            [
+              {
+                "type": "body",
+                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
+                "message": "The acknowledgment section was not removed."
+              },
+              {
+                "type": "body",
+                "regex": ".*\\* (LNReader version|Android version|Device): \\?.*",
+                "message": "Requested information in the template was not filled out."
+              }
+            ]

.github/workflows/lint.yml

@@ -1,5 +1,12 @@
-name: Lint
-on: [push, pull_request]
+name: CI
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
 jobs:
   build:
     name: ESLint
@@ -7,6 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install modules
-        run: npm i
+        run: npm i --legacy-peer-deps
       - name: Run ESLint
         run: npm run lint

App.js

@@ -1,3 +1,4 @@
+import 'react-native-gesture-handler';
 import { enableFreeze } from 'react-native-screens';
 
 enableFreeze(true);
@@ -9,30 +10,36 @@ import { Provider as PaperProvider } from 'react-native-paper';
 import { Provider } from 'react-redux';
 import { persistor, store } from './src/redux/store';
 import { PersistGate } from 'redux-persist/lib/integration/react';
-import * as SplashScreen from 'expo-splash-screen';
 
 import Main from './src/navigators/Main';
 
-import { createDB } from './src/database/db';
+import { createDatabase } from './src/database/db';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
+import LottieSplashScreen from 'react-native-lottie-splash-screen';
+import AppErrorBoundary from '@components/AppErrorBoundary/AppErrorBoundary';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 const App = () => {
   useEffect(() => {
-    SplashScreen.preventAutoHideAsync();
-    createDB();
+    LottieSplashScreen.hide();
+    createDatabase();
   }, []);
 
   return (
-    <Provider store={store}>
-      <PersistGate loading={null} persistor={persistor}>
-        <SafeAreaProvider>
-          <PaperProvider>
-            <StatusBar translucent={true} backgroundColor="transparent" />
-            <Main />
-          </PaperProvider>
-        </SafeAreaProvider>
-      </PersistGate>
-    </Provider>
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <AppErrorBoundary>
+        <Provider store={store}>
+          <PersistGate loading={null} persistor={persistor}>
+            <SafeAreaProvider>
+              <PaperProvider>
+                <StatusBar translucent={true} backgroundColor="transparent" />
+                <Main />
+              </PaperProvider>
+            </SafeAreaProvider>
+          </PersistGate>
+        </Provider>
+      </AppErrorBoundary>
+    </GestureHandlerRootView>
   );
 };
 

android/app/build.gradle

@@ -84,7 +84,6 @@ project.ext.react = [
 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:
@@ -123,6 +122,12 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+ext {
+    versionMajor = 1
+    versionMinor = 1
+    versionPatch = 14
+}
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
@@ -135,8 +140,9 @@ android {
         applicationId 'com.rajarsheechatterjee.LNReader'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.1.8"
+        // Generated version code. Supports versions up to 1024.1024.2048
+        versionCode ((((versionMajor << 10) | versionMinor) << 11) | versionPatch)
+        versionName "$versionMajor.$versionMinor.$versionPatch"
     }
     splits {
         abi {
@@ -188,7 +194,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-
+    implementation project(':react-native-lottie-splash-screen')
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     

android/app/proguard-rules.pro

@@ -8,6 +8,8 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
+-keep class com.swmansion.reanimated.** { *; }
+-keep class com.facebook.react.turbomodule.** { *; }
 -keep class com.facebook.hermes.unicode.** { *; }
 -keep class com.facebook.jni.** { *; }
 -keep public class com.dylanvann.fastimage.* {*;}

android/app/src/main/AndroidManifest.xml

@@ -1,64 +1,50 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-  	package="com.rajarsheechatterjee.LNReader">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="com.rajarsheechatterjee.LNReader">
 
 	<!-- Internet -->
-  	<uses-permission android:name="android.permission.INTERNET"/>
-  	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
 
 	<!-- Storage -->
-  	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
 	<!-- For background jobs -->
-  	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
 
 
-  	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-  	<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-  	<uses-permission android:name="android.permission.VIBRATE"/>
-  	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-  	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-  	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
-  	<application 
-	  	android:name=".MainApplication"
+	<queries>
+		<intent>
+			<action android:name="android.intent.action.TTS_SERVICE" />
+		</intent>
+	</queries>
+
+	<application
+		android:name=".MainApplication"
 		android:largeHeap="true"
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
-		android:roundIcon="@mipmap/ic_launcher_round"
 		android:allowBackup="true"
 		android:theme="@style/AppTheme"
 		android:usesCleartextTraffic="true">
-    
-		<meta-data
-			android:name="expo.modules.updates.EXPO_UPDATE_URL"
-			android:value="https://exp.host/@rajarsheechatterjee/LNReader"/>
-    	
-		<meta-data
-			android:name="expo.modules.updates.EXPO_SDK_VERSION"
-			android:value="41.0.0"/>
-    
-		<meta-data
-			android:name="expo.modules.updates.ENABLED"
-			android:value="false"/>
-	
-		<meta-data
-			android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH"
-			android:value="ALWAYS"/>
-	
-		<meta-data
-			android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS"
-			android:value="0"/>
-	
+
 		<meta-data
 			android:name="expo.modules.notifications.default_notification_icon"
-			android:resource="@drawable/notification_icon"/>
-	
+			android:resource="@drawable/notification_icon" />
+
 		<meta-data
 			android:name="expo.modules.notifications.default_notification_color"
-			android:resource="@color/notification_icon_color"/>
-    
+			android:resource="@color/notification_icon_color" />
+
 		<activity
 			android:name=".MainActivity"
 			android:label="@string/app_name"
@@ -67,24 +53,24 @@
 			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>
+				<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>
+
+	</application>
+</manifest>

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

@@ -1,22 +1,22 @@
 package com.rajarsheechatterjee.LNReader;
-import android.content.res.Configuration;
-import android.content.Intent;
 
-import android.os.Bundle;
+import android.content.Intent;
+import android.content.res.Configuration;
 import android.graphics.Color;
-import android.view.WindowManager;
 import android.os.Build;
+import android.os.Bundle;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowManager;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
+import com.rajarsheechatterjee.VolumeButtonListener.VolumeButtonListener;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
-import expo.modules.splashscreen.singletons.SplashScreen;
-import expo.modules.splashscreen.SplashScreenImageResizeMode;
-
+import org.devio.rn.splashscreen.SplashScreen;
 
 public class MainActivity extends ReactActivity {
 
@@ -31,24 +31,54 @@ public class MainActivity extends ReactActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-      // SplashScreen.show(...) has to be called after super.onCreate(...)
-      // Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-          WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
-          layoutParams.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-          getWindow().setAttributes(layoutParams);
-      }
-
-      Window w = getWindow();
-      w.setStatusBarColor(Color.TRANSPARENT);
-      w.setNavigationBarColor(Color.TRANSPARENT);
-      w.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-
-      super.onCreate(null);
-      SplashScreen.show(this, SplashScreenImageResizeMode.COVER, ReactRootView.class, false);
+        // SplashScreen.show(...) has to be called after super.onCreate(...)
+        // Below line is handled by '@expo/configure-splash-screen' command and it's
+        // discouraged to modify it manually
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+            layoutParams.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+            getWindow().setAttributes(layoutParams);
+        }
 
+        Window w = getWindow();
+        w.setStatusBarColor(Color.TRANSPARENT);
+        w.setNavigationBarColor(Color.TRANSPARENT);
+        w.getDecorView()
+                .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        SplashScreen.show(this,R.style.SplashScreenTheme, R.id.lottie);
+        SplashScreen.setAnimationFinished(true);
+        super.onCreate(null);
     }
 
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (VolumeButtonListener.isActive()) {
+
+            int action = event.getAction();
+            int keyCode = event.getKeyCode();
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_VOLUME_UP:
+                    if (action == KeyEvent.ACTION_DOWN) {
+                        // volup
+                        VolumeButtonListener.up();
+                        if (!VolumeButtonListener.prevent)
+                            return super.dispatchKeyEvent(event);
+                    }
+                    return true;
+                case KeyEvent.KEYCODE_VOLUME_DOWN:
+                    if (action == KeyEvent.ACTION_DOWN) {
+                        // voldown
+                        VolumeButtonListener.down();
+                        if (!VolumeButtonListener.prevent)
+                            return super.dispatchKeyEvent(event);
+                    }
+                    return true;
+                default:
+                    return super.dispatchKeyEvent(event);
+            }
+        }
+        return super.dispatchKeyEvent(event);
+    }
 
     /**
      * Returns the name of the main component registered from JavaScript.
@@ -68,4 +98,5 @@ public class MainActivity extends ReactActivity {
             }
         };
     }
+
 }

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

@@ -2,39 +2,30 @@ 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 com.rajarsheechatterjee.VolumeButtonListener.VolumeButtonListenerPackage;
 
-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 org.devio.rn.splashscreen.SplashScreenReactPackage;
 
 public class MainApplication extends Application implements ReactApplication {
   private final ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(
-    new BasePackageList().getPackageList()
-  );
+      new BasePackageList().getPackageList());
 
   private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
     @Override
@@ -46,7 +37,8 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       List<ReactPackage> packages = new PackageList(this).getPackages();
       packages.add(new ModuleRegistryAdapter(mModuleRegistryProvider));
-      packages.add(new NavigationBarColorPackage());
+      packages.add(new com.rajarsheechatterjee.LNReader.NavigationBarColorPackage());
+      packages.add(new VolumeButtonListenerPackage());
       return packages;
     }
 
@@ -59,24 +51,6 @@ public class MainApplication extends Application implements ReactApplication {
     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
@@ -89,15 +63,12 @@ public class MainApplication extends Application implements ReactApplication {
     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
+   * Loads Flipper in React Native templates. Call this in the onCreate method
+   * with something like
    * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
    * @param context
@@ -108,9 +79,9 @@ public class MainApplication extends Application implements ReactApplication {
     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
-        */
+         * 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)

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

@@ -20,9 +20,7 @@ public class BasePackageList {
         new expo.modules.localization.LocalizationPackage(),
         new expo.modules.notifications.NotificationsPackage(),
         new expo.modules.permissions.PermissionsPackage(),
-        new expo.modules.splashscreen.SplashScreenPackage(),
         new expo.modules.sqlite.SQLitePackage(),
-        new expo.modules.updates.UpdatesPackage(),
         new expo.modules.webbrowser.WebBrowserPackage()
     );
   }

android/app/src/main/java/com/rajarsheechatterjee/VolumeButtonListener/VolumeButtonListener.java

@@ -0,0 +1,93 @@
+package com.rajarsheechatterjee.VolumeButtonListener;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+
+public class VolumeButtonListener extends ReactContextBaseJavaModule {
+
+    static ReactApplicationContext appContext;
+
+    public VolumeButtonListener(ReactApplicationContext context) {
+        super(context);
+        appContext = context;
+    }
+
+    private static boolean active = false;
+
+    public static boolean isActive() {
+        return active;
+    }
+
+    public static boolean prevent = false;
+
+    public static void sendEvent(boolean up) {
+        if (active) {
+            WritableMap args = Arguments.createMap();
+            if (up)
+                appContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("VolumeUp", args);
+            else
+                appContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("VolumeDown", args);
+        }
+    }
+
+    public static void down() {
+        sendEvent(false);
+    }
+
+    public static void up() {
+        sendEvent(true);
+    }
+
+    @ReactMethod
+    public void connect() {
+        active = true;
+    }
+
+    @ReactMethod
+    void disconnect() {
+        active = false;
+    }
+
+    @ReactMethod
+    public void pause() {
+        active = false;
+    }
+
+    @ReactMethod
+    public void unpause() {
+        active = true;
+    }
+
+    @ReactMethod
+    public void preventDefault() {
+        prevent = true;
+    }
+
+    @ReactMethod
+    public void noPreventDefault() {
+        prevent = false;
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "VolumeButtonListener";
+    }
+
+    @ReactMethod
+    public void addListener(String eventName) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+}

android/app/src/main/java/com/rajarsheechatterjee/VolumeButtonListener/VolumeButtonListenerPackage.java

@@ -0,0 +1,30 @@
+package com.rajarsheechatterjee.VolumeButtonListener;
+
+import androidx.annotation.NonNull;
+
+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 VolumeButtonListenerPackage implements ReactPackage {
+    @NonNull
+    @Override
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<NativeModule>();
+
+        modules.add(new VolumeButtonListener(reactContext));
+
+        return modules;
+    }
+
+    @NonNull
+    @Override
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

android/app/src/main/res/layout/launch_screen.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:background="@color/colorPrimaryDark"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:scaleType="centerCrop"
+    android:navigationBarColor="#333333"
+    tools:context=".MainActivity">
+
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/lottie"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingLeft="25dp"
+        app:lottie_autoPlay="true"
+        app:lottie_loop="false"
+        app:lottie_rawRes="@raw/loading" />
+</LinearLayout>

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

@@ -1,5 +1,6 @@
 <?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"/>
+    <background android:drawable="@mipmap/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
 </adaptive-icon>

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

@@ -1,5 +0,0 @@
-<?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

@@ -6,4 +6,5 @@
   <color name="colorPrimaryDark">#202125</color>
   <color name="navigationBarColor">#202125</color>
   <color name="notification_icon_color">#00adb5</color>
+  <color name="ic_launcher_background">#222831</color>
 </resources>

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

@@ -8,16 +8,20 @@
     <item name="android:textColor">#000000</item>
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="android:navigationBarColor">#202125</item>
-    <item name="android:statusBarColor">#202125</item>
-    
+    <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+    <item name="android:statusBarColor">@color/colorPrimaryDark</item>
   </style>
-  <style name="Theme.App.SplashScreen" parent="Theme.AppCompat.Light.NoActionBar">
+  <style name="SplashScreenTheme" parent="SplashScreen_SplashTheme">
+    <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowFullscreen">true</item>
+    <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+</style>
+  <style name="Theme.App.SplashScreen" parent="AppTheme">
     <!-- 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="icon">@drawable/no_icon</item> -->
     <item name="android:windowBackground">@drawable/splashscreen</item>
-    <item name="android:navigationBarColor">#202125</item>
-    <item name="android:statusBarColor">#202125</item>
-   
   </style>
 </resources>

android/build.gradle

@@ -6,6 +6,7 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 30
         targetSdkVersion = 30
+        ndkVersion = "21.1.6352462"
     }
     repositories {
         google()
@@ -21,6 +22,20 @@ buildscript {
 
 allprojects {
     repositories {
+        exclusiveContent {
+            // We get React Native's Android binaries exclusively through npm,
+            // from a local Maven repo inside node_modules/react-native/.
+            // (The use of exclusiveContent prevents looking elsewhere like Maven Central
+            // and potentially getting a wrong version.)
+            filter {
+                includeGroup "com.facebook.react"
+            }
+            forRepository {
+                maven {
+                    url "$rootDir/../node_modules/react-native/android"
+                }
+            }
+        }
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

android/settings.gradle

@@ -6,4 +6,7 @@ includeUnimodulesProjects()
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
 applyNativeModulesSettingsGradle(settings)
 
+include ':react-native-lottie-splash-screen'
+project(':react-native-lottie-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-lottie-splash-screen/android')
+
 include ':app'

babel.config.js

@@ -2,5 +2,25 @@ module.exports = function (api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
+    plugins: [
+      [
+        'module-resolver',
+        {
+          alias: {
+            '@components': './src/components',
+            '@database': './src/database',
+            '@hooks': './src/hooks',
+            '@screens': './src/screens',
+            '@strings': './strings',
+            '@redux': './src/redux',
+            '@services': './src/services',
+            '@sources': './src/sources',
+            '@utils': './src/utils',
+            '@theme': './src/theme',
+          },
+        },
+      ],
+      'react-native-reanimated/plugin',
+    ],
   };
 };

crowdin.yml

@@ -1,4 +1,5 @@
 pull_request_title: 'chore: Update translations'
+commit_message: '[ci skip]'
 files:
   - source: /strings/languages/en/strings.json
     translation: /strings/languages/%two_letters_code%/strings.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lnreader",
-  "version": "1.1.8",
+  "version": "1.1.14",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -8,82 +8,92 @@
     "start": "react-native start",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "prettier": "prettier --write \"./src/**/*.{js,jsx,ts,tsx}\"",
-    "buildRelease": "cd android && gradlew clean && gradlew assembleRelease",
-    "sources:madara": "node scripts/generateMadaraSource.cjs && prettier --write {src/sources/multisrc/madara/MadaraGenerator.ts,src/sources/sources.json}",
+    "buildRelease": "cd android && ./gradlew clean && ./gradlew assembleRelease",
+    "open": "open ./android/app/build/outputs/apk/release/",
+    "sources:madara": "node scripts/generateMadaraSource.cjs",
     "source:generator": "node scripts/generateSource.cjs",
     "strings": "node scripts/stringTypes.cjs",
     "prepare": "husky install"
   },
   "dependencies": {
+    "@gorhom/bottom-sheet": "^4.4.5",
     "@react-native-async-storage/async-storage": "^1.15.11",
+    "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/masked-view": "^0.1.11",
-    "@react-native-community/netinfo": "^7.1.1",
     "@react-native-community/slider": "^4.1.12",
+    "@react-native-cookies/cookies": "^6.2.1",
+    "@react-native-picker/picker": "^2.4.1",
+    "@react-navigation/drawer": "^6.0.1",
     "@react-navigation/material-bottom-tabs": "^6.0.9",
     "@react-navigation/native": "^6.0.6",
     "@react-navigation/stack": "^6.0.11",
     "@reduxjs/toolkit": "^1.7.2",
-    "@types/react-native-vector-icons": "^6.4.10",
+    "@shopify/flash-list": "^1.2.1",
+    "buffer": "^6.0.3",
     "cheerio": "^1.0.0-rc.10",
+    "color": "^4.2.3",
+    "dayjs": "^1.11.4",
     "expo": "^41.0.1",
     "expo-document-picker": "^9.2.4",
     "expo-file-system": "~11.0.2",
-    "expo-font": "~9.1.0",
     "expo-haptics": "~10.0.0",
     "expo-keep-awake": "~9.1.2",
     "expo-linear-gradient": "~9.1.0",
     "expo-linking": "~2.2.3",
     "expo-localization": "~10.1.0",
     "expo-notifications": "~0.11.6",
-    "expo-splash-screen": "^0.11.4",
     "expo-sqlite": "~9.1.0",
-    "expo-updates": "~0.5.4",
     "expo-web-browser": "~9.1.0",
     "i18n-js": "^3.8.0",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
+    "lottie-react-native": "^5.1.4",
     "prop-types": "^15.7.2",
-    "qs": "^6.10.1",
+    "qs": "^6.10.3",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-native": "^0.64.3",
     "react-native-background-actions": "^2.6.5",
     "react-native-device-info": "^8.4.7",
     "react-native-easing-gradient": "^1.0.0",
+    "react-native-error-boundary": "^1.1.16",
     "react-native-fast-image": "^8.5.11",
-    "react-native-gesture-handler": "~1.10.2",
+    "react-native-gesture-handler": "~2.1.3",
+    "react-native-lottie-splash-screen": "^1.0.1",
+    "react-native-markdown-display": "^7.0.0-alpha.2",
+    "react-native-mmkv": "^2.4.3",
     "react-native-pager-view": "^5.4.9",
-    "react-native-paper": "^4.10.1",
-    "react-native-reanimated": "^2.2.4",
+    "react-native-paper": "^5.1.2",
+    "react-native-reanimated": "^2.13.0",
     "react-native-render-html": "^6.3.4",
     "react-native-safe-area-context": "^3.2.0",
     "react-native-screens": "^3.9.0",
-    "react-native-skeleton-placeholder": "^5.0.0",
+    "react-native-shimmer-placeholder": "^2.0.9",
     "react-native-swipe-gestures": "^1.0.5",
     "react-native-tab-view": "^3.1.1",
     "react-native-tts": "^4.1.0",
     "react-native-unimodules": "^0.13.3",
     "react-native-vector-icons": "^9.0.0",
-    "react-native-web": "^0.17.5",
     "react-native-webview": "^11.14.3",
     "react-redux": "^7.2.6",
     "redux": "^4.1.2",
     "redux-persist": "^6.0.0",
-    "redux-thunk": "^2.4.0",
-    "rn-sliding-up-panel": "^2.4.4",
+    "rn-fetch-blob": "^0.12.0",
     "sanitize-html": "^2.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",
     "@react-native-community/eslint-config": "^3.0.1",
+    "@types/color": "^3.0.3",
     "@types/i18n-js": "^3.8.2",
     "@types/jest": "^27.4.0",
     "@types/lodash": "^4.14.179",
     "@types/react-native": "^0.66.15",
+    "@types/react-native-vector-icons": "^6.4.10",
     "@types/react-test-renderer": "^17.0.1",
     "@types/sanitize-html": "^2.6.2",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
+    "babel-plugin-module-resolver": "^4.1.0",
     "eslint": "^7.32.0",
     "eslint-plugin-react-native": "^3.11.0",
     "husky": "^7.0.4",

scripts/generateMadaraSource.cjs

@@ -1,11 +1,17 @@
 const path = require('path');
 const fs = require('fs');
+const prettier = require('prettier');
+const prettierConfig = require('../.prettierrc');
 
 const MadaraSources = require('../src/sources/multisrc/madara/MadaraSources.json');
 const AllSources = require('../src/sources/sources.json');
 
 const getScraperName = scraperName => {
-  let name = scraperName.replace(/\./g, 'Dot').replace('1st', 'First');
+  let name = scraperName
+    .replace(/\s+/g, '')
+    .replace(/-/g, 'Dash')
+    .replace(/\./g, 'Dot')
+    .replace('1st', 'First');
 
   return name;
 };
@@ -23,6 +29,11 @@ MadaraSources.forEach(source => {
     }", ${source.options ? JSON.stringify(source.options) : ''});\n\n`;
 });
 
+content = prettier.format(content, {
+  parser: 'typescript',
+  ...prettierConfig,
+});
+
 fs.writeFile(
   path.resolve(process.cwd(), 'src/sources/multisrc/madara/MadaraGenerator.ts'),
   content,
@@ -40,13 +51,21 @@ MadaraSources.forEach(madaraSource => {
     allSourcesContent.push({
       sourceId: madaraSource.sourceId,
       sourceName: madaraSource.sourceName,
-      icon: `https://github.com/LNReader/lnreader-sources/blob/main/multisrc/madara/icons/${madaraSource.sourceName.toLowerCase()}.png?raw=true`,
+      icon: `https://github.com/LNReader/lnreader-sources/blob/main/multisrc/madara/icons/${madaraSource.sourceName
+        .replace(/\s+/g, '')
+        .toLowerCase()}.png?raw=true`,
       url: madaraSource.baseUrl,
       lang: madaraSource.options.lang || 'English',
     });
 
     allSourcesContent = JSON.stringify(allSourcesContent);
 
+    allSourcesContent = prettier.format(allSourcesContent, {
+      parser: 'json5',
+      quoteProps: 'preserve',
+      trailingComma: 'none',
+    });
+
     fs.writeFile(
       path.resolve(process.cwd(), 'src/sources/sources.json'),
       allSourcesContent,

scripts/generateSource.cjs

@@ -254,7 +254,7 @@ try {
     
       return novels;`
         : `
-      showToast('Search is not available in this source')
+      showToast('${source.sourceName}: Search is not available in this source')
       
       return [];
       `

src/components/Actionbar/Actionbar.js

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

src/components/Actionbar/Actionbar.tsx

@@ -0,0 +1,88 @@
+import { useTheme } from '@hooks/useTheme';
+import React from 'react';
+import {
+  Dimensions,
+  Pressable,
+  StyleProp,
+  StyleSheet,
+  View,
+  ViewProps,
+} from 'react-native';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import color from 'color';
+
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { overlay } from 'react-native-paper';
+
+type Action = {
+  icon: string;
+  onPress: () => void;
+};
+
+interface ActionbarProps {
+  active: boolean;
+  actions: Action[];
+  viewStyle?: StyleProp<ViewProps>;
+}
+
+export const Actionbar: React.FC<ActionbarProps> = ({
+  active,
+  actions,
+  viewStyle,
+}) => {
+  const theme = useTheme();
+
+  const { bottom } = useSafeAreaInsets();
+
+  if (active) {
+    return (
+      <View
+        style={[
+          styles.actionbarContainer,
+          {
+            backgroundColor: theme.isDark
+              ? overlay(2, theme.surface)
+              : theme.secondaryContainer,
+            minHeight: 80 + bottom,
+            paddingBottom: bottom,
+          },
+          viewStyle,
+        ]}
+      >
+        {actions.map(({ icon, onPress }, id) => (
+          <Pressable
+            key={id}
+            android_ripple={{
+              radius: 50,
+              color: color(theme.primary).alpha(0.12).string(),
+              borderless: true,
+            }}
+            onPress={onPress}
+          >
+            <MaterialCommunityIcons
+              name={icon}
+              color={theme.onSurface}
+              size={24}
+            />
+          </Pressable>
+        ))}
+      </View>
+    );
+  } else {
+    return null;
+  }
+};
+
+const styles = StyleSheet.create({
+  actionbarContainer: {
+    position: 'absolute',
+    width: Dimensions.get('window').width,
+    bottom: 0,
+    borderTopLeftRadius: 16,
+    borderTopRightRadius: 16,
+    elevation: 1,
+    flexDirection: 'row',
+    justifyContent: 'space-around',
+    alignItems: 'center',
+  },
+});

src/components/AppErrorBoundary/AppErrorBoundary.tsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { StyleSheet, View, Text, StatusBar } from 'react-native';
+import ErrorBoundary from 'react-native-error-boundary';
+
+import { Button, List } from '@components';
+import { useTheme } from '@hooks';
+import { ButtonVariation } from '@components/Button/Button';
+
+interface ErrorFallbackProps {
+  error: Error;
+  resetError: () => void;
+}
+
+export const ErrorFallback: React.FC<ErrorFallbackProps> = ({
+  error,
+  resetError,
+}) => {
+  const theme = useTheme();
+
+  return (
+    <View style={[styles.mainCtn, { backgroundColor: theme.background }]}>
+      <StatusBar translucent={true} backgroundColor="transparent" />
+      <View style={styles.errorInfoCtn}>
+        <Text style={[styles.errorTitle, { color: theme.onSurface }]}>
+          An Unexpected Error Ocurred
+        </Text>
+        <Text style={[styles.errorDesc, { color: theme.onSurface }]}>
+          The application ran into an unexpected error. We suggest you
+          screenshot this message and then share it in our support channel on
+          Discord.
+        </Text>
+        <Text
+          style={[
+            styles.errorCtn,
+            {
+              backgroundColor: theme.surfaceVariant,
+              color: theme.onSurfaceVariant,
+            },
+          ]}
+          numberOfLines={20}
+        >
+          {`${error.message}\n\n${error.stack}`}
+        </Text>
+      </View>
+      <List.Divider theme={theme} />
+      <Button
+        variation={ButtonVariation.DEFAULT}
+        onPress={resetError}
+        title={'Restart the application'}
+        style={styles.buttonCtn}
+        theme={theme}
+      />
+    </View>
+  );
+};
+
+interface AppErrorBoundaryProps {
+  children: React.ReactNode | React.ReactElement;
+}
+
+const AppErrorBoundary: React.FC<AppErrorBoundaryProps> = ({ children }) => {
+  return (
+    <ErrorBoundary FallbackComponent={ErrorFallback}>{children}</ErrorBoundary>
+  );
+};
+
+export default AppErrorBoundary;
+
+const styles = StyleSheet.create({
+  mainCtn: {
+    flex: 1,
+  },
+  errorInfoCtn: {
+    flex: 1,
+    justifyContent: 'center',
+    padding: 16,
+  },
+  buttonCtn: {
+    margin: 16,
+    marginBottom: 32,
+  },
+  errorTitle: {
+    marginBottom: 8,
+    textAlign: 'center',
+    fontSize: 20,
+  },
+  errorDesc: {
+    lineHeight: 20,
+    marginVertical: 8,
+  },
+  errorCtn: {
+    borderRadius: 8,
+    lineHeight: 20,
+    marginVertical: 16,
+    paddingVertical: 16,
+    paddingHorizontal: 8,
+  },
+});

src/components/Appbar.js

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

src/components/Appbar/Appbar.tsx

@@ -2,24 +2,38 @@ import React from 'react';
 import { StatusBar } from 'react-native';
 
 import { Appbar as PaperAppbar } from 'react-native-paper';
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
 
 interface AppbarProps {
   title: string;
   handleGoBack: () => void;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
+  mode?: 'small' | 'medium' | 'large' | 'center-aligned';
 }
 
-const Appbar: React.FC<AppbarProps> = ({ title, handleGoBack, theme }) => (
+const Appbar: React.FC<AppbarProps> = ({
+  title,
+  handleGoBack,
+  theme,
+  mode = 'large',
+  children,
+}) => (
   <PaperAppbar.Header
-    style={{ backgroundColor: theme.colorPrimary }}
+    style={{ backgroundColor: theme.surface }}
     statusBarHeight={StatusBar.currentHeight}
+    mode={mode}
   >
-    {handleGoBack && <PaperAppbar.BackAction onPress={handleGoBack} />}
+    {handleGoBack && (
+      <PaperAppbar.BackAction
+        onPress={handleGoBack}
+        iconColor={theme.textColorPrimary}
+      />
+    )}
     <PaperAppbar.Content
       title={title}
       titleStyle={{ color: theme.textColorPrimary }}
     />
+    {children}
   </PaperAppbar.Header>
 );
 

src/components/BottomSheet/BottomSheet.tsx

@@ -0,0 +1,49 @@
+import React, { ReactElement, Ref, useCallback } from 'react';
+import { overlay } from 'react-native-paper';
+import { default as BS, BottomSheetBackdrop } from '@gorhom/bottom-sheet';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { MD3ThemeType } from '@theme/types';
+import { StyleSheet } from 'react-native';
+
+interface BottomSheetProps {
+  bottomSheetRef: Ref<BS>;
+  snapPoints: Array<number>;
+  height: number;
+  theme: MD3ThemeType;
+  children: ReactElement;
+}
+
+const BottomSheet: React.FC<BottomSheetProps> = ({
+  bottomSheetRef,
+  snapPoints,
+  height,
+  theme,
+  children,
+}) => {
+  const { bottom } = useSafeAreaInsets();
+  const renderBackdrop = useCallback(
+    props => <BottomSheetBackdrop {...props} disappearsOnIndex={0} />,
+    [],
+  );
+  return (
+    <BS
+      index={-1}
+      backdropComponent={renderBackdrop}
+      snapPoints={[0.1].concat(snapPoints)}
+      enablePanDownToClose={true}
+      ref={bottomSheetRef}
+      handleStyle={styles.handle}
+      containerHeight={height + bottom}
+      containerStyle={{ paddingBottom: bottom }}
+      backgroundStyle={{ backgroundColor: overlay(2, theme.surface) }}
+    >
+      {children}
+    </BS>
+  );
+};
+const styles = StyleSheet.create({
+  handle: {
+    display: 'none',
+  },
+});
+export default BottomSheet;

src/components/BottomSheetHandle.js

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

src/components/Button/Button.tsx

@@ -1,7 +1,16 @@
-import { Pressable, StyleSheet, Text, View } from 'react-native';
-import React from 'react';
+import {
+  Pressable,
+  StyleProp,
+  StyleSheet,
+  Text,
+  TextStyle,
+  View,
+  ViewStyle,
+} from 'react-native';
+import React, { useMemo } from 'react';
+import color from 'color';
 
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
 
 export enum ButtonVariation {
   DEFAULT = 'default',
@@ -14,50 +23,59 @@ interface Props {
   title: string;
   textColor?: string;
   onPress?: () => void;
-  margin?: number;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
+  style?: ViewStyle;
+  labelStyle?: StyleProp<TextStyle>;
+  disabled?: boolean;
 }
 
 const Button: React.FC<Props> = ({
   variation = ButtonVariation.DEFAULT,
   title,
   textColor,
-  margin = 0,
   onPress,
   theme,
+  style,
+  disabled,
+  labelStyle,
 }) => {
+  const textStyles: StyleProp<TextStyle> = useMemo(
+    () => ({
+      color: disabled
+        ? theme.textColorHint
+        : textColor
+        ? textColor
+        : variation === ButtonVariation.OUTLINED
+        ? theme.primary
+        : variation === ButtonVariation.CLEAR
+        ? theme.primary
+        : theme.onSecondary,
+    }),
+    [],
+  );
+
   return (
     <View
       style={[
         styles.button,
-        { margin },
-        variation === 'outlined'
+        variation === ButtonVariation.OUTLINED
           ? {
               ...styles.outlined,
               borderColor: theme.textColorHint,
             }
-          : variation !== 'clear' && {
-              backgroundColor: theme.colorAccent,
+          : variation !== ButtonVariation.CLEAR && {
+              backgroundColor: theme.secondary,
             },
+        style,
       ]}
     >
       <Pressable
         style={styles.pressable}
         onPress={onPress}
-        android_ripple={{ color: theme.rippleColor }}
+        android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
+        disabled={disabled}
       >
-        <Text
-          style={{
-            color: textColor
-              ? textColor
-              : variation === 'outlined'
-              ? theme.colorAccent
-              : variation === 'default'
-              ? theme.colorButtonText
-              : theme.textColorPrimary,
-          }}
-          numberOfLines={1}
-        >
+        <Text style={[textStyles, labelStyle]} numberOfLines={1}>
           {title}
         </Text>
       </Pressable>

src/components/Checkbox/Checkbox.tsx

@@ -1,13 +1,40 @@
 import React from 'react';
-import { Pressable, StyleSheet, Text } from 'react-native';
+import {
+  Pressable,
+  StyleProp,
+  StyleSheet,
+  Text,
+  TextStyle,
+  ViewStyle,
+} from 'react-native';
 import { Checkbox as PaperCheckbox } from 'react-native-paper';
-
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import color from 'color';
 
-export const Checkbox = ({ label, status, onPress, disabled, theme }) => (
+import { MD3ThemeType } from '../../theme/types';
+
+interface CheckboxProps {
+  label: string;
+  status: boolean | 'indeterminate';
+  onPress?: () => void;
+  disabled?: boolean;
+  theme: MD3ThemeType;
+  viewStyle?: StyleProp<ViewStyle>;
+  labelStyle?: StyleProp<TextStyle>;
+}
+
+export const Checkbox: React.FC<CheckboxProps> = ({
+  label,
+  status,
+  theme,
+  disabled,
+  onPress,
+  viewStyle,
+  labelStyle,
+}) => (
   <Pressable
-    android_ripple={{ color: theme.rippleColor }}
-    style={styles.pressable}
+    android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
+    style={[styles.pressable, viewStyle]}
     onPress={onPress}
     disabled={disabled}
   >
@@ -20,11 +47,14 @@ export const Checkbox = ({ label, status, onPress, disabled, theme }) => (
           : 'unchecked'
       }
       onPress={onPress}
-      color={theme.colorAccent}
+      color={theme.primary}
+      theme={{
+        colors: { disabled: theme.textColorSecondary },
+      }}
       uncheckedColor={theme.textColorSecondary}
       disabled={disabled}
     />
-    <Text style={{ color: theme.textColorPrimary, marginLeft: 12 }}>
+    <Text style={[styles.defaultLabel, { color: theme.onSurface }, labelStyle]}>
       {label}
     </Text>
   </Pressable>
@@ -32,19 +62,19 @@ export const Checkbox = ({ label, status, onPress, disabled, theme }) => (
 
 export const SortItem = ({ label, status, onPress, theme }) => (
   <Pressable
-    android_ripple={{ color: theme.rippleColor }}
+    android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
     style={[styles.pressable, { paddingVertical: 16, paddingLeft: 64 }]}
     onPress={onPress}
   >
     {status && (
       <MaterialCommunityIcons
         name={status === 'asc' ? 'arrow-up' : 'arrow-down'}
-        color={theme.colorAccent}
+        color={theme.primary}
         size={21}
         style={styles.icon}
       />
     )}
-    <Text style={{ color: theme.textColorPrimary }}>{label}</Text>
+    <Text style={{ color: theme.onSurface }}>{label}</Text>
   </Pressable>
 );
 
@@ -60,4 +90,7 @@ const styles = StyleSheet.create({
     left: 24,
     alignSelf: 'center',
   },
+  defaultLabel: {
+    marginLeft: 12,
+  },
 });

src/components/Chip/Chip.tsx

@@ -1,20 +1,38 @@
 import React from 'react';
 import { Pressable, StyleSheet, Text, View } from 'react-native';
+import color from 'color';
 
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
+import { overlay } from 'react-native-paper';
 
 interface ChipProps {
   label: string;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }
 
 const Chip: React.FC<ChipProps> = ({ label, theme }) => (
-  <View style={[styles.chipContainer, { backgroundColor: theme.colorPrimary }]}>
+  <View
+    style={[
+      styles.chipContainer,
+      {
+        backgroundColor: theme.isDark
+          ? overlay(1, theme.surface)
+          : theme.secondaryContainer,
+      },
+    ]}
+  >
     <Pressable
-      android_ripple={{ color: theme.rippleColor }}
+      android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
       style={styles.pressable}
     >
-      <Text style={[styles.label, { color: theme.textColorSecondary }]}>
+      <Text
+        style={[
+          styles.label,
+          {
+            color: theme.isDark ? theme.onSurface : theme.onSecondaryContainer,
+          },
+        ]}
+      >
         {label}
       </Text>
     </Pressable>
@@ -27,7 +45,7 @@ const styles = StyleSheet.create({
   chipContainer: {
     overflow: 'hidden',
     borderRadius: 8,
-    height: 28,
+    height: 32,
     marginRight: 8,
   },
   pressable: {

src/components/ColorPickerModal/ColorPickerModal.tsx

@@ -1,48 +1,52 @@
 import React, { useState } from 'react';
 import { FlatList, Pressable, StyleSheet, Text, View } from 'react-native';
 
-import { Modal, Portal, TextInput } from 'react-native-paper';
+import { Modal, overlay, Portal, TextInput } from 'react-native-paper';
+import { MD3ThemeType } from '../../theme/types';
 
-const ColorPickerModal = ({
+interface ColorPickerModalProps {
+  visible: boolean;
+  title: string;
+  color: string;
+  onSubmit: (val: string) => void;
+  closeModal: () => void;
+  theme: MD3ThemeType;
+  showAccentColors?: boolean;
+}
+
+const ColorPickerModal: React.FC<ColorPickerModalProps> = ({
   theme,
   color,
   title,
   onSubmit,
-  hideModal,
-  modalVisible,
+  closeModal,
+  visible,
   showAccentColors,
 }) => {
-  const [text, setText] = useState(color);
-  const [error, setError] = useState();
+  const [text, setText] = useState<string>(color);
+  const [error, setError] = useState<string | null>();
 
   const onDismiss = () => {
-    hideModal();
-    setText();
-    setError();
+    closeModal();
+    if (error) {
+      setText(color);
+    }
+    setError(null);
   };
 
-  const onChangeText = txt => setText(txt);
+  const onChangeText = (txt: string) => setText(txt);
 
   const onSubmitEditing = () => {
-    const re = /^#([0-9a-f]{6}|[0-9a-f]{3})$/i;
+    const re = /^#([0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3})$/i;
 
     if (text.match(re)) {
       onSubmit(text);
-      hideModal();
+      closeModal();
     } else {
       setError('Enter a valid hex color code');
     }
   };
 
-  const textInputTheme = {
-    colors: {
-      primary: color,
-      placeholder: theme.textColorHint,
-      text: theme.textColorPrimary,
-      background: 'transparent',
-    },
-  };
-
   const accentColors = [
     '#EF5350',
     '#EC407A',
@@ -69,17 +73,17 @@ const ColorPickerModal = ({
   return (
     <Portal>
       <Modal
-        visible={modalVisible}
+        visible={visible}
         onDismiss={onDismiss}
         contentContainerStyle={[
           styles.modalContainer,
-          { backgroundColor: theme.colorPrimary },
+          { backgroundColor: overlay(2, theme.surface) },
         ]}
       >
         <Text style={[styles.modalTitle, { color: theme.textColorPrimary }]}>
           {title}
         </Text>
-        {showAccentColors && (
+        {showAccentColors ? (
           <FlatList
             contentContainerStyle={{ marginBottom: 8 }}
             data={accentColors}
@@ -104,24 +108,24 @@ const ColorPickerModal = ({
                   }}
                   onPress={() => {
                     onSubmit(item);
-                    hideModal();
+                    closeModal();
                   }}
                 />
               </View>
             )}
           />
-        )}
+        ) : null}
         <TextInput
           value={text}
-          defaultValue={color}
+          defaultValue={typeof color === 'string' ? color : ''}
           placeholder="Hex Color Code (E.g. #3399FF)"
           onChangeText={onChangeText}
           onSubmitEditing={onSubmitEditing}
           mode="outlined"
-          theme={textInputTheme}
+          theme={{ colors: { ...theme } }}
           underlineColor={theme.textColorHint}
           dense
-          error={error}
+          error={Boolean(error)}
         />
         <Text style={styles.errorText}>{error}</Text>
       </Modal>
@@ -134,11 +138,11 @@ export default ColorPickerModal;
 const styles = StyleSheet.create({
   modalContainer: {
     margin: 30,
-    padding: 20,
-    borderRadius: 8,
+    padding: 24,
+    borderRadius: 28,
   },
   modalTitle: {
-    fontSize: 18,
+    fontSize: 24,
     marginBottom: 16,
   },
   errorText: {

src/components/ColorPreferenceItem/ColorPreferenceItem.tsx

@@ -0,0 +1,54 @@
+import React from 'react';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
+
+import { ThemeType } from '../../theme/types';
+
+interface ColorPreferenceItemProps {
+  label: string;
+  description?: string;
+  onPress: () => void;
+  theme: ThemeType;
+}
+
+const ColorPreferenceItem: React.FC<ColorPreferenceItemProps> = ({
+  label,
+  description,
+  theme,
+  onPress,
+}) => (
+  <Pressable
+    style={styles.container}
+    android_ripple={{ color: theme.rippleColor }}
+    onPress={onPress}
+  >
+    <View>
+      <Text style={[styles.label, { color: theme.textColorPrimary }]}>
+        {label}
+      </Text>
+      <Text style={{ color: theme.textColorSecondary }}>
+        {description?.toUpperCase?.()}
+      </Text>
+    </View>
+    <View style={[{ backgroundColor: description }, styles.colorPreview]} />
+  </Pressable>
+);
+
+export default ColorPreferenceItem;
+
+const styles = StyleSheet.create({
+  container: {
+    padding: 16,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  },
+  label: {
+    fontSize: 16,
+  },
+  colorPreview: {
+    height: 24,
+    width: 24,
+    borderRadius: 50,
+    marginRight: 16,
+  },
+});

src/components/Common.js

@@ -18,7 +18,7 @@ const ScreenContainer = ({ children, theme }) => {
   );
 };
 
-const Row = ({ children, style }) => (
+const Row = ({ children, style = {} }) => (
   <View style={[styles.row, style]}>{children}</View>
 );
 

src/components/Common/ToggleButton.js

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

src/components/Common/ToggleButton.tsx

@@ -0,0 +1,92 @@
+import React from 'react';
+import { Pressable, View } from 'react-native';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import { MD3ThemeType } from '../../theme/types';
+import Color from 'color';
+
+interface ToggleButtonProps {
+  icon: string;
+  selected: boolean;
+  theme: MD3ThemeType;
+  color?: string;
+  onPress: () => void;
+}
+
+export const ToggleButton: React.FC<ToggleButtonProps> = ({
+  icon,
+  selected,
+  theme,
+  color,
+  onPress,
+}) => (
+  <View
+    style={{
+      borderRadius: 6,
+      overflow: 'hidden',
+      marginHorizontal: 6,
+    }}
+  >
+    <Pressable
+      android_ripple={{ color: Color(theme.primary).alpha(0.12).string() }}
+      style={{
+        padding: 8,
+        alignItems: 'center',
+        justifyContent: 'center',
+        backgroundColor: selected
+          ? Color(theme.primary).alpha(0.12).string()
+          : 'transparent',
+      }}
+      onPress={onPress}
+    >
+      <MaterialCommunityIcons
+        name={icon}
+        color={
+          selected ? theme.primary : color ? color : theme.textColorPrimary
+        }
+        size={24}
+      />
+    </Pressable>
+  </View>
+);
+
+interface ToggleColorButtonProps {
+  selected: boolean;
+  backgroundColor: string;
+  textColor: string;
+  onPress: () => void;
+}
+
+export const ToggleColorButton: React.FC<ToggleColorButtonProps> = ({
+  selected,
+  backgroundColor,
+  textColor,
+  onPress,
+}) => (
+  <View
+    style={{
+      borderRadius: 50,
+      overflow: 'hidden',
+      marginHorizontal: 6,
+      height: 44,
+      width: 44,
+    }}
+  >
+    <Pressable
+      android_ripple={{ color: textColor }}
+      style={{
+        flex: 1,
+        padding: 10,
+        backgroundColor: backgroundColor,
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+      onPress={onPress}
+    >
+      <MaterialCommunityIcons
+        name={selected ? 'check' : 'format-color-text'}
+        color={textColor}
+        size={24}
+      />
+    </Pressable>
+  </View>
+);

src/components/ConfirmationDialog/ConfirmationDialog.tsx

@@ -0,0 +1,78 @@
+import React from 'react';
+import { StyleSheet, View } from 'react-native';
+
+import { getString } from '@strings/translations';
+
+import { Dialog, Portal } from 'react-native-paper';
+import { MD3ThemeType } from '../../theme/types';
+import { Button } from '@components/index';
+import { ButtonVariation } from '@components/Button/Button';
+import { getDialogBackground } from '@theme/colors';
+
+interface ConfirmationDialogProps {
+  title: string;
+  visible: boolean;
+  theme: MD3ThemeType;
+  onSubmit: () => void;
+  onDismiss: () => void;
+}
+
+const ConfirmationDialog: React.FC<ConfirmationDialogProps> = ({
+  title,
+  visible,
+  onDismiss,
+  theme,
+  onSubmit,
+}) => {
+  const handleOnSubmit = () => {
+    onSubmit();
+    onDismiss();
+  };
+
+  return (
+    <Portal>
+      <Dialog
+        visible={visible}
+        onDismiss={onDismiss}
+        style={[
+          styles.container,
+          { backgroundColor: getDialogBackground(theme) },
+        ]}
+      >
+        <Dialog.Title style={[styles.title, { color: theme.textColorPrimary }]}>
+          {title}
+        </Dialog.Title>
+        <View style={styles.buttonCtn}>
+          <Button
+            theme={theme}
+            onPress={handleOnSubmit}
+            title={getString('common.ok')}
+            variation={ButtonVariation.CLEAR}
+          />
+          <Button
+            theme={theme}
+            onPress={onDismiss}
+            title={getString('common.cancel')}
+            variation={ButtonVariation.CLEAR}
+          />
+        </View>
+      </Dialog>
+    </Portal>
+  );
+};
+
+export default ConfirmationDialog;
+
+const styles = StyleSheet.create({
+  container: {
+    borderRadius: 28,
+  },
+  title: {
+    letterSpacing: 0,
+    fontSize: 16,
+  },
+  buttonCtn: {
+    flexDirection: 'row-reverse',
+    padding: 16,
+  },
+});

src/components/Dialog/Dialog.js

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

src/components/EmptyView.js

@@ -1,9 +1,9 @@
+import { useTheme } from '@hooks/useTheme';
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import { useSelector } from 'react-redux';
 
 const EmptyView = ({ icon, description, style, children, iconStyle }) => {
-  const theme = useSelector(state => state.settingsReducer.theme);
+  const theme = useTheme();
 
   return (
     <View style={styles.emptyViewContainer}>

src/components/EmptyView/EmptyView.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 import { StyleSheet, View, Text } from 'react-native';
 
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
 
 interface EmptyViewProps {
   icon?: string;
   description: string;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }
 
 const EmptyView: React.FC<EmptyViewProps> = ({ icon, description, theme }) => (
@@ -25,6 +25,7 @@ export default EmptyView;
 const styles = StyleSheet.create({
   container: {
     flex: 1,
+    padding: 16,
     alignItems: 'center',
     justifyContent: 'center',
   },

src/components/ErrorScreenV2/ErrorScreenV2.tsx

@@ -1,24 +1,21 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import { Container } from '..';
 
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '@theme/types';
 
 interface ErrorScreenProps {
   error?: string;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }
 
 const ErrorScreen: React.FC<ErrorScreenProps> = ({ error, theme }) => {
   return (
-    <Container>
-      <View style={styles.container}>
-        <Text style={[styles.icon, { color: theme.textColorHint }]}>ಥ_ಥ</Text>
-        <Text style={[styles.error, { color: theme.textColorHint }]}>
-          {error}
-        </Text>
-      </View>
-    </Container>
+    <View style={styles.container}>
+      <Text style={[styles.icon, { color: theme.textColorHint }]}>ಥ_ಥ</Text>
+      <Text style={[styles.error, { color: theme.textColorHint }]}>
+        {error}
+      </Text>
+    </View>
   );
 };
 
@@ -35,5 +32,7 @@ const styles = StyleSheet.create({
   },
   error: {
     marginTop: 16,
+    paddingHorizontal: 16,
+    textAlign: 'center',
   },
 });

src/components/ErrorView.js

@@ -1,28 +0,0 @@
-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.text}
-        onPress={onRetry}
-      />
-      <Text style={{ color: theme.textColorPrimary }}>Retry</Text>
-    </EmptyView>
-  </View>
-);
-
-export default ErrorView;

src/components/IconButtonV2/IconButtonV2.tsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import { Pressable, StyleSheet, View, ViewStyle } from 'react-native';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import Color from 'color';
 
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
 
 type Props = {
   name: string;
@@ -11,7 +12,7 @@ type Props = {
   disabled?: boolean;
   padding?: number;
   onPress?: () => void;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
   style?: ViewStyle;
 };
 
@@ -30,7 +31,11 @@ const IconButton: React.FC<Props> = ({
       style={[styles.pressable, { padding }]}
       onPress={onPress}
       disabled={disabled}
-      android_ripple={{ color: theme.rippleColor }}
+      android_ripple={
+        onPress
+          ? { color: Color(theme.primary).alpha(0.12).string() }
+          : undefined
+      }
     >
       <MaterialCommunityIcons
         name={name}

src/components/List.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Pressable, StyleSheet, Text, View } from 'react-native';
+import color from 'color';
 
 import { List as PaperList, Divider as PaperDivider } from 'react-native-paper';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
@@ -9,9 +10,7 @@ const ListSection = ({ children }) => (
 );
 
 const ListSubHeader = ({ children, theme }) => (
-  <PaperList.Subheader
-    style={[styles.listSubHeader, { color: theme.colorAccent }]}
-  >
+  <PaperList.Subheader style={[styles.listSubHeader, { color: theme.primary }]}>
     {children}
   </PaperList.Subheader>
 );
@@ -29,24 +28,26 @@ const ListItem = ({
 }) => (
   <PaperList.Item
     title={title}
-    style={style}
+    style={[{ paddingHorizontal: 16, paddingVertical: 12 }, style]}
     titleStyle={[{ color: theme.textColorPrimary }, titleStyle]}
     description={description}
     descriptionStyle={{ color: theme.textColorSecondary }}
     descriptionNumberOfLines={1}
-    left={() => (
-      <View style={{ justifyContent: 'center' }}>
-        {icon && (
-          <PaperList.Icon
-            color={theme.colorAccent}
-            icon={icon}
-            style={{
-              marginVertical: 0,
-            }}
-          />
-        )}
-      </View>
-    )}
+    left={
+      icon
+        ? () => (
+            <View style={{ justifyContent: 'center' }}>
+              <PaperList.Icon
+                color={theme.primary}
+                icon={icon}
+                style={{
+                  marginVertical: 0,
+                }}
+              />
+            </View>
+          )
+        : undefined
+    }
     right={() =>
       right && (
         <MaterialCommunityIcons
@@ -58,12 +59,20 @@ const ListItem = ({
       )
     }
     onPress={onPress}
-    rippleColor={theme.rippleColor}
+    rippleColor={color(theme.primary).alpha(0.12).string()}
   />
 );
 
 const Divider = ({ theme }) => (
-  <PaperDivider style={{ backgroundColor: theme.dividerColor, height: 1 }} />
+  <PaperDivider
+    style={{
+      backgroundColor: color(theme.isDark ? '#FFFFFF' : '#000000')
+        .alpha(0.12)
+        .rgb()
+        .string(),
+      height: 1,
+    }}
+  />
 );
 
 const InfoItem = ({ title, icon, theme }) => (
@@ -85,7 +94,7 @@ const ColorItem = ({ title, description, theme, onPress }) => (
       justifyContent: 'space-between',
       alignItems: 'center',
     }}
-    android_ripple={{ color: theme.rippleColor }}
+    android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
     onPress={onPress}
   >
     <View>
@@ -107,7 +116,7 @@ const ColorItem = ({ title, description, theme, onPress }) => (
 );
 
 const Icon = ({ icon, theme }) => (
-  <PaperList.Icon color={theme.colorAccent} icon={icon} style={{ margin: 0 }} />
+  <PaperList.Icon color={theme.primary} icon={icon} style={{ margin: 0 }} />
 );
 
 export const List = {
@@ -126,6 +135,7 @@ const styles = StyleSheet.create({
     marginVertical: 0,
   },
   listSubHeader: {
+    fontWeight: 'bold',
     paddingBottom: 5,
   },
 });

src/components/List/List.tsx

@@ -1,15 +1,18 @@
 import React, { ReactNode } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, Text, View } from 'react-native';
+import color from 'color';
+import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 
 import { List as PaperList, Divider as PaperDivider } from 'react-native-paper';
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
+import { dividerColor } from '../../theme/colors';
 
 interface ListItemProps {
   title: string;
   description?: string | null;
   icon?: string;
   onPress?: () => void;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }
 
 const Section = ({ children }: { children: ReactNode }) => (
@@ -21,9 +24,9 @@ const SubHeader = ({
   theme,
 }: {
   children: ReactNode;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }) => (
-  <PaperList.Subheader style={{ color: theme.colorAccent }}>
+  <PaperList.Subheader style={{ color: theme.primary }}>
     {children}
   </PaperList.Subheader>
 );
@@ -44,7 +47,7 @@ const Item: React.FC<ListItemProps> = ({
       <View style={styles.iconContainer}>
         {icon && (
           <PaperList.Icon
-            color={theme.colorAccent}
+            color={theme.primary}
             icon={icon}
             style={styles.icon}
           />
@@ -52,33 +55,35 @@ const Item: React.FC<ListItemProps> = ({
       </View>
     )}
     onPress={onPress}
-    rippleColor={theme.rippleColor}
+    rippleColor={color(theme.primary).alpha(0.12).string()}
   />
 );
 
-const Divider = ({ theme }: { theme: ThemeTypeV1 }) => (
+const Divider = ({ theme }: { theme: MD3ThemeType }) => (
   <PaperDivider
-    style={[styles.divider, { backgroundColor: theme.dividerColor }]}
+    style={[styles.divider, { backgroundColor: dividerColor(theme.isDark) }]}
   />
 );
 
 const InfoItem = ({
   title,
-  icon,
+  icon = 'information-outline',
   theme,
 }: {
   title: string;
   icon: string;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }) => (
-  <PaperList.Item
-    title={title}
-    titleStyle={[{ color: theme.textColorSecondary }, styles.infoItem]}
-    titleNumberOfLines={5}
-    left={() =>
-      icon && <PaperList.Icon color={theme.textColorSecondary} icon={icon} />
-    }
-  />
+  <View style={styles.infoCtn}>
+    <MaterialIcon size={20} color={theme.onSurfaceVariant} name={icon} />
+    <Text style={[styles.infoMsg, { color: theme.onSurfaceVariant }]}>
+      {title}
+    </Text>
+  </View>
+);
+
+const Icon = ({ icon, theme }: { icon: string; theme: MD3ThemeType }) => (
+  <PaperList.Icon color={theme.primary} icon={icon} style={{ margin: 0 }} />
 );
 
 export default {
@@ -87,6 +92,7 @@ export default {
   Item,
   Divider,
   InfoItem,
+  Icon,
 };
 
 const styles = StyleSheet.create({
@@ -103,7 +109,12 @@ const styles = StyleSheet.create({
   icon: {
     marginVertical: 0,
   },
-  infoItem: {
-    fontSize: 14,
+  infoCtn: {
+    paddingVertical: 12,
+    paddingHorizontal: 16,
+  },
+  infoMsg: {
+    marginTop: 12,
+    fontSize: 12,
   },
 });

src/components/ListView.js

@@ -5,6 +5,8 @@ import FastImage from 'react-native-fast-image';
 import { defaultCoverUri } from '../sources/helpers/constants';
 import { coverPlaceholderColor } from '../theme/colors';
 
+import color from 'color';
+
 const ListView = ({
   item,
   downloadBadge,
@@ -17,10 +19,12 @@ const ListView = ({
 }) => {
   return (
     <Pressable
-      android_ripple={{ color: theme.rippleColor }}
+      android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
       style={[
         styles.listView,
-        isSelected && { backgroundColor: theme.rippleColor },
+        isSelected && {
+          backgroundColor: color(theme.primary).alpha(0.12).string(),
+        },
       ]}
       onPress={onPress}
       onLongPress={onLongPress}

src/components/LoadingMoreIndicator/LoadingMoreIndicator.tsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import { ActivityIndicator, StyleSheet } from 'react-native';
+import { MD3ThemeType } from '../../theme/types';
+
+interface Props {
+  theme: MD3ThemeType;
+}
+
+const LoadingMoreIndicator: React.FC<Props> = ({ theme }) => (
+  <ActivityIndicator color={theme.primary} style={styles.indicator} />
+);
+
+export default LoadingMoreIndicator;
+
+const styles = StyleSheet.create({
+  indicator: {
+    padding: 32,
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});

src/components/LoadingScreen/LoadingScreen.js

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

src/components/LoadingScreenV2/LoadingScreenV2.tsx

@@ -1,17 +1,10 @@
 import React from 'react';
 import { StyleSheet, ActivityIndicator } from 'react-native';
 
-import { Container } from '..';
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
 
-const LoadingScreen: React.FC<{ theme: ThemeTypeV1 }> = ({ theme }) => (
-  <Container>
-    <ActivityIndicator
-      size={50}
-      color={theme.colorAccent}
-      style={styles.indicator}
-    />
-  </Container>
+const LoadingScreen: React.FC<{ theme: MD3ThemeType }> = ({ theme }) => (
+  <ActivityIndicator size={50} color={theme.primary} style={styles.indicator} />
 );
 
 export default LoadingScreen;

src/components/NewUpdateDialog.js

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

src/components/NewUpdateDialog.tsx

@@ -0,0 +1,98 @@
+import React, { useState } from 'react';
+import { StyleSheet, View, Text, Dimensions } from 'react-native';
+import { Portal, Modal } from 'react-native-paper';
+import * as Linking from 'expo-linking';
+import { ScrollView } from 'react-native-gesture-handler';
+import Button, { ButtonVariation } from './Button/Button';
+import { getString } from '@strings/translations';
+import Markdown from 'react-native-markdown-display';
+import { dividerColor, getDialogBackground } from '@theme/colors';
+import { useTheme } from '@hooks/useTheme';
+
+interface NewUpdateDialogProps {
+  newVersion: {
+    tag_name: string;
+    body: string;
+    downloadUrl: string;
+  };
+}
+
+const NewUpdateDialog: React.FC<NewUpdateDialogProps> = ({ newVersion }) => {
+  const [newUpdateDialog, showNewUpdateDialog] = useState(true);
+
+  const theme = useTheme();
+
+  const modalHeight = Dimensions.get('window').height / 2;
+
+  return (
+    <Portal>
+      <Modal
+        visible={newUpdateDialog}
+        onDismiss={() => showNewUpdateDialog(false)}
+        contentContainerStyle={[
+          styles.containerStyle,
+          { backgroundColor: getDialogBackground(theme) },
+        ]}
+      >
+        <Text style={[styles.modalHeader, { color: theme.textColorPrimary }]}>
+          {`${getString('common.newUpdateAvailable')} ${newVersion.tag_name}`}
+        </Text>
+        <ScrollView style={{ height: modalHeight }}>
+          <Markdown
+            style={{
+              body: {
+                color: theme.textColorSecondary,
+                lineHeight: 20,
+                paddingVertical: 8,
+              },
+              hr: {
+                backgroundColor: dividerColor(theme.isDark),
+                marginVertical: 16,
+              },
+              code_inline: {
+                backgroundColor: getDialogBackground(theme),
+              },
+            }}
+          >
+            {newVersion.body}
+          </Markdown>
+        </ScrollView>
+        <View style={styles.buttonCtn}>
+          <Button
+            title={getString('common.cancel')}
+            theme={theme}
+            variation={ButtonVariation.CLEAR}
+            onPress={() => showNewUpdateDialog(false)}
+          />
+          <Button
+            title={getString('common.install')}
+            theme={theme}
+            variation={ButtonVariation.CLEAR}
+            onPress={() => Linking.openURL(newVersion.downloadUrl)}
+          />
+        </View>
+      </Modal>
+    </Portal>
+  );
+};
+
+export default NewUpdateDialog;
+
+const styles = StyleSheet.create({
+  containerStyle: {
+    padding: 20,
+    margin: 20,
+    borderRadius: 6,
+  },
+  modalHeader: {
+    fontWeight: 'bold',
+    fontSize: 20,
+    marginBottom: 16,
+  },
+  body: {},
+  buttonCtn: {
+    flexDirection: 'row',
+    marginTop: 16,
+    justifyContent: 'flex-end',
+  },
+});

src/components/NovelCover.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback } from 'react';
+import React, { memo, useMemo } from 'react';
 import {
   StyleSheet,
   View,
@@ -6,16 +6,16 @@ import {
   useWindowDimensions,
   Pressable,
 } from 'react-native';
+import color from 'color';
 
 import { LinearGradient } from 'expo-linear-gradient';
 import FastImage from 'react-native-fast-image';
-
 import ListView from './ListView';
 
 import { useDeviceOrientation } from '../services/utils/helpers';
-import { useSettings } from '../hooks/reduxHooks';
-import { defaultCoverUri } from '../sources/helpers/constants';
 import { coverPlaceholderColor } from '../theme/colors';
+import { useLibrarySettings } from '@hooks/useSettings';
+import { DisplayModes } from '@screens/library/constants/constants';
 
 const NovelCover = ({
   item,
@@ -26,43 +26,48 @@ const NovelCover = ({
   onLongPress,
   selectedNovels,
 }) => {
-  const { displayMode, novelsPerRow, showDownloadBadges, showUnreadBadges } =
-    useSettings();
+  const {
+    displayMode = DisplayModes.Comfortable,
+    showDownloadBadges = true,
+    showUnreadBadges = true,
+    novelsPerRow = 3,
+  } = useLibrarySettings();
 
   const window = useWindowDimensions();
 
   const orientation = useDeviceOrientation();
 
-  const getNovelsPerRow = () =>
-    orientation === 'landscape' ? 6 : novelsPerRow;
+  const numColumns = useMemo(
+    () => (orientation === 'landscape' ? 6 : novelsPerRow),
+    [orientation, novelsPerRow],
+  );
 
-  const getHeight = useCallback(
-    () => (window.width / getNovelsPerRow()) * (4 / 3),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [],
+  const coverHeight = useMemo(
+    () => (window.width / numColumns) * (4 / 3),
+    [numColumns],
   );
 
   const selectNovel = () => onLongPress && onLongPress(item.novelId);
 
   const uri = item.novelCover;
 
-  return displayMode !== 2 ? (
+  return displayMode !== DisplayModes.List ? (
     <View
       style={[
         {
-          flex: 1 / getNovelsPerRow(),
+          flex: 1 / numColumns,
           borderRadius: 6,
           overflow: 'hidden',
           margin: 2,
         },
         isSelected && {
-          backgroundColor: theme.colorAccent,
+          backgroundColor: theme.primary,
           opacity: 0.8,
         },
       ]}
     >
       <Pressable
-        android_ripple={{ color: theme.colorAccent }}
+        android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
         style={styles.opac}
         onPress={
           selectedNovels && selectedNovels.length > 0 ? selectNovel : onPress
@@ -76,6 +81,7 @@ const NovelCover = ({
               showUnreadBadges={showUnreadBadges}
               chaptersDownloaded={item.chaptersDownloaded}
               chaptersUnread={item.chaptersUnread}
+              theme={theme}
             />
           )}
           {showUnreadBadges && item.chaptersUnread && (
@@ -91,7 +97,7 @@ const NovelCover = ({
           source={{ uri }}
           style={[
             {
-              height: getHeight(),
+              height: coverHeight,
               borderRadius: 4,
               backgroundColor: coverPlaceholderColor,
             },
@@ -99,9 +105,11 @@ const NovelCover = ({
           ]}
         />
         <View style={styles.compactTitleContainer}>
-          {displayMode === 0 && <CompactTitle novelName={item.novelName} />}
+          {displayMode === DisplayModes.Compact && (
+            <CompactTitle novelName={item.novelName} />
+          )}
         </View>
-        {displayMode === 1 && (
+        {displayMode === DisplayModes.Comfortable && (
           <ComfortableTitle novelName={item.novelName} theme={theme} />
         )}
       </Pressable>
@@ -113,6 +121,7 @@ const NovelCover = ({
         showDownloadBadges &&
         item.chaptersDownloaded && (
           <DownloadBadge
+            theme={theme}
             showUnreadBadges={showUnreadBadges}
             chaptersDownloaded={item.chaptersDownloaded}
             chaptersUnread={item.chaptersUnread}
@@ -187,8 +196,8 @@ const InLibraryBadge = ({ theme }) => (
     style={[
       styles.inLibraryBadge,
       {
-        backgroundColor: theme.colorAccent,
-        color: theme.colorButtonText,
+        backgroundColor: theme.primary,
+        color: theme.onPrimary,
         borderRadius: 4,
       },
     ]}
@@ -214,8 +223,8 @@ const UnreadBadge = ({
         borderRadius: 4,
       },
       {
-        backgroundColor: theme.colorAccent,
-        color: theme.colorButtonText,
+        backgroundColor: theme.primary,
+        color: theme.onPrimary,
       },
     ]}
   >
@@ -227,6 +236,7 @@ const DownloadBadge = ({
   chaptersDownloaded,
   showUnreadBadges,
   chaptersUnread,
+  theme,
 }) => (
   <Text
     style={[
@@ -238,6 +248,10 @@ const DownloadBadge = ({
       !showUnreadBadges && {
         borderRadius: 4,
       },
+      {
+        backgroundColor: theme.tertiary,
+        color: theme.onTertiary,
+      },
     ]}
   >
     {chaptersDownloaded}
@@ -277,16 +291,13 @@ const styles = StyleSheet.create({
   },
 
   downloadBadge: {
-    backgroundColor: '#2979FF',
-    color: '#FFFFFF',
     borderTopLeftRadius: 4,
     borderBottomLeftRadius: 4,
     paddingTop: 2,
-    paddingHorizontal: 4,
+    paddingHorizontal: 5,
     fontSize: 12,
   },
   unreadBadge: {
-    color: '#FFFFFF',
     borderTopRightRadius: 4,
     borderBottomRightRadius: 4,
     paddingTop: 2,

src/components/NovelCover/NovelCover.tsx

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

src/components/NovelCover/NovelCoverBadges.tsx

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

src/components/NovelList.js

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

src/components/NovelList.tsx

@@ -0,0 +1,67 @@
+import { useLibrarySettings } from '@hooks/useSettings';
+import { DisplayModes } from '@screens/library/constants/constants';
+import React, { useCallback, useMemo } from 'react';
+import {
+  StyleSheet,
+  FlatList,
+  FlatListProps,
+  ListRenderItem,
+} from 'react-native';
+import { SourceNovelItem } from '../sources/types';
+import { LibraryNovelInfo, NovelInfo } from '../database/types';
+
+import { useDeviceOrientation } from '../services/utils/helpers';
+
+export type NovelListRenderItem = ListRenderItem<
+  LibraryNovelInfo | NovelInfo | SourceNovelItem
+>;
+
+const NovelList: React.FC<
+  FlatListProps<LibraryNovelInfo | NovelInfo | SourceNovelItem>
+> = props => {
+  const { displayMode = DisplayModes.Comfortable, novelsPerRow = 3 } =
+    useLibrarySettings();
+
+  const orientation = useDeviceOrientation();
+
+  const isListView = displayMode === DisplayModes.List;
+
+  const numColumns = useMemo(() => {
+    if (isListView) {
+      return 1;
+    }
+
+    if (orientation === 'landscape') {
+      return 6;
+    } else {
+      return novelsPerRow;
+    }
+  }, [isListView, orientation, novelsPerRow]);
+
+  const keyExtractor = useCallback(item => item.sourceId + item.novelUrl, []);
+
+  return (
+    <FlatList
+      contentContainerStyle={[
+        !isListView && styles.listView,
+        styles.flatListCont,
+      ]}
+      numColumns={numColumns}
+      key={numColumns}
+      keyExtractor={keyExtractor}
+      {...props}
+    />
+  );
+};
+
+export default NovelList;
+
+const styles = StyleSheet.create({
+  flatListCont: {
+    flexGrow: 1,
+    paddingBottom: 56,
+  },
+  listView: {
+    paddingHorizontal: 4,
+  },
+});

src/components/NovelList/NovelList.tsx

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

src/components/RadioButton.js

@@ -12,7 +12,7 @@ export const RadioButton = ({ value, label, theme, labelStyle }) => (
   <View style={styles.radioButtonContainer}>
     <MaterialRadioButton
       value={value}
-      color={theme.colorAccent}
+      color={theme.primary}
       uncheckedColor={theme.textColorSecondary}
     />
     <Text

src/components/RadioButton/RadioButton.tsx

@@ -1,8 +1,26 @@
 import React from 'react';
-import { Pressable, StyleSheet, Text } from 'react-native';
+import {
+  Pressable,
+  StyleProp,
+  StyleSheet,
+  Text,
+  TextStyle,
+  ViewStyle,
+} from 'react-native';
 import { RadioButton as PaperRadioButton } from 'react-native-paper';
+import { MD3ThemeType } from '../../theme/types';
+import color from 'color';
 
-export const RadioButton = ({
+interface Props {
+  label: string;
+  status: boolean;
+  onPress?: () => void;
+  style?: StyleProp<ViewStyle>;
+  labelStyle?: StyleProp<TextStyle>;
+  theme: MD3ThemeType;
+}
+
+export const RadioButton: React.FC<Props> = ({
   label,
   status,
   onPress,
@@ -11,19 +29,18 @@ export const RadioButton = ({
   theme,
 }) => (
   <Pressable
-    android_ripple={{ color: theme.rippleColor }}
+    android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
     style={[styles.pressable, style]}
     onPress={onPress}
   >
     <PaperRadioButton
       status={status ? 'checked' : 'unchecked'}
+      value={label}
       onPress={onPress}
-      color={theme.colorAccent}
+      color={theme.primary}
       uncheckedColor={theme.textColorSecondary}
     />
-    <Text
-      style={[labelStyle, { color: theme.textColorPrimary, marginLeft: 12 }]}
-    >
+    <Text style={[styles.label, labelStyle, { color: theme.onSurface }]}>
       {label}
     </Text>
   </Pressable>
@@ -41,4 +58,7 @@ const styles = StyleSheet.create({
     left: 24,
     alignSelf: 'center',
   },
+  label: {
+    marginLeft: 12,
+  },
 });

src/components/Searchbar/Searchbar.js

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

src/components/SearchbarV2/SearchbarV2.tsx

@@ -1,9 +1,10 @@
 import React, { useRef } from 'react';
 import { Pressable, StyleSheet, View, TextInput } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import color from 'color';
 
-import { IconButtonV2 } from '..';
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import IconButtonV2 from '../IconButtonV2/IconButtonV2';
+import { MD3ThemeType } from '../../theme/types';
 
 interface RightIcon {
   iconName: string;
@@ -21,7 +22,7 @@ interface SearcbarProps {
   handleBackAction?: () => void;
   clearSearchbar: () => void;
   onLeftIconPress?: () => void;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }
 
 const Searchbar: React.FC<SearcbarProps> = ({
@@ -39,24 +40,31 @@ const Searchbar: React.FC<SearcbarProps> = ({
   const searchbarRef = useRef<any>(null);
   const focusSearchbar = () => searchbarRef.current.focus();
 
-  const { top } = useSafeAreaInsets();
+  const { top, right, left } = useSafeAreaInsets();
   const marginTop = top + 8;
+  const marginRight = right + 16;
+  const marginLeft = left + 16;
 
   return (
     <View
       style={[
         styles.searchbarContainer,
-        { marginTop, backgroundColor: theme.searchBarColor },
+        {
+          marginTop,
+          marginRight,
+          marginLeft,
+          backgroundColor: color(theme.primary).alpha(0.08).string(),
+        },
       ]}
     >
       <Pressable
         onPress={focusSearchbar}
-        android_ripple={{ color: theme.rippleColor }}
+        android_ripple={{ color: color(theme.primary).alpha(12).toString() }}
         style={[styles.searchbar]}
       >
         <IconButtonV2
           name={handleBackAction ? 'arrow-left' : leftIcon}
-          color={theme.textColorPrimary}
+          color={theme.onSurface}
           onPress={() => {
             if (handleBackAction) {
               handleBackAction();
@@ -69,9 +77,9 @@ const Searchbar: React.FC<SearcbarProps> = ({
 
         <TextInput
           ref={searchbarRef}
-          style={[styles.textInput, { color: theme.textColorPrimary }]}
+          style={[styles.textInput, { color: theme.onSurface }]}
           placeholder={placeholder}
-          placeholderTextColor={theme.textColorSecondary}
+          placeholderTextColor={theme.onSurface}
           onChangeText={onChangeText}
           onSubmitEditing={onSubmitEditing}
           defaultValue={searchText}
@@ -79,7 +87,7 @@ const Searchbar: React.FC<SearcbarProps> = ({
         {searchText !== '' ? (
           <IconButtonV2
             name="close"
-            color={theme.textColorPrimary}
+            color={theme.onSurface}
             onPress={clearSearchbar}
             theme={theme}
           />
@@ -88,7 +96,7 @@ const Searchbar: React.FC<SearcbarProps> = ({
           <IconButtonV2
             key={index}
             name={icon.iconName}
-            color={icon.color || theme.textColorPrimary}
+            color={icon.color || theme.onSurface}
             onPress={icon.onPress}
             theme={theme}
           />
@@ -103,8 +111,8 @@ export default Searchbar;
 const styles = StyleSheet.create({
   searchbarContainer: {
     marginHorizontal: 16,
-    marginBottom: 16,
-    minHeight: 46,
+    marginBottom: 12,
+    minHeight: 56,
     borderRadius: 50,
     overflow: 'hidden',
     zIndex: 1,

src/components/Switch/Switch.js

@@ -1,21 +1,17 @@
 import React from 'react';
 import { Pressable, StyleSheet, View, Text } from 'react-native';
-
+import color from 'color';
 import { Switch, List } from 'react-native-paper';
 
 const SwitchSetting = ({ label, description, onPress, theme, icon, value }) => (
   <Pressable
-    android_ripple={{ color: theme.rippleColor }}
+    android_ripple={{ color: color(theme.primary).alpha(0.12).rgb().string() }}
     style={[styles.container, { paddingVertical: description ? 16 : 12 }]}
     onPress={onPress}
   >
     <View style={{ flexDirection: 'row', flex: 1 }}>
       {icon && (
-        <List.Icon
-          color={theme.colorAccent}
-          icon={icon}
-          style={{ margin: 0 }}
-        />
+        <List.Icon color={theme.primary} icon={icon} style={{ margin: 0 }} />
       )}
       <View style={[icon && { marginLeft: 16 }]}>
         <Text
@@ -36,7 +32,7 @@ const SwitchSetting = ({ label, description, onPress, theme, icon, value }) => (
     <Switch
       value={value}
       onValueChange={onPress}
-      color={theme.colorAccent}
+      color={theme.primary}
       style={{ marginLeft: 8 }}
     />
   </Pressable>

src/components/SwitchItem/SwitchItem.tsx

@@ -1,15 +1,16 @@
 import React from 'react';
 import { Pressable, StyleSheet, View, Text } from 'react-native';
+import color from 'color';
 
 import { Switch } from 'react-native-paper';
-import { ThemeTypeV1 } from '../../theme/v1/theme/types';
+import { MD3ThemeType } from '../../theme/types';
 
 interface SwitchItemProps {
   value: boolean;
   label: string;
   description?: string;
   onPress: () => void;
-  theme: ThemeTypeV1;
+  theme: MD3ThemeType;
 }
 
 const SwitchItem: React.FC<SwitchItemProps> = ({
@@ -20,7 +21,7 @@ const SwitchItem: React.FC<SwitchItemProps> = ({
   value,
 }) => (
   <Pressable
-    android_ripple={{ color: theme.rippleColor }}
+    android_ripple={{ color: color(theme.primary).alpha(0.12).string() }}
     style={[styles.container]}
     onPress={onPress}
   >
@@ -35,7 +36,7 @@ const SwitchItem: React.FC<SwitchItemProps> = ({
     <Switch
       value={value}
       onValueChange={onPress}
-      color={theme.colorAccent}
+      color={theme.primary}
       style={styles.switch}
     />
   </Pressable>
@@ -52,10 +53,10 @@ const styles = StyleSheet.create({
   },
   labelContainer: {
     flex: 1,
+    justifyContent: 'center',
   },
   label: {
     fontSize: 16,
-    textAlignVertical: 'center',
   },
   switch: {
     marginLeft: 8,

src/components/ThemePicker/ThemePicker.js

@@ -1,5 +1,7 @@
 import React from 'react';
 import { View, Text, /* StyleSheet, */ Pressable } from 'react-native';
+import { overlay } from 'react-native-paper';
+import color from 'color';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 export const ThemePicker = ({ theme, currentTheme, onPress }) => (
@@ -12,12 +14,12 @@ export const ThemePicker = ({ theme, currentTheme, onPress }) => (
   >
     <View
       style={{
-        backgroundColor: theme.colorPrimaryDark,
+        backgroundColor: theme.background,
         borderWidth: 3.6,
         borderColor:
           currentTheme.id === theme.id
-            ? theme.colorAccent
-            : currentTheme.colorPrimaryDark,
+            ? theme.primary
+            : currentTheme.background,
         width: 95,
         height: 140,
         borderRadius: 16,
@@ -29,10 +31,10 @@ export const ThemePicker = ({ theme, currentTheme, onPress }) => (
         {currentTheme.id === theme.id && (
           <MaterialCommunityIcons
             name="check"
-            color={theme.colorButtonText}
+            color={theme.onPrimary}
             size={15}
             style={{
-              backgroundColor: theme.colorAccent,
+              backgroundColor: theme.primary,
               position: 'absolute',
               top: 5,
               right: 5,
@@ -45,7 +47,7 @@ export const ThemePicker = ({ theme, currentTheme, onPress }) => (
         <View
           style={{
             height: 20,
-            backgroundColor: theme.colorPrimary,
+            backgroundColor: overlay(2, theme.surface),
             elevation: 1,
             justifyContent: 'center',
           }}
@@ -82,7 +84,7 @@ export const ThemePicker = ({ theme, currentTheme, onPress }) => (
                 height: 10,
                 width: 16,
                 marginLeft: 4,
-                backgroundColor: theme.colorAccent,
+                backgroundColor: theme.primary,
                 borderRadius: 50,
               }}
             />
@@ -114,7 +116,7 @@ export const ThemePicker = ({ theme, currentTheme, onPress }) => (
             left: 0,
             right: 0,
             height: 24,
-            backgroundColor: theme.colorPrimary,
+            backgroundColor: color(theme.primary).alpha(0.08).string(),
             justifyContent: 'center',
           }}
         >
@@ -141,7 +143,7 @@ export const ThemePicker = ({ theme, currentTheme, onPress }) => (
                 height: 12,
                 width: 12,
                 borderRadius: 50,
-                backgroundColor: theme.colorAccent,
+                backgroundColor: theme.primary,
               }}
             />
             <View

src/components/Typography/Typography.js

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