chore: disable newArch in android

Related software-mansion/react-native-screens#2219
crossplatformkorea · Aug 6, 2024 · f003469 · f003469
1 parent 2448804
commit f003469
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -81,15 +81,15 @@ 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;
   margin-bottom: 4px;
 `;
 
 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;
                 `}
               >
-                <Icon name="GithubLogo" size={16} color={theme.role.secondary} />
+                <Icon name="GithubLogo" size={16} color={theme.role.link} />
                 <InfoValue>{user?.github_id || ''}</InfoValue>
               </View>
             </InfoItem>

diff --git 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
@@ -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 () => {