Merge pull request #119 from AmericaSCORESBayArea/fix/appleSignIn

fixed apple sign in
AmericaSCORESBayArea · Jun 25, 2021 · 23496c6 · 23496c6
2 parents d57e79c + 5da9932
commit 23496c6
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 19 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -135,8 +135,8 @@ android {
         applicationId "com.americaScoresAttendance.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11
-        versionName '1.6.2c'
+        versionCode 12
+        versionName '1.7'
 
         missingDimensionStrategy 'react-native-camera', 'general'
         manifestPlaceholders = [appAuthRedirectScheme: 'com.redirectScheme.comm']

diff --git a/android/app/src/main/java/com/americaScoresAttendance/MainApplication.java b/android/app/src/main/java/com/americaScoresAttendance/MainApplication.java
@@ -3,6 +3,8 @@
 import android.app.Application;
 import android.content.Context;
 
+import androidx.multidex.MultiDex;
+
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 
@@ -24,6 +26,15 @@
 import javax.annotation.Nullable;
 
 public class MainApplication extends Application implements ReactApplication {
+
+
+    @Override
+    protected void attachBaseContext(Context base) {
+      super.attachBaseContext(base);
+      MultiDex.install(this);
+    }
+
+
   private final ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(
     new BasePackageList().getPackageList()
   );

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "@ui-kitten/eva-icons": "^5.0.0",
     "@ui-kitten/moment": "^5.0.0",
     "axios": "^0.21.1",
+    "browserslist": "^4.16.6",
     "expo": "^38.0.10",
     "expo-app-auth": "~9.1.1",
     "expo-google-sign-in": "~8.2.1",

diff --git a/src/Activities.Screen.js b/src/Activities.Screen.js
@@ -44,6 +44,7 @@ class ActivitiesScreen extends Component {
 
     async componentDidMount() {
         this._syncActivities();
+        await AsyncStorage.setItem('loggedStatus', "true");
         if (this.props.user.firstTimeLoggedIn) {
             setTimeout(() => (this.setState({welcomeModalVisibility: true})), 500);
             setTimeout(() => {this.setState({welcomeModalVisibility: false})}, 3500);