diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx index 6b6cbf2..35fab04 100644 --- a/app/(tabs)/index.tsx +++ b/app/(tabs)/index.tsx @@ -7,7 +7,7 @@ const HomeScreen = () => { return ( + } headerTitle={ @@ -33,17 +33,17 @@ const styles = StyleSheet.create({ gap: 8, marginBottom: 8, }, - reactLogo: { + techTrackerLogo: { height: 70, width: 72, bottom: 10, - left: 40, + left: Platform.OS === 'ios' ? 40 : 20, position: 'absolute', }, headerTitle: { position: 'absolute', bottom: 20, - left: 75, + left: 80, right: 0, textAlign: 'center', fontSize: 48, diff --git a/app/(tabs)/settings/index.tsx b/app/(tabs)/settings/index.tsx index d12e21a..0bdfb25 100644 --- a/app/(tabs)/settings/index.tsx +++ b/app/(tabs)/settings/index.tsx @@ -3,8 +3,11 @@ import { useRouter } from 'expo-router'; import ParallaxScrollView from '@/components/default/ParallaxScrollView'; import { ThemedText, ThemedTextButton, ThemedView } from '@/components/theme'; import { IconSymbol } from '@/components/ui/IconSymbol'; +import { Colors } from '@/constants/Colors'; +import { useColorScheme } from '@/hooks/useColorScheme'; const SettingsScreen = () => { + const scheme = useColorScheme() ?? 'dark'; const router = useRouter(); return ( @@ -20,7 +23,7 @@ const SettingsScreen = () => { > router.push('/settings/profile')} > @@ -67,7 +70,6 @@ const styles = StyleSheet.create({ flexDirection: 'row', alignItems: 'center', padding: 16, - backgroundColor: 'rgba(200, 200, 200, 0.1)', marginBottom: 1, }, icon: { diff --git a/app/(tabs)/settings/profile.tsx b/app/(tabs)/settings/profile.tsx index f4e080f..fe30655 100644 --- a/app/(tabs)/settings/profile.tsx +++ b/app/(tabs)/settings/profile.tsx @@ -3,6 +3,7 @@ import { StyleSheet, Alert, ActivityIndicator, + ScrollView, } from 'react-native'; import { supabase } from '@/lib/supabase'; import { ThemedView, ThemedText, ThemedTextButton, ThemedTextInput } from '@/components/theme'; @@ -107,53 +108,58 @@ const ProfileScreen = () => { } return ( + - - + + + + {profile.provider && ( + + Signed in with {profile.provider.charAt(0).toUpperCase() + profile.provider.slice(1)} + + )} + + Name + setProfile(prev => ({ ...prev, full_name: text }))} + placeholder="Enter your full name" + style={styles.input} + editable={!updating} + autoCapitalize='words' + textContentType='name' + maxLength={50} + returnKeyType='done' + /> + + + - - - {profile.provider && ( - - Signed in with {profile.provider.charAt(0).toUpperCase() + profile.provider.slice(1)} - - )} - - Name - setProfile(prev => ({ ...prev, full_name: text }))} - placeholder="Enter your full name" - style={styles.input} - editable={!updating} - autoCapitalize='words' - textContentType='name' - maxLength={50} - returnKeyType='done' + + - - - - - + ); }; export default ProfileScreen; diff --git a/components/status/StatusList.tsx b/components/status/StatusList.tsx index 71d5ce6..868d2b9 100644 --- a/components/status/StatusList.tsx +++ b/components/status/StatusList.tsx @@ -20,8 +20,12 @@ import { RealtimeChannel } from '@supabase/supabase-js'; import { UserStatus } from '@/constants/Types'; import debounce from 'lodash/debounce'; import NetInfo from '@react-native-community/netinfo'; +import { Colors } from '@/constants/Colors'; +import { useColorScheme } from '@/hooks/useColorScheme'; const StatusList = () => { + const scheme = useColorScheme() ?? 'dark'; + const [statuses, setStatuses] = useState([]); const [loading, setLoading] = useState(true); const [refreshing, setRefreshing] = useState(false); @@ -357,6 +361,7 @@ const StatusList = () => { style={[ styles.statusItem, recentlyUpdatedIds.has(item.id) && styles.recentlyUpdated, + {backgroundColor: Colors[scheme].card}, ]} onPress={() => handleUserSelect(item)} activeOpacity={0.7} @@ -469,7 +474,6 @@ const styles = StyleSheet.create({ }, statusItem: { flexDirection: 'row', - backgroundColor: 'rgba(200, 200, 200, 0.1)', padding: 16, borderRadius: 12, marginHorizontal: 16, diff --git a/components/ui/IconSymbol.tsx b/components/ui/IconSymbol.tsx index 3864699..aeb7d8c 100644 --- a/components/ui/IconSymbol.tsx +++ b/components/ui/IconSymbol.tsx @@ -13,6 +13,9 @@ const MAPPING = { 'paperplane.fill': 'send', 'chevron.left.forwardslash.chevron.right': 'code', 'chevron.right': 'chevron-right', + 'gear.circle' : 'settings', + 'gearshape.fill' : 'settings', + 'person.fill' : 'person' } as Partial< Record< import('expo-symbols').SymbolViewProps['name'],