Fix bugs with image size and AR view production build

mobile/src/ARViewer/ARViewer.js

@@ -22,18 +22,18 @@ const styles = {
 }
 
 const shapes = {
-  // hardhat: {
+  hardhat: {
-  //   shape: require("./models/hardhat.obj"),
+    shape: require("./models/hardhat_obj.obj"),
-  //   materials: [require("./models/hardhat.mtl")],
+    materials: [require("./models/hardhat.mtl")],
-  // },
+  },
-  // question: {
+  question: {
-  //   shape: require("./models/question.obj"),
+    shape: require("./models/question_obj.obj"),
-  //   materials: [require("./models/question.mtl")],
+    materials: [require("./models/question.mtl")],
-  // },
+  },
-  // clipboard: {
+  clipboard: {
-  //   shape: require("./models/clipboard.obj"),
+    shape: require("./models/clipboard_obj.obj"),
-  //   materials: [require("./models/clipboard.mtl")],
+    materials: [require("./models/clipboard.mtl")],
-  // },
+  },
 }
 
 class WorkItemSceneAR extends React.Component {

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
         />
         <MapView
           ref={(ref) => {
@@ -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)}>
-            />
+              <Icon name="pin" size={24} />
+            </Marker>
           ))}
         </MapView>
         <View
@@ -183,7 +182,8 @@ export class Home extends React.Component {
                 height: 45,
               }}>
               <Text style={{ fontSize: 16 }}>
-                WORK ORDER {pad(workItem.ticketNumber, 4)}
+                {workItemTypeText[workItem.workItemType].toUpperCase()}{" "}
+                {pad(workItem.ticketNumber, 4)}
               </Text>
             </View>
           )}

mobile/src/ui/Icon.js

@@ -1,19 +1,20 @@
-import React, { Component } from 'react'
+import React, { Component } from "react"
-import { Image, View } from 'react-native'
+import { Image, View } from "react-native"
-import PropTypes from 'prop-types'
+import PropTypes from "prop-types"
 
 const images = {
-  logout: require('./images/logout.png'),
+  logout: require("./images/logout.png"),
-  glasses: require('./images/ar-glasses.png'),
+  glasses: require("./images/ar-glasses.png"),
-  back: require('./images/back.png'),
+  back: require("./images/back.png"),
-  hand: require('./images/hand.png'),
+  hand: require("./images/hand.png"),
-  center: require('./images/center.png'),
+  center: require("./images/center.png"),
-  rightArrow: require('./images/right-arrow.png'),
+  rightArrow: require("./images/right-arrow.png"),
-  search: require('./images/search.png'),
+  search: require("./images/search.png"),
-  settings: require('./images/settings.png'),
+  settings: require("./images/settings.png"),
-  add: require('./images/add.png'),
+  add: require("./images/add.png"),
-  done: require('./images/done.png'),
+  done: require("./images/done.png"),
-  target: require('./images/target.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 <View style={{ width: size, height: size, margin }} />
     } else {
-      return <Image style={[{ width: size, height: size, margin }, style]} source={source} resizeMode='stretch' />
+      return (
+        <Image
+          style={[{ width: size, height: size, margin }, style]}
+          source={source}
+          resizeMode="stretch"
+        />
+      )
     }
   }
 }