Update android robot package name, target API/Gradle, and localisations

android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath 'de.undercouch:gradle-download-task:4.1.1'

android/controller/build.gradle

@@ -15,12 +15,12 @@ appVersioning {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.1"
+    compileSdkVersion 36
+    buildToolsVersion '36.0.0'
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 36
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Sep 19 11:12:47 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/robot/build.gradle

@@ -18,12 +18,12 @@ appVersioning {
 
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.1'
+    compileSdkVersion 36
+    buildToolsVersion '36.0.0'
     defaultConfig {
-        applicationId "org.openbot"
+        applicationId "org.openbot.app.robot"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 36
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
@@ -38,6 +38,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     compileOptions {
@@ -56,7 +57,7 @@ android {
         abortOnError false
         checkReleaseBuilds false
     }
-    namespace 'org.openbot'
+    namespace 'org.openbot.app.robot'
     packagingOptions {
         resources.excludes.add("META-INF/*")
     }
@@ -66,6 +67,14 @@ android {
 project.ext.ASSET_DIR = projectDir.toString() + '/src/main/assets'
 apply from: 'download.gradle'
 
+// The comlib AAR fileTree dependency below reads files produced by :comlib:downloadAars.
+// Gradle can't infer that ordering from a raw fileTree, so declare it explicitly.
+afterEvaluate {
+    tasks.matching { it.name =~ /^collect.*Dependencies$/ }.configureEach {
+        dependsOn(':comlib:downloadAars')
+    }
+}
+
 // Define the path to the comlib lib directory
 def comlibDir = file("${project.rootDir}/comlib/libs")
 
@@ -100,6 +109,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:16.0.1'
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.lifecycle:lifecycle-livedata:2.3.1'
@@ -161,7 +171,7 @@ dependencies {
     // classpath.
     androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.3.0'
 
-    implementation platform('com.google.firebase:firebase-bom:31.5.0')
+    implementation platform('com.google.firebase:firebase-bom:32.7.1')
     implementation 'com.google.android.gms:play-services-auth:20.5.0'
     // Declare the dependencies for the Crashlytics and Analytics libraries
     // When using the BoM, you don't specify versions in Firebase library dependencies

android/robot/google-services.json

@@ -1,57 +1,49 @@
 {
   "project_info": {
-    "project_number": "955078484078",
-    "firebase_url": "https://opencode-openbot-default-rtdb.asia-southeast1.firebasedatabase.app",
-    "project_id": "opencode-openbot",
-    "storage_bucket": "opencode-openbot.appspot.com"
+    "project_number": "000000000000",
+    "firebase_url": "https://example-project-default-rtdb.firebasedatabase.app",
+    "project_id": "example-project",
+    "storage_bucket": "example-project.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:955078484078:android:42efc0c06fa6583165867f",
+        "mobilesdk_app_id": "1:000000000000:android:0000000000000000000000",
         "android_client_info": {
-          "package_name": "org.openbot"
+          "package_name": "org.openbot.app.robot"
         }
       },
       "oauth_client": [
         {
-          "client_id": "955078484078-91d6gg3p2qt9eilolpqp8o9j6nqjaqdf.apps.googleusercontent.com",
+          "client_id": "000000000000-0000000000000000000000000000.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "org.openbot",
-            "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
+            "package_name": "org.openbot.app.robot",
+            "certificate_hash": "0000000000000000000000000000000000000"
           }
         },
         {
-          "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_id": "000000000000-1111111111111111111111111111.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyA7AhVQcAsZJtYIrJqcvmlxNlcPgmt5bGw"
+          "current_key": "AIzaSyDUMMYDUMMYDUMMYDUMMYDUMMYDUMMYD"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
+              "client_id": "000000000000-1111111111111111111111111111.apps.googleusercontent.com",
               "client_type": 3
             },
             {
-              "client_id": "955078484078-4m63lascf45ranfmedahhcgo10ainnfa.apps.googleusercontent.com",
+              "client_id": "000000000000-2222222222222222222222222222.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "org.openbot"
+                "bundle_id": "org.openbot.app.robot"
               }
             }
           ]

android/robot/src/main/AndroidManifest.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -14,6 +16,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
 
     <!-- RTSP Video streaming -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

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

@@ -1,57 +1,49 @@
 {
   "project_info": {
-    "project_number": "955078484078",
-    "firebase_url": "https://opencode-openbot-default-rtdb.asia-southeast1.firebasedatabase.app",
-    "project_id": "opencode-openbot",
-    "storage_bucket": "opencode-openbot.appspot.com"
+    "project_number": "000000000000",
+    "firebase_url": "https://example-project-default-rtdb.firebasedatabase.app",
+    "project_id": "example-project",
+    "storage_bucket": "example-project.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:955078484078:android:42efc0c06fa6583165867f",
+        "mobilesdk_app_id": "1:000000000000:android:0000000000000000000000",
         "android_client_info": {
-          "package_name": "org.openbot"
+          "package_name": "org.openbot.app.robot"
         }
       },
       "oauth_client": [
         {
-          "client_id": "955078484078-91d6gg3p2qt9eilolpqp8o9j6nqjaqdf.apps.googleusercontent.com",
+          "client_id": "000000000000-0000000000000000000000000000.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "org.openbot",
-            "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
+            "package_name": "org.openbot.app.robot",
+            "certificate_hash": "0000000000000000000000000000000000000"
           }
         },
         {
-          "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_id": "000000000000-1111111111111111111111111111.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyA7AhVQcAsZJtYIrJqcvmlxNlcPgmt5bGw"
+          "current_key": "AIzaSyDUMMYDUMMYDUMMYDUMMYDUMMYDUMMYD"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
+              "client_id": "000000000000-1111111111111111111111111111.apps.googleusercontent.com",
               "client_type": 3
             },
             {
-              "client_id": "955078484078-4m63lascf45ranfmedahhcgo10ainnfa.apps.googleusercontent.com",
+              "client_id": "000000000000-2222222222222222222222222222.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "org.openbot"
+                "bundle_id": "org.openbot.app.robot"
               }
             }
           ]

android/robot/src/main/java/org/openbot/OpenBotApplication.java → android/robot/src/main/java/org/openbot/app/robot/OpenBotApplication.java

@@ -1,12 +1,12 @@
-package org.openbot;
+package org.openbot.app.robot;
 
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import org.jetbrains.annotations.NotNull;
-import org.openbot.vehicle.Vehicle;
+import org.openbot.app.robot.vehicle.Vehicle;
 import timber.log.Timber;
 
 public class OpenBotApplication extends Application {

android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java → android/robot/src/main/java/org/openbot/app/robot/autopilot/AutopilotFragment.java

@@ -1,4 +1,4 @@
-package org.openbot.autopilot;
+package org.openbot.app.robot.autopilot;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -26,21 +26,21 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.NotNull;
-import org.openbot.R;
-import org.openbot.common.CameraFragment;
-import org.openbot.databinding.FragmentAutopilotBinding;
-import org.openbot.env.BorderedText;
-import org.openbot.env.BotToControllerEventBus;
-import org.openbot.env.ImageUtils;
-import org.openbot.tflite.Autopilot;
-import org.openbot.tflite.Model;
-import org.openbot.tflite.Network;
-import org.openbot.tracking.MultiBoxTracker;
-import org.openbot.utils.ConnectionUtils;
-import org.openbot.utils.Constants;
-import org.openbot.utils.Enums;
-import org.openbot.utils.PermissionUtils;
-import org.openbot.vehicle.Control;
+import org.openbot.app.robot.R;
+import org.openbot.app.robot.common.CameraFragment;
+import org.openbot.app.robot.databinding.FragmentAutopilotBinding;
+import org.openbot.app.robot.env.BorderedText;
+import org.openbot.app.robot.env.BotToControllerEventBus;
+import org.openbot.app.robot.env.ImageUtils;
+import org.openbot.app.robot.tflite.Autopilot;
+import org.openbot.app.robot.tflite.Model;
+import org.openbot.app.robot.tflite.Network;
+import org.openbot.app.robot.tracking.MultiBoxTracker;
+import org.openbot.app.robot.utils.ConnectionUtils;
+import org.openbot.app.robot.utils.Constants;
+import org.openbot.app.robot.utils.Enums;
+import org.openbot.app.robot.utils.PermissionUtils;
+import org.openbot.app.robot.vehicle.Control;
 import timber.log.Timber;
 
 public class AutopilotFragment extends CameraFragment {