Commit 8ee7813e authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

Se agregó el fondo animado al carrusel

See merge request !13
parents 7dd3c1d4 5531e5bf

mobile/app.json

+21 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
    "version": "1.0.0",

    "orientation": "portrait",

    "icon": "./assets/icon.png",

    "userInterfaceStyle": "light",

    "userInterfaceStyle": "automatic",

    "splash": {

      "image": "./assets/splash.png",

      "resizeMode": "contain",
@@ -29,6 +29,26 @@ 
      "favicon": "./assets/favicon.png"

    },

    "plugins": [

      [

        "expo-screen-orientation",

        {

          "initialOrientation": "DEFAULT"

        }

      ],

      [

        "expo-camera",

        {

          "cameraPermission": "Allow $(PRODUCT_NAME) to access your camera",

          "microphonePermission": "Allow $(PRODUCT_NAME) to access your microphone",

          "recordAudioAndroid": true

        }

      ],

      [

        "expo-image-picker",

        {

          "photosPermission": "The app accesses your photos to let you share them with your friends."

        }

      ],

      "expo-router",

      "expo-secure-store"

    ],

mobile/app/(tabs)/_layout.tsx

+7 −0
Original line number Diff line number Diff line
@@ -17,7 +17,14 @@ export default function Layout() { 
      screenOptions={{

        tabBarActiveTintColor: LIGTHT_THEME.color.primary,

        tabBarInactiveTintColor: LIGTHT_THEME.color.secondary,

        headerStyle: {

          backgroundColor: LIGTHT_THEME.color.primary,

        },

        headerTitleStyle: {

          color: LIGTHT_THEME.color.white,

        },

        headerTitleAlign: "center",

        

      }}

    >

      <Tabs.Screen

mobile/app/_layout.tsx

+21 −9
Original line number Diff line number Diff line
@@ -3,13 +3,18 @@ import { DataContextProvider } from "../src/contexts/data_context"; 
import { LIGTHT_THEME } from "../src/constants/theme";

import { AuthContextProvider, useAuth } from "../src/contexts/auth_context";

import { ActivityIndicator } from "react-native";

import { GestureHandlerRootView } from "react-native-gesture-handler";



export default function Root() {

  return <DataContextProvider>

  return (

    <GestureHandlerRootView style={{ flex: 1 }}>

      <DataContextProvider>

        <AuthContextProvider>

          <MainLayout />

        </AuthContextProvider>

  </DataContextProvider>;

      </DataContextProvider>

    </GestureHandlerRootView>

  );

}



const MainLayout = () => {
@@ -20,12 +25,12 @@ const MainLayout = () => { 
  }

  

  return (

    <Stack initialRouteName="(tabs)" screenOptions={{}}>

      <Stack.Screen name="(tabs)" options={{ headerShown: false }} />

    <Stack initialRouteName="(tabs)" >

      <Stack.Screen name="(tabs)" options={{ headerShown: false, statusBarColor: LIGTHT_THEME.color.primary }} />

      <Stack.Screen

        name="(modal)/[id]"

        name="state"

        options={{

          title: "Select town",

          headerShown: false,

          statusBarColor: LIGTHT_THEME.color.primary,

        }}

      />
@@ -44,6 +49,13 @@ const MainLayout = () => { 
          }

        }

      />

      <Stack.Screen

        name="profile"

        options={{

          title: "Profile",

          headerShown: false,

        }}

      />

    </Stack>

  );

};

mobile/app/profile/_layout.tsx

0 → 100644
+12 −0
Original line number Diff line number Diff line 
import { Stack } from "expo-router";



export default function Layout() {

    return (

        <Stack>

            <Stack.Screen name="edit" options={{

                title: "Edit Profile",

                headerShown: true,

            }}/>

        </Stack>

    );

}
 
 No newline at end of file

mobile/app/profile/edit.tsx

0 → 100644
+7 −0
Original line number Diff line number Diff line 
import { EditProfilePage } from "../../src/screens/edit_profile/edit_profile_page";



export default function EditProfileScreen() {

    return (

        <EditProfilePage />

    );

}
 
 No newline at end of file