Group 5 Assignment 2

.gitignore

@@ -14,3 +14,13 @@
 .cxx
 local.properties
 /.idea/
+secrets.properties
+app/google-services.json
+*.jks
+*.keystore
+keystore.properties
+/.android-local/
+/.gradle-local/
+/app/build/
+/tmp_pdf/
+/_zip_ref/

app/.gitignore

@@ -1 +1,12 @@
-/build
+/build
+# NEW: do not commit secrets
+secrets.properties
+
+# NEW: do not commit generated/build outputs
+**/build/
+
+# NEW: do not commit generated protobuf Java
+**/Traj.java
+
+# NEW: old proto should not be committed (we use new_traj.proto)
+app/src/main/proto/traj.proto

app/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'com.google.gms.google-services'
     id 'androidx.navigation.safeargs'
+    id 'com.google.protobuf'
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
@@ -34,12 +35,6 @@ android {
                 "\"${localProperties['OPENPOSITIONING_MASTER_KEY'] ?: ''}\""
     }
 
-    buildFeatures {
-        // For example:
-        // compose true    // if you want Jetpack Compose
-        // viewBinding true
-    }
-
     buildFeatures {
         buildConfig true
     }
@@ -55,8 +50,35 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    configurations {
+        all*.exclude group: 'com.google.protobuf', module: 'protobuf-javalite'
+    }
+
+    sourceSets {
+        main {
+            proto {
+
+                srcDir 'src/main/proto'
+            }
+        }
+    }
 }
 
+protobuf {
+    protoc {
+
+        artifact = "com.google.protobuf:protoc:3.21.7"
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+
+                }
+            }
+        }
+    }
+}
 dependencies {
     // Core AndroidX
     implementation 'androidx.appcompat:appcompat:1.7.0-alpha03' // or stable: 1.6.1
@@ -68,14 +90,11 @@ dependencies {
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
 
     // Material Components (Material 3 support is in 1.12.0+)
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'com.google.android.material:material:1.12.0'
 
-    implementation 'com.google.protobuf:protobuf-java:3.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation "com.google.protobuf:protobuf-java-util:3.0.0"
+    implementation "com.google.protobuf:protobuf-java:3.21.7"
+    implementation "com.google.protobuf:protobuf-java-util:3.21.7"
     implementation "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
     implementation 'com.google.android.gms:play-services-maps:19.0.0'
 

app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
          If you plan to adopt scoped storage fully and store only within your app-specific directories
          (or MediaStore for shared media), consider removing READ/WRITE_EXTERNAL_STORAGE eventually.
          If you still need broad file access (for example, to migrate existing user data), keep them
-         short-term but note that starting with Android 11 (API 30), they don’t allow the same broad file access.
+         short-term but note that starting with Android 11 (API 30), they don't allow the same broad file access.
     -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -84,7 +84,7 @@
     <!-- Google Maps API key metadata -->
     <meta-data
         android:name="com.google.android.geo.API_KEY"
-        android:value="@string/google_maps_key"/>
+        android:value="AIzaSyAncwR5gNfJ-zJf1gtlVVRZ1SQyXfvr9pk"/>
 
     <activity
         android:name="com.openpositioning.PositionMe.presentation.activity.MainActivity"