From fbc98dd09970c33c1f1d3afef853807c877427a7 Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Tue, 20 Mar 2018 08:05:36 -0700 Subject: [PATCH] Commit test viewer screen --- mobile/src/screens/Home.js | 13 +++++++-- mobile/src/screens/Viewer.js | 43 +++++++++++++++++++++++++++++ mobile/src/screens/images/back.png | Bin 0 -> 3447 bytes mobile/src/screens/index.js | 2 +- 4 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 mobile/src/screens/images/back.png diff --git a/mobile/src/screens/Home.js b/mobile/src/screens/Home.js index 02c3b03..9b002a6 100644 --- a/mobile/src/screens/Home.js +++ b/mobile/src/screens/Home.js @@ -12,14 +12,14 @@ export class Home extends React.Component { static navigatorButtons = { rightButtons: [ { + id: 'viewer', icon: require('./images/ar-glases.png'), - id: 'arview', } ], leftButtons: [ { - icon: require('./images/logout.png'), id: 'logout', + icon: require('./images/logout.png'), } ] } @@ -55,13 +55,20 @@ export class Home extends React.Component { api.logout().then(() => { this.props.navigator.showModal({ screen: 'app.Login' }) }) + break + case 'viewer': + this.props.navigator.push({ + screen: 'app.Viewer', + animation: 'slide-horizontal', + }) + break case 'willAppear': break case 'didAppear': if (!api.loggedInUser) { this.props.navigator.showModal({ screen: 'app.Login' }) } - break; + break case 'willDisappear': break case 'didDisappear': diff --git a/mobile/src/screens/Viewer.js b/mobile/src/screens/Viewer.js index e69de29..6d814b0 100644 --- a/mobile/src/screens/Viewer.js +++ b/mobile/src/screens/Viewer.js @@ -0,0 +1,43 @@ +import React from 'react' +import { StyleSheet, View, TouchableOpacity, Image } from 'react-native' +import backImage from './images/back.png' + +export class Viewer extends React.Component { + static navigatorStyle = { + navBarHidden: true, + } + + static styles = StyleSheet.create({ + container: { + height: '100%', + width: '100%', + justifyContent: 'flex-start', + backgroundColor: '#AAAAAA', + }, + button: { + marginTop: 40, + marginLeft: 20, + width: 45, + height: 45, + } + }) + + constructor(props) { + super(props) + this._handlePressButton = this._handlePressButton.bind(this) + } + + _handlePressButton() { + this.props.navigator.pop() + } + + render() { + return ( + + + + + + ); + } +} diff --git a/mobile/src/screens/images/back.png b/mobile/src/screens/images/back.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd82ca2112078153be720225996f570cf0502d3 GIT binary patch literal 3447 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 A9{>OV literal 0 HcmV?d00001 diff --git a/mobile/src/screens/index.js b/mobile/src/screens/index.js index c92144c..947bf9a 100644 --- a/mobile/src/screens/index.js +++ b/mobile/src/screens/index.js @@ -1,7 +1,7 @@ import { Home } from './Home' import { Login } from './Login' import { Error } from './Error' -import { View } from './Viewer' +import { Viewer } from './Viewer' import { Navigation } from 'react-native-navigation' export function registerScreens() {