From 565ec4f408c3b56904406b410a2908715ae39177 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 27 Mar 2019 23:17:44 +0000 Subject: [PATCH] mapa e etc --- .DS_Store | Bin 6148 -> 6148 bytes App/android/app/build.gradle | 2 +- .../main/java/com/app/MainApplication.java | 4 +- App/android/settings.gradle | 3 +- App/app/screens/Profile.js | 25 +--- App/app/screens/calendarDetail.js | 93 +++++++----- App/ios/app.xcodeproj/project.pbxproj | 138 ------------------ .../xcshareddata/xcschemes/app.xcscheme | 19 +-- App/ios/app/Info.plist | 4 +- App/package-lock.json | 17 +-- App/package.json | 5 +- App/yarn.lock | 9 -- 12 files changed, 82 insertions(+), 237 deletions(-) diff --git a/.DS_Store b/.DS_Store index 2bf5077a1756b8abb017a5665155126ad57ea496..e69afe4362569edb639f5f5b889ba2465f3dacdb 100644 GIT binary patch delta 20 bcmZoMXffFEiHY6VNJqiQz;g3XCT>vxM?D5E delta 20 bcmZoMXffFEiHY6JTt~ss)M)chCT>vxM~MbA diff --git a/App/android/app/build.gradle b/App/android/app/build.gradle index fac4a68f..07d87ff7 100755 --- a/App/android/app/build.gradle +++ b/App/android/app/build.gradle @@ -149,7 +149,7 @@ android { } dependencies { - compile project(':react-native-image-picker') + compile project(':react-native-maps') compile project(':react-native-device-info') compile project(':react-native-material-shadows') diff --git a/App/android/app/src/main/java/com/app/MainApplication.java b/App/android/app/src/main/java/com/app/MainApplication.java index 7224c546..326eac1c 100755 --- a/App/android/app/src/main/java/com/app/MainApplication.java +++ b/App/android/app/src/main/java/com/app/MainApplication.java @@ -3,7 +3,7 @@ package com.app; import android.app.Application; import com.facebook.react.ReactApplication; -import com.imagepicker.ImagePickerPackage; + import com.airbnb.android.react.maps.MapsPackage; import com.learnium.RNDeviceInfo.RNDeviceInfo; import ui.materialshadows.RNMaterialShadowsPackage; @@ -31,7 +31,7 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { return Arrays.asList( new MainReactPackage(), - new ImagePickerPackage(), + new MapsPackage(), new RNDeviceInfo(), new RNMaterialShadowsPackage(), diff --git a/App/android/settings.gradle b/App/android/settings.gradle index e5be8414..bf47bc13 100755 --- a/App/android/settings.gradle +++ b/App/android/settings.gradle @@ -1,6 +1,5 @@ rootProject.name = 'app' -include ':react-native-image-picker' -project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android') + include ':react-native-maps' project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android') include ':react-native-device-info' diff --git a/App/app/screens/Profile.js b/App/app/screens/Profile.js index 3e250a6b..aa9a9c30 100644 --- a/App/app/screens/Profile.js +++ b/App/app/screens/Profile.js @@ -35,7 +35,7 @@ import Tel from "../components/Telephone"; const SCREEN_HEIGHT = Dimensions.get("window").height; const SCREEN_WIDTH = Dimensions.get("window").width; import Icon from "react-native-vector-icons/Ionicons"; -import ImagePicker from "react-native-image-picker"; + var options = { title: "Selecionar foto de perfil", @@ -191,28 +191,7 @@ class Profile extends Component { }); } else console.log("data not valid"); } - _open = () => { - ImagePicker.showImagePicker(options, response => { - console.log("Response = ", response); - - if (response.didCancel) { - console.log("User cancelled image picker"); - } else if (response.error) { - console.log("ImagePicker Error: ", response.error); - } else if (response.customButton) { - console.log("User tapped custom button: ", response.customButton); - } else { - const source = { uri: response.uri }; - - // You can also display the image using data: - // const source = { uri: 'data:image/jpeg;base64,' + response.data }; - - this.setState({ - avatarSource: source - }); - } - }); - }; + render() { if (this.props.onHold) { diff --git a/App/app/screens/calendarDetail.js b/App/app/screens/calendarDetail.js index e791b97e..c90f9ac6 100644 --- a/App/app/screens/calendarDetail.js +++ b/App/app/screens/calendarDetail.js @@ -11,7 +11,9 @@ import { ImageBackground, ListView, FlatList, - ActivityIndicator + ActivityIndicator, + Linking, + Platform } from "react-native"; import moment from "moment"; @@ -51,7 +53,7 @@ class calendarDetail extends React.Component { header: ( ) }); @@ -82,30 +84,30 @@ class calendarDetail extends React.Component { const { navigation } = this.props; const info = navigation.getParam("info", "error"); - if(this.props.sessionDetail==undefined){ - return( - + if (this.props.sessionDetail == undefined) { + return ( + - + ) } return ( - info!=undefined && + info != undefined && - - - - - + + + + + @@ -134,18 +136,18 @@ class calendarDetail extends React.Component { > {this.props.sessionDetail.Name} - + - {this.props.sessionDetail.Enrolled!= 0 && this.props.sessionDetail.MaxAttendees!=0 && - } + {this.props.sessionDetail.Enrolled != 0 && this.props.sessionDetail.MaxAttendees != 0 && + } {this.props.sessionDetail.Enrolled} / {this.props.sessionDetail.MaxAttendees} @@ -226,15 +228,38 @@ class calendarDetail extends React.Component { - - - Localização + { + this.props.sessionDetail.LocalRoom != undefined && this.props.sessionDetail.LocalCoordinates != undefined && + + + + Localização - - Em breve - + + {this.props.sessionDetail.LocalRoom} +