diff options
| -rw-r--r-- | mobile/.expo/packager-info.json | 12 | ||||
| -rw-r--r-- | mobile/App.js | 2 | ||||
| -rw-r--r-- | mobile/components/FormPage.js | 20 | ||||
| -rw-r--r-- | mobile/screens/GreetingPage.js (renamed from mobile/components/GreetingPage.js) | 0 | ||||
| -rw-r--r-- | mobile/screens/HomeScreen.js | 188 | ||||
| -rw-r--r-- | mobile/screens/LinksScreen.js | 27 | ||||
| -rw-r--r-- | mobile/screens/SettingsScreen.js | 14 |
7 files changed, 7 insertions, 256 deletions
diff --git a/mobile/.expo/packager-info.json b/mobile/.expo/packager-info.json index 7391ba7..606e044 100644 --- a/mobile/.expo/packager-info.json +++ b/mobile/.expo/packager-info.json @@ -1,9 +1,9 @@ { "devToolsPort": 19002, - "expoServerPort": null, - "packagerPort": null, - "packagerPid": null, - "expoServerNgrokUrl": null, - "packagerNgrokUrl": null, - "ngrokPid": null + "expoServerPort": 19000, + "packagerPort": 19001, + "packagerPid": 29021, + "expoServerNgrokUrl": "https://h6-m98.csc301dreamteam.mobile.exp.direct", + "packagerNgrokUrl": "https://packager.h6-m98.csc301dreamteam.mobile.exp.direct", + "ngrokPid": 29069 }
\ No newline at end of file diff --git a/mobile/App.js b/mobile/App.js index c9331bc..a1f3bc4 100644 --- a/mobile/App.js +++ b/mobile/App.js @@ -3,7 +3,7 @@ import { Text, View, Alert, StyleSheet, Button, AppRegistry, Navigator, Touchabl import { Ionicons } from '@expo/vector-icons'; import { createStackNavigator, createAppContainer } from 'react-navigation'; -import GreetingPage from './components/GreetingPage'; +import GreetingPage from './screens/GreetingPage'; import FormPage from './screens/Form1'; import MapPage from './screens/MapPage'; diff --git a/mobile/components/FormPage.js b/mobile/components/FormPage.js deleted file mode 100644 index 5fa4abb..0000000 --- a/mobile/components/FormPage.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { Component } from 'react'; -import { Text, View, Alert, StyleSheet, Button, AppRegistry, Navigator, TouchableHighlight} from 'react-native'; -import { Ionicons } from '@expo/vector-icons'; -import { createStackNavigator, createAppContainer } from 'react-navigation'; - -export default class FormPage extends Component { - render() { - return ( - <View marginTop = {50}> - <Text> - Put the form stuff here - </Text> - <Button - onPress={() => this.props.navigation.navigate('GreetingPage')} - title='Go Back' - /> - </View> - ); - } -} diff --git a/mobile/components/GreetingPage.js b/mobile/screens/GreetingPage.js index 0bfa63b..0bfa63b 100644 --- a/mobile/components/GreetingPage.js +++ b/mobile/screens/GreetingPage.js diff --git a/mobile/screens/HomeScreen.js b/mobile/screens/HomeScreen.js deleted file mode 100644 index 0d3548e..0000000 --- a/mobile/screens/HomeScreen.js +++ /dev/null @@ -1,188 +0,0 @@ -import React from 'react'; -import { - Image, - Platform, - ScrollView, - StyleSheet, - Text, - TouchableOpacity, - View, -} from 'react-native'; -import { WebBrowser } from 'expo'; - -import { MonoText } from '../components/StyledText'; - -export default class HomeScreen extends React.Component { - static navigationOptions = { - header: null, - }; - - render() { - return ( - <View style={styles.container}> - <ScrollView style={styles.container} contentContainerStyle={styles.contentContainer}> - <View style={styles.welcomeContainer}> - <Image - source={ - __DEV__ - ? require('../assets/images/robot-dev.png') - : require('../assets/images/robot-prod.png') - } - style={styles.welcomeImage} - /> - </View> - - <View style={styles.getStartedContainer}> - {this._maybeRenderDevelopmentModeWarning()} - - <Text style={styles.getStartedText}>Get started by opening</Text> - - <View style={[styles.codeHighlightContainer, styles.homeScreenFilename]}> - <MonoText style={styles.codeHighlightText}>screens/HomeScreen.js</MonoText> - </View> - - <Text style={styles.getStartedText}> - Change this text and your app will automatically reload. - </Text> - </View> - - <View style={styles.helpContainer}> - <TouchableOpacity onPress={this._handleHelpPress} style={styles.helpLink}> - <Text style={styles.helpLinkText}>Help, it didn’t automatically reload!</Text> - </TouchableOpacity> - </View> - </ScrollView> - - <View style={styles.tabBarInfoContainer}> - <Text style={styles.tabBarInfoText}>This is a tab bar. You can edit it in:</Text> - - <View style={[styles.codeHighlightContainer, styles.navigationFilename]}> - <MonoText style={styles.codeHighlightText}>navigation/MainTabNavigator.js</MonoText> - </View> - </View> - </View> - ); - } - - _maybeRenderDevelopmentModeWarning() { - if (__DEV__) { - const learnMoreButton = ( - <Text onPress={this._handleLearnMorePress} style={styles.helpLinkText}> - Learn more - </Text> - ); - - return ( - <Text style={styles.developmentModeText}> - Development mode is enabled, your app will be slower but you can use useful development - tools. {learnMoreButton} - </Text> - ); - } else { - return ( - <Text style={styles.developmentModeText}> - You are not in development mode, your app will run at full speed. - </Text> - ); - } - } - - _handleLearnMorePress = () => { - WebBrowser.openBrowserAsync('https://docs.expo.io/versions/latest/guides/development-mode'); - }; - - _handleHelpPress = () => { - WebBrowser.openBrowserAsync( - 'https://docs.expo.io/versions/latest/guides/up-and-running.html#can-t-see-your-changes' - ); - }; -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: '#fff', - }, - developmentModeText: { - marginBottom: 20, - color: 'rgba(0,0,0,0.4)', - fontSize: 14, - lineHeight: 19, - textAlign: 'center', - }, - contentContainer: { - paddingTop: 30, - }, - welcomeContainer: { - alignItems: 'center', - marginTop: 10, - marginBottom: 20, - }, - welcomeImage: { - width: 100, - height: 80, - resizeMode: 'contain', - marginTop: 3, - marginLeft: -10, - }, - getStartedContainer: { - alignItems: 'center', - marginHorizontal: 50, - }, - homeScreenFilename: { - marginVertical: 7, - }, - codeHighlightText: { - color: 'rgba(96,100,109, 0.8)', - }, - codeHighlightContainer: { - backgroundColor: 'rgba(0,0,0,0.05)', - borderRadius: 3, - paddingHorizontal: 4, - }, - getStartedText: { - fontSize: 17, - color: 'rgba(96,100,109, 1)', - lineHeight: 24, - textAlign: 'center', - }, - tabBarInfoContainer: { - position: 'absolute', - bottom: 0, - left: 0, - right: 0, - ...Platform.select({ - ios: { - shadowColor: 'black', - shadowOffset: { height: -3 }, - shadowOpacity: 0.1, - shadowRadius: 3, - }, - android: { - elevation: 20, - }, - }), - alignItems: 'center', - backgroundColor: '#fbfbfb', - paddingVertical: 20, - }, - tabBarInfoText: { - fontSize: 17, - color: 'rgba(96,100,109, 1)', - textAlign: 'center', - }, - navigationFilename: { - marginTop: 5, - }, - helpContainer: { - marginTop: 15, - alignItems: 'center', - }, - helpLink: { - paddingVertical: 15, - }, - helpLinkText: { - fontSize: 14, - color: '#2e78b7', - }, -}); diff --git a/mobile/screens/LinksScreen.js b/mobile/screens/LinksScreen.js deleted file mode 100644 index 7bb4a62..0000000 --- a/mobile/screens/LinksScreen.js +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react'; -import { ScrollView, StyleSheet } from 'react-native'; -import { ExpoLinksView } from '@expo/samples'; - -export default class LinksScreen extends React.Component { - static navigationOptions = { - title: 'Links', - }; - - render() { - return ( - <ScrollView style={styles.container}> - {/* Go ahead and delete ExpoLinksView and replace it with your - * content, we just wanted to provide you with some helpful links */} - <ExpoLinksView /> - </ScrollView> - ); - } -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - paddingTop: 15, - backgroundColor: '#fff', - }, -}); diff --git a/mobile/screens/SettingsScreen.js b/mobile/screens/SettingsScreen.js deleted file mode 100644 index 6957dcb..0000000 --- a/mobile/screens/SettingsScreen.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import { ExpoConfigView } from '@expo/samples'; - -export default class SettingsScreen extends React.Component { - static navigationOptions = { - title: 'app.json', - }; - - render() { - /* Go ahead and delete ExpoConfigView and replace it with your - * content, we just wanted to give you a quick view of your config */ - return <ExpoConfigView />; - } -} |
