Merge pull request #40 from CD-Z/useNovel_Refactor

Use novel refactor

Author: Palloxin

App.tsx

@@ -16,6 +16,7 @@ import AppErrorBoundary from '@components/AppErrorBoundary/AppErrorBoundary';
 
 import Main from './src/navigators/Main';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
+import { Providers } from './src/providers/Providers';
 
 Notifications.setNotificationHandler({
   handleNotification: async () => {
@@ -33,16 +34,18 @@ LottieSplashScreen.hide();
 const App = () => {
   return (
     <GestureHandlerRootView style={styles.flex}>
-      <AppErrorBoundary>
-        <SafeAreaProvider>
-          <PaperProvider>
-            <BottomSheetModalProvider>
-              <StatusBar translucent={true} backgroundColor="transparent" />
-              <Main />
-            </BottomSheetModalProvider>
-          </PaperProvider>
-        </SafeAreaProvider>
-      </AppErrorBoundary>
+      <Providers>
+        <AppErrorBoundary>
+          <SafeAreaProvider>
+            <PaperProvider>
+              <BottomSheetModalProvider>
+                <StatusBar translucent={true} backgroundColor="transparent" />
+                <Main />
+              </BottomSheetModalProvider>
+            </PaperProvider>
+          </SafeAreaProvider>
+        </AppErrorBoundary>
+      </Providers>
     </GestureHandlerRootView>
   );
 };

babel.config.js

@@ -20,6 +20,7 @@ module.exports = function (api) {
             '@strings': './strings',
             '@services': './src/services',
             '@plugins': './src/plugins',
+            '@providers': './src/providers',
             '@utils': './src/utils',
             '@theme': './src/theme',
             '@navigators': './src/navigators',

package-lock.json

@@ -25,7 +25,7 @@
     "android": {
       "javaPackageName": "com.lnreader.spec"
     },
-    "ios": { 
+    "ios": {
       "modulesProvider": {
         "NativeEpubUtil": "RCTNativeEpubUtil",
         "NativeFile": "RCTNativeFile",
@@ -96,8 +96,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",
-    "@babel/preset-env": "7.25.3",
-    "@babel/runtime": "7.25.0",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/runtime": "^7.25.0",
     "@react-native-community/cli": "^18.0.0",
     "@react-native-community/cli-platform-android": "^18.0.0",
     "@react-native-community/cli-platform-ios": "^18.0.0",
@@ -111,7 +111,7 @@
     "@types/react": "19.1.3",
     "@types/sanitize-html": "^2.11.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "babel-plugin-react-compiler": "19.1.0-rc.1",
+    "babel-plugin-react-compiler": "19.1.0-rc.2",
     "eslint": "^8.19.0",
     "husky": "^7.0.4",
     "lint-staged": "^12.3.7",

package.json

@@ -1,4 +1,4 @@
-import { useTheme } from '@hooks/persisted';
+import { useTheme } from '@providers/Providers';
 import React from 'react';
 import {
   Dimensions,
@@ -12,12 +12,12 @@ import MaterialCommunityIcons from '@react-native-vector-icons/material-design-i
 import { MaterialDesignIconName } from '@type/icon';
 import Animated, { SlideInDown, SlideOutDown } from 'react-native-reanimated';
 
-type Action = {
+export type Action = {
   icon: MaterialDesignIconName;
   onPress: () => void;
 };
 
-interface ActionbarProps {
+export interface ActionbarProps {
   active: boolean;
   actions: Action[];
   viewStyle?: StyleProp<ViewStyle>;

src/components/Actionbar/Actionbar.tsx

@@ -3,7 +3,7 @@ import { StyleSheet, View, Text, StatusBar } from 'react-native';
 import ErrorBoundary from 'react-native-error-boundary';
 
 import { Button, List } from '@components';
-import { useTheme } from '@hooks/persisted';
+import { useTheme } from '@providers/Providers';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
 interface ErrorFallbackProps {

src/components/AppErrorBoundary/AppErrorBoundary.tsx

@@ -4,7 +4,7 @@ import {
   ButtonProps as PaperButtonProps,
 } from 'react-native-paper';
 
-import { useTheme } from '@hooks/persisted';
+import { useTheme } from '@providers/Providers';
 import { ThemeProp } from 'react-native-paper/lib/typescript/types';
 
 interface ButtonProps extends Partial<PaperButtonProps> {