From 44d2066dec33485cd2e27c6fe52d732abb56b748 Mon Sep 17 00:00:00 2001 From: suresh Date: Tue, 25 Apr 2023 14:39:34 +0530 Subject: [PATCH] deliveryboy commit --- assets/images/drop_marker.png | Bin 4637 -> 1009 bytes assets/images/pickup_marker.png | Bin 1288 -> 2588 bytes lib/location_controller.dart | 8 +++++--- lib/order_tracking_page.dart | 18 ++++++++++++------ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/assets/images/drop_marker.png b/assets/images/drop_marker.png index ae03626f82a632cdb348c18f185ed3719b2719b2..6878849b2c448b24ecd768dfe932e3fe07d4c6dc 100644 GIT binary patch literal 1009 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 TC}0g500000NkvXXu0mjf(A)pM diff --git a/assets/images/pickup_marker.png b/assets/images/pickup_marker.png index 793b7b1fb2a3f2078bdc1369185b078c37f2859c..a8b0258034a4bf1e616342d4dc0e8834aad0eacf 100644 GIT binary patch literal 2588 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 extends GetxController { Location location = Location(); // final Rx locationPosition = const LatLng(0.0, 0.0).obs; + /*final Rx locationPosition = + const LatLng(12.90618717, 77.5844983).obs;*/ final Rx locationPosition = - const LatLng(12.90618717, 77.5844983).obs; + const LatLng(17.491659, 78.391983).obs; bool locationServiceActive = true; @@ -26,8 +28,8 @@ class LocationController extends GetxController { @override void onInit() async { - await _getBytesFromAsset(AppImages.pickupMarker, AppSizes.mapPinSize * 0.2); - await _getBytesFromAsset(AppImages.dropMarker, AppSizes.mapPinSize * 0.2); + await _getBytesFromAsset(AppImages.pickupMarker, AppSizes.mapPinSize * 0.1); + await _getBytesFromAsset(AppImages.dropMarker, AppSizes.mapPinSize * 0.05); super.onInit(); refreshToLiveLocation(); diff --git a/lib/order_tracking_page.dart b/lib/order_tracking_page.dart index 1eb6f40..2d41de8 100644 --- a/lib/order_tracking_page.dart +++ b/lib/order_tracking_page.dart @@ -27,16 +27,22 @@ class OrderTrackingPageState extends State { double latitude=0; double longitude=0; - String googleAPiKey = "AIzaSyBOigf-qg4v_aD0Jrx2wFOMNzObxXrfDEM"; + String googleAPiKey ="AIzaSyBOigf-qg4v_aD0Jrx2wFOMNzObxXrfDEM"; Set markers = {}; Map polylines = {}; - LatLng startLocation = const LatLng(0,0); + LatLng startLocation = const LatLng(17.416806,78.4521704); LocationController locationController = Get.put(LocationController()); + + + + + + @override void initState() { super.initState(); @@ -103,15 +109,15 @@ class OrderTrackingPageState extends State { PolylineId id = const PolylineId("poly"); Polyline polyline = Polyline( polylineId: id, - color: Colors.blueAccent, + color: Colors.red, points: polylineCoordinates, - width: 8, + width: 4, ); polylines[id] = polyline; var position = CameraPosition( target: LatLng(startLocation.latitude, startLocation.longitude), - zoom: 21); + zoom: 18); final GoogleMapController controller = await mapController.future; controller.animateCamera(CameraUpdate.newCameraPosition(position)); @@ -129,7 +135,7 @@ class OrderTrackingPageState extends State { initialCameraPosition: CameraPosition( //innital position in map target: startLocation, //initial position - zoom: 5.0, //initial zoom level + zoom: 8.0, //initial zoom level ), markers: markers, //markers to show on map