From 888cf83c18d77803bdbdaef04b5bb4146ee6df20 Mon Sep 17 00:00:00 2001
From: Achintha Isuru <achinthaisuru444@gmail.com>
Date: Mon, 16 Feb 2026 13:50:02 -0500
Subject: [PATCH] feat(breaks): Implement Google Maps API key integration and
 decode Dart defines for both client and staff apps

---
 .../apps/client/android/app/build.gradle.kts  | 16 ++++++++++++
 .../android/app/src/main/AndroidManifest.xml  |  3 +++
 .../apps/client/ios/Runner/AppDelegate.swift  | 25 +++++++++++++++++++
 apps/mobile/apps/client/ios/Runner/Info.plist |  6 +++--
 .../apps/staff/android/app/build.gradle.kts   | 16 ++++++++++++
 .../android/app/src/main/AndroidManifest.xml  |  3 +++
 .../apps/staff/ios/Runner/AppDelegate.swift   | 25 +++++++++++++++++++
 apps/mobile/apps/staff/ios/Runner/Info.plist  |  6 +++--
 8 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/apps/mobile/apps/client/android/app/build.gradle.kts b/apps/mobile/apps/client/android/app/build.gradle.kts
index 202bc20b..593af2c7 100644
--- a/apps/mobile/apps/client/android/app/build.gradle.kts
+++ b/apps/mobile/apps/client/android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.util.Base64
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -6,6 +8,18 @@ plugins {
     id("com.google.gms.google-services")
 }
 
+val dartDefinesString = project.findProperty("dart-defines") as? String ?: ""
+val dartEnvironmentVariables = mutableMapOf<String, String>()
+dartDefinesString.split(",").forEach {
+    if (it.isNotEmpty()) {
+        val decoded = String(Base64.getDecoder().decode(it))
+        val components = decoded.split("=")
+        if (components.size == 2) {
+            dartEnvironmentVariables[components[0]] = components[1]
+        }
+    }
+}
+
 android {
     namespace = "com.krowwithus.client"
     compileSdk = flutter.compileSdkVersion
@@ -29,6 +43,8 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+
+        manifestPlaceholders["GOOGLE_MAPS_API_KEY"] = dartEnvironmentVariables["GOOGLE_MAPS_API_KEY"] ?: ""
     }
 
     buildTypes {
diff --git a/apps/mobile/apps/client/android/app/src/main/AndroidManifest.xml b/apps/mobile/apps/client/android/app/src/main/AndroidManifest.xml
index 5bf8f125..da643f20 100644
--- a/apps/mobile/apps/client/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/apps/client/android/app/src/main/AndroidManifest.xml
@@ -30,6 +30,9 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="${GOOGLE_MAPS_API_KEY}" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/apps/mobile/apps/client/ios/Runner/AppDelegate.swift b/apps/mobile/apps/client/ios/Runner/AppDelegate.swift
index 62666446..561125ac 100644
--- a/apps/mobile/apps/client/ios/Runner/AppDelegate.swift
+++ b/apps/mobile/apps/client/ios/Runner/AppDelegate.swift
@@ -1,5 +1,6 @@
 import Flutter
 import UIKit
+import GoogleMaps
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -7,7 +8,31 @@ import UIKit
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
+    if let apiKey = getDartDefine(key: "GOOGLE_MAPS_API_KEY") {
+      GMSServices.provideAPIKey(apiKey)
+    }
+    
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  private func getDartDefine(key: String) -> String? {
+    guard let dartDefines = Bundle.main.infoDictionary?["DART_DEFINES"] as? String else {
+      return nil
+    }
+    
+    let defines = dartDefines.components(separatedBy: ",")
+    for define in defines {
+      guard let decodedData = Data(base64Encoded: define),
+            let decodedString = String(data: decodedData, encoding: .utf8) else {
+        continue
+      }
+      
+      let components = decodedString.components(separatedBy: "=")
+      if components.count == 2 && components[0] == key {
+        return components[1]
+      }
+    }
+    return nil
+  }
 }
diff --git a/apps/mobile/apps/client/ios/Runner/Info.plist b/apps/mobile/apps/client/ios/Runner/Info.plist
index 86819848..d9d134b1 100644
--- a/apps/mobile/apps/client/ios/Runner/Info.plist
+++ b/apps/mobile/apps/client/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Krow With Us Client</string>
+	<string>Krow With Us Client</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Krow With Us Client</string>
+	<string>Krow With Us Client</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -45,5 +45,7 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>DART_DEFINES</key>
+	<string>$(DART_DEFINES)</string>
 </dict>
 </plist>
diff --git a/apps/mobile/apps/staff/android/app/build.gradle.kts b/apps/mobile/apps/staff/android/app/build.gradle.kts
index 8764d57b..24b1df50 100644
--- a/apps/mobile/apps/staff/android/app/build.gradle.kts
+++ b/apps/mobile/apps/staff/android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.util.Base64
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -6,6 +8,18 @@ plugins {
     id("com.google.gms.google-services")
 }
 
+val dartDefinesString = project.findProperty("dart-defines") as? String ?: ""
+val dartEnvironmentVariables = mutableMapOf<String, String>()
+dartDefinesString.split(",").forEach {
+    if (it.isNotEmpty()) {
+        val decoded = String(Base64.getDecoder().decode(it))
+        val components = decoded.split("=")
+        if (components.size == 2) {
+            dartEnvironmentVariables[components[0]] = components[1]
+        }
+    }
+}
+
 android {
     namespace = "com.krowwithus.staff"
     compileSdk = flutter.compileSdkVersion
@@ -29,6 +43,8 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+
+        manifestPlaceholders["GOOGLE_MAPS_API_KEY"] = dartEnvironmentVariables["GOOGLE_MAPS_API_KEY"] ?: ""
     }
 
     buildTypes {
diff --git a/apps/mobile/apps/staff/android/app/src/main/AndroidManifest.xml b/apps/mobile/apps/staff/android/app/src/main/AndroidManifest.xml
index cb199edb..83813ec6 100644
--- a/apps/mobile/apps/staff/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/apps/staff/android/app/src/main/AndroidManifest.xml
@@ -30,6 +30,9 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="${GOOGLE_MAPS_API_KEY}" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/apps/mobile/apps/staff/ios/Runner/AppDelegate.swift b/apps/mobile/apps/staff/ios/Runner/AppDelegate.swift
index 62666446..561125ac 100644
--- a/apps/mobile/apps/staff/ios/Runner/AppDelegate.swift
+++ b/apps/mobile/apps/staff/ios/Runner/AppDelegate.swift
@@ -1,5 +1,6 @@
 import Flutter
 import UIKit
+import GoogleMaps
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -7,7 +8,31 @@ import UIKit
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
+    if let apiKey = getDartDefine(key: "GOOGLE_MAPS_API_KEY") {
+      GMSServices.provideAPIKey(apiKey)
+    }
+    
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  private func getDartDefine(key: String) -> String? {
+    guard let dartDefines = Bundle.main.infoDictionary?["DART_DEFINES"] as? String else {
+      return nil
+    }
+    
+    let defines = dartDefines.components(separatedBy: ",")
+    for define in defines {
+      guard let decodedData = Data(base64Encoded: define),
+            let decodedString = String(data: decodedData, encoding: .utf8) else {
+        continue
+      }
+      
+      let components = decodedString.components(separatedBy: "=")
+      if components.count == 2 && components[0] == key {
+        return components[1]
+      }
+    }
+    return nil
+  }
 }
diff --git a/apps/mobile/apps/staff/ios/Runner/Info.plist b/apps/mobile/apps/staff/ios/Runner/Info.plist
index 30831a46..d89cfb53 100644
--- a/apps/mobile/apps/staff/ios/Runner/Info.plist
+++ b/apps/mobile/apps/staff/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Krow With Us Staff</string>
+	<string>Krow With Us Staff</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Krow With Us Staff</string>
+	<string>Krow With Us Staff</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -45,5 +45,7 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>DART_DEFINES</key>
+	<string>$(DART_DEFINES)</string>
 </dict>
 </plist>