diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx index 11ace04..eb39d68 100644 --- a/app/(tabs)/index.tsx +++ b/app/(tabs)/index.tsx @@ -1,18 +1,22 @@ import { Image, StyleSheet, Platform } from 'react-native'; import ParallaxScrollView from '@/components/default/ParallaxScrollView'; import { ThemedText, ThemedView } from '@/components/theme/Theme'; +import { Colors } from '@/constants/Colors'; +import { useColorScheme } from '@/hooks/useColorScheme'; const HomeScreen = () => { + const scheme = useColorScheme() ?? 'dark'; return ( } + headerTitle={ + Tech Tracker + } > Welcome! @@ -64,10 +68,20 @@ const styles = StyleSheet.create({ marginBottom: 8, }, reactLogo: { - height: 178, - width: 290, - bottom: 0, - left: 0, + height: 80, + width: 82, + bottom: 10, + left: 10, position: 'absolute', }, + headerTitle: { + position: 'absolute', + bottom: 20, + left: 40, + right: 0, + textAlign: 'center', + fontSize: 48, + lineHeight: 64, + fontWeight: 'bold', + }, }); diff --git a/app/(tabs)/settings.tsx b/app/(tabs)/settings.tsx index 406376e..c772ba4 100644 --- a/app/(tabs)/settings.tsx +++ b/app/(tabs)/settings.tsx @@ -44,7 +44,7 @@ const TabTwoScreen = () => { @3x suffixes to provide files for different screen densities - + Learn more diff --git a/components/default/ParallaxScrollView.tsx b/components/default/ParallaxScrollView.tsx index 2af4f0a..ac2a573 100644 --- a/components/default/ParallaxScrollView.tsx +++ b/components/default/ParallaxScrollView.tsx @@ -1,28 +1,31 @@ import type { PropsWithChildren, ReactElement } from 'react'; -import { StyleSheet } from 'react-native'; +import { StyleSheet, ViewStyle, StyleProp } from 'react-native'; import Animated, { interpolate, useAnimatedRef, useAnimatedStyle, useScrollViewOffset, } from 'react-native-reanimated'; -import { ThemedView } from '@/components/theme/Theme'; +import { ThemedText, ThemedView } from '@/components/theme/Theme'; import { useBottomTabOverflow } from '@/components/ui/TabBarBackground'; +import { Colors } from '@/constants/Colors'; import { useColorScheme } from '@/hooks/useColorScheme'; -const HEADER_HEIGHT = 250; +const HEADER_HEIGHT = 150; type Props = PropsWithChildren<{ - headerImage: ReactElement; - headerBackgroundColor: { dark: string; light: string }; + headerImage?: ReactElement; + headerBackgroundColor?: { dark: string; light: string }; headerHeight?: number; + headerTitle?: ReactElement; }>; const ParallaxScrollView = ({ children, - headerImage, - headerBackgroundColor, + headerImage = , + headerBackgroundColor = { light: Colors.light.accent, dark: Colors.dark.accent }, headerHeight = HEADER_HEIGHT, + headerTitle = , }: Props) => { const scheme = useColorScheme() ?? 'dark'; const scrollRef = useAnimatedRef(); @@ -64,6 +67,7 @@ const ParallaxScrollView = ({ ]} > {headerImage} + {headerTitle} {children} @@ -73,6 +77,9 @@ const ParallaxScrollView = ({ export default ParallaxScrollView; const styles = StyleSheet.create({ + blank: { + + }, container: { flex: 1, }, diff --git a/constants/Colors.ts b/constants/Colors.ts index 14e6784..071b220 100644 --- a/constants/Colors.ts +++ b/constants/Colors.ts @@ -1,26 +1,32 @@ -/** - * Below are the colors that are used in the app. The colors are defined in the light and dark mode. - * There are many other ways to style your app. For example, [Nativewind](https://www.nativewind.dev/), [Tamagui](https://tamagui.dev/), [unistyles](https://reactnativeunistyles.vercel.app), etc. - */ - -const tintColorLight = '#0a7ea4'; -const tintColorDark = '#fff'; +const black = '#1f1e2c'; +const white = '#ECEDEE' +const darkTint = '#fff'; +const lightTint = '#0a7ea4'; +const darkIcon = '#9BA1A6'; +const lightIcon = '#687076'; +const ttBlue = '#4d5eae'; +const ttDarkBlue = '#2e2f3d'; +const ttLightBlue = '#c8d0d7'; export const Colors = { light: { - text: '#11181C', - background: '#fff', - tint: tintColorLight, - icon: '#687076', - tabIconDefault: '#687076', - tabIconSelected: tintColorLight, + text: black, + background: white, + tint: lightTint, + icon: lightIcon, + tabIconDefault: lightIcon, + tabIconSelected: lightTint, + ttBlue, + accent: ttLightBlue, }, dark: { - text: '#ECEDEE', - background: '#151718', - tint: tintColorDark, - icon: '#9BA1A6', - tabIconDefault: '#9BA1A6', - tabIconSelected: tintColorDark, + text: white, + background: black, + tint: darkTint, + icon: darkIcon, + tabIconDefault: darkIcon, + tabIconSelected: darkTint, + ttBlue, + accent: ttDarkBlue, }, };