Merge branch 'master' into master

shumin13 · web-flow · commit eaa193c2e4ec · 2017-09-20T02:09:02.000+08:00
diff --git a/.expo/packager-info.json b/.expo/packager-info.json
@@ -0,0 +1,8 @@
+{
+  "expoServerPort": null,
+  "packagerPort": null,
+  "packagerPid": null,
+  "expoServerNgrokUrl": null,
+  "packagerNgrokUrl": null,
+  "ngrokPid": null
+}
diff --git a/.expo/settings.json b/.expo/settings.json
@@ -0,0 +1,9 @@
+{
+  "hostType": "tunnel",
+  "lanType": "ip",
+  "dev": true,
+  "strict": false,
+  "minify": false,
+  "urlType": "exp",
+  "urlRandomness": null
+}
diff --git a/App.js b/App.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { Screens } from './src/config/router'
-
-var HockeyApp = require('react-native-hockeyapp')
+// const TestFairy = require('react-native-testfairy')
+const HockeyApp = require('react-native-hockeyapp')
 
 class App extends Component {
   constructor () {
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ Software
 * Native geolocation
 * Communications library to send SMS
 
-
 ## Getting Started
 
 To see a working version of the phone app, you will need to
@@ -32,10 +31,8 @@ To see a working version of the phone app, you will need to
 
 
 ## ERD
-
 <img src="src/images/ERD.png">
 
-
 ## Wireframe
 
 <img src="src/images/1Home.png" height="400"><img src="src/images/2CreateProfilePage.png" height="400"><img src="src/images/3Sensor.png" height="400"><br>
@@ -61,7 +58,6 @@ To see a working version of the phone app, you will need to
 2. Will app running in background continually receive bluetooth data?
 3. iOS doe not allow apps to send messages without prompting user to click 'send'
 
-
 ## Future Plans
 
 1. Deployment to Play Store
@@ -70,7 +66,6 @@ To see a working version of the phone app, you will need to
 4. 'Forget Password' feature
 5. Provide settings page to enable users to amend details such as emergency contact, allergies and health status
 
-
 ## Authors
 
 * **Wan Zhen** - [thecodingdog](https://github.com/thecodingdog)
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -91,7 +91,7 @@ def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '25.0.0'
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "com.androidtest"
@@ -137,13 +137,14 @@ dependencies {
     compile project(':react-native-bluetooth-serial')
     compile project(':react-native-maps')
     compile project(':react-native-vector-icons')
+    compile project(':react-native-sms-android')
+    compile project(':react-native-maps')
+    compile project(':react-native-hockeyapp')
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
-    compile project(':react-native-sms-android')
     compile 'com.facebook.fresco:fresco:1.5.0'
     compile 'com.facebook.fresco:animated-gif:1.5.0'
-    compile project(":react-native-hockeyapp")
 }
 
 // Run this once to be able to run the application with BUCK
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -7,9 +7,11 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <activity android:name="net.hockeyapp.android.UpdateActivity" />
+    <activity android:name="net.hockeyapp.android.FeedbackActivity" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    
+
     <uses-sdk
         android:minSdkVersion="16"
         android:targetSdkVersion="22" />
@@ -31,15 +33,9 @@
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <activity android:name="net.hockeyapp.android.UpdateActivity" />
-      <activity android:name="net.hockeyapp.android.FeedbackActivity" />
-
       <meta-data
-       android:name="com.google.android.geo.API_KEY"
-       android:value="AIzaSyBgoQ72_YnhMWOHjgFFEQuxW_w8KjRw970
-"/>
-      <!-- <meta-data android:name="net.hockeyapp.android.appIdentifier" android:value="${499de5c783a145babda49068385acdb2}" /> -->
-
+      android:name="com.google.android.geo.API_KEY"
+      android:value="AIzaSyBgoQ72_YnhMWOHjgFFEQuxW_w8KjRw970"/>
     </application>
 
 </manifest>
diff --git a/android/app/src/main/java/com/androidtest/MainApplication.java b/android/app/src/main/java/com/androidtest/MainApplication.java
@@ -5,14 +5,16 @@
 import com.facebook.react.ReactApplication;
 import com.showlocationservicesdialogbox.LocationServicesDialogBoxPackage;
 import com.rusel.RCTBluetoothSerial.RCTBluetoothSerialPackage;
+import com.rhaker.reactnativesmsandroid.RNSmsAndroidPackage;
 import com.airbnb.android.react.maps.MapsPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 
-import com.rhaker.reactnativesmsandroid.RNSmsAndroidPackage;
+import com.slowpath.hockeyapp.RNHockeyAppModule;
+import com.slowpath.hockeyapp.RNHockeyAppPackage;
 
 import com.slowpath.hockeyapp.RNHockeyAppModule;
 import com.slowpath.hockeyapp.RNHockeyAppPackage;
@@ -34,7 +36,7 @@ protected List<ReactPackage> getPackages() {
           new RNHockeyAppPackage(MainApplication.this),
           new RNSmsAndroidPackage(),
           new MainReactPackage(),
-            new LocationServicesDialogBoxPackage(),
+          new LocationServicesDialogBoxPackage(),
           new RCTBluetoothSerialPackage(),
           new MapsPackage(),
           new VectorIconsPackage()
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,9 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'net.hockeyapp.android:HockeySDK:4.1.0'
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Sep 06 17:39:14 SGT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -7,11 +7,11 @@ 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'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
-
-include ':app'
-
 include ':react-native-sms-android'
-project(':react-native-sms-android').projectDir = new File(settingsDir, '../node_modules/react-native-sms-android/android')
-
-include ':react-native-hockeyapp', ':app'
+project(':react-native-sms-android').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sms-android/android')
+include ':react-native-maps'
+project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
+include ':react-native-hockeyapp'
 project(':react-native-hockeyapp').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-hockeyapp/android')
+
+include ':app'
diff --git a/imgs/ERD.png b/imgs/ERD.png
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
 		"test": "jest"
 	},
 	"dependencies": {
+		"@remobile/react-native-toast": "^1.0.6",
 		"firebase": "^4.3.0",
 		"moment": "^2.18.1",
 		"react": "16.0.0-alpha.12",
diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js
@@ -0,0 +1,91 @@
+import React, { Component } from 'react'
+import { Text, View, TouchableOpacity, StatusBar, ScrollView, StyleSheet } from 'react-native'
+import MapView from 'react-native-maps'
+import DrawerButton from '../DrawerButton'
+
+const styles = StyleSheet.create({
+  container: {
+    ...StyleSheet.absoluteFillObject,
+    height: 400,
+    width: 400,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+});
+
+const LATITUDE = 1.3077426;
+const LONGITUDE = 103.8318502;
+const LATITUDE_DELTA = 0.015;
+const LONGITUDE_DELTA = 0.0121;
+
+export default class Map extends Component {
+  constructor() {
+  super();
+
+  this.state = {
+    region: {
+      latitude: LATITUDE,
+      longitude: LONGITUDE,
+      latitudeDelta: LATITUDE_DELTA,
+      longitudeDelta: LONGITUDE_DELTA,
+    }
+  };
+}
+
+componentDidMount() {
+  navigator.geolocation.getCurrentPosition(
+    position => {
+      this.setState({
+        region: {
+          latitude: position.coords.latitude,
+          longitude: position.coords.longitude,
+          latitudeDelta: LATITUDE_DELTA,
+          longitudeDelta: LONGITUDE_DELTA,
+        }
+      });
+    },
+  (error) => console.log(error.message),
+  { enableHighAccuracy: true, timeout: 20000, maximumAge: 1000 },
+  );
+  this.watchID = navigator.geolocation.watchPosition(
+    position => {
+      this.setState({
+        region: {
+          latitude: position.coords.latitude,
+          longitude: position.coords.longitude,
+          latitudeDelta: LATITUDE_DELTA,
+          longitudeDelta: LONGITUDE_DELTA,
+        }
+      });
+    }
+  );
+}
+
+componentWillUnmount() {
+  navigator.geolocation.clearWatch(this.watchId);
+}
+
+  render () {
+    const { navigate } = this.props.navigation
+    const { region } = this.props;
+        console.log(region);
+
+        return (
+          <View style ={styles.container}>
+          <DrawerButton onPress={() => navigate('DrawerOpen')} />
+            <MapView
+              style={styles.map}
+              region={ this.state.region }
+              onRegionChange={ region => this.setState({region}) }
+              onRegionChangeComplete={ region => this.setState({region}) }
+            >
+            <MapView.Marker coordinate={ this.state.region }
+            />
+            </MapView>
+          </View>
+        );
+      }
+    }
diff --git a/src/components/Profile/CreateProfile.js b/src/components/Profile/CreateProfile.js
@@ -78,7 +78,6 @@ export default class CreateProfile extends Component {
   render () {
     var Form = t.form.Form
     return (
-
       <KeyboardAwareScrollView
         style={{ backgroundColor: '#6ed3cf' }}
         resetScrollToCoords={{ x: 0, y: 0 }}
diff --git a/src/components/Session/Impact.js b/src/components/Session/Impact.js
@@ -5,6 +5,7 @@ import styles from '../styles/styles.js'
 export default class Impact extends Component {
   constructor (props) {
     super(props)
+    this.componentDidUpdate = this.componentDidUpdate.bind(this)
     this.state = {
       seconds: 10,
       value: false
diff --git a/src/components/Session/Session.js b/src/components/Session/Session.js
@@ -7,8 +7,8 @@ import LocationServicesDialogBox from "react-native-android-location-services-di
 
 // device info
 const device = {
-  name: 'HC-06',
-  id: '98:D3:31:FD:68:8E'
+  name: 'HC-05',
+  id: '20:16:05:24:58:27'
 }
 
 // const device = {
diff --git a/src/components/TO-DEL-WHEN-BT-DONE.js b/src/components/TO-DEL-WHEN-BT-DONE.js
diff --git a/src/components/imgs/ic_done_black_24dp.png b/src/components/imgs/ic_done_black_24dp.png
diff --git a/src/config/router.js b/src/config/router.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.3.3'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.2.3'`
`9`	`9`	`classpath 'net.hockeyapp.android:HockeySDK:4.1.0'`
`10`		`-`
`11`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`11`	`// in the individual module build.gradle files`
`13`	`12`	`}`