Resolve "google places upgrade by end of July"

This commit is contained in:
Bart Akeley 2019-07-06 16:05:39 +00:00
parent a59c86ba14
commit c0e5f6ae98
10 changed files with 31 additions and 95 deletions

View file

@ -137,22 +137,23 @@ android {
}
}
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
}
dependencies {
compile project(':react-native-google-places')
// api project(':react-native-firebase')
api project(':react-native-google-places')
api project(':react-native-snackbar')
api project(':react-native-google-places')
api project(':react-native-auth0')
api project(':react-native-image-resizer')
api project(':react-native-maps')
api project(':react-native-vector-icons')
api project(':react-native-image-picker')
// implementation 'com.google.firebase:firebase-core:16.0.1'
// implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
// transitive = true
// }
@ -161,8 +162,8 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
// implementation "com.android.support:appcompat-v7:26.0.0"
implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
// implementation "com.android.support:appcompat-v7:26.0.0"
implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
implementation "com.facebook.react:react-native:+" // From node_modules
}

View file

@ -6,7 +6,6 @@ import com.facebook.react.ReactApplication;
import com.oblador.vectoricons.VectorIconsPackage;
import com.azendoo.reactnativesnackbar.SnackbarPackage;
import com.airbnb.android.react.maps.MapsPackage;
import fr.bamlab.rnimageresizer.ImageResizerPackage;
import com.imagepicker.ImagePickerPackage;
import com.arttitude360.reactnative.rngoogleplaces.RNGooglePlacesPackage;
import com.auth0.react.A0Auth0Package;
@ -14,8 +13,6 @@ import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
// import io.invertase.firebase.RNFirebasePackage;
// import io.invertase.firebase.fabric.crashlytics.RNFirebaseCrashlyticsPackage;
import java.util.Arrays;
import java.util.List;
@ -35,7 +32,6 @@ public class MainApplication extends Application implements ReactApplication {
new RNGooglePlacesPackage(),
new SnackbarPackage(),
new A0Auth0Package(),
new ImageResizerPackage(),
new MapsPackage(),
new ImagePickerPackage()
);

View file

@ -3,9 +3,9 @@
buildscript {
ext {
buildToolsVersion = "28.0.3"
minSdkVersion = 18
minSdkVersion = 23
compileSdkVersion = 27
targetSdkVersion = 26
targetSdkVersion = 27
supportLibVersion = "27.1.1"
googlePlayServicesVersion = "15.0.1"
androidMapsUtilsVersion = "0.5+"
@ -19,7 +19,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'io.fabric.tools:gradle:1.25.4'
}

View file

@ -1,6 +1,6 @@
#Sat Dec 01 09:59:24 CST 2018
#Sat Jul 06 09:44:44 CDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

View file

@ -1,16 +1,12 @@
rootProject.name = 'AreThereCookies'
include ':react-native-google-places'
project(':react-native-google-places').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-places/android')
// include ':react-native-firebase'
// project(':react-native-firebase').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-firebase/android')
include ':react-native-snackbar'
project(':react-native-snackbar').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-snackbar/android')
include ':react-native-google-places'
project(':react-native-google-places').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-places/android')
include ':react-native-auth0'
project(':react-native-auth0').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-auth0/android')
include ':react-native-image-resizer'
project(':react-native-image-resizer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-resizer/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'

View file

@ -15,7 +15,6 @@
029B651D0B0E4AE3837F4281 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8F9368F722A4808842C3802 /* AddressBook.framework */; };
0BB615C49CCD433DA593C478 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BFB7419F05149A0AA3B5196 /* libRNVectorIcons.a */; };
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
1242B1F0F0FB4315B5CADEC5 /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E3D55C0169946DB80AA27E5 /* libRCTImageResizer.a */; };
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
@ -367,13 +366,6 @@
remoteGlobalIDString = 11FA5C511C4A1296003AC2EE;
remoteInfo = AirMaps;
};
8626C5A32258FE3B00664303 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 5D72D2E81C16249000E22EC1;
remoteInfo = RCTImageResizer;
};
8626C5A62258FE3B00664303 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6A1C7332790C45828F29BB89 /* RNGooglePlaces.xcodeproj */;
@ -432,7 +424,6 @@
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = AreThereCookies/main.m; sourceTree = "<group>"; };
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
1CDCCD20971D43E3A647B5AA /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = "<group>"; };
1E3D55C0169946DB80AA27E5 /* libRCTImageResizer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTImageResizer.a; sourceTree = "<group>"; };
1E8312BB21594022857FE94F /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
28807711BA664F9EB49B3B76 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
2D02E47B1E0B4A5D006451C7 /* aretherecookies-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "aretherecookies-tvOS.app"; path = "AreThereCookies-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -477,7 +468,6 @@
861EFBF32274B81B005A103F /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = "<group>"; };
A7AD62EB06284B498A5E9460 /* libRNGooglePlaces.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNGooglePlaces.a; sourceTree = "<group>"; };
ABBDD4481F9A4A879DC2DA9B /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTImageResizer.xcodeproj; path = "../node_modules/react-native-image-resizer/ios/RCTImageResizer.xcodeproj"; sourceTree = "<group>"; };
C547107D34794AD7B535271C /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
C68D60C5A4D14EB1B5FCF548 /* RNSnackbar.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSnackbar.xcodeproj; path = "../node_modules/react-native-snackbar/ios/RNSnackbar.xcodeproj"; sourceTree = "<group>"; };
CA8120963AF94E0FB384289D /* AirMaps.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = AirMaps.xcodeproj; path = "../node_modules/react-native-maps/lib/ios/AirMaps.xcodeproj"; sourceTree = "<group>"; };
@ -533,7 +523,6 @@
6D42E5626E694AD8B2E1F392 /* libRNImagePicker.a in Frameworks */,
0BB615C49CCD433DA593C478 /* libRNVectorIcons.a in Frameworks */,
58AA5BD96D1F473CAF1D0297 /* libAirMaps.a in Frameworks */,
1242B1F0F0FB4315B5CADEC5 /* libRCTImageResizer.a in Frameworks */,
5AAA204F998B478B8817CB33 /* libz.tbd in Frameworks */,
EA087CEA76394C3DB637FCA4 /* SafariServices.framework in Frameworks */,
A1CF0A85A34940CDA949E850 /* SystemConfiguration.framework in Frameworks */,
@ -733,7 +722,6 @@
1CDCCD20971D43E3A647B5AA /* RNImagePicker.xcodeproj */,
ABBDD4481F9A4A879DC2DA9B /* RNVectorIcons.xcodeproj */,
CA8120963AF94E0FB384289D /* AirMaps.xcodeproj */,
AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */,
40366698AD0243C08C474E18 /* A0Auth0.xcodeproj */,
6A1C7332790C45828F29BB89 /* RNGooglePlaces.xcodeproj */,
C68D60C5A4D14EB1B5FCF548 /* RNSnackbar.xcodeproj */,
@ -806,7 +794,6 @@
4B39ECE2FC3546CDBD026A5B /* libRNImagePicker.a */,
5BFB7419F05149A0AA3B5196 /* libRNVectorIcons.a */,
484774914A724BB18F8CBAC7 /* libAirMaps.a */,
1E3D55C0169946DB80AA27E5 /* libRCTImageResizer.a */,
1E8312BB21594022857FE94F /* libz.tbd */,
84A166D2AEF7429D9D52FF2D /* SafariServices.framework */,
840A8631BCFC4F9E8370035F /* SystemConfiguration.framework */,
@ -860,14 +847,6 @@
name = Products;
sourceTree = "<group>";
};
8626C5962258FE3B00664303 /* Products */ = {
isa = PBXGroup;
children = (
8626C5A42258FE3B00664303 /* libRCTImageResizer.a */,
);
name = Products;
sourceTree = "<group>";
};
8626C5982258FE3B00664303 /* Products */ = {
isa = PBXGroup;
children = (
@ -1059,10 +1038,6 @@
ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */;
ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
},
{
ProductGroup = 8626C5962258FE3B00664303 /* Products */;
ProjectRef = AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */;
},
{
ProductGroup = 78C398B11ACF4ADC00677621 /* Products */;
ProjectRef = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@ -1378,13 +1353,6 @@
remoteRef = 8626C5A02258FE3B00664303 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8626C5A42258FE3B00664303 /* libRCTImageResizer.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRCTImageResizer.a;
remoteRef = 8626C5A32258FE3B00664303 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8626C5A72258FE3B00664303 /* libRNGooglePlaces.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1676,7 +1644,6 @@
"$(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-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-snackbar/ios",
@ -1710,7 +1677,6 @@
"$(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-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-snackbar/ios",
@ -1745,7 +1711,6 @@
"$(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-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-snackbar/ios",
@ -1774,7 +1739,6 @@
"$(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-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-snackbar/ios",
@ -1809,7 +1773,6 @@
"$(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-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-snackbar/ios",
@ -1850,7 +1813,6 @@
"$(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-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-snackbar/ios",

View file

@ -1,13 +1,6 @@
// @flow
import type { ImageRaw } from '../records/ImageRecord';
import { fetchRequest, fetchRequestBinary } from './FetchApi';
// $FlowFixMe yes, flow, there is a default export...
import ImageResizer from 'react-native-image-resizer';
const IMAGE_HEIGHT = 512;
const IMAGE_WIDTH = 512;
const IMAGE_FORMAT = 'JPEG';
const IMAGE_QUALITY = 70;
export const getImages = (foodItemId: string): Promise<Array<ImageRaw>> => {
return fetchRequest({
@ -27,17 +20,9 @@ export const addImage = async ({
}) => {
const body = new FormData();
const { uri } = await ImageResizer.createResizedImage(
imageUri,
IMAGE_WIDTH,
IMAGE_HEIGHT,
IMAGE_FORMAT,
IMAGE_QUALITY
);
// $FlowFixMe - react-native does different stuff with FormData
body.append('photo', {
uri,
uri: imageUri,
type: 'image/jpeg',
name: 'photo.jpg',
});

View file

@ -1,12 +1,13 @@
// @flow
import * as ReactNativeImagePicker from 'react-native-image-picker';
const IMAGE_MAX_WIDTH = 512;
const IMAGE_QUALITY = 0.8;
export const openImagePicker = () =>
new Promise((resolve, reject) =>
ReactNativeImagePicker.showImagePicker({}, ({ didCancel, error, uri }) => {
if (!didCancel && !error) {
resolve(uri);
}
reject(error);
})
ReactNativeImagePicker.showImagePicker(
{ maxWidth: IMAGE_MAX_WIDTH, quality: IMAGE_QUALITY },
({ didCancel, error, uri }) => (!didCancel && !error ? resolve(uri) : reject(error))
)
);

View file

@ -24,12 +24,11 @@
"react": "16.6.1",
"react-native": "0.57.5",
"react-native-auth0": "^1.3.0",
"react-native-google-places": "2.5.0",
"react-native-google-places": "3.1.1",
"react-native-image-picker": "^0.27",
"react-native-image-resizer": "^1.0.0",
"react-native-loading-spinner-overlay": "^0.5.2",
"react-native-looped-carousel": "^0.1.5",
"react-native-maps": "^0.22.1",
"react-native-maps": "^0.24",
"react-native-material-ui": "1.22.0",
"react-native-snackbar": "^0.5.3",
"react-native-vector-icons": "6.0.2",

View file

@ -5038,21 +5038,16 @@ react-native-auth0@^1.3.0:
base-64 "^0.1.0"
url "^0.11.0"
react-native-google-places@2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/react-native-google-places/-/react-native-google-places-2.5.0.tgz#a52c0ee6629a5c4aa222589022f127c5fa201436"
integrity sha512-SizcXJZVLPQAECa8hNpP9osaf3kb01c+6r+5c/LvFqDEIc3wRDsRO4UgmrJyQBKmZX8Z01hUrO5T4GngG49cKQ==
react-native-google-places@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/react-native-google-places/-/react-native-google-places-3.1.1.tgz#c4f4f4cfd218e9f01d18013c4364b3b077c49210"
integrity sha512-t1wtLZQwsc4QXHxSFFQSeyaj/zcIJu14xJO1N9IBCMRmAj5OmYICPL+/+crK2VPqdSWZ6gQHSJlJ1XXT0vZD/w==
react-native-image-picker@^0.27:
version "0.27.1"
resolved "https://registry.yarnpkg.com/react-native-image-picker/-/react-native-image-picker-0.27.1.tgz#32877c667e8c2713466fe178a6c7dd648e6cb5d3"
integrity sha512-LuEt5I9TFe3+lfN8E9geuN2OOgnld0QmeHRPTCV+mzkT5zASsoibNIUItt6WQBWG4nXC/90aufQYZn92i3lTxw==
react-native-image-resizer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/react-native-image-resizer/-/react-native-image-resizer-1.0.0.tgz#d47e14943c37938e287fbd639e4db7ceb7fd8917"
integrity sha1-1H4UlDw3k44of71jnk23zrf9iRc=
react-native-loading-spinner-overlay@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/react-native-loading-spinner-overlay/-/react-native-loading-spinner-overlay-0.5.2.tgz#b7bcd277476d596615fd7feee601789f9bdc7acc"
@ -5064,9 +5059,10 @@ react-native-looped-carousel@^0.1.5:
lodash.isequal "^4.5.0"
prop-types "^15.6.1"
react-native-maps@^0.22.1:
version "0.22.1"
resolved "https://registry.yarnpkg.com/react-native-maps/-/react-native-maps-0.22.1.tgz#ce856e71970e872e596e6fa4773279cae2c4dcdd"
react-native-maps@^0.24:
version "0.24.2"
resolved "https://registry.yarnpkg.com/react-native-maps/-/react-native-maps-0.24.2.tgz#19974f967cb0c2e24dab74ca879118e0932571b2"
integrity sha512-1iNIDikp2dkCG+8DguaEviYZiMSYyvwqYT7pO2YTZvuFRDSc/P9jXMhTUnSh4wNDlEeQ47OJ09l0pwWVBZ7wxg==
react-native-material-design-styles@^0.2.6:
version "0.2.7"