resolve conflict in ch-github-actions-setup branch

app.json

@@ -2,11 +2,11 @@
   "expo": {
     "name": "matadors-rn-medica",
     "slug": "matadors-rn-medica",
+    "scheme": "matadors-rn-medica",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
-    "scheme": "myapp",
-    "userInterfaceStyle": "automatic",
+    "userInterfaceStyle": "dark",
     "splash": {
       "image": "./assets/images/splash.png",
       "resizeMode": "contain",

app/(app)/HomeScreen.tsx

@@ -0,0 +1,5 @@
+interface Props {}
+
+export default function HomeScreen({}: Props) {
+  return <></>;
+}

app/(auth)/SignIn&SignOut/SetYourFingerPrint.tsx

@@ -0,0 +1,11 @@
+import { Text, View } from "@/components/Themed";
+import { LeftArrow } from "@/components/UI/icons";
+import { SvgUri, SvgXml } from "react-native-svg";
+
+export default function SetYourFingerPrint() {
+  return (
+    <>
+      <Text>Set Your Finger Print</Text>
+    </>
+  );
+}

app/(auth)/_layout.tsx

@@ -0,0 +1,17 @@
+import Header from "@/components/UI/Header";
+import { Stack } from "expo-router";
+
+export default function AuthLayout() {
+  return (
+    <Stack initialRouteName="SignIn&SignOut/SetYourFingerPrint">
+      <Stack.Screen
+        name="SignIn&SignOut/SetYourFingerPrint"
+        options={{
+          header: () => {
+            return <Header />;
+          },
+        }}
+      />
+    </Stack>
+  );
+}

app/_layout.tsx

@@ -1,28 +1,36 @@
-import FontAwesome from '@expo/vector-icons/FontAwesome';
-import { DarkTheme, DefaultTheme, ThemeProvider } from '@react-navigation/native';
-import { useFonts } from 'expo-font';
-import { Stack } from 'expo-router';
-import * as SplashScreen from 'expo-splash-screen';
-import { useEffect } from 'react';
+import FontAwesome from "@expo/vector-icons/FontAwesome";
+import {
+  DarkTheme,
+  DefaultTheme,
+  ThemeProvider,
+} from "@react-navigation/native";
+import { useFonts } from "expo-font";
+import { Stack } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
 
-import { useColorScheme } from '@/components/useColorScheme';
+import { useEffect, useState } from "react";
+
+import { useColorScheme } from "@/components/useColorScheme";
 
 export {
   // Catch any errors thrown by the Layout component.
   ErrorBoundary,
-} from 'expo-router';
+} from "expo-router";
 
 export const unstable_settings = {
   // Ensure that reloading on `/modal` keeps a back button present.
-  initialRouteName: '(tabs)',
+  initialRouteName: "(auth)",
 };
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
 
 export default function RootLayout() {
   const [loaded, error] = useFonts({
-    SpaceMono: require('../assets/fonts/SpaceMono-Regular.ttf'),
+    Medium: require("../assets/fonts/Urbanist-Medium.ttf"),
+    SemiBold: require("../assets/fonts/Urbanist-SemiBold.ttf"),
+    Bold: require("../assets/fonts/Urbanist-Bold.ttf"),
+    Regular: require("../assets/fonts/Urbanist-Regular.ttf"),
     ...FontAwesome.font,
   });
 
@@ -48,10 +56,10 @@ function RootLayoutNav() {
   const colorScheme = useColorScheme();
 
   return (
-    <ThemeProvider value={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
-      <Stack>
-        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="modal" options={{ presentation: 'modal' }} />
+    <ThemeProvider value={colorScheme === "light" ? DarkTheme : DefaultTheme}>
+      <Stack initialRouteName="(auth)">
+        <Stack.Screen name="(auth)" options={{ headerShown: false }} />
+        <Stack.Screen name="modal" options={{ presentation: "modal" }} />
       </Stack>
     </ThemeProvider>
   );

app/index.tsx

@@ -0,0 +1,17 @@
+import { Text } from "@/components/Themed";
+import { router } from "expo-router";
+import { useEffect } from "react";
+
+export default function Index() {
+  useEffect(() => {
+    setTimeout(() => {
+      router.push("/(auth)/SignIn&SignOut/SetYourFingerPrint");
+    }, 2000);
+  });
+
+  return (
+    <>
+      <Text>Onboarding Screen</Text>
+    </>
+  );
+}

components/StyledText.tsx

@@ -1,5 +1,5 @@
-import { Text, TextProps } from './Themed';
+import { Text, TextProps } from "./Themed";
 
 export function MonoText(props: TextProps) {
-  return <Text {...props} style={[props.style, { fontFamily: 'SpaceMono' }]} />;
+  return <Text {...props} style={[props.style]} />;
 }

components/Themed.tsx

@@ -3,24 +3,24 @@
  * https://docs.expo.io/guides/color-schemes/
  */
 
-import { Text as DefaultText, View as DefaultView } from 'react-native';
+import { Text as DefaultText, View as DefaultView } from "react-native";
 
-import Colors from '@/constants/Colors';
-import { useColorScheme } from './useColorScheme';
+import Colors from "@/constants/Colors";
+import { useColorScheme } from "./useColorScheme";
 
 type ThemeProps = {
   lightColor?: string;
   darkColor?: string;
 };
 
-export type TextProps = ThemeProps & DefaultText['props'];
-export type ViewProps = ThemeProps & DefaultView['props'];
+export type TextProps = ThemeProps & DefaultText["props"];
+export type ViewProps = ThemeProps & DefaultView["props"];
 
 export function useThemeColor(
   props: { light?: string; dark?: string },
   colorName: keyof typeof Colors.light & keyof typeof Colors.dark
 ) {
-  const theme = useColorScheme() ?? 'light';
+  const theme = useColorScheme() ?? "light";
   const colorFromProps = props[theme];
 
   if (colorFromProps) {
@@ -32,14 +32,17 @@ export function useThemeColor(
 
 export function Text(props: TextProps) {
   const { style, lightColor, darkColor, ...otherProps } = props;
-  const color = useThemeColor({ light: lightColor, dark: darkColor }, 'text');
+  const color = useThemeColor({ light: lightColor, dark: darkColor }, "text");
 
   return <DefaultText style={[{ color }, style]} {...otherProps} />;
 }
 
 export function View(props: ViewProps) {
   const { style, lightColor, darkColor, ...otherProps } = props;
-  const backgroundColor = useThemeColor({ light: lightColor, dark: darkColor }, 'background');
+  const backgroundColor = useThemeColor(
+    { light: lightColor, dark: darkColor },
+    "background"
+  );
 
   return <DefaultView style={[{ backgroundColor }, style]} {...otherProps} />;
 }

components/UI/Header.tsx

@@ -0,0 +1,5 @@
+import { View } from "../Themed";
+
+export default function Header() {
+  return <View style={{}}></View>;
+}

components/UI/icons.tsx

@@ -0,0 +1,16 @@
+import { Path, Svg } from "react-native-svg";
+
+export function LeftArrow({ fillColor }: { fillColor: string }) {
+  return (
+    <Svg width="28" height="28" viewBox="0 0 28 28" fill="none">
+      <Path
+        d="M23.333 14.32C23.333 14.763 23.0038 15.1291 22.5767 15.187L22.458 15.195L4.95801 15.195C4.47476 15.195 4.08301 14.8033 4.08301 14.32C4.08301 13.877 4.41219 13.5109 4.83928 13.453L4.95801 13.445L22.458 13.445C22.9413 13.445 23.333 13.8368 23.333 14.32Z"
+        fill={fillColor}
+      />
+      <Path
+        d="M12.634 20.7284C12.9764 21.0694 12.9776 21.6234 12.6367 21.9659C12.3267 22.2772 11.8406 22.3065 11.4975 22.053L11.3992 21.9685L4.34088 14.9405C4.02864 14.6296 4.00024 14.1418 4.25568 13.7988L4.34083 13.7005L11.3992 6.67132C11.7416 6.33032 12.2956 6.33147 12.6366 6.67388C12.9466 6.98517 12.9738 7.47134 12.719 7.81336L12.634 7.91132L6.19867 14.3208L12.634 20.7284Z"
+        fill={fillColor}
+      />
+    </Svg>
+  );
+}

components/useColorScheme.web.ts

@@ -4,5 +4,5 @@
 // to render different styles on the client and server, these aren't directly supported in React Native
 // but can be achieved using a styling library like Nativewind.
 export function useColorScheme() {
-  return 'light';
+  return "light";
 }