Merge e63c841 into 0cbbc05

lifeomic · Feb 6, 2024 · f292134 · f292134
2 parents 0cbbc05 + e63c841
commit f292134
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/common/RootProviders.tsx b/src/common/RootProviders.tsx
@@ -8,7 +8,11 @@ import { useDeveloperConfig } from '../hooks/useDeveloperConfig';
 import { BrandConfigProvider } from '../components/BrandConfigProvider';
 import { NoInternetToastProvider } from '../hooks/NoInternetToastProvider';
 import { ActionSheetProvider } from '@expo/react-native-action-sheet';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { Theme } from '@react-navigation/native';
+import {
+  SafeAreaProvider,
+  SafeAreaProviderProps,
+} from 'react-native-safe-area-context';
 import { ThemedNavigationContainer } from './ThemedNavigationContainer';
 import { LoggedInProviders } from './LoggedInProviders';
 import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
@@ -21,12 +25,15 @@ const queryClient = new QueryClient();
 export type RootProvidersProps = {
   account: string;
   authConfig: AuthConfiguration | AuthConfigGetter;
+  safeAreaProviderProps?: SafeAreaProviderProps;
+  navigationTheme?: Theme;
   children?: React.ReactNode;
 };
 
 export function RootProviders({
   account,
   authConfig,
+  safeAreaProviderProps,
   children,
 }: RootProvidersProps) {
   const { apiBaseURL, theme, brand } = useDeveloperConfig();
@@ -41,7 +48,7 @@ export function RootProviders({
                 <BrandConfigProvider theme={theme} {...brand}>
                   <NoInternetToastProvider>
                     <ActionSheetProvider>
-                      <SafeAreaProvider>
+                      <SafeAreaProvider {...safeAreaProviderProps}>
                         <ThemedNavigationContainer>
                           <Toast />
                           <LoggedInProviders>

diff --git a/src/common/ThemedNavigationContainer.tsx b/src/common/ThemedNavigationContainer.tsx
@@ -5,22 +5,24 @@ import {
   NavigationContainer,
   Theme,
 } from '@react-navigation/native';
-import { useTheme } from 'react-native-paper';
 import { useDeveloperConfig } from '../hooks';
 
 export const navigationRef = createNavigationContainerRef();
 
 interface Props {
   children?: React.ReactNode;
+  navigationTheme?: Theme;
 }
 
-export function ThemedNavigationContainer({ children }: Props) {
-  const theme = useTheme<Theme>();
+export function ThemedNavigationContainer({
+  children,
+  navigationTheme,
+}: Props) {
   const { navigationLinking } = useDeveloperConfig();
 
   return (
     <NavigationContainer
-      theme={theme}
+      theme={navigationTheme}
       ref={navigationRef}
       linking={navigationLinking}
     >