9/6/1

lib/views/home/map_page.dart

@@ -4,10 +4,8 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:ride/constant/colors.dart';
 import 'package:ride/controller/home/map_page_controller.dart';
 import 'package:ride/views/home/map_widget.dart/cancel_raide_page.dart';
-import 'package:ride/views/widgets/circle_container.dart';
 import 'package:ride/views/widgets/mycircular.dart';
 
-import '../../controller/functions/toast.dart';
 import '../../controller/home/menu_controller.dart';
 import 'map_widget.dart/buttom_sheet_map_show.dart';
 import 'map_widget.dart/cash_confirm_bottom_page.dart';
@@ -15,7 +13,8 @@ import 'map_widget.dart/main_bottom_Menu_map.dart';
 import 'map_widget.dart/map_menu_widget.dart';
 import 'map_widget.dart/menu_map_page.dart';
 import 'map_widget.dart/payment_method.page.dart';
-import 'map_widget.dart/picker_animation_container.dart';
+import 'my_wallet/passenger_wallet.dart';
+import 'profile/order_history.dart';
 
 class MapPage extends StatelessWidget {
   const MapPage({super.key});
@@ -25,6 +24,35 @@ class MapPage extends StatelessWidget {
     Get.put(MapController());
     Get.put(MyMenuController());
     return Scaffold(
+      // appBar: AppBar(),
+      // drawer: Drawer(
+      //   child: ListView(
+      //     padding: EdgeInsets.zero,
+      //     children: [
+      //       ListTile(
+      //         onTap: () {
+      //           Get.to(() => const PassengerWallet());
+      //         },
+      //         leading: Icon(Icons.wallet),
+      //         title: Text('My Wallet'),
+      //       ),
+      //       ListTile(
+      //         onTap: () async {
+      //           // await OrderHistoryController().getOrderHistoryByPassenger();
+      //           Get.to(() => const OrderHistory());
+      //         },
+      //         leading: Icon(Icons.history),
+      //         title: Text('Order History'),
+      //       ),
+      //       ListTile(
+      //         onTap: () {},
+      //         leading: Icon(Icons.money),
+      //         title: Text('Tariff'),
+      //       ),
+      //     ],
+      //   ),
+      // ),
+
       body: Stack(
         children: [
           GetBuilder<MapController>(
@@ -135,8 +163,10 @@ class MapPage extends StatelessWidget {
                     mapType:
                         controller.mapType ? MapType.satellite : MapType.normal,
                     myLocationButtonEnabled: true,
-                    indoorViewEnabled: true,
-                    trafficEnabled: false,
+                    // liteModeEnabled: true, tiltGesturesEnabled: false,
+
+                    // indoorViewEnabled: true,
+                    trafficEnabled: controller.mapTraficON,
                     buildingsEnabled: true,
                     mapToolbarEnabled: true,
                     onCameraMove: (position) {
@@ -150,17 +180,50 @@ class MapPage extends StatelessWidget {
           ),
           GetBuilder<MapController>(
             builder: (controller) => Positioned(
-                top: 80,
+                top: 85,
                 left: 6,
-                child: IconButton(
-                  onPressed: () {
-                    controller.changeMapType();
-                    // Toast.show(context, 'This is a toast message!');
-                  },
-                  icon: const Icon(
-                    Icons.satellite_alt,
-                    size: 35,
-                  ),
+                child: Column(
+                  children: [
+                    AnimatedContainer(
+                      duration: const Duration(microseconds: 200),
+                      width: controller.widthMapTypeAndTrafic,
+                      decoration: BoxDecoration(
+                          border: Border.all(),
+                          color: AppColor.secondaryColor,
+                          borderRadius: BorderRadius.circular(15)),
+                      child: IconButton(
+                        onPressed: () {
+                          controller.changeMapType();
+                          // Toast.show(context, 'This is a toast message!');
+                        },
+                        icon: const Icon(
+                          Icons.satellite_alt,
+                          size: 29,
+                        ),
+                      ),
+                    ),
+                    const SizedBox(
+                      height: 5,
+                    ),
+                    AnimatedContainer(
+                      duration: const Duration(microseconds: 200),
+                      width: controller.widthMapTypeAndTrafic,
+                      decoration: BoxDecoration(
+                          color: AppColor.secondaryColor,
+                          border: Border.all(),
+                          borderRadius: BorderRadius.circular(15)),
+                      child: IconButton(
+                        onPressed: () {
+                          controller.changeMapTraffic();
+                          // Toast.show(context, 'This is a toast message!');
+                        },
+                        icon: const Icon(
+                          Icons.streetview_sharp,
+                          size: 29,
+                        ),
+                      ),
+                    ),
+                  ],
                 )),
           ),
           const PickerIconOnMap(),