Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

42 changes: 37 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 30
defaultConfig {
applicationId "upb.airdocs"
minSdkVersion 23
targetSdkVersion 30
minSdkVersion 24
targetSdkVersion 30 // target sdk version 30 doesnt work
versionCode 1
versionName "0.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -18,21 +19,43 @@ android {
}
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
// sourceCompatibility 1.8
// targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
//implementation 'com.android.support:appcompat-v7:26.0.0'
implementation 'com.google.ar:core:1.37.0'

implementation 'de.javagl:obj:0.2.1'

implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
implementation 'com.google.android.gms:play-services-auth:20+'
implementation 'com.google.android.gms:play-services-location:19+'
implementation 'com.google.android.gms:play-services-maps:18.0.2'
implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

// implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
// implementation 'com.google.android.gms:play-services-base:18.2.0'
//implementation 'com.android.support:appcompat-v7:28.0.0'
//implementation 'com.google.android.gms:play-services-ads:19.6.0'
testImplementation 'junit:junit:4.12'
//androidTestImplementation 'com.android.support.test:runner:1.0.2'
//androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
api 'com.google.android.gms:play-services:12.0.1'
// api 'com.google.android.gms:play-services:12.0.1'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
//implementation "androidx.multidex:multidex:2.0.1"
implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.5.1'
implementation 'com.squareup.picasso:picasso:2.71828'
Expand All @@ -43,4 +66,13 @@ dependencies {
// Java language implementation
implementation "androidx.core:core:$core_version"
implementation "androidx.webkit:webkit:1.4.0"
compile 'com.indooratlas.android:indooratlas-android-sdk:3.4.12@aar'
implementation 'com.google.ar.sceneform.ux:sceneform-ux:1.15.0'
implementation 'com.google.ar.sceneform:assets:1.15.0'
}

repositories{
maven {
url "https://dl.cloudsmith.io/public/indooratlas/mvn-public/maven/"
}
}
Binary file modified app/build/outputs/apk/debug/app-debug.apk
Binary file not shown.
65 changes: 57 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="upb.airdocs">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
<uses-permission android:name="android.permission.CAMERA"/>

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
Expand All @@ -26,11 +29,30 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true">

<activity
android:name=".hellogeospatial.HelloGeoActivity"
android:label="AirDocs" />
<meta-data android:name="com.google.ar.core" android:value="required" />
<meta-data
android:name="com.google.android.ar.API_KEY"
android:value="TODO"/>
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="TODO" />

<meta-data
android:name="com.indooratlas.android.sdk.API_KEY"
android:value="TODO" />
<meta-data
android:name="com.indooratlas.android.sdk.API_SECRET"
android:value="TODO" />

<activity
android:name=".TestingActivity"
android:label="AirDocs" />
Expand All @@ -40,10 +62,11 @@
<activity
android:name=".UserActivity"
android:label="AirDocs">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".SettingsActivity"
Expand All @@ -56,62 +79,86 @@
android:label="AirDocs">
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="text/plain" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/pdf" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="audio/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="video/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/msword" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/vnd.ms-excel" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/vnd.ms-powerpoint" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />

<category android:name="android.intent.category.DEFAULT" />

<data android:mimeType="application/zip" />
</intent-filter>
</activity>
Expand All @@ -124,15 +171,17 @@
<activity
android:name=".SelectPointActivity"
android:label="AirDocs" />

<service
android:name=".ScanService"
android:enabled="true"
android:exported="false" />

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="upb.airdocs.fileprovider"
android:grantUriPermissions="true"
android:exported="false">
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" />
Expand Down
Loading