From b301bf17eb30c819930c8d33fbc0172d014af0a0 Mon Sep 17 00:00:00 2001
From: John Lyon-Smith <john@lyon-smith.org>
Date: Thu, 29 Mar 2018 15:40:37 -0700
Subject: [PATCH] Adding Android ViroAR stuff

---
 mobile/.idea/workspace.xml                    |  10 +--
 mobile/android/app/app.iml                    |   6 +-
 mobile/android/app/build.gradle               |  34 ++++++---
 .../android/app/src/main/AndroidManifest.xml  |  38 ++++-----
 .../java/com/deightonar/MainApplication.java  |   5 +-
 mobile/android/build.gradle                   |  10 ---
 mobile/android/keystores/debug.keystore       | Bin 0 -> 2316 bytes
 mobile/android/settings.gradle                |   5 ++
 .../ios/DeightonAR.xcodeproj/project.pbxproj  |   2 +
 mobile/ios/DeightonAR/Info.plist              |  10 +--
 mobile/package.json                           |   3 +-
 mobile/src/API.js                             |   2 +-
 mobile/src/app.js                             |   5 ++
 mobile/src/screens/Home.js                    |   4 +-
 mobile/src/screens/Login.js                   |   4 +-
 mobile/src/screens/Viewer.js                  |  72 ++++++++++++------
 16 files changed, 126 insertions(+), 84 deletions(-)
 create mode 100644 mobile/android/keystores/debug.keystore

diff --git a/mobile/.idea/workspace.xml b/mobile/.idea/workspace.xml
index 32a9465..0364ec8 100644
--- a/mobile/.idea/workspace.xml
+++ b/mobile/.idea/workspace.xml
@@ -15,8 +15,8 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-4322" />
-    <option name="y" value="122" />
+    <option name="x" value="82" />
+    <option name="y" value="121" />
     <option name="width" value="1522" />
     <option name="height" value="1014" />
   </component>
@@ -58,8 +58,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane" />
+      <pane id="Scratches" />
       <pane id="AndroidView">
         <subPane>
           <expand>
@@ -71,8 +71,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -191,7 +191,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4322" y="122" width="1522" height="1014" extended-state="0" />
+    <frame x="82" y="121" width="1522" height="1014" extended-state="0" />
     <layout>
       <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
diff --git a/mobile/android/app/app.iml b/mobile/android/app/app.iml
index 7d6576b..a7549d6 100644
--- a/mobile/android/app/app.iml
+++ b/mobile/android/app/app.iml
@@ -96,11 +96,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
@@ -112,12 +109,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-25.3.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-fragment-25.3.1" level="project" />
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 7bf7bef..6466259 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -94,13 +94,11 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
+    compileSdkVersion 25
     defaultConfig {
         applicationId "com.deightonar"
-        minSdkVersion rootProject.ext.targetSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         ndk {
@@ -126,7 +124,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2]
+            def versionCodes = ["armeabi-v7a": 1, "x86": 2]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -134,14 +132,28 @@ android {
             }
         }
     }
+    productFlavors {
+    }
 }
 
 dependencies {
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    compile "com.facebook.react:react-native:+"  // From node_modules
-    compile project(':react-native-navigation')
-    compile project(':react-native-maps')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    api "com.android.support:appcompat-v7:25.3.1"
+    api 'com.facebook.react:react-native:+'
+    // From node_modules
+    api project(':react-native-navigation')
+    api project(':react-native-maps')
+    api project(':gvr_common')
+    api project(':arcore_client')
+    api project(path: ':react_viro')
+    api project(path: ':viro_renderer')
+    api 'com.google.android.exoplayer:exoplayer:r2.2.0'
+    api 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
+    api 'com.amazonaws:aws-android-sdk-core:2.2.+'
+    api 'com.amazonaws:aws-android-sdk-ddb:2.2.+'
+    api 'com.amazonaws:aws-android-sdk-ddb-mapper:2.2.+'
+    api 'com.amazonaws:aws-android-sdk-cognito:2.2.+'
+    api 'com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.2.+'
 }
 
 // Run this once to be able to run the application with BUCK
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 753613a..287cd00 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -5,31 +5,33 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-sdk
         android:minSdkVersion="24"
         android:targetSdkVersion="27" />
 
     <application
-      android:name=".MainApplication"
-      android:allowBackup="true"
-      android:label="@string/app_name"
-      android:icon="@mipmap/ic_launcher"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MainActivity"
+        android:name=".MainApplication"
+        android:allowBackup="true"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <meta-data
-        android:name="com.google.android.geo.API_KEY"
-        android:value="AIzaSyDN4E_vzO4cKjKHkMg_49hX1GBnU34kx4U"/>
+        android:icon="@mipmap/ic_launcher"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyAC7r1GjMFL1atZdbEcFSdCaXDrPnISqTc" />
+        <meta-data android:name="com.google.ar.core" android:value="required" />
     </application>
 
 </manifest>
diff --git a/mobile/android/app/src/main/java/com/deightonar/MainApplication.java b/mobile/android/app/src/main/java/com/deightonar/MainApplication.java
index 0767542..4cd464c 100644
--- a/mobile/android/app/src/main/java/com/deightonar/MainApplication.java
+++ b/mobile/android/app/src/main/java/com/deightonar/MainApplication.java
@@ -14,6 +14,8 @@ import java.util.List;
 import com.reactnativenavigation.NavigationApplication;
 import com.airbnb.android.react.maps.MapsPackage;
 
+import com.viromedia.bridge.ReactViroPackage;
+
 public class MainApplication extends NavigationApplication {
     @Override
     public boolean isDebug() {
@@ -25,7 +27,8 @@ public class MainApplication extends NavigationApplication {
       // Add additional packages you require here
       // No need to add RnnPackage and MainReactPackage
       return Arrays.<ReactPackage>asList(
-          new MapsPackage()
+        new MapsPackage(),
+        new ReactViroPackage(ReactViroPackage.ViroPlatform.GVR)
       );
     }
 
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index be34f35..7928a91 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -23,13 +23,3 @@ allprojects {
         }
     }
 }
-
-ext {
-    compileSdkVersion = 27
-    targetSdkVersion = 27
-    minSdkVersion = 24
-    buildToolsVersion = "27.0.3"
-    supportLibVersion = "25.3.1"
-    googlePlayServicesVersion = "11.8.0"
-    androidMapsUtilsVersion = "0.5+"
-}
diff --git a/mobile/android/keystores/debug.keystore b/mobile/android/keystores/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..53a3caa2321bcce334e0381138414af0c0063730
GIT binary patch
literal 2316
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
LlTxKI0Q3I=5oP`Z

literal 0
HcmV?d00001

diff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradle
index 22c63ee..180c0aa 100644
--- a/mobile/android/settings.gradle
+++ b/mobile/android/settings.gradle
@@ -5,3 +5,8 @@ include ':react-native-navigation'
 project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')
 include ':react-native-maps'
 project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
+include ':react_viro', ':arcore_client', ':gvr_common', ':viro_renderer'
+project(':arcore_client').projectDir = new File('../node_modules/react-viro/android/arcore_client')
+project(':gvr_common').projectDir = new File('../node_modules/react-viro/android/gvr_common')
+project(':viro_renderer').projectDir = new File('../node_modules/react-viro/android/viro_renderer')
+project(':react_viro').projectDir = new File('../node_modules/react-viro/android/react_viro')
\ No newline at end of file
diff --git a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
index 2826ce4..eb8c74e 100644
--- a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
+++ b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
@@ -321,6 +321,7 @@
 					"-lc++",
 					"$(inherited)",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.us.kss.deighton-ar";
 				PRODUCT_NAME = DeightonAR;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -347,6 +348,7 @@
 					"-lc++",
 					"$(inherited)",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.us.kss.deighton-ar";
 				PRODUCT_NAME = DeightonAR;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
diff --git a/mobile/ios/DeightonAR/Info.plist b/mobile/ios/DeightonAR/Info.plist
index a9c25ab..b60520a 100644
--- a/mobile/ios/DeightonAR/Info.plist
+++ b/mobile/ios/DeightonAR/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.us.kss.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>20180328.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -35,10 +35,10 @@
 			</dict>
 		</dict>
 	</dict>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
 	<key>NSCameraUsageDescription</key>
 	<string>$(PRODUCT_NAME) camera use</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>$(PRODUCT_NAME) photo use</string>
 	<key>UILaunchStoryboardName</key>
diff --git a/mobile/package.json b/mobile/package.json
index 127e8a3..305def1 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -21,9 +21,10 @@
   },
   "dependencies": {
     "autobind-decorator": "^2.1.0",
+    "create-react-class": "^15.6.3",
     "eventemitter3": "^3.0.1",
     "npm": "^5.7.1",
-    "react": "16.2.0",
+    "react": "^16.2.0",
     "react-form-binder": "^1.2.0",
     "react-native": "^0.51.1",
     "react-native-google-maps": "^1.0.0",
diff --git a/mobile/src/API.js b/mobile/src/API.js
index ee71cd9..0212c6d 100644
--- a/mobile/src/API.js
+++ b/mobile/src/API.js
@@ -5,7 +5,7 @@ import { AsyncStorage } from 'react-native'
 const authTokenName = 'AuthToken'
 let baseURL = null
 let apiPath = null
-
+//
 if (__DEV__) {
   const localIPAddr = process.env.LOCAL_IP_ADDR
 
diff --git a/mobile/src/app.js b/mobile/src/app.js
index d4df46f..3fc2be4 100644
--- a/mobile/src/app.js
+++ b/mobile/src/app.js
@@ -2,6 +2,11 @@ import { Platform } from 'react-native'
 import { Navigation } from 'react-native-navigation'
 import { registerScreens } from './screens'
 
+// See https://github.com/facebook/react-native/issues/12981
+console.ignoredYellowBox = [
+  'Setting a timer'
+]
+
 registerScreens()
 
 Navigation.startSingleScreenApp({
diff --git a/mobile/src/screens/Home.js b/mobile/src/screens/Home.js
index eb8c80d..c8a2937 100644
--- a/mobile/src/screens/Home.js
+++ b/mobile/src/screens/Home.js
@@ -100,7 +100,9 @@ export class Home extends React.Component {
     return (
       <View style={Home.styles.container}>
         <MapView
-          style={{ width: '100%', height: '50%' }}
+          style={{
+            width: '100%', height: '50%',
+          }}
           zoomControlEnabled
           initialRegion={{
             latitude: 43.653908,
diff --git a/mobile/src/screens/Login.js b/mobile/src/screens/Login.js
index 4e8036e..0e6a77c 100644
--- a/mobile/src/screens/Login.js
+++ b/mobile/src/screens/Login.js
@@ -69,7 +69,7 @@ export class Login extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      binder: new FormBinder({email: 'john@lyon-smith.org', password: 'Skunkay'}, Login.bindings)
+      binder: new FormBinder({email: 'john@lyon-smith.org'}, Login.bindings)
     }
   }
 
@@ -90,7 +90,7 @@ export class Login extends React.Component {
   render() {
     return (
       <KeyboardAvoidingView style={Login.styles.page} behavior='padding'
-        keyboardVerticalOffset={Platform.select({ios: 0, android: 200})}>
+        keyboardVerticalOffset={Platform.select({ios: 0, android: -220})}>
         <Image style={Login.styles.logo} source={logoImage} resizeMode='contain' />
         <View style={Login.styles.inputRow}>
           <BoundInput name='email' label='Email:' placeholder='name@xyz.com' message='Must enter a valid email' binder={this.state.binder} />
diff --git a/mobile/src/screens/Viewer.js b/mobile/src/screens/Viewer.js
index 6d814b0..4b63d4d 100644
--- a/mobile/src/screens/Viewer.js
+++ b/mobile/src/screens/Viewer.js
@@ -1,6 +1,40 @@
 import React from 'react'
-import { StyleSheet, View, TouchableOpacity, Image } from 'react-native'
-import backImage from './images/back.png'
+import { StyleSheet, View } from 'react-native'
+import {
+  ViroARSceneNavigator, ViroARScene, ViroARPlane, ViroBox, ViroText, ViroAmbientLight
+} from 'react-viro'
+import createReactClass from 'create-react-class'
+
+const styles = {
+  helloWorldTextStyle: {
+    fontFamily: 'Arial',
+    fontSize: 30,
+    color: '#ffffff',
+    textAlignVertical: 'center',
+    textAlign: 'center',
+  },
+}
+
+const WorkItemSceneAR = createReactClass({
+  getInitialState: function() {
+    return {
+      text : "Initializing AR..."
+    }
+  },
+
+  render: function() {
+    return (
+      <ViroARScene onTrackingInitialized={()=>{this.setState({text : "Hello World!"})}}>
+        <ViroAmbientLight color="#ffffff" intensity={200}/>
+        <ViroText text={this.state.text} scale={[.5, .5, .5]} position={[0, 0, -1]}
+          style={styles.helloWorldTextStyle} />
+        <ViroARPlane>
+          <ViroBox position={[0, .5, 0]} />
+        </ViroARPlane>
+      </ViroARScene>
+    )
+  }
+})
 
 export class Viewer extends React.Component {
   static navigatorStyle = {
@@ -9,35 +43,25 @@ export class Viewer extends React.Component {
 
   static styles = StyleSheet.create({
     container: {
-      height: '100%',
-      width: '100%',
-      justifyContent: 'flex-start',
-      backgroundColor: '#AAAAAA',
-    },
-    button: {
-      marginTop: 40,
-      marginLeft: 20,
-      width: 45,
-      height: 45,
-    }
+      flex: 1,
+     },
+     arScene: {
+      flex: 1,
+     },
   })
 
   constructor(props) {
     super(props)
-    this._handlePressButton = this._handlePressButton.bind(this)
-  }
-
-  _handlePressButton() {
-    this.props.navigator.pop()
-  }
+   }
 
   render() {
     return (
-      <View style={Viewer.styles.container}>
-        <TouchableOpacity onPress={this._handlePressButton}>
-          <Image style={Viewer.styles.button} source={backImage} />
-        </TouchableOpacity>
+      <View style={Viewer.styles.arScene}>
+        <ViroARSceneNavigator
+          apiKey='06F37B6A-74DA-4A83-965A-7DE2209A5C46'
+          style={Viewer.styles.arScene}
+          initialScene={{ scene: WorkItemSceneAR }} debug={true} />
       </View>
-    );
+    )
   }
 }