feat: refactor financial wallet UI components and add offline map service support

2026-04-21 00:35:30 +03:00
parent 4293d20561
commit b92db3bb39
99 changed files with 22888 additions and 27387 deletions
--- a/lib/views/home/Captin/orderCaptin/marker_generator.dart
+++ b/lib/views/home/Captin/orderCaptin/marker_generator.dart
@@ -1,11 +1,11 @@
 import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:intaleq_maps/intaleq_maps.dart';
 import 'package:flutter/services.dart';

 class MarkerGenerator {
  // دالة لرسم ماركر يحتوي على نص (للوقت والمسافة)
-  static Future<BitmapDescriptor> createCustomMarkerBitmap({
+  static Future<InlqBitmap> createCustomMarkerBitmap({
    required String title,
    required String subtitle,
    required Color color,
@@ -19,15 +19,15 @@ class MarkerGenerator {
    const double height = 110.0;
    const double circleRadius = 25.0;

-    // 1. رسم المربع (Info Box)
+    // 1. رسم المربع (Info Box) مع تدرج لوني بسيط
    final Paint paint = Paint()..color = color;
    final RRect rRect = RRect.fromRectAndRadius(
-      const Rect.fromLTWH(0, 0, width, 60),
-      const Radius.circular(15),
+      const Rect.fromLTWH(0, 0, width, 65),
+      const Radius.circular(20), // زوايا أكثر استدارة لشكل عصري
    );

-    // ظل خفيف
-    canvas.drawShadow(Path()..addRRect(rRect), Colors.black, 5.0, true);
+    // ظل أقوى لمظهر بارز (Premium Feel)
+    canvas.drawShadow(Path()..addRRect(rRect), Colors.black54, 10.0, true);
    canvas.drawRRect(rRect, paint);

    // 2. رسم مثلث صغير أسفل المربع (Arrow Tail)
@@ -96,11 +96,11 @@ class MarkerGenerator {
        );
    final ByteData? data =
        await image.toByteData(format: ui.ImageByteFormat.png);
-    return BitmapDescriptor.fromBytes(data!.buffer.asUint8List());
+    return InlqBitmap.fromBytes(data!.buffer.asUint8List());
  }

  // دالة خاصة لرسم ماركر السائق (دائرة وخلفها سهم)
-  static Future<BitmapDescriptor> createDriverMarker() async {
+  static Future<InlqBitmap> createDriverMarker() async {
    final ui.PictureRecorder pictureRecorder = ui.PictureRecorder();
    final Canvas canvas = Canvas(pictureRecorder);
    const double size = 100.0;
@@ -137,6 +137,6 @@ class MarkerGenerator {
        .toImage(size.toInt(), size.toInt());
    final ByteData? data =
        await image.toByteData(format: ui.ImageByteFormat.png);
-    return BitmapDescriptor.fromBytes(data!.buffer.asUint8List());
+    return InlqBitmap.fromBytes(data!.buffer.asUint8List());
  }
 }
--- a/lib/views/home/Captin/orderCaptin/order_request_page.dart
+++ b/lib/views/home/Captin/orderCaptin/order_request_page.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:intaleq_maps/intaleq_maps.dart';
+import 'package:sefer_driver/constant/api_key.dart';
 import 'package:sefer_driver/constant/colors.dart';
 import 'package:sefer_driver/controller/home/captin/order_request_controller.dart';

@@ -63,20 +64,21 @@ class OrderRequestPage extends StatelessWidget {
                // 1. الخارطة
                Positioned.fill(
                  bottom: 300,
-                  child: GoogleMap(
-                    mapType: MapType.normal,
+                  child: IntaleqMap(
+                    apiKey: AK.mapAPIKEY,
                    initialCameraPosition: CameraPosition(
                      target: LatLng(
                          controller.latPassenger, controller.lngPassenger),
                      zoom: 13.0,
                    ),
                    markers: controller.markers,
+                    mapType: Get.isDarkMode
+                        ? IntaleqMapType.normal
+                        : IntaleqMapType.light,
                    polylines: controller.polylines,
                    zoomControlsEnabled: false,
                    myLocationButtonEnabled: false,
                    compassEnabled: false,
-                    padding: const EdgeInsets.only(
-                        top: 80, bottom: 20, left: 20, right: 20),
                    onMapCreated: (c) {
                      controller.onMapCreated(c);
                      controller.update();
@@ -124,15 +126,16 @@ class OrderRequestPage extends StatelessWidget {
                  alignment: Alignment.bottomCenter,
                  child: Container(
                    height: 360,
-                    decoration: const BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.only(
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).cardColor,
+                      borderRadius: const BorderRadius.only(
                        topLeft: Radius.circular(25),
                        topRight: Radius.circular(25),
                      ),
                      boxShadow: [
                        BoxShadow(
-                            color: Colors.black12,
+                            color:
+                                Theme.of(context).shadowColor.withOpacity(0.1),
                            blurRadius: 20,
                            spreadRadius: 5)
                      ],
@@ -146,8 +149,9 @@ class OrderRequestPage extends StatelessWidget {
                                width: 40,
                                height: 4,
                                decoration: BoxDecoration(
-                                    color: Colors.grey[300],
+                                    color: Theme.of(context).dividerColor,
                                    borderRadius: BorderRadius.circular(2)))),
+
                        const SizedBox(height: 15),

                        // الصف الأول: الراكب والسعر
@@ -156,11 +160,14 @@ class OrderRequestPage extends StatelessWidget {
                          children: [
                            Row(
                              children: [
-                                const CircleAvatar(
+                                CircleAvatar(
                                  radius: 24,
-                                  backgroundColor: Color(0xFFF5F5F5),
+                                  backgroundColor: Theme.of(context)
+                                      .colorScheme
+                                      .surfaceVariant,
                                  child: Icon(Icons.person,
-                                      color: Colors.grey, size: 28),
+                                      color: Theme.of(context).hintColor,
+                                      size: 28),
                                ),
                                const SizedBox(width: 10),
                                Column(
@@ -233,27 +240,45 @@ class OrderRequestPage extends StatelessWidget {
                          padding: const EdgeInsets.symmetric(
                              vertical: 10, horizontal: 10),
                          decoration: BoxDecoration(
-                            color: const Color(0xFFF8F9FA),
+                            color: Theme.of(context)
+                                .colorScheme
+                                .surfaceVariant
+                                .withOpacity(0.5),
                            borderRadius: BorderRadius.circular(12),
-                            border: Border.all(color: Colors.grey.shade200),
+                            border: Border.all(
+                                color: Theme.of(context).dividerColor),
                          ),
                          child: Row(
                            mainAxisAlignment: MainAxisAlignment.spaceAround,
                            children: [
                              _buildInfoItem(
-                                  carIcon, carTypeLabel, carTypeColor),
+                                  context, carIcon, carTypeLabel, carTypeColor),
                              Container(
                                  height: 20,
                                  width: 1,
-                                  color: Colors.grey.shade300),
-                              _buildInfoItem(Icons.route,
-                                  controller.totalTripDistance, Colors.black87),
+                                  color: Theme.of(context).dividerColor),
+                              _buildInfoItem(
+                                  context,
+                                  Icons.route,
+                                  controller.totalTripDistance,
+                                  Theme.of(context)
+                                          .textTheme
+                                          .bodyLarge
+                                          ?.color ??
+                                      Colors.black87),
                              Container(
                                  height: 20,
                                  width: 1,
-                                  color: Colors.grey.shade300),
-                              _buildInfoItem(Icons.access_time_filled,
-                                  controller.totalTripDuration, Colors.black87),
+                                  color: Theme.of(context).dividerColor),
+                              _buildInfoItem(
+                                  context,
+                                  Icons.access_time_filled,
+                                  controller.totalTripDuration,
+                                  Theme.of(context)
+                                          .textTheme
+                                          .bodyLarge
+                                          ?.color ??
+                                      Colors.black87),
                            ],
                          ),
                        ),
@@ -397,7 +422,8 @@ class OrderRequestPage extends StatelessWidget {
    );
  }

-  Widget _buildInfoItem(IconData icon, String text, Color color) {
+  Widget _buildInfoItem(
+      BuildContext context, IconData icon, String text, Color color) {
    return Row(
      mainAxisSize: MainAxisSize.min,
      children: [
--- a/lib/views/home/Captin/orderCaptin/order_speed_request.dart
+++ b/lib/views/home/Captin/orderCaptin/order_speed_request.dart
@@ -2,7 +2,7 @@

 // import 'package:flutter/material.dart';
 // import 'package:get/get.dart';
-// import 'package:google_maps_flutter/google_maps_flutter.dart';
+// import 'package:intaleq_maps/intaleq_maps.dart';

 // import 'package:sefer_driver/controller/home/captin/home_captain_controller.dart';
 // import 'package:sefer_driver/constant/box_name.dart';
--- a/lib/views/home/Captin/orderCaptin/test_order_page.dart
+++ b/lib/views/home/Captin/orderCaptin/test_order_page.dart
@@ -1,7 +1,8 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:intaleq_maps/intaleq_maps.dart';
+import 'package:sefer_driver/constant/api_key.dart';
 import 'dart:math' as math;

 import '../../../../constant/colors.dart';
@@ -60,7 +61,8 @@ class _OrderRequestPageTestState extends State<OrderRequestPageTest> {
                children: [
                  SizedBox(
                    height: Get.height * .33,
-                    child: Obx(() => GoogleMap(
+                    child: Obx(() => IntaleqMap(
+                          apiKey: AK.mapAPIKEY,
                          initialCameraPosition: CameraPosition(
                            zoom: 12,
                            target:
@@ -69,13 +71,13 @@ class _OrderRequestPageTestState extends State<OrderRequestPageTest> {
                          cameraTargetBounds: CameraTargetBounds(
                              _orderRequestController.mapBounds.value),
                          myLocationButtonEnabled: true,
-                          trafficEnabled: false,
-                          buildingsEnabled: false,
-                          mapToolbarEnabled: true,
+                          // trafficEnabled: false,
+                          // buildingsEnabled: false,
+                          // mapToolbarEnabled: true,
                          myLocationEnabled: true,
                          markers: _orderRequestController.markers.value,
                          polylines: _orderRequestController.polylines.value,
-                          onMapCreated: (GoogleMapController controller) {
+                          onMapCreated: (IntaleqMapController controller) {
                            _orderRequestController.mapController.value =
                                controller;
                          },
@@ -104,11 +106,11 @@ class OrderRequestController extends GetxController {
  Rx<Set<Marker>> markers = Rx<Set<Marker>>({});
  Rx<Set<Polyline>> polylines = Rx<Set<Polyline>>({});

-  Rx<GoogleMapController?> mapController = Rx<GoogleMapController?>(null);
+  Rx<IntaleqMapController?> mapController = Rx<IntaleqMapController?>(null);

  // Icons for start and end markers
-  late BitmapDescriptor startIcon;
-  late BitmapDescriptor endIcon;
+  late InlqBitmap startIcon;
+  late InlqBitmap endIcon;

  // Coordinates for passenger location and destination
  Rx<LatLng?> passengerLocation = Rx<LatLng?>(null);
@@ -123,12 +125,8 @@ class OrderRequestController extends GetxController {

  void _initializeMarkerIcons() async {
    // Load custom marker icons
-    startIcon = await BitmapDescriptor.fromAssetImage(
-        const ImageConfiguration(size: Size(48, 48)),
-        'assets/start_marker.png');
-
-    endIcon = await BitmapDescriptor.fromAssetImage(
-        const ImageConfiguration(size: Size(48, 48)), 'assets/end_marker.png');
+    startIcon = InlqBitmap.fromAsset('assets/start_marker.png');
+    endIcon = InlqBitmap.fromAsset('assets/end_marker.png');
  }

  void parseCoordinates(List myList) {
@@ -184,10 +182,10 @@ class OrderRequestController extends GetxController {
    polylines.value = {
      Polyline(
        zIndex: 1,
-        consumeTapEvents: true,
+        // consumeTapEvents: true,
        geodesic: true,
-        endCap: Cap.buttCap,
-        startCap: Cap.buttCap,
+        // endCap: Cap.buttCap,
+        // startCap: Cap.buttCap,
        visible: true,
        polylineId: const PolylineId('routeOrder'),
        points: [passengerLocation.value!, passengerDestination.value!],