diff --git a/app.config.ts b/app.config.ts index cb6a15f..a325295 100644 --- a/app.config.ts +++ b/app.config.ts @@ -40,7 +40,8 @@ export default ({config}: ConfigContext): ExpoConfig => ({ 'expo-build-properties', { ios: {newArchEnabled: true}, - android: {newArchEnabled: true}, + // https://github.com/software-mansion/react-native-screens/issues/2219 + android: {newArchEnabled: false}, }, ], // @ts-ignore @@ -94,6 +95,7 @@ export default ({config}: ConfigContext): ExpoConfig => ({ entitlements: { 'com.apple.developer.applesignin': ['Default'], }, + googleServicesFile: process.env.GOOGLE_SERVICES_IOS, infoPlist: { LSApplicationQueriesSchemes: ['mailto'], CFBundleAllowMixedLocalizations: true, @@ -107,7 +109,7 @@ export default ({config}: ConfigContext): ExpoConfig => ({ }, }, android: { - googleServicesFile: process.env.GOOGLE_SERVICES_JSON, + googleServicesFile: process.env.GOOGLE_SERVICES_ANDROID, userInterfaceStyle: 'automatic', permissions: [ 'RECEIVE_BOOT_COMPLETED', diff --git a/app/(app)/(tabs)/profile.tsx b/app/(app)/(tabs)/profile.tsx index 610c4f8..ffedf42 100644 --- a/app/(app)/(tabs)/profile.tsx +++ b/app/(app)/(tabs)/profile.tsx @@ -81,7 +81,7 @@ const TagContainer = styled.View` `; const Tag = styled.View` - background-color: ${({theme}) => theme.role.accent}; + background-color: ${({theme}) => theme.role.link}; border-radius: 20px; padding: 6px 12px; margin-right: 8px; @@ -89,7 +89,7 @@ const Tag = styled.View` `; const TagText = styled.Text` - color: ${({theme}) => theme.text.basic}; + color: ${({theme}) => theme.text.contrast}; font-size: 14px; `; @@ -123,7 +123,7 @@ export default function Profile(): JSX.Element { gap: 4px; `} > - + {user?.github_id || ''} diff --git a/app/(app)/settings/profile-update.tsx b/app/(app)/settings/profile-update.tsx index 36cfe37..c4a8166 100644 --- a/app/(app)/settings/profile-update.tsx +++ b/app/(app)/settings/profile-update.tsx @@ -138,7 +138,7 @@ export default function ProfileUpdate(): JSX.Element { if (user) { setTags(tags); - setAuth((prev) => ({...prev, user})); + setAuth((prev) => ({...prev, user, tags})); back(); } } catch (error: any) { diff --git a/app/(auth)/sign-in.tsx b/app/(auth)/sign-in.tsx index 3ad214b..5bb19b0 100644 --- a/app/(auth)/sign-in.tsx +++ b/app/(auth)/sign-in.tsx @@ -17,7 +17,7 @@ import {t} from '../../src/STRINGS'; import {supabase} from '../../src/supabase'; import SocialSignInButton from '../../src/components/uis/SocialSignInButton'; import {showAlert} from '../../src/utils/alert'; -import { useSafeAreaInsets } from 'react-native-safe-area-context'; +import {useSafeAreaInsets} from 'react-native-safe-area-context'; const Container = styled.View` flex: 1; @@ -58,7 +58,6 @@ export default function SignIn(): JSX.Element { const googleSignIn = useCallback(async () => { try { await GoogleSignin.hasPlayServices(); - const userInfo = await GoogleSignin.signIn(); InteractionManager.runAfterInteractions(async () => {