Integrated master/detail, refactor Icon, add base router

mobile/src/Activity/Activity.js

@@ -22,7 +22,7 @@ import {
   BoundPhotoPanel,
   FormStaticInput,
 } from "../ui"
-import { MessageModal, WaitModal } from "../Modal"
+import { MessageModal, WaitModal, ProgressModal } from "../Modal"
 import autobind from "autobind-decorator"
 import KeyboardSpacer from "react-native-keyboard-spacer"
 import { isIphoneX } from "react-native-iphone-x-helper"
@@ -88,6 +88,7 @@ export class Activity extends React.Component {
       binder: new FormBinder({}, Activity.bindings),
       waitModal: null,
       messageModal: null,
+      progressModal: null,
     }
 
     const { search } = this.props.location
@@ -105,7 +106,7 @@ export class Activity extends React.Component {
             this.setState({
               binder: new FormBinder(
                 {
-                  ...this.state.binder.getOriginalFieldValues(),
+                  ...this.state.binder.originalObj,
                   workItem: workItem._id,
                   team: api.loggedInUser.team,
                 },
@@ -225,12 +226,35 @@ export class Activity extends React.Component {
 
   @autobind
   handleUploadStarted() {
-    this.setState({ waitModal: { message: "Uploading Photo..." } })
+    this.setState({
+      progressModal: { message: "Uploading Photo..." },
+      uploadPercent: 0,
+    })
   }
 
   @autobind
-  handleUploadEnded() {
-    this.setState({ waitModal: null })
+  handleUploadProgress(uploadData) {
+    console.log(uploadData)
+    if (this.state.progressModal) {
+      this.setState({
+        uploadPercent: Math.round(
+          uploadData.uploadedChunks / uploadData.numberOfChunks * 100
+        ),
+      })
+      return true
+    } else {
+      return false
+    }
+  }
+
+  @autobind
+  handleUploadEnded(successful, uploadData) {
+    this.setState({ progressModal: null })
+  }
+
+  @autobind
+  handleUploadCanceled() {
+    this.setState({ progressModal: null })
   }
 
   render() {
@@ -313,11 +337,18 @@ export class Activity extends React.Component {
               name="photos"
               binder={binder}
               onUploadStarted={this.handleUploadStarted}
+              onUploadProgress={this.handleUploadProgress}
               onUploadEnded={this.handleUploadEnded}
             />
           </View>
           {isIphoneX ? <View style={{ height: 30, width: "100%" }} /> : null}
         </ScrollView>
+        <ProgressModal
+          open={!!progressModal}
+          message={progressModal ? progressModal.message : ""}
+          percent={uploadPercent}
+          onCancel={this.handleUploadCanceled}
+        />
         <WaitModal
           open={!!waitModal}
           message={waitModal ? waitModal.message : ""}