diff --git a/App.js b/App.js index 6103972..e30c3e6 100644 --- a/App.js +++ b/App.js @@ -17,7 +17,9 @@ import RunInfoNumeric from './components/run-info-num'; import MapView from 'react-native-maps'; import NewButton from "./components/new-button"; +import JoinButton from "./components/join-button"; import CapturedArea from "./components/captured-area"; +import RoomInput from "./components/room-input"; const instructions = Platform.select({ ios: 'Press Cmd+R to reload,\n' + 'Cmd+D or shake for dev menu', @@ -93,7 +95,6 @@ export default class App extends Component { strokeWidth={5} /> {this.state.captures.map((capture, i) => { - {console.log(capture);} return { ) } - + + + + + {this.setState({walkMarkers: []})}}/> + - {/* this.distanceInfo = info}*/} - {/*/>*/} - {/* this.speedInfo = info}*/} - {/*/>*/} - {/* this.directionInfo = info}*/} - {/*/>*/} - {this.setState({walkMarkers: []})}}/> - + + + {}}/> + {}}/> + {}}/> + {}}/> + + + + ); } @@ -128,10 +130,29 @@ export default class App extends Component { const styles = StyleSheet.create({ infoWrapper: { + // position: 'absolute', + // left: 0, + // bottom: 0, + // right: 0, + paddingVertical: 0, + flexDirection: 'row', + flex: 1 + }, + menu: { + position: 'absolute', left: 0, bottom: 0, right: 0, + flexDirection: 'column', + flex: 1 + }, + new: { + // position: 'absolute', + // left: 0, + // bottom: 60, + // right: 0, + paddingHorizontal: 10, flexDirection: 'row', flex: 1 }, diff --git a/components/join-button.js b/components/join-button.js new file mode 100644 index 0000000..956328c --- /dev/null +++ b/components/join-button.js @@ -0,0 +1,35 @@ +import React, { Component } from 'react'; +import sharedStyles from '../shared-styles'; +import { + TouchableHighlight, + Platform, + StyleSheet, + Text, + View +} from 'react-native'; + +export default class JoinButton extends Component { + constructor(props) { + super(props); + this.join = this.props.join; + this.state = { value: this.props.value}; + } + + formatValue() { + return this.state.value; + } + + render() { + return ( + + this.join()} + // style={sharedStyles.new} + > + Join + + + + ) + } +} diff --git a/components/new-button.js b/components/new-button.js index 9671cbd..2aa0162 100644 --- a/components/new-button.js +++ b/components/new-button.js @@ -21,12 +21,17 @@ export default class NewButton extends Component { render() { return ( - + this.erase()} // style={sharedStyles.new} > - New + Start Capture + diff --git a/components/room-input.js b/components/room-input.js new file mode 100644 index 0000000..e69de29 diff --git a/shared-styles.js b/shared-styles.js index b98cd88..3872f52 100644 --- a/shared-styles.js +++ b/shared-styles.js @@ -2,7 +2,7 @@ import { StyleSheet} from 'react-native'; export default StyleSheet.create({ runInfoWrapper: { - backgroundColor: 'rgba(255,255,255,0.75)', + backgroundColor: 'rgba(255,255,255,1)', paddingVertical: 15 }, runInfoTitle: {