commit e53973e3364c8c3c20f16b5ec6f9db98ed03f47b · gmstn.systems/gemstone-app

+18 -7

src/app/(protected)/_layout.tsx

···

       1
       1
        
       import { SessionGate } from "@/components/Auth/SessionGate";

     

       2
       2
       +
       import { ChannelsDrawer } from "@/components/Navigation/ChannelsDrawer";

     

       2
       3
        
       import { TopBar } from "@/components/Navigation/TopBar";

     

       3
       4
        
       import { Stack } from "@/components/primitives/Stack";

     

       4
       5
        
       import { AuthedProviders } from "@/providers/authed";

     

       5
       6
        
       import { useCurrentPalette } from "@/providers/ThemeProvider";

     

       7
       7
       +
       import { View } from "react-native";

     

       6
       8
        
       

     

       7
       9
        
       export default function ProtectedLayout() {

     

       8
       10
        
           const { semantic } = useCurrentPalette();

     

       9
       11
        
           return (

     

       10
       12
        
               <SessionGate>

     

       11
       13
        
                   <AuthedProviders>

     

       12
       12
       -
                       <TopBar />

     

       13
       13
       -
                       <Stack

     

       14
       14
       -
                           screenOptions={{

     

       15
       15
       -
                               contentStyle: {

     

       16
       16
       -
                                   backgroundColor: semantic.background,

     

       17
       17
       -
                               },

     

       14
       14
       +
                       <View

     

       15
       15
       +
                           style={{

     

       16
       16
       +
                               flexDirection: "column",

     

       17
       17
       +
                               flex: 1,

     

       18
       18
       +
                               backgroundColor: semantic.background,

     

       18
       19
        
                           }}

     

       19
       19
       -
                       />

     

       20
       20
       +
                       >

     

       21
       21
       +
                           <TopBar />

     

       22
       22
       +
                           <ChannelsDrawer />

     

       23
       23
       +
                           <Stack

     

       24
       24
       +
                               screenOptions={{

     

       25
       25
       +
                                   contentStyle: {

     

       26
       26
       +
                                       backgroundColor: semantic.background,

     

       27
       27
       +
                                   },

     

       28
       28
       +
                               }}

     

       29
       29
       +
                           />

     

       30
       30
       +
                       </View>

     

       20
       31
        
                   </AuthedProviders>

     

       21
       32
        
               </SessionGate>

     

       22
       33
        
           );

+2 -14

src/app/_layout.tsx

···

       1
       1
       -
       import { Stack } from "@/components/primitives/Stack";

     

       2
       1
        
       import { isDevMode } from "@/lib/utils/env";

     

       3
       2
        
       import { RootProviders } from "@/providers";

     

       4
       4
       -
       import { useCurrentPalette } from "@/providers/ThemeProvider";

     

       5
       3
        
       import {

     

       6
       4
        
           Lexend_100Thin,

     

       7
       5
        
           Lexend_200ExtraLight,

     
···

       14
       12
        
           Lexend_900Black,

     

       15
       13
        
           useFonts,

     

       16
       14
        
       } from "@expo-google-fonts/lexend";

     

       17
       17
       -
       import { SplashScreen } from "expo-router";

     

       15
       15
       +
       import { Slot, SplashScreen } from "expo-router";

     

       18
       16
        
       import { useEffect } from "react";

     

       19
       17
        
       import { Platform } from "react-native";

     

       20
       18
        
       

     
···

       31
       29
        
               Lexend_900Black,

     

       32
       30
        
           });

     

       33
       31
        
       

     

       34
       34
       -
           const { semantic } = useCurrentPalette();

     

       35
       35
       -
       

     

       36
       32
        
           useEffect(() => {

     

       37
       33
        
               if (!isDevMode) return;

     

       38
       34
        
               if (Platform.OS === "web" && typeof window !== "undefined") {

     
···

       63
       59
        
               return null;

     

       64
       60
        
           }

     

       65
       61
        
       

     

       66
       66
       -
           return (

     

       67
       67
       -
               <Stack

     

       68
       68
       -
                   screenOptions={{

     

       69
       69
       -
                       contentStyle: {

     

       70
       70
       -
                           backgroundColor: semantic.background,

     

       71
       71
       -
                       },

     

       72
       72
       -
                   }}

     

       73
       73
       -
               />

     

       74
       74
       -
           );

     

       62
       62
       +
           return <Slot />;

     

       75
       63
        
       };

     

       76
       64
        
       

     

       77
       65
        
       const RootLayout = () => {