Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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>
);
};
Expand Down
1 change: 1 addition & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
89 changes: 40 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"android": {
"javaPackageName": "com.lnreader.spec"
},
"ios": {
"ios": {
"modulesProvider": {
"NativeEpubUtil": "RCTNativeEpubUtil",
"NativeFile": "RCTNativeFile",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Actionbar/Actionbar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useTheme } from '@hooks/persisted';
import { useTheme } from '@providers/Providers';
import React from 'react';
import {
Dimensions,
Expand All @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppErrorBoundary/AppErrorBoundary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
Loading