25-8-6-1
This commit is contained in:
Hamza-Ayed
@@ -26,6 +26,86 @@ import 'widget/connect.dart';
|
||||
import 'widget/left_menu_map_captain.dart';
|
||||
import '../../../../main.dart';
|
||||
|
||||
// =================================================================
|
||||
// STEP 1: Modify your LocationController
|
||||
// =================================================================
|
||||
/*
|
||||
In your `location_controller.dart` file, change `myLocation` and `heading`
|
||||
to be observable by adding `.obs`. This will allow other parts of your app,
|
||||
like the map, to automatically react to changes.
|
||||
|
||||
// BEFORE:
|
||||
// LatLng myLocation = LatLng(....);
|
||||
// double heading = 0.0;
|
||||
|
||||
// AFTER:
|
||||
final myLocation = const LatLng(30.0444, 31.2357).obs; // Default to Cairo or a sensible default
|
||||
final heading = 0.0.obs;
|
||||
|
||||
// When you update these values elsewhere in your controller,
|
||||
// make sure to update their `.value` property.
|
||||
// e.g., myLocation.value = newLatLng;
|
||||
// e.g., heading.value = newHeading;
|
||||
*/
|
||||
|
||||
// =================================================================
|
||||
// STEP 2: Modify your HomeCaptainController
|
||||
// =================================================================
|
||||
/*
|
||||
In your `home_captain_controller.dart` file, you need to add logic to
|
||||
listen for changes from the LocationController and animate the camera.
|
||||
|
||||
class HomeCaptainController extends GetxController {
|
||||
// ... your existing variables (mapController, carIcon, etc.)
|
||||
|
||||
// Make sure you have a reference to the GoogleMapController
|
||||
GoogleMapController? mapHomeCaptainController;
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
super.onInit();
|
||||
_setupLocationListener();
|
||||
}
|
||||
|
||||
void onMapCreated(GoogleMapController controller) {
|
||||
mapHomeCaptainController = controller;
|
||||
// Any other map setup logic
|
||||
}
|
||||
|
||||
// THIS IS THE NEW LOGIC TO ADD
|
||||
void _setupLocationListener() {
|
||||
final locationController = Get.find<LocationController>();
|
||||
|
||||
// The 'ever' worker from GetX listens for changes to an observable variable.
|
||||
// Whenever `heading` or `myLocation` changes, it will call our method.
|
||||
ever(locationController.heading, (_) => _updateCameraPosition());
|
||||
ever(locationController.myLocation, (_) => _updateCameraPosition());
|
||||
}
|
||||
|
||||
void _updateCameraPosition() {
|
||||
final locationController = Get.find<LocationController>();
|
||||
if (mapHomeCaptainController != null) {
|
||||
final newPosition = CameraPosition(
|
||||
target: locationController.myLocation.value,
|
||||
zoom: 17.5, // A bit closer for a navigation feel
|
||||
tilt: 50.0, // A nice 3D perspective
|
||||
bearing: locationController.heading.value, // This rotates the map
|
||||
);
|
||||
|
||||
// Animate the camera smoothly to the new position and rotation
|
||||
mapHomeCaptainController!.animateCamera(
|
||||
CameraUpdate.newCameraPosition(newPosition),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ... rest of your controller code
|
||||
}
|
||||
*/
|
||||
|
||||
// =================================================================
|
||||
// STEP 3: Update the HomeCaptain Widget
|
||||
// =================================================================
|
||||
class HomeCaptain extends StatelessWidget {
|
||||
HomeCaptain({super.key});
|
||||
final LocationController locationController = Get.put(LocationController());
|
||||
@@ -34,16 +114,12 @@ class HomeCaptain extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Get.put(OrderRequestController());
|
||||
Get.put(HomeCaptainController());
|
||||
// Get.put(CaptainWalletController());
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||
closeOverlayIfFound();
|
||||
checkForUpdate(context);
|
||||
getPermissionOverlay();
|
||||
showDriverGiftClaim(context);
|
||||
// getPermissionLocation1();
|
||||
// await showFirstTimeOfferNotification(context);
|
||||
});
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
@@ -118,14 +194,18 @@ class HomeCaptain extends StatelessWidget {
|
||||
onPressed: homeCaptainController.changeMapTraffic,
|
||||
),
|
||||
_MapControlButton(
|
||||
icon: Icons.location_on,
|
||||
tooltip: 'My Location'.tr,
|
||||
icon: Icons.my_location, // Changed for clarity
|
||||
tooltip: 'Center on Me'.tr,
|
||||
onPressed: () {
|
||||
homeCaptainController.mapHomeCaptainController!
|
||||
.animateCamera(CameraUpdate.newLatLng(LatLng(
|
||||
Get.find<LocationController>().myLocation.latitude,
|
||||
Get.find<LocationController>().myLocation.longitude,
|
||||
)));
|
||||
// This button now just re-centers without changing rotation
|
||||
if (homeCaptainController.mapHomeCaptainController !=
|
||||
null) {
|
||||
homeCaptainController.mapHomeCaptainController!
|
||||
.animateCamera(CameraUpdate.newLatLngZoom(
|
||||
Get.find<LocationController>().myLocation,
|
||||
17.5,
|
||||
));
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
@@ -134,47 +214,57 @@ class HomeCaptain extends StatelessWidget {
|
||||
const SizedBox(width: 8),
|
||||
],
|
||||
),
|
||||
|
||||
drawer:
|
||||
CupertinoDrawerCaptain(), // Add this widget at the bottom of the file
|
||||
drawer: CupertinoDrawerCaptain(),
|
||||
body: Stack(
|
||||
children: [
|
||||
GetBuilder<HomeCaptainController>(builder: (homeCaptainController) {
|
||||
return homeCaptainController.isLoading
|
||||
// FIX: Replaced nested GetBuilder/Obx with a single GetX widget.
|
||||
// GetX handles both observable (.obs) variables and standard controller updates.
|
||||
GetBuilder<HomeCaptainController>(builder: (controller) {
|
||||
return controller.isLoading
|
||||
? const MyCircularProgressIndicator()
|
||||
: GoogleMap(
|
||||
onMapCreated: homeCaptainController.onMapCreated,
|
||||
// cameraTargetBounds: CameraTargetBounds(controller.boundsdata),
|
||||
onMapCreated: controller.onMapCreated,
|
||||
minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
|
||||
|
||||
initialCameraPosition: CameraPosition(
|
||||
// Use .value to get the latest location from the reactive variable
|
||||
target: locationController.myLocation,
|
||||
zoom: 15,
|
||||
),
|
||||
onCameraMove: (position) {
|
||||
CameraPosition(
|
||||
target: locationController.myLocation,
|
||||
zoom: 17.5, // A bit closer for a navigation feel
|
||||
tilt: 50.0, // A nice 3D perspective
|
||||
bearing:
|
||||
locationController.heading, // This rotates the map
|
||||
);
|
||||
},
|
||||
markers: {
|
||||
Marker(
|
||||
markerId: MarkerId('MyLocation'.tr),
|
||||
position: locationController.myLocation,
|
||||
draggable: false,
|
||||
icon: homeCaptainController.carIcon,
|
||||
rotation: locationController.heading)
|
||||
markerId: MarkerId('MyLocation'.tr),
|
||||
// Use .value for position and rotation from the reactive variable
|
||||
position: locationController.myLocation,
|
||||
rotation: locationController.heading,
|
||||
// IMPORTANT: These two properties make the marker look
|
||||
// correct when the map is tilted and rotating.
|
||||
flat: true,
|
||||
anchor: const Offset(0.5, 0.5),
|
||||
icon: controller.carIcon,
|
||||
)
|
||||
},
|
||||
mapType: homeCaptainController.mapType
|
||||
mapType: controller.mapType
|
||||
? MapType.satellite
|
||||
: MapType.terrain,
|
||||
myLocationButtonEnabled: true,
|
||||
// liteModeEnabled: true, tiltGesturesEnabled: false,
|
||||
|
||||
// indoorViewEnabled: true,
|
||||
trafficEnabled: homeCaptainController.mapTrafficON,
|
||||
myLocationButtonEnabled: false, // Disable default button
|
||||
myLocationEnabled: false, // We use our custom marker
|
||||
trafficEnabled: controller.mapTrafficON,
|
||||
buildingsEnabled: true,
|
||||
mapToolbarEnabled: true,
|
||||
|
||||
myLocationEnabled: false,
|
||||
// liteModeEnabled: true,
|
||||
zoomControlsEnabled: false, // Cleaner UI for navigation
|
||||
);
|
||||
}),
|
||||
|
||||
// The rest of your UI remains the same...
|
||||
Positioned(
|
||||
bottom: 10,
|
||||
right: Get.width * .1,
|
||||
@@ -384,45 +474,7 @@ class HomeCaptain extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
), // Positioned(
|
||||
// bottom: Get.height * .17,
|
||||
// right: Get.width * .01,
|
||||
// child: AnimatedContainer(
|
||||
// duration: const Duration(microseconds: 200),
|
||||
// width: Get.width * .12,
|
||||
// decoration: BoxDecoration(
|
||||
// color: AppColor.secondaryColor,
|
||||
// border: Border.all(),
|
||||
// borderRadius: BorderRadius.circular(15)),
|
||||
// child: IconButton(
|
||||
// onPressed: () async {
|
||||
// CRUD().sendEmail(AppLink.sendEmailToPassengerForTripDetails, {
|
||||
// 'startLocation': Get.find<MapDriverController>()
|
||||
// .passengerLocation
|
||||
// .toString(),
|
||||
// 'endLocation': Get.find<MapDriverController>()
|
||||
// .passengerDestination
|
||||
// .toString(),
|
||||
// 'name': Get.find<MapDriverController>().name.toString(),
|
||||
// 'timeOfTrip':
|
||||
// Get.find<MapDriverController>().timeOfOrder.toString(),
|
||||
// 'fee': Get.find<MapDriverController>()
|
||||
// .totalPassenger
|
||||
// .toString(),
|
||||
// 'duration':
|
||||
// Get.find<MapDriverController>().duration.toString(),
|
||||
// 'phone': Get.find<MapDriverController>().phone.toString(),
|
||||
// 'email': Get.find<MapDriverController>().email.toString(),
|
||||
// });
|
||||
// },
|
||||
// icon: const Icon(
|
||||
// MaterialCommunityIcons.map_marker_radius,
|
||||
// size: 45,
|
||||
// color: AppColor.blueColor,
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
),
|
||||
Positioned(
|
||||
bottom: Get.height * .2,
|
||||
right: 6,
|
||||
@@ -438,14 +490,6 @@ class HomeCaptain extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(15)),
|
||||
child: IconButton(
|
||||
onPressed: () async {
|
||||
// final Bubble _bubble = Bubble(showCloseButton: false);
|
||||
// try {
|
||||
// await _bubble.startBubbleHead(
|
||||
// sendAppToBackground: false);
|
||||
// } on PlatformException {
|
||||
// print('Failed to call startBubbleHead');
|
||||
// }
|
||||
|
||||
Bubble().startBubbleHead(sendAppToBackground: true);
|
||||
},
|
||||
icon: Image.asset(
|
||||
@@ -483,8 +527,6 @@ class HomeCaptain extends StatelessWidget {
|
||||
),
|
||||
GetBuilder<HomeCaptainController>(
|
||||
builder: (homeCaptainController) {
|
||||
Log.print(
|
||||
'rideStatus from home 486 : ${box.read(BoxName.rideStatus)}');
|
||||
return box.read(BoxName.rideStatus) == 'Applied' ||
|
||||
box.read(BoxName.rideStatus) == 'Begin'
|
||||
? Positioned(
|
||||
@@ -537,27 +579,13 @@ class HomeCaptain extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
leftMainMenuCaptainIcons(),
|
||||
|
||||
// callPage(),
|
||||
|
||||
// Positioned(
|
||||
// top: Get.height * .2,
|
||||
// // left: 20,
|
||||
// // right: 20,
|
||||
// bottom: Get.height * .4,
|
||||
// child: IconButton(
|
||||
// onPressed: () {
|
||||
// homeCaptainController.getCountRideToday();
|
||||
// },
|
||||
// icon: const Icon(Icons.call),
|
||||
// ),
|
||||
// ),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// These helper widgets and functions remain unchanged
|
||||
showFirstTimeOfferNotification(BuildContext context) async {
|
||||
bool isFirstTime = _checkIfFirstTime();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user