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

Adding Android ViroAR stuff

Browse Source
This commit is contained in:
John Lyon-Smith
2018-03-29 15:40:37 -07:00
parent bd5cd8a0d8
commit b301bf17eb
16 changed files with 126 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/app/app.iml
View File

@@ -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" />

34
mobile/android/app/build.gradle
View File

@@ -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

38
mobile/android/app/src/main/AndroidManifest.xml
View File

@@ -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>

5
mobile/android/app/src/main/java/com/deightonar/MainApplication.java
View File

@@ -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)
);
}