diff --git a/android/app/build.gradle b/android/app/build.gradle index 52edecc..b6b0cda 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -127,6 +127,7 @@ android { } dependencies { + compile project(':react-native-oauth') compile project(':react-native-maps') compile project(':react-native-vector-icons') compile project(':react-native-image-picker') diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf new file mode 100755 index 0000000..244854c Binary files /dev/null and b/android/app/src/main/assets/fonts/Feather.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf index 832a57b..69404e3 100644 Binary files a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf index 5b1f7d6..09e2b2d 100644 Binary files a/android/app/src/main/assets/fonts/Octicons.ttf and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/java/com/aretherecookies/MainApplication.java b/android/app/src/main/java/com/aretherecookies/MainApplication.java index ce0dc93..41262d1 100644 --- a/android/app/src/main/java/com/aretherecookies/MainApplication.java +++ b/android/app/src/main/java/com/aretherecookies/MainApplication.java @@ -3,6 +3,7 @@ package com.aretherecookies; import android.app.Application; import com.facebook.react.ReactApplication; +import io.fullstack.oauth.OAuthManagerPackage; import com.airbnb.android.react.maps.MapsPackage; import com.oblador.vectoricons.VectorIconsPackage; import com.imagepicker.ImagePickerPackage; @@ -27,6 +28,7 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { return Arrays.asList( new MainReactPackage(), + new OAuthManagerPackage(), new MapsPackage(), new VectorIconsPackage(), new ImagePickerPackage(), diff --git a/android/build.gradle b/android/build.gradle index eed9972..e24622f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,6 +16,7 @@ allprojects { repositories { mavenLocal() jcenter() + maven { url "https://jitpack.io" } maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" diff --git a/android/settings.gradle b/android/settings.gradle index 31d154e..6bfd04b 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,6 @@ rootProject.name = 'AreThereCookies' +include ':react-native-oauth' +project(':react-native-oauth').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-oauth/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/ios/AreThereCookies.xcodeproj/project.pbxproj b/ios/AreThereCookies.xcodeproj/project.pbxproj index 7cdd4f9..dd5eb5e 100644 --- a/ios/AreThereCookies.xcodeproj/project.pbxproj +++ b/ios/AreThereCookies.xcodeproj/project.pbxproj @@ -49,6 +49,7 @@ 761A158B50BE4290B39D8637 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 28807711BA664F9EB49B3B76 /* SimpleLineIcons.ttf */; }; B861BE92B155457990C8500E /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D53B3F694EB44AC8B196FE53 /* Zocial.ttf */; }; 58AA5BD96D1F473CAF1D0297 /* libAirMaps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 484774914A724BB18F8CBAC7 /* libAirMaps.a */; }; + 7D81C1833A6948FEAC69243F /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 75D683233A53472F8D93A7CF /* Feather.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -286,6 +287,8 @@ D53B3F694EB44AC8B196FE53 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; CA8120963AF94E0FB384289D /* AirMaps.xcodeproj */ = {isa = PBXFileReference; name = "AirMaps.xcodeproj"; path = "../node_modules/react-native-maps/lib/ios/AirMaps.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; 484774914A724BB18F8CBAC7 /* libAirMaps.a */ = {isa = PBXFileReference; name = "libAirMaps.a"; path = "libAirMaps.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + F15C09674A234801B8D6B4BA /* OAuthManager.xcodeproj */ = {isa = PBXFileReference; name = "OAuthManager.xcodeproj"; path = "../node_modules/react-native-oauth/ios/OAuthManager.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 75D683233A53472F8D93A7CF /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -486,6 +489,7 @@ 1CDCCD20971D43E3A647B5AA /* RNImagePicker.xcodeproj */, ABBDD4481F9A4A879DC2DA9B /* RNVectorIcons.xcodeproj */, CA8120963AF94E0FB384289D /* AirMaps.xcodeproj */, + F15C09674A234801B8D6B4BA /* OAuthManager.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -536,6 +540,7 @@ 58F3E8D932CA42CCBE826FCC /* Octicons.ttf */, 28807711BA664F9EB49B3B76 /* SimpleLineIcons.ttf */, D53B3F694EB44AC8B196FE53 /* Zocial.ttf */, + 75D683233A53472F8D93A7CF /* Feather.ttf */, ); name = Resources; path = ""; @@ -909,6 +914,7 @@ 2D3494321C8A477BB5FA1C40 /* Octicons.ttf in Resources */, 761A158B50BE4290B39D8637 /* SimpleLineIcons.ttf in Resources */, B861BE92B155457990C8500E /* Zocial.ttf in Resources */, + 7D81C1833A6948FEAC69243F /* Feather.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1053,6 +1059,7 @@ "$(SRCROOT)/../node_modules/react-native-image-picker/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", + "$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager/**", ); }; name = Debug; @@ -1084,6 +1091,7 @@ "$(SRCROOT)/../node_modules/react-native-image-picker/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", + "$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager/**", ); }; name = Release; @@ -1109,6 +1117,7 @@ "$(SRCROOT)/../node_modules/react-native-image-picker/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", + "$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager/**", ); }; name = Debug; @@ -1133,6 +1142,7 @@ "$(SRCROOT)/../node_modules/react-native-image-picker/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", + "$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager/**", ); }; name = Release; @@ -1173,6 +1183,7 @@ "$(SRCROOT)/../node_modules/react-native-image-picker/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", + "$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager/**", ); }; name = Debug; @@ -1213,6 +1224,7 @@ "$(SRCROOT)/../node_modules/react-native-image-picker/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**", + "$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager/**", ); }; name = Release; diff --git a/ios/AreThereCookies/Info.plist b/ios/AreThereCookies/Info.plist index 16a07e1..8628930 100644 --- a/ios/AreThereCookies/Info.plist +++ b/ios/AreThereCookies/Info.plist @@ -63,6 +63,7 @@ Octicons.ttf SimpleLineIcons.ttf Zocial.ttf + Feather.ttf \ No newline at end of file diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..94e8f8d --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,5 @@ +source 'https://github.com/CocoaPods/Specs.git' +platform :ios, '8.0' +use_frameworks! + +pod 'DCTAuth', :git => 'https://github.com/danielctull/DCTAuth.git' diff --git a/package.json b/package.json index c6b2ccb..5a0a94d 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "react-native-maps": "0.15.1", "react-native-material-ui": "^1.7.0", "react-native-modal": "^2.2.0", + "react-native-oauth": "^2.2.0", "react-native-scrollable-tab-view": "^0.7.4", "react-native-vector-icons": "^4.0.0", "react-router-native": "~4.1.0", diff --git a/yarn.lock b/yarn.lock index 81c85ba..771ba56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3727,6 +3727,13 @@ react-native-modal@^2.2.0: prop-types "15.5.10" react-native-animatable "^1.2.3" +react-native-oauth@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/react-native-oauth/-/react-native-oauth-2.2.0.tgz#8aa7fad344b22cd29f24a4c3385244684dbcbe9e" + dependencies: + invariant "^2.2.1" + valib "^2.0.0" + react-native-scrollable-tab-view@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/react-native-scrollable-tab-view/-/react-native-scrollable-tab-view-0.7.4.tgz#623a047cbfab35a27b8689095af524e9aac74b62" @@ -4628,6 +4635,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +valib@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/valib/-/valib-2.0.0.tgz#e0d455b10e17ae605c0f33971adac73564ee18a7" + validate-npm-package-license@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"