feat(SCRUM-98): SCRUM-98-location-page

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "bd7a4a6b5576630823ca344e3e684c53aa1a0f46"
+  revision: "9f455d2486bcb28cad87b062475f42edc959f636"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
-      base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
-    - platform: web
-      create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
-      base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
+      create_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+      base_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+    - platform: android
+      create_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+      base_revision: 9f455d2486bcb28cad87b062475f42edc959f636
 
   # User provided section
 

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
         android:label="tracking_app"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        <meta-data android:name="com.google.android.geo.API_KEY"
+               android:value="AIzaSyBRplvYc2qNr0KuGUndmcJQHiVdBLIO1IA"/>
         <activity
             android:name=".MainActivity"
             android:exported="true"

assets/translations/ar.json

@@ -265,5 +265,7 @@
   "btnArrivedAtPickupPoint": "وصلت الى نقطة الالتقاء",
   "btnStartDeliver": "بدء التوصيل",
   "btnArrivedToUser": "وصلت إلى المستخدم",
-  "btnDeliveredToUser": "تم التوصيل للمستخدم"
+  "btnDeliveredToUser": "تم التوصيل للمستخدم",
+  "finishYourOrder": "عليك انهاء توصيل الطلب اولا"
+
 }

assets/translations/en.json

@@ -268,5 +268,6 @@
   "btnArrivedAtPickupPoint": "Arrived at Pickup point",
   "btnStartDeliver": "Start deliver",
   "btnArrivedToUser": "Arrived to the user",
-  "btnDeliveredToUser": "Delivered to the user"
+  "btnDeliveredToUser": "Delivered to the user",
+  "finishYourOrder": "You must finish the order first"
 }

ios/Runner/AppDelegate.swift

@@ -1,12 +1,14 @@
 import Flutter
 import UIKit
+import GoogleMaps
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
+    GMSServices.provideAPIKey("AIzaSyBRplvYc2qNr0KuGUndmcJQHiVdBLIO1IA")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

lib/app/core/router/app_router.dart

@@ -4,7 +4,10 @@ import 'package:tracking_app/app/config/di/di.dart';
 import 'package:tracking_app/app/core/router/route_names.dart';
 import 'package:tracking_app/features/Onboarding/presentation/pages/onboardingScreen.dart';
 import 'package:tracking_app/features/app_sections/presentation/pages/app_sections.dart';
+import 'package:tracking_app/features/driver_orders_details/domain/models/location_type.dart';
 import 'package:tracking_app/features/driver_orders_details/presentation/pages/drivers_orders_details_page.dart';
+import 'package:tracking_app/features/driver_orders_details/presentation/pages/location_page.dart';
+import 'package:tracking_app/features/home/presentation/pages/driverOrderScreen.dart';
 import 'package:tracking_app/features/profile/data/models/driver_model.dart';
 import 'package:tracking_app/features/profile/presentation/pages/edit_driver_profile_page.dart';
 import 'package:tracking_app/features/profile/presentation/pages/edit_vehicle_page.dart';
@@ -14,15 +17,14 @@ import 'package:tracking_app/features/my_orders/presentation/pages/order_details
 import 'package:tracking_app/features/auth/presentation/apply/view/apply_view.dart';
 import 'package:tracking_app/features/auth/presentation/forget_pass/manager/cubit/forget_pass_cubit.dart';
 import 'package:tracking_app/features/auth/presentation/forget_pass/pages/forget_pass_page.dart';
-import 'package:tracking_app/features/auth/presentation/login/pages/loginScreen.dart';
 import 'package:tracking_app/features/auth/presentation/reset_password/manager/reset_password_cubit.dart';
 import 'package:tracking_app/features/auth/presentation/reset_password/pages/change_password_page.dart';
 import 'package:tracking_app/features/auth/presentation/reset_password/pages/reset_password.dart';
 import 'package:tracking_app/features/auth/presentation/verify_reset/manger/cubit/verify_reset_cubit.dart';
 import 'package:tracking_app/features/auth/presentation/verify_reset/pages/verify_reset_page.dart';
 
 final GoRouter appRouter = GoRouter(
-  initialLocation: RouteNames.onboarding,
+  initialLocation: RouteNames.login,
   routes: [
     GoRoute(
       path: RouteNames.changePassword,
@@ -36,7 +38,7 @@ final GoRouter appRouter = GoRouter(
 
     GoRoute(
       path: RouteNames.login,
-      builder: (context, state) => const LoginScreen(),
+      builder: (context, state) => const DriverOrderScreen(),
     ),
 
     GoRoute(
@@ -110,5 +112,13 @@ final GoRouter appRouter = GoRouter(
         return OrderDetailsPage(order: order);
       },
     ),
+
+    GoRoute(
+      path: RouteNames.locationPage,
+      builder: (context, state) {
+        final locationType = state.extra as LocationType;
+        return LocationPage(locationType: locationType);
+      },
+    ),
   ],
 );

lib/app/core/router/route_names.dart

@@ -16,4 +16,5 @@ abstract class RouteNames {
   static const ordersDetailsPage = "/ordersDetails";
   static const myOrders = "/myOrders";
   static const orderDetails = "/orderDetails";
+  static const locationPage = "/locationPage";
 }

lib/app/core/ui_helper/assets/images.dart

@@ -13,4 +13,7 @@ class Assets {
   static const String imagesFilter = "assets/images/filter.png";
   static const String imagesFlower = "assets/images/Flower.svg";
   static const String delete = "assets/images/delete.png";
+  static const String driverLocation = "assets/images/driver_location.png";
+  static const String userLocation = "assets/images/user_location.png";
+  static const String floweryLocation = "assets/images/flowery_location.png";
 }

lib/app/core/utils/app_launcher.dart

@@ -0,0 +1,20 @@
+import 'package:url_launcher/url_launcher.dart';
+
+abstract class AppLauncher {
+  static void launchPhone(String phoneNumber) async {
+    final Uri url = Uri(scheme: 'tel', path: phoneNumber);
+    if (await canLaunchUrl(url)) {
+      await launchUrl(url);
+    }
+  }
+
+  static void launchWhatsApp(String phoneNumber) async {
+    String formattedPhone = phoneNumber.replaceAll(RegExp(r'[^0-9]'), '');
+
+    if (formattedPhone.startsWith('0')) {
+      formattedPhone = '20${formattedPhone.substring(1)}';
+    }
+    final Uri url = Uri.parse("whatsapp://send?phone=$formattedPhone");
+    await launchUrl(url, mode: LaunchMode.externalApplication);
+  }
+}

lib/features/auth/data/repos/auth_repo_impl.dart

@@ -2,7 +2,7 @@ import 'package:injectable/injectable.dart';
 import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/auth/data/datasource/auth_remote_datasource.dart';
 import 'package:tracking_app/features/auth/data/mapper/vehicles_mapper.dart';
-import 'package:tracking_app/features/auth/data/mappers/change_password_dto_mapper.dart';
+import 'package:tracking_app/features/auth/data/mapper/change_password_dto_mapper.dart';
 import 'package:tracking_app/features/auth/data/model/request/LoginRequest.dart';
 import 'package:tracking_app/features/auth/data/model/response/LoginResponse.dart';
 import 'package:tracking_app/features/auth/data/model/response/change_password_dto.dart';