From 67a7d1ad2a19164648b588f588ab120fa8b30ec2 Mon Sep 17 00:00:00 2001
From: Van Leemput Dayron <la236098@student.helha.be>
Date: Tue, 30 Dec 2025 16:56:13 +0100
Subject: [PATCH] feat: Streamline Google Maps API key retrieval and update
 Google Maps Flutter dependencies.

---
 lib/services/activity_places_service.dart |  9 ---------
 pubspec.lock                              | 12 ++++++------
 pubspec.yaml                              |  4 +++-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/lib/services/activity_places_service.dart b/lib/services/activity_places_service.dart
index 5829de8..3d15a15 100644
--- a/lib/services/activity_places_service.dart
+++ b/lib/services/activity_places_service.dart
@@ -16,15 +16,6 @@ class ActivityPlacesService {
   final ErrorService _errorService = ErrorService();
 
   static String get _apiKey {
-    if (Platform.isAndroid) {
-      return dotenv.env['GOOGLE_MAPS_API_KEY_ANDROID'] ??
-          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
-          '';
-    } else if (Platform.isIOS) {
-      return dotenv.env['GOOGLE_MAPS_API_KEY_IOS'] ??
-          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
-          '';
-    }
     return dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
   }
 
diff --git a/pubspec.lock b/pubspec.lock
index 9600d52..aa53074 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -713,13 +713,13 @@ packages:
     source: hosted
     version: "2.13.1"
   google_maps_flutter_android:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: google_maps_flutter_android
-      sha256: f820a3990d4ff23e3baf01ce794f7f08cca9a9ce6c875ec96882d605f6f039df
+      sha256: "3835f6ae5e8b8d4d454d913575069513c9f216e088b87aa5c18cb3610951c6b4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.18.4"
+    version: "2.18.6"
   google_maps_flutter_ios:
     dependency: transitive
     description:
@@ -729,13 +729,13 @@ packages:
     source: hosted
     version: "2.15.5"
   google_maps_flutter_platform_interface:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: google_maps_flutter_platform_interface
-      sha256: f4b9b44f7b12a1f6707ffc79d082738e0b7e194bf728ee61d2b3cdf5fdf16081
+      sha256: e8b1232419fcdd35c1fdafff96843f5a40238480365599d8ca661dde96d283dd
       url: "https://pub.dev"
     source: hosted
-    version: "2.14.0"
+    version: "2.14.1"
   google_maps_flutter_web:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index f304cff..1bd1fda 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2025.12.1+2
+version: 2025.12.1+3
 
 environment:
   sdk: ^3.9.2
@@ -64,6 +64,8 @@ dependencies:
   firebase_messaging: ^16.0.4
   flutter_local_notifications: ^19.5.0
   package_info_plus: ^8.3.1
+  google_maps_flutter_platform_interface: ^2.14.1
+  google_maps_flutter_android: ^2.18.6
 
 dev_dependencies:
   flutter_launcher_icons: ^0.13.1