john/deighton-ar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added wait modals everywhere. Reduce required distance to item

Browse Source
This commit is contained in:
John Lyon-Smith
2018-05-31 11:15:53 -07:00
parent 9e55320a21
commit 2bbd464b7e
6 changed files with 205 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/DeightonAR.iml
View File

@@ -8,7 +8,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

154
mobile/android/app/app.iml Normal file
View File

@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:fbcore-1.3.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-r2.2.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:drawee-1.3.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-okhttp3-1.3.0" level="project" />
<orderEntry type="library" name="Gradle: artifacts:arcore_client" level="project" />
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-ddb:2.2.22@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.2.4@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:fresco-1.3.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: org.webkit:android-jsc-r174650" level="project" />
<orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-s3:2.2.22@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-core:2.2.22@jar" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.soloader:soloader-0.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fbui.textlayoutbuilder:textlayoutbuilder-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-base-1.3.0" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.6.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-25.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: artifacts:react_viro" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.react:react-native-0.55.4" level="project" />
<orderEntry type="library" name="Gradle: com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.0.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-cognito:2.2.22@jar" level="project" />
<orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.2.22@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp-urlconnection:3.6.0@jar" level="project" />
<orderEntry type="library" name="Gradle: artifacts:viro_renderer" level="project" />
<orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-ddb-mapper:2.2.22@jar" level="project" />
<orderEntry type="library" name="Gradle: artifacts:gvr_common" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-1.3.0" level="project" />
<orderEntry type="module" module-name="react-native-fs" />
<orderEntry type="module" module-name="react-native-maps" />
<orderEntry type="module" module-name="react-native-image-resizer" />
<orderEntry type="module" module-name="react-native-image-picker" />
<orderEntry type="library" name="Gradle: android-android-27" level="project" />
</component>
</module>

10
mobile/src/Activity/Activity.js
View File

@@ -97,16 +97,19 @@ export class Activity extends React.Component {
this.region = null
this.isMapReady = false
this.goToRegionWhenReady = false
}
componentDidMount() {
const { search } = this.props.location
const params = search ? new URLSearchParams(search) : { get: () => null }
const id = params.get("id")
const workItemId = params.get("workItemId")
const getWorkItem = (id) => {
this.setState({ waitModal: { message: "Loading Work Item Details..." } })
api
.getWorkItem(id)
.then((workItem) => {
this.setState({ waitModal: null })
if (workItem) {
const [lng, lat] = workItem.location.coordinates
@@ -139,6 +142,7 @@ export class Activity extends React.Component {
})
.catch((err) => {
this.setState({
waitModal: null,
messageModal: {
icon: "hand",
message: "Unable to get work item details",
@@ -150,9 +154,12 @@ export class Activity extends React.Component {
}
if (id) {
this.setState({ waitModal: { message: "Loading Activity..." } })
api
.getActivity(id)
.then((activity) => {
this.setState({ waitModal: null })
if (activity) {
this.setState({
binder: new FormBinder(activity, Activity.bindings),
@@ -163,6 +170,7 @@ export class Activity extends React.Component {
})
.catch((err) => {
this.setState({
waitModal: null,
messageModal: {
icon: "hand",
message: "Unable to get activity details",

27
mobile/src/Home/Home.js
View File

@@ -13,7 +13,7 @@ import {
} from "react-native"
import MapView, { Marker, Callout } from "react-native-maps"
import { Icon, Header, Geolocation } from "../ui"
import { MessageModal } from "../Modal"
import { MessageModal, WaitModal } from "../Modal"
import { api } from "../API"
import { reactAutoBind } from "auto-bind2"
import { ifIphoneX } from "react-native-iphone-x-helper"
@@ -41,6 +41,8 @@ export class Home extends React.Component {
super(props)
reactAutoBind(this)
this.state = {
waitModal: null,
messageModal: null,
sections: [],
showWorkItems: true,
haveCameraPermission: false,
@@ -97,7 +99,14 @@ export class Home extends React.Component {
this.state.haveLocationPermission = true
this.state.haveCameraPermission = true
}
}
componentDidMount() {
this.loadWorkItems()
}
loadWorkItems() {
this.setState({ waitModal: { message: "Loading Work Items..." } })
api
.listTeams()
.then((list) => {
@@ -105,6 +114,8 @@ export class Home extends React.Component {
return api.listWorkItemActivities()
})
.then((list) => {
this.setState({ waitModal: null })
list.items.forEach((item) => {
item.data.forEach((datum) => {
const team = this.teams.find((team) => team._id === datum.team)
@@ -130,6 +141,7 @@ export class Home extends React.Component {
})
.catch((err) => {
this.setState({
waitModal: null,
messageModal: {
icon: "hand",
message: "Unable to get a list of work items, activities and teams",
@@ -246,7 +258,13 @@ export class Home extends React.Component {
}
handleToggleWorkItemsList() {
this.setState({ showWorkItems: !this.state.showWorkItems })
const newShowWorkItems = !this.state.showWorkItems
this.setState({ showWorkItems: newShowWorkItems })
if (newShowWorkItems) {
this.loadWorkItems()
}
}
handleCalloutPress(workItem) {
@@ -287,6 +305,7 @@ export class Home extends React.Component {
sections,
showWorkItems,
messageModal,
waitModal,
haveCameraPermission,
haveLocationPermission,
} = this.state
@@ -491,6 +510,10 @@ export class Home extends React.Component {
{haveLocationPermission && (
<Geolocation onUpdate={this.handlePositionUpdate} />
)}
<WaitModal
open={!!waitModal}
message={waitModal ? waitModal.message : ""}
/>
<MessageModal
open={!!messageModal}
icon={messageModal ? messageModal.icon : ""}

12
mobile/src/WorkItem/WorkItem.js
View File

@@ -104,15 +104,21 @@ export class WorkItem extends React.Component {
this.region = null
this.isMapReady = false
this.goToRegionWhenReady = false
}
componentDidMount() {
const { search } = this.props.location
const params = search ? new URLSearchParams(search) : { get: () => null }
const id = params.get("id")
if (id) {
this.setState({ waitModal: { message: "Loading Work Item..." } })
api
.getWorkItem(id)
.then((workItem) => {
this.setState({ waitModal: null })
if (workItem) {
const [longitude, latitude] = workItem.location.coordinates
@@ -136,6 +142,7 @@ export class WorkItem extends React.Component {
})
.catch((err) => {
this.setState({
waitModal: null,
messageModal: {
icon: "hand",
message: "Unable to get work item details",
@@ -167,14 +174,18 @@ export class WorkItem extends React.Component {
const { binder } = this.state
let obj = binder.getModifiedBindingValues()
this.setState({ waitModal: { message: "Creating Work Item..." } })
if (!obj._id) {
api
.createWorkItem(obj)
.then((workItem) => {
this.setState({ waitModal: null })
this.handleBackPress()
})
.catch((error) => {
this.setState({
waitModal: null,
messageModal: {
icon: "hand",
message: "Unable to create work item",
@@ -190,6 +201,7 @@ export class WorkItem extends React.Component {
})
.catch((error) => {
this.setState({
waitModal: null,
messageModal: {
icon: "hand",
message: "Unable to update work item",

8
mobile/src/config.js
View File

@@ -2,20 +2,20 @@ import React from "react"
import { Platform } from "react-native"
export const config = {
localIPAddr: "192.168.1.175",
//localIPAddr: "192.168.1.14",
//localIPAddr: "192.168.1.175",
localIPAddr: "192.168.1.14",
viroAPIKey: "06F37B6A-74DA-4A83-965A-7DE2209A5C46",
googleGeocodeAPIKey: "AIzaSyCs4JVT6gysnY5dAJ7KjVJYeykLv_xz1GI",
googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json",
refererURL: "https://dar.kss.us.com",
minDistanceToItem: 20,
minDistanceToItem: 10,
workItemRegionDelta: 0.005,
activityRegionDelta: 0.005,
homeRegionInset: 0.02,
homeRegionDelta: 0.005,
geocodeDelayMilliseconds: 500,
// defaultUser: "john@lyon-smith.org",
//defaultUser: "john@lyon-smith.org",
defaultUser: "",
// This region is downtown Toronto