This commit is contained in:
Joseph D'Souza 2026-02-11 13:03:22 +01:00
parent d7e30ce781
commit da9ba3094c
3 changed files with 25 additions and 29 deletions

View File

@ -15,7 +15,6 @@ export default function App() {
const [isSplashFinished, setSplashFinished] = useState(false);
const colorScheme = useColorScheme();
// Fix for white background behind modals
const backgroundColor = colorScheme === 'dark' ? AppDarkTheme.colors.background : AppLightTheme.colors.background;
SystemUI.setBackgroundColorAsync(backgroundColor);

View File

@ -1,8 +1,6 @@
import React from 'react';
import { View, Text, TouchableOpacity, StyleSheet, Platform, useColorScheme, Image } from 'react-native';
import * as AppleAuthentication from 'expo-apple-authentication';
import { FontAwesome } from '@expo/vector-icons';
import { COLORS } from '../theme/colors';
interface SocialButtonsProps {
onGooglePress: () => void;
@ -17,35 +15,35 @@ export default function SocialButtons({ onGooglePress, onFacebookPress, onAppleP
return (
<View style={styles.container}>
<Text style={[styles.divider, { color: isDark ? '#a0aec0' : '#888' }]}>Or continue with</Text>
<View style={styles.row}>
{/* Google Button - Multicolored Image */}
<TouchableOpacity
style={[styles.circleButton, { backgroundColor: 'white' }]}
{/* Google Button */}
<TouchableOpacity
style={[styles.circleButton, { backgroundColor: 'white' }]}
onPress={onGooglePress}
>
<Image
source={require('../../assets/icons/google.png')}
style={{ width: 24, height: 24 }}
<Image
source={require('../../assets/icons/google.png')}
style={{ width: 24, height: 24 }}
resizeMode="contain"
/>
</TouchableOpacity>
{/* Facebook Button - White F on Blue Background */}
<TouchableOpacity
style={[styles.circleButton, { backgroundColor: '#1877F2', borderWidth: 0 }]}
{/* Facebook Button */}
<TouchableOpacity
style={[styles.circleButton, { backgroundColor: '#1877F2', borderWidth: 0 }]}
onPress={onFacebookPress}
>
<FontAwesome name="facebook" size={24} color="white" />
</TouchableOpacity>
{/* Apple Button - White on Black (Light) / Black on White (Dark) */}
{/* Apple Button */}
{Platform.OS === 'ios' && (
<TouchableOpacity
<TouchableOpacity
style={[
styles.circleButton,
styles.circleButton,
{ backgroundColor: isDark ? 'white' : 'black', borderWidth: 0 }
]}
]}
onPress={onApplePress}
>
<FontAwesome name="apple" size={24} color={isDark ? "black" : "white"} />
@ -89,7 +87,7 @@ const styles = StyleSheet.create({
backgroundColor: 'white',
},
facebook: {
backgroundColor: 'white',
backgroundColor: 'white',
},
appleLight: {
backgroundColor: 'white',

View File

@ -1,7 +1,6 @@
import React, { useEffect, useRef, useState, useCallback } from 'react';
import { View, StyleSheet, Image, Animated, useColorScheme } from 'react-native';
import * as SplashScreen from 'expo-splash-screen';
import { COLORS } from '../theme/colors';
interface AnimatedSplashProps {
onFinish: () => void;
@ -36,7 +35,7 @@ export default function AnimatedSplash({ onFinish }: AnimatedSplashProps) {
if (isAppReady && isLayoutReady) {
// Hide native splash screen
SplashScreen.hideAsync();
// Start fade out
Animated.timing(fadeAnim, {
toValue: 0,
@ -49,24 +48,24 @@ export default function AnimatedSplash({ onFinish }: AnimatedSplashProps) {
}, [isAppReady, isLayoutReady]);
return (
<Animated.View
<Animated.View
style={[
styles.container,
{
styles.container,
{
opacity: fadeAnim,
backgroundColor: isDark ? '#000000' : '#ffffff'
backgroundColor: isDark ? '#000000' : '#ffffff'
}
]}
onLayout={onLayoutRootView}
>
<View style={styles.centered}>
<Image
<Image
source={
isDark
? require('../../assets/icons/splash-icon-light.png')
isDark
? require('../../assets/icons/splash-icon-light.png')
: require('../../assets/icons/splash-icon-dark.png')
}
style={styles.logo}
}
style={styles.logo}
resizeMode="contain"
/>
</View>