remove AppLayout
This commit is contained in:
@@ -1,32 +1,29 @@
|
||||
import React, {
|
||||
useState,
|
||||
useCallback,
|
||||
useEffect,
|
||||
setGlobal,
|
||||
useGlobal,
|
||||
} from "reactn";
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler";
|
||||
import "@expo/metro-runtime";
|
||||
import { PortalProvider } from "@gorhom/portal";
|
||||
import { DefaultTheme, NavigationContainer } from "@react-navigation/native";
|
||||
import { useFonts } from "expo-font";
|
||||
import * as SplashScreen from "expo-splash-screen";
|
||||
import { StatusBar } from "expo-status-bar";
|
||||
import { Platform } from "react-native";
|
||||
import { NavigationContainer, DefaultTheme } from "@react-navigation/native";
|
||||
import moment from "moment";
|
||||
import "moment/locale/fr";
|
||||
import "@expo/metro-runtime";
|
||||
import { PortalProvider } from "@gorhom/portal";
|
||||
import { Platform } from "react-native";
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler";
|
||||
import React, {
|
||||
setGlobal,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useGlobal,
|
||||
useState,
|
||||
} from "reactn";
|
||||
|
||||
import { MainStack, Routes } from "./src/navigation";
|
||||
import { Palette } from "./src/styles";
|
||||
|
||||
import { navigationRef, reset } from "./src/navigation/NavigationService";
|
||||
|
||||
import initialGlobalState from "./src/config/initialGlobalState";
|
||||
import { MenuProvider } from "react-native-popup-menu";
|
||||
import initialGlobalState from "./src/config/initialGlobalState";
|
||||
|
||||
import firebase from "./src/config/firebase";
|
||||
import Providers from "./src/providers";
|
||||
import AppLayout from "./src/layouts/AppLayout";
|
||||
import {
|
||||
Inter_400Regular,
|
||||
Inter_400Regular_Italic,
|
||||
@@ -34,10 +31,12 @@ import {
|
||||
Inter_600SemiBold,
|
||||
Inter_700Bold,
|
||||
} from "@expo-google-fonts/inter";
|
||||
import firebase from "./src/config/firebase";
|
||||
import Providers from "./src/providers";
|
||||
|
||||
import "./src/utils/Sheet";
|
||||
import {LogBox} from "react-native";
|
||||
import { LogBox } from "react-native";
|
||||
import CommentsBottomSheet from "./src/components/bottomsheets/CommentsBottomSheet";
|
||||
import "./src/utils/Sheet";
|
||||
|
||||
console.disableYellowBox = true;
|
||||
console.reportErrorsAsExceptions = false;
|
||||
@@ -120,32 +119,41 @@ const App = () => {
|
||||
|
||||
<GestureHandlerRootView
|
||||
onLayout={onLayoutRootView}
|
||||
style={[{ flex: 1, backgroundColor: Platform.OS === 'web' ? 'transparent' : Palette.darkPurple }]}
|
||||
style={[
|
||||
{
|
||||
flex: 1,
|
||||
backgroundColor:
|
||||
Platform.OS === "web" ? "transparent" : Palette.darkPurple,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PortalProvider>
|
||||
<Providers>
|
||||
<MenuProvider>
|
||||
<AppLayout currentUID={currentUID}>
|
||||
<NavigationContainer
|
||||
theme={{
|
||||
...DefaultTheme,
|
||||
colors: {
|
||||
...DefaultTheme.colors,
|
||||
background: Platform.OS === 'web' ? 'transparent' : Palette.darkPurple,
|
||||
},
|
||||
}}
|
||||
ref={navigationRef}
|
||||
documentTitle={{
|
||||
formatter: (options) =>
|
||||
options?.title
|
||||
? `${options?.title} - minuit.starter`
|
||||
: "minuit.starter",
|
||||
}}
|
||||
>
|
||||
<MainStack />
|
||||
</NavigationContainer>
|
||||
<CommentsBottomSheet />
|
||||
</AppLayout>
|
||||
{/* <AppLayout currentUID={currentUID}> */}
|
||||
<NavigationContainer
|
||||
theme={{
|
||||
...DefaultTheme,
|
||||
colors: {
|
||||
...DefaultTheme.colors,
|
||||
background:
|
||||
Platform.OS === "web"
|
||||
? "transparent"
|
||||
: Palette.darkPurple,
|
||||
},
|
||||
}}
|
||||
ref={navigationRef}
|
||||
documentTitle={{
|
||||
formatter: (options) =>
|
||||
options?.title
|
||||
? `${options?.title} - minuit.starter`
|
||||
: "minuit.starter",
|
||||
}}
|
||||
>
|
||||
<MainStack />
|
||||
</NavigationContainer>
|
||||
<CommentsBottomSheet />
|
||||
{/* </AppLayout> */}
|
||||
</MenuProvider>
|
||||
</Providers>
|
||||
</PortalProvider>
|
||||
|
||||
Reference in New Issue
Block a user