ALVR v21 API Migration, 3DoF Stillness-based Bias estimator, ARCore with Complimentary filter, Adjustable FOV

code/mobile/android/PhoneVR/.gitignore

@@ -48,3 +48,9 @@ google-services.json
 
 # Android Profiling
 *.hprof
+arcore-android-sdk-main/
+/wgpu-hal-25.0.2/
+*.bak
+*.orig
+*.rej
+signing.properties

code/mobile/android/PhoneVR/app/CMakeLists.txt

@@ -1,44 +1,35 @@
 cmake_minimum_required(VERSION 3.4.3)
 
-#use rtti, exceptions for asio library ## -std=c++17
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -frtti -fexceptions -Wc++11-narrowing -Wreorder")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -g")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -O3 -std=c++17 -g")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -std=c++17 -g")
 
 set(ANDROID_STL c++_static)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 
-file(GLOB_RECURSE LIB_SRC
-    ../../../../common/libs/ifaddrs/*.c
-    ../../../../common/libs/json/single_include/*.hpp
-)
-
 add_library(native-lib-alvr SHARED
     src/main/cpp/alvr_main.cpp
-    ${LIB_SRC}
+)
+
+# Import the ARCore (Google Play Services for AR) library.
+add_library(arcore SHARED IMPORTED)
+set_target_properties(arcore PROPERTIES IMPORTED_LOCATION
+        ${ARCORE_LIBPATH}/${ANDROID_ABI}/libarcore_sdk_c.so
+        INTERFACE_INCLUDE_DIRECTORIES ${ARCORE_INCLUDE}
 )
 
 set(libs_dir ${CMAKE_CURRENT_SOURCE_DIR}/libraries)
 set(alvr_build_dir ${CMAKE_CURRENT_SOURCE_DIR}/../ALVR/build/alvr_client_core)
 
 target_include_directories(native-lib-alvr
-    PUBLIC ../../../../common/libs/asio/asio/include
-    PUBLIC ../../../../common/libs/eigen/Eigen
-    PUBLIC ../../../../common/libs/ifaddrs
-    PUBLIC ../../../../common/libs/json/single_include/
-
     # ALVR Headers
     PUBLIC ${alvr_build_dir}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../cardboard
+    PUBLIC ${ARCORE_INCLUDE}
 )
 
 target_link_libraries(native-lib-alvr
-    log android EGL GLESv3 mediandk
+    log android EGL GLESv3 mediandk arcore
     ${alvr_build_dir}/${ANDROID_ABI}/libalvr_client_core.so
     ${libs_dir}/jni/${ANDROID_ABI}/libGfxPluginCardboard.so
 )
-
-IF(${HAVEGVR})
-add_subdirectory(src/gvr)
-ENDIF()

code/mobile/android/PhoneVR/app/build.gradle

@@ -7,23 +7,43 @@ apply plugin: 'com.google.gms.google-services'
 apply from: '../versioning.gradle'
 apply plugin: "com.diffplug.spotless"
 
+def arcore_libpath = "${rootProject.layout.buildDirectory.get()}/arcore-native"
+
+configurations { natives }
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 def defaultALVRFlavour = "--release"
 
+// Part of the APK file name: PhoneVR-v<VERSION_NAME>-<releaseLabel>-<buildType>.apk
+// e.g. PhoneVR-v2.0.0-beta-ARcore-v21-release.apk (VERSION_NAME is set in ../version.properties)
+def releaseLabel = "ARcore-v21"
+
 android {
     signingConfigs {
         releaseconfig {
-            if( System.getenv('GITHUB_EVENT_NAME') == 'pull_request' || System.getenv("Store") == null || System.getenv("Key") == null ) {
+            // Your own release key. signing.properties is NOT committed (it is in .gitignore) and
+            // holds: storeFile, storePassword, keyAlias, keyPassword.
+            def localSigningFile = rootProject.file("signing.properties")
+            if (localSigningFile.exists()) {
+                def localSigning = new Properties()
+                localSigningFile.withInputStream { localSigning.load(it) }
+                storeFile file(localSigning['storeFile'])
+                storePassword localSigning['storePassword']
+                keyAlias localSigning['keyAlias']
+                keyPassword localSigning['keyPassword']
+                println "[PVR] Configuring releaseconfig with your own key from signing.properties"
+            }
+            else if( System.getenv('GITHUB_EVENT_NAME') == 'pull_request' || System.getenv("Store") == null || System.getenv("Key") == null ) {
                 // If its a PR Supply a dummy KeySigningConfig
                 // Or in Local env if Store and Keys are not present in ENV Vars do the same
                 storeFile file("PhoneVRKeyStorePR.jks")
                 storePassword "test1234"
                 keyAlias "PhoneVRKeyPR"
                 keyPassword "test1234"
                 println "[PVR] Configuring releaseconfigs for testing a PR..."
+                println "[PVR] WARNING: this APK is signed with the public TEST key (no signing.properties). Do not share it."
             }
             else {
                 storeFile file(keystoreProperties['storeFile'])
@@ -41,6 +61,11 @@ android {
         applicationId "viritualisres.phonevr"
         minSdkVersion 24
         targetSdkVersion 33
+
+        ndk {
+            abiFilters "arm64-v8a"
+        }
+
         versionCode buildVersionCode()
         versionName buildVersionName()
 
@@ -50,6 +75,8 @@ android {
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++17 -fexceptions -frtti" //-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=ON"
+                arguments "-DARCORE_LIBPATH=${arcore_libpath}/jni",
+                        "-DARCORE_INCLUDE=${project.rootDir}/arcore-android-sdk-main/libraries/include"
             }
         }
 
@@ -77,6 +104,12 @@ android {
             defaultALVRFlavour = ""
         }
     }
+    // APK file name, e.g. PhoneVR-v2.0.0-beta-ARcore-v21-release.apk
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "PhoneVR-v${defaultConfig.versionName}-${releaseLabel}-${variant.buildType.name}.apk"
+        }
+    }
     buildFeatures {
         buildConfig = true // TODO: Remove BuildConfig, Gradle suggests this usage is inefficient > v8 disabled by default
         viewBinding true
@@ -93,7 +126,8 @@ android {
         }
         noGvr {
             dimension "gvr"
-            versionNameSuffix "-nogvr"
+            //versionNameSuffix "-nogvr"
+            versionNameSuffix ""
         }
     }
     sourceSets {
@@ -167,13 +201,16 @@ dependencies {
 
     gvrImplementation 'com.google.vr:sdk-base:1.200.0@aar'
     implementation 'com.google.cardboard.sdk:cardboard-sdk:1.17.0@aar'
-    implementation 'io.github.zxing-cpp:android:2.3.0-SNAPSHOT'
+    implementation 'io.github.zxing-cpp:android:2.3.0'
     implementation 'com.google.protobuf:protobuf-javalite:3.19.4'
     implementation 'androidx.camera:camera-core:1.3.4'
     implementation 'androidx.camera:camera-view:1.3.4'
     implementation 'androidx.camera:camera-lifecycle:1.3.4'
     implementation 'androidx.camera:camera-camera2:1.3.4'
 
+    implementation 'com.google.ar:core:1.46.0'
+    natives 'com.google.ar:core:1.46.0'
+
     def acraVersion = '5.7.0'
     implementation "ch.acra:acra-mail:$acraVersion"
     implementation "ch.acra:acra-dialog:$acraVersion"
@@ -199,6 +236,13 @@ task extractNdk(type: Copy)  {
             include "jni/**/libgvr.so"
         }
     }
+    configurations.natives.files.each { f ->
+        copy {
+            from zipTree(f)
+            into arcore_libpath
+            include "jni/**/*"
+        }
+    }
 }
 
 task deleteNdk(type: Delete) {

code/mobile/android/PhoneVR/app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 
     <uses-feature
         android:glEsVersion="0x00030001"
@@ -46,6 +47,11 @@
         tools:replace="android:extractNativeLibs"
         android:extractNativeLibs="true">
 
+        <!-- ARCore is optional: the app also works (rotation only) on phones without it. -->
+        <meta-data
+            android:name="com.google.ar.core"
+            android:value="optional" />
+
         <activity
             android:name=".InitActivity"
             android:label="@string/app_name"
@@ -70,6 +76,9 @@
             android:finishOnTaskLaunch="true"
             android:launchMode="singleInstance"
             android:process=":acra" />
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/settings_title" />
         <activity
             android:name=".ALVRActivity"
             android:screenOrientation="landscape"