diff --git a/mobile/src/ARViewer/ARViewer.js b/mobile/src/ARViewer/ARViewer.js
index f851e80..33fc58f 100644
--- a/mobile/src/ARViewer/ARViewer.js
+++ b/mobile/src/ARViewer/ARViewer.js
@@ -22,18 +22,18 @@ const styles = {
}
const shapes = {
- // hardhat: {
- // shape: require("./models/hardhat.obj"),
- // materials: [require("./models/hardhat.mtl")],
- // },
- // question: {
- // shape: require("./models/question.obj"),
- // materials: [require("./models/question.mtl")],
- // },
- // clipboard: {
- // shape: require("./models/clipboard.obj"),
- // materials: [require("./models/clipboard.mtl")],
- // },
+ hardhat: {
+ shape: require("./models/hardhat_obj.obj"),
+ materials: [require("./models/hardhat.mtl")],
+ },
+ question: {
+ shape: require("./models/question_obj.obj"),
+ materials: [require("./models/question.mtl")],
+ },
+ clipboard: {
+ shape: require("./models/clipboard_obj.obj"),
+ materials: [require("./models/clipboard.mtl")],
+ },
}
class WorkItemSceneAR extends React.Component {
diff --git a/mobile/src/ARViewer/models/clipboard.obj b/mobile/src/ARViewer/models/clipboard_obj.obj
similarity index 100%
rename from mobile/src/ARViewer/models/clipboard.obj
rename to mobile/src/ARViewer/models/clipboard_obj.obj
diff --git a/mobile/src/ARViewer/models/hardhat.obj b/mobile/src/ARViewer/models/hardhat_obj.obj
similarity index 100%
rename from mobile/src/ARViewer/models/hardhat.obj
rename to mobile/src/ARViewer/models/hardhat_obj.obj
diff --git a/mobile/src/ARViewer/models/question.obj b/mobile/src/ARViewer/models/question_obj.obj
similarity index 100%
rename from mobile/src/ARViewer/models/question.obj
rename to mobile/src/ARViewer/models/question_obj.obj
diff --git a/mobile/src/Home/Home.js b/mobile/src/Home/Home.js
index a576e7e..0ba1b5e 100644
--- a/mobile/src/Home/Home.js
+++ b/mobile/src/Home/Home.js
@@ -106,7 +106,6 @@ export class Home extends React.Component {
title="Work Item Map"
leftButton={{ icon: "logout", onPress: this.handleLogoutPress }}
rightButton={{ icon: "glasses", onPress: this.handleGlassesPress }}
- disabled
/>
{
@@ -137,10 +136,10 @@ export class Home extends React.Component {
workItemTypeText[workItem.workItemType]
}
description={workItem.address}
- image={require("./images/pin.png")}
anchor={{ x: 0.5, y: 1.0 }}
- onPress={(e) => this.handleMarkerPress(e, index)}
- />
+ onPress={(e) => this.handleMarkerPress(e, index)}>
+
+
))}
- WORK ORDER {pad(workItem.ticketNumber, 4)}
+ {workItemTypeText[workItem.workItemType].toUpperCase()}{" "}
+ {pad(workItem.ticketNumber, 4)}
)}
diff --git a/mobile/src/Home/images/pin.png b/mobile/src/Home/images/pin.png
deleted file mode 100644
index 2b3ffe8..0000000
Binary files a/mobile/src/Home/images/pin.png and /dev/null differ
diff --git a/mobile/src/ui/Icon.js b/mobile/src/ui/Icon.js
index 4834018..e63275a 100644
--- a/mobile/src/ui/Icon.js
+++ b/mobile/src/ui/Icon.js
@@ -1,19 +1,20 @@
-import React, { Component } from 'react'
-import { Image, View } from 'react-native'
-import PropTypes from 'prop-types'
+import React, { Component } from "react"
+import { Image, View } from "react-native"
+import PropTypes from "prop-types"
const images = {
- logout: require('./images/logout.png'),
- glasses: require('./images/ar-glasses.png'),
- back: require('./images/back.png'),
- hand: require('./images/hand.png'),
- center: require('./images/center.png'),
- rightArrow: require('./images/right-arrow.png'),
- search: require('./images/search.png'),
- settings: require('./images/settings.png'),
- add: require('./images/add.png'),
- done: require('./images/done.png'),
- target: require('./images/target.png'),
+ logout: require("./images/logout.png"),
+ glasses: require("./images/ar-glasses.png"),
+ back: require("./images/back.png"),
+ hand: require("./images/hand.png"),
+ center: require("./images/center.png"),
+ rightArrow: require("./images/right-arrow.png"),
+ search: require("./images/search.png"),
+ settings: require("./images/settings.png"),
+ add: require("./images/add.png"),
+ done: require("./images/done.png"),
+ target: require("./images/target.png"),
+ pin: require("./images/pin.png"),
}
export class Icon extends Component {
@@ -31,13 +32,19 @@ export class Icon extends Component {
render() {
let { name, margin, style } = this.props
- let size = this.props.size - (margin * 2)
+ let size = this.props.size - margin * 2
let source = images[name]
if (!source) {
return
} else {
- return
+ return (
+
+ )
}
}
}
diff --git a/mobile/src/ui/images/pin.png b/mobile/src/ui/images/pin.png
new file mode 100644
index 0000000..7828274
Binary files /dev/null and b/mobile/src/ui/images/pin.png differ