9/13/3

lib/views/home/map_page.dart

@@ -7,6 +7,7 @@ import 'package:ride/constant/colors.dart';
 import 'package:ride/constant/style.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/elevated_btn.dart';
 import 'package:ride/views/widgets/mycircular.dart';
 
@@ -299,20 +300,31 @@ class CancelRidePageShow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GetBuilder<MapController>(
-        builder: (controller) => controller.data.isNotEmpty
-            ? Positioned(
-                right: 5,
-                top: 55,
-                child: GestureDetector(
-                  onTap: () {
-                    controller.changeCancelRidePageShow();
-                  },
-                  child: const Icon(
-                    Icons.clear,
-                    size: 30,
-                  ),
-                ))
-            : const SizedBox());
+        builder: (controller) =>
+            controller.data.isNotEmpty && controller.remainingTime > 0
+                ? Positioned.directional(
+                    end: 10,
+                    top: 55,
+                    textDirection: TextDirection.ltr,
+                    child: GestureDetector(
+                      onTap: () {
+                        controller.changeCancelRidePageShow();
+                      },
+                      child: Container(
+                        decoration: BoxDecoration(
+                            color: AppColor.redColor,
+                            borderRadius: BorderRadius.circular(15)),
+                        child: const Padding(
+                          padding: EdgeInsets.all(3),
+                          child: Icon(
+                            Icons.clear,
+                            size: 30,
+                            color: AppColor.secondaryColor,
+                          ),
+                        ),
+                      ),
+                    ))
+                : const SizedBox());
   }
 }