2026-04-03-maplibra primary succsess

2026-04-04 14:08:07 +03:00
parent e325405dff
commit 8d5fefc9e3
23 changed files with 2331 additions and 947 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -84,12 +84,6 @@ PODS:
  - geolocator_apple (1.2.0):
    - Flutter
    - FlutterMacOS
-  - Google-Maps-iOS-Utils (6.1.3):
-    - GoogleMaps (~> 10.0)
-  - google_maps_flutter_ios (0.0.1):
-    - Flutter
-    - Google-Maps-iOS-Utils (< 7.0, >= 5.0)
-    - GoogleMaps (< 11.0, >= 8.4)
  - google_sign_in_ios (0.0.1):
    - Flutter
    - FlutterMacOS
@@ -98,9 +92,6 @@ PODS:
  - GoogleDataTransport (10.1.0):
    - nanopb (~> 3.30910.0)
    - PromisesObjC (~> 2.4)
-  - GoogleMaps (10.8.0):
-    - GoogleMaps/Maps (= 10.8.0)
-  - GoogleMaps/Maps (10.8.0)
  - GoogleSignIn (9.1.0):
    - AppAuth (~> 2.0)
    - AppCheckCore (~> 11.0)
@@ -157,6 +148,10 @@ PODS:
    - FlutterMacOS
  - location (0.0.1):
    - Flutter
+  - MapLibre (6.19.1)
+  - maplibre_gl (0.25.0):
+    - Flutter
+    - MapLibre (= 6.19.1)
  - nanopb (3.30910.0):
    - nanopb/decode (= 3.30910.0)
    - nanopb/encode (= 3.30910.0)
@@ -268,7 +263,6 @@ DEPENDENCIES:
  - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
  - flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
-  - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
  - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
  - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
@@ -277,6 +271,7 @@ DEPENDENCIES:
  - live_activities (from `.symlinks/plugins/live_activities/ios`)
  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
  - location (from `.symlinks/plugins/location/ios`)
+  - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
  - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`)
@@ -304,14 +299,13 @@ SPEC REPOS:
    - FirebaseCoreInternal
    - FirebaseInstallations
    - FirebaseMessaging
-    - Google-Maps-iOS-Utils
    - GoogleDataTransport
-    - GoogleMaps
    - GoogleSignIn
    - GoogleUtilities
    - GTMAppAuth
    - GTMSessionFetcher
    - IOSSecuritySuite
+    - MapLibre
    - nanopb
    - PromisesObjC
    - RecaptchaInterop
@@ -355,8 +349,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/flutter_tts/ios"
  geolocator_apple:
    :path: ".symlinks/plugins/geolocator_apple/darwin"
-  google_maps_flutter_ios:
-    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
  google_sign_in_ios:
    :path: ".symlinks/plugins/google_sign_in_ios/darwin"
  image_cropper:
@@ -373,6 +365,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/local_auth_darwin/darwin"
  location:
    :path: ".symlinks/plugins/location/ios"
+  maplibre_gl:
+    :path: ".symlinks/plugins/maplibre_gl/ios"
  package_info_plus:
    :path: ".symlinks/plugins/package_info_plus/ios"
  permission_handler_apple:
@@ -426,11 +420,8 @@ SPEC CHECKSUMS:
  flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
  flutter_tts: 35ac3c7d42412733e795ea96ad2d7e05d0a75113
  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
-  Google-Maps-iOS-Utils: bed22fa703c919259b3901449434d60d994fae20
-  google_maps_flutter_ios: 0cf046caf50b00d95071f79e8031fcd5ef902beb
  google_sign_in_ios: 000870aa06da9b28d1d0bf7ef70ff0213059dd28
  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
-  GoogleMaps: fe4035acb768ed14ce732811363f232550ba55af
  GoogleSignIn: fcee2257188d5eda57a5e2b6a715550ffff9206d
  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
  GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
@@ -443,6 +434,8 @@ SPEC CHECKSUMS:
  live_activities: 4dfa736d0736e1c77866a2f9c056a76513cc9e7b
  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
  location: 155caecf9da4f280ab5fe4a55f94ceccfab838f8
+  MapLibre: 7f24faba45439f80ccb0f83393c29fa32cb81952
+  maplibre_gl: a2114567cbd1065866614fbd34dfb75ab782aaa2
  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -121,7 +121,7 @@
 /* End PBXFileReference section */

 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		C663DBEB2F50907200D79908 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		C663DBEB2F50907200D79908 /* Exceptions for "RideWidget" folder in "RideWidgetExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -131,7 +131,18 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		C663DBD82F50907000D79908 /* RideWidget */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (C663DBEB2F50907200D79908 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = RideWidget; sourceTree = "<group>"; };
+		C663DBD82F50907000D79908 /* RideWidget */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				C663DBEB2F50907200D79908 /* Exceptions for "RideWidget" folder in "RideWidgetExtension" target */,
+			);
+			explicitFileTypes = {
+			};
+			explicitFolders = (
+			);
+			path = RideWidget;
+			sourceTree = "<group>";
+		};
 /* End PBXFileSystemSynchronizedRootGroup section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -295,6 +306,7 @@
 				C663DBE72F50907200D79908 /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				9DE0D475D98797EEBEE003BD /* [CP] Copy Pods Resources */,
+				B77A6F719CDC97DC7270EA70 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -469,19 +481,32 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		B77A6F719CDC97DC7270EA70 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		C6C3FB403E5DB104310DE9A1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,6 @@
 import UIKit
 import Flutter
 import FirebaseCore
-import GoogleMaps

@main
@objc class AppDelegate: FlutterAppDelegate {
@@ -11,11 +10,7 @@ import GoogleMaps
        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
    ) -> Bool {

-        // --- 1. تهيئة خرائط جوجل ---
-        // يتأكد من وجود ملف Config.plist ويقرأ المفتاح منه
-        if let config = loadConfig(), let apiKey = config["APIKey"] as? String {
-            GMSServices.provideAPIKey(apiKey)
-        }
+

        // --- 2. تهيئة Firebase ---
        FirebaseApp.configure()
@@ -87,13 +82,7 @@ import GoogleMaps
        }
    }

-    func loadConfig() -> [String: Any]? {
-        guard let path = Bundle.main.path(forResource: "Config", ofType: "plist"),
-              let config = NSDictionary(contentsOfFile: path) as? [String: Any] else {
-            fatalError("Couldn't find Config.plist file. Please add it to your project.")
-        }
-        return config
-    }
+
 }

 // --- الامتدادات (Extensions) من الكود القديم ---