Merge

ride_share/.gitignore

@@ -37,8 +37,13 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
+config.json
 
 # Android Studio will place build artifacts here
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+#Secrets file for API keys
+/lib/auth/secrets.dart
+/lib/auth.config.dart

ride_share/android/app/build.gradle

@@ -21,6 +21,12 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
+def envVariables = [
+        MAPS_API_KEY: project.hasProperty('MAPS_API_KEY')
+                ? MAPS_API_KEY
+                : "API_KEY",
+];
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
@@ -47,10 +53,11 @@ android {
         applicationId "com.example.ride_share"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        resValue "string", "googleMapApiKey", envVariables.MAPS_API_KEY
     }
 
     buildTypes {
@@ -68,4 +75,5 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.google.android.gms:play-services-maps:18.1.0'
 }

ride_share/android/app/google-services.json

@@ -0,0 +1,99 @@
+{
+  "project_info": {
+    "project_number": "943152405737",
+    "firebase_url": "https://school-carpool-csp1-default-rtdb.europe-west1.firebasedatabase.app",
+    "project_id": "school-carpool-csp1",
+    "storage_bucket": "school-carpool-csp1.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:943152405737:android:5457e3555963406fdce478",
+        "android_client_info": {
+          "package_name": "com.example.ride_share"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "943152405737-dl3gep47gr3a3m6e6uhjfmctev8nq0rd.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.example.ride_share",
+            "certificate_hash": "0cef302226b6059fc5e61d390fbeeba8fc32c916"
+          }
+        },
+        {
+          "client_id": "943152405737-1ibrmd1ee903soduuo0cgvfoqag8k98n.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCZy5aFxa7OGpgnAFvVX-ozsCZ71DJWCbA"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "943152405737-1ibrmd1ee903soduuo0cgvfoqag8k98n.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "943152405737-jheatv57d64h92jk6hlugo81ivhpqhq2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.example.rideShare"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:943152405737:android:1756b43b64699837dce478",
+        "android_client_info": {
+          "package_name": "com.school.testrun"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "943152405737-4igp2ltm5gqsco0stb3r06e52v12sha0.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.school.testrun",
+            "certificate_hash": "0cef302226b6059fc5e61d390fbeeba8fc32c916"
+          }
+        },
+        {
+          "client_id": "943152405737-1ibrmd1ee903soduuo0cgvfoqag8k98n.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCZy5aFxa7OGpgnAFvVX-ozsCZ71DJWCbA"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "943152405737-1ibrmd1ee903soduuo0cgvfoqag8k98n.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "943152405737-jheatv57d64h92jk6hlugo81ivhpqhq2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.example.rideShare"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

ride_share/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.ride_share">
-   <application
+    <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+    <uses-permission android:name="android.permission.LOCATION"/>
+    <application
         android:label="ride_share"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
@@ -17,9 +19,9 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+                />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -30,5 +32,7 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+       <meta-data android:name="com.google.android.geo.API_KEY"
+           android:value="@string/googleApiKey"/>
     </application>
 </manifest>

ride_share/android/app/src/main/kotlin/com/example/ride_share/MainActivity.kt

@@ -1,6 +1,6 @@
 package com.example.ride_share
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterFragmentActivity() {
 }