fixed landscape orientation in object tracking and updated sign-in fingerprints

.github/workflows/gradle.yml

@@ -23,11 +23,11 @@ jobs:
           run:
             working-directory: android
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Style
@@ -39,12 +39,12 @@ jobs:
       - name: Build
         run: ./gradlew build
       - name: Upload OpenBot App
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: robot-debug.apk
           path: android/robot/build/outputs/apk/debug/robot-debug.apk
       - name: Upload Controller App
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: controller-debug.apk
           path: android/controller/build/outputs/apk/debug/controller-debug.apk

.github/workflows/traffic.yml

@@ -35,7 +35,7 @@ jobs:
 
     # Uploads new traffic as artifact 
     - name: Upload new traffic
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: traffic
         path: ./traffic/ 

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.8.0'
     ext.webrtc_version = '1.0.32006'
     ext.location_version = '19.0.1'
     ext.nearby_version = '18.0.2'
@@ -8,6 +8,7 @@ buildscript {
         google()
         mavenCentral()
         mavenLocal()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'

android/comlib/.gitignore

@@ -0,0 +1,2 @@
+/build
+libs

android/comlib/build.gradle

@@ -0,0 +1,44 @@
+//Abemart wroup and google webRtc are both deprecated on maven and other similar repositories
+//Hence created a local implementation of those libraries using pre-compiled .aar files in a shared modules called comlib
+plugins {
+    id 'java-library'
+    id 'de.undercouch.download'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+// Define the libs directory
+project.ext.LIB_DIR = "${projectDir}/libs"
+apply from: 'download.gradle'
+
+def googleWebrtcFile = file("${project.ext.LIB_DIR}/google-webrtc-1.0.32006.aar")
+def wroupFile = file("${project.ext.LIB_DIR}/Wroup-master-release.aar")
+
+// Task to check for AAR files
+task checkAars {
+    dependsOn downloadAars // Ensure this matches the actual download task name
+
+    doLast {
+        if (!googleWebrtcFile.exists() || !wroupFile.exists()) {
+            throw new GradleException("Required AAR files are missing. Please run the download task.")
+        }
+    }
+}
+
+dependencies {
+    if (googleWebrtcFile.exists()) {
+        api files(googleWebrtcFile)
+    }
+
+    if (wroupFile.exists()) {
+        api files(wroupFile)
+    }
+}
+
+// Ensure that checkAars runs before any Java compile tasks
+tasks.withType(JavaCompile) {
+    dependsOn checkAars
+}

android/comlib/download.gradle

@@ -0,0 +1,9 @@
+task downloadAars(type: Download) {
+    src([
+            'https://storage.googleapis.com/openbot_aar/Wroup-master-release.aar',
+            'https://storage.googleapis.com/openbot_aar/google-webrtc-1.0.32006.aar',
+    ])
+    dest project.ext.LIB_DIR
+    onlyIfModified true
+    overwrite false
+}

android/controller/build.gradle

@@ -20,10 +20,11 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
+
         defaultConfig {
             ndk {
                 abiFilters 'armeabi-v7a', 'arm64-v8a'
@@ -45,12 +46,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     packagingOptions {
         resources {
@@ -59,10 +60,20 @@ android {
     }
 
     namespace 'org.openbot.controller'
+    ndkVersion '23.1.7779620'
 }
 
+// Define the path to the comlib lib directory
+def comlibDir = file("${project.rootDir}/comlib/libs")
+
 dependencies {
 
+    // WiFi direct + WebRTC
+    implementation project(':comlib')
+
+    // Include AAR files from comlib/lib
+    implementation fileTree(dir: comlibDir, include: ['*.aar'])
+
     //noinspection GradleDependency
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
@@ -78,17 +89,11 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.2.8"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
-    // WiFi direct
-    implementation 'com.abemart.wroup:wroup:0.9'
-
     // material design
     implementation 'com.google.android.material:material:1.4.0'
 
-    // WebRTC
-    implementation "org.webrtc:google-webrtc:$webrtc_version"
-
     // For a library module, uncomment the following line and comment the one after
     // apply plugin: 'com.android.library'
     apply plugin: 'com.android.application'
     apply plugin: 'kotlin-android'
-}
+}

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 13 15:23:50 CET 2023
+#Thu Sep 19 11:12:47 IST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/robot/build.gradle

@@ -15,14 +15,16 @@ appVersioning {
 apply plugin: 'com.android.application'
 apply plugin: 'de.undercouch.download'
 apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'com.google.gms.google-services'
+
 
 android {
     compileSdkVersion 33
     buildToolsVersion '33.0.1'
     defaultConfig {
         applicationId "org.openbot"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
@@ -42,8 +44,8 @@ android {
     compileOptions {
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility = '11'
-        targetCompatibility = '11'
+        sourceCompatibility = '17'
+        targetCompatibility = '17'
     }
     androidResources {
         noCompress 'tflite', 'mp3'
@@ -62,10 +64,18 @@ android {
 project.ext.ASSET_DIR = projectDir.toString() + '/src/main/assets'
 apply from: 'download.gradle'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.google.gms.google-services'
+
+// Define the path to the comlib lib directory
+def comlibDir = file("${project.rootDir}/comlib/libs")
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+
+    // WiFi direct + WebRTC
+    implementation project(':comlib')
+
+    // Include AAR files from comlib/lib
+    implementation fileTree(dir: comlibDir, include: ['*.aar'])
+
     implementation 'com.google.android.material:material:1.4.0'
 
     // Build off of stable TensorFlow Lite
@@ -115,15 +125,15 @@ dependencies {
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     // CameraX View class
     implementation "androidx.camera:camera-view:1.0.0-alpha24"
-    implementation 'com.github.anastr:speedviewlib:1.5.3'
+    implementation 'com.github.anastr:speedviewlib:1.6.1'
 
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'androidx.fragment:fragment:1.3.4'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'androidx.test.ext:junit:1.1.5'
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation "org.robolectric:robolectric:4.4"
+    testImplementation 'androidx.test.ext:junit:1.2.1'
+    testImplementation 'androidx.test:core:1.6.1'
+    testImplementation "org.robolectric:robolectric:4.12.1"
 
     // Core library
     androidTestImplementation 'androidx.test:core:1.5.0'
@@ -157,14 +167,12 @@ dependencies {
     // When using the BoM, you don't specify versions in Firebase library dependencies
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-analytics'
-    implementation 'com.nononsenseapps:filepicker:4.1.0'
+    implementation 'com.nononsenseapps:filepicker:4.2.1'
 
     // arcore
     implementation 'com.google.ar:core:1.29.0'
     implementation 'de.javagl:obj:0.2.1'
 
-    // WebRTC
-    implementation "org.webrtc:google-webrtc:$webrtc_version"
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
     implementation 'com.koushikdutta.ion:ion:3.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'

android/robot/google-services.json

@@ -22,6 +22,14 @@
             "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
           }
         },
+        {
+          "client_id": "955078484078-kiqt23b9043p6lpevmdd2c42bid22rct.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.openbot",
+            "certificate_hash": "d6550cd35e6f79362f3d379f65f5bf7b607830f5"
+          }
+        },
         {
           "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
           "client_type": 3

android/robot/src/main/assets/google-services.json

@@ -22,6 +22,14 @@
             "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
           }
         },
+        {
+          "client_id": "955078484078-kiqt23b9043p6lpevmdd2c42bid22rct.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.openbot",
+            "certificate_hash": "d6550cd35e6f79362f3d379f65f5bf7b607830f5"
+          }
+        },
         {
           "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
           "client_type": 3

android/robot/src/main/res/layout-land/fragment_object_nav.xml

@@ -77,7 +77,7 @@
             android:id="@+id/usbToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="8dp"
             android:button="@drawable/usb_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -87,7 +87,7 @@
             android:id="@+id/bleToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="4dp"
             android:button="@drawable/ble_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -97,15 +97,26 @@
             android:id="@+id/camera_toggle"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="4dp"
             android:background="@android:color/transparent"
             android:scaleType="center"
             android:src="@drawable/ic_cameraswitch"
             android:text="@string/camera_facing_back"
-            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/mirrorControl"
+            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
             app:tint="@color/openBotBlue" />
 
+        <CheckBox
+            android:id="@+id/mirrorControl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:button="@drawable/mirror_control"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout" />
+
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -357,4 +368,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>