diff --git a/.gitignore b/.gitignore index ec8a36a..6623142 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,9 @@ web-build/ # macOS .DS_Store + +# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb +# The following patterns were generated by expo-cli + +expo-env.d.ts +# @end expo-cli \ No newline at end of file diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx index 22a49b6..0edcba2 100644 --- a/app/(tabs)/_layout.tsx +++ b/app/(tabs)/_layout.tsx @@ -1,21 +1,28 @@ -import { Tabs } from 'expo-router'; -import React from 'react'; - -import { TabBarIcon } from '@/components/navigation/TabBarIcon'; +import { Tabs } from "expo-router"; +import { TabBarIcon } from '@/components/default/navigation/TabBarIcon'; import { Colors } from '@/constants/Colors'; import { useColorScheme } from '@/hooks/useColorScheme'; -export default function TabLayout() { - const colorScheme = useColorScheme(); +const TabLayout = () => { + const scheme = useColorScheme() ?? 'light'; return ( + headerStyle: { + backgroundColor: Colors[scheme].background, + }, + headerShadowVisible: false, + headerTintColor: Colors[scheme].tint, + tabBarStyle: { + backgroundColor: Colors[scheme].background, + }, + }} + > ( @@ -24,14 +31,15 @@ export default function TabLayout() { }} /> ( - + ), }} /> ); -} +}; +export default TabLayout; diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx index 324aeb7..4662e77 100644 --- a/app/(tabs)/index.tsx +++ b/app/(tabs)/index.tsx @@ -1,70 +1,34 @@ -import { Image, StyleSheet, Platform } from 'react-native'; +import { StyleSheet } from "react-native"; +import { ThemedText } from "@/components/ThemedText"; +import { ThemedView } from "@/components/ThemedView"; -import { HelloWave } from '@/components/HelloWave'; -import ParallaxScrollView from '@/components/ParallaxScrollView'; -import { ThemedText } from '@/components/ThemedText'; -import { ThemedView } from '@/components/ThemedView'; +import Button from "@/components/buttons/Button"; -export default function HomeScreen() { +const Index = () => { return ( - - }> - - Welcome! - + + + Home Screen + + +