Merge branch 'master' of https://github.com/skiser/Routinely into Chase

skiser · Oct 4, 2019 · 7297766 · 7297766
2 parents 46d3994 + 310e6b8
commit 7297766
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/Routinely/android/app/build.gradle b/Routinely/android/app/build.gradle
@@ -179,7 +179,6 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-google-signin')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
 

diff --git a/Routinely/android/app/src/main/java/com/routinely/MainApplication.java b/Routinely/android/app/src/main/java/com/routinely/MainApplication.java
@@ -4,7 +4,6 @@
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
-import co.apptailor.googlesignin.RNGoogleSigninPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;

diff --git a/Routinely/android/settings.gradle b/Routinely/android/settings.gradle
@@ -1,5 +1,3 @@
 rootProject.name = 'Routinely'
-include ':react-native-google-signin'
-project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
diff --git a/Routinely/app/components/login.js b/Routinely/app/components/login.js
@@ -42,7 +42,7 @@ class LoginScreen extends Component {
       // login with credential
       const firebaseUserCredential = await firebase.auth().signInWithCredential(credential);
 
-      console.warn(JSON.stringify(firebaseUserCredential.user.toJSON()));
+      //console.warn(JSON.stringify(firebaseUserCredential.user.toJSON()));
     } catch (error) {
       console.log(error)
       if (error.code === statusCodes.SIGN_IN_CANCELLED) {
@@ -115,12 +115,13 @@ class LoginScreen extends Component {
     return (
           <View style={styles.body}>
             <View style={styles.sectionContainer}>
+            {!this.state.loggedIn &&
               <GoogleSigninButton
                 style={{ width: 192, height: 48 }}
                 size={GoogleSigninButton.Size.Wide}
                 color={GoogleSigninButton.Color.Dark}
                 onPress={this.firebaseGoogleLogin}
-                disabled={this.state.isSigninInProgress} />
+                disabled={this.state.isSigninInProgress} />}
             </View>
             <View style={styles.buttonContainer}>
                 {!this.state.loggedIn && <Text>You are currently logged out</Text>}

diff --git a/Routinely/ios/Podfile b/Routinely/ios/Podfile
@@ -3,7 +3,6 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 
 target 'Routinely' do
   # Pods for Routinely
-  pod 'GoogleSignIn', '~> 4.4.0'
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
   pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
@@ -39,8 +38,7 @@ target 'Routinely' do
   pod 'Firebase/Analytics'
   pod 'Firebase/Auth'
 
-
-  pod 'RNGoogleSignin', :path => '../node_modules/react-native-google-signin'
+  pod 'GoogleSignIn', '~> 5.0.0'
 
   target 'RoutinelyTests' do
     inherit! :search_paths

diff --git a/Routinely/package.json b/Routinely/package.json
@@ -15,7 +15,7 @@
     "react-dom": "^16.10.1",
     "react-native": "0.61.0",
     "react-native-calendars": "^1.212.0",
-    "react-native-elements": "^1.2.3",
+    "react-native-elements": "^1.2.4",
     "react-native-firebase": "^5.5.6",
     "react-native-gesture-handler": "^1.4.1",
     "react-native-google-signin": "^2.0.0",