diff --git a/android/app/build.gradle b/android/app/build.gradle index 52edecc..9b56acb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -127,6 +127,7 @@ android { } dependencies { + compile project(':react-native-facebook-login') compile project(':react-native-maps') compile project(':react-native-vector-icons') compile project(':react-native-image-picker') diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0fee02e..c534d63 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:theme="@style/AppTheme"> + + + + + + + + + + + + + + + android:name="com.google.android.geo.API_KEY" + android:value="AIzaSyBfMm1y6JayCbXrQmgAG1R3ka4ZOJno_5E"/> + diff --git a/android/app/src/main/java/com/aretherecookies/MainApplication.java b/android/app/src/main/java/com/aretherecookies/MainApplication.java index ce0dc93..10ce5af 100644 --- a/android/app/src/main/java/com/aretherecookies/MainApplication.java +++ b/android/app/src/main/java/com/aretherecookies/MainApplication.java @@ -11,6 +11,7 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; import com.facebook.soloader.SoLoader; +import com.magus.fblogin.FacebookLoginPackage; import java.util.Arrays; import java.util.List; @@ -30,7 +31,8 @@ public class MainApplication extends Application implements ReactApplication { new MapsPackage(), new VectorIconsPackage(), new ImagePickerPackage(), - new RNGooglePlacesPackage() + new RNGooglePlacesPackage(), + new FacebookLoginPackage() ); } }; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index c374c7e..324ce55 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ AreThereCookies + 253138281884118 + fb253138281884118 diff --git a/android/settings.gradle b/android/settings.gradle index 31d154e..8ca0aed 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,6 @@ rootProject.name = 'AreThereCookies' +include ':react-native-facebook-login' +project(':react-native-facebook-login').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-facebook-login/android') include ':react-native-maps' project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android') include ':react-native-vector-icons' diff --git a/package.json b/package.json index c1d9a76..cb245fa 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "react": "~15.4.1", "react-native": "~0.42.0", "react-native-drawer": "^2.3.0", + "react-native-facebook-login": "^1.6.0", "react-native-google-places": "^2.1.0", "react-native-image-picker": "^0.26.3", "react-native-looped-carousel": "^0.1.5", diff --git a/yarn.lock b/yarn.lock index 81c85ba..df01163 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2537,6 +2537,10 @@ istanbul-reports@^1.1.1: dependencies: handlebars "^4.0.3" +itypeof@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/itypeof/-/itypeof-1.1.2.tgz#6fb22639dc78a414f594b3d553a5f2c2488fd022" + jest-changed-files@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7" @@ -3691,6 +3695,12 @@ react-native-drawer@^2.3.0: prop-types "^15.5.8" tween-functions "^1.0.1" +react-native-facebook-login@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/react-native-facebook-login/-/react-native-facebook-login-1.6.0.tgz#0ef406f89760d1af2905ce272a556ad35c0dea42" + dependencies: + itypeof "^1.1.2" + react-native-google-places@^2.1.0: version "2.4.2" resolved "https://registry.yarnpkg.com/react-native-google-places/-/react-native-google-places-2.4.2.tgz#ac4cf3391481ecd89803282554e209f0bfefc31e"