Hamza/tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11/13/1

Browse Source
This commit is contained in:
Hamza-Ayed
2023-11-13 17:34:00 +03:00
parent 8d405c5381
commit 8aab58d4aa
26 changed files with 349 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/views/home/map_widget.dart/buttom_sheet_map_show.dart
View File

@@ -49,48 +49,66 @@ GetBuilder<MapPassengerController> buttomSheetMapPage() {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Image.asset(
'assets/images/jeep.png',
width: 50,
fit: BoxFit.fill,
repeat: ImageRepeat.repeatX,
SizedBox(
width: Get.width * .15,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Image.asset(
'assets/images/jeep.png',
width: 50,
fit: BoxFit.fill,
repeat: ImageRepeat.repeatX,
),
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${'Your Ride Duration is '.tr}${controller.duration} minutes'),
Text(
'${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}'),
Text(
'${'You trip distance is'.tr} ${controller.distance} KM')
],
),
Padding(
padding:
const EdgeInsets.only(right: 5, left: 5),
SizedBox(
width: Get.width * .55,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
Text(
'${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}',
'${'Your Ride Duration is '.tr}${controller.duration} minutes',
style: AppStyle.subtitle,
),
controller.promoTaken
? const Icon(
Icons.filter_vintage_rounded,
color: AppColor.redColor,
)
: const SizedBox(
height: 0,
)
Text(
'${'You will be thier in'.tr} ${DateFormat('h:mm a').format(controller.newTime)}',
style: AppStyle.subtitle,
),
Text(
'${'You trip distance is'.tr} ${controller.distance} KM',
style: AppStyle.subtitle,
)
],
),
),
SizedBox(
width: Get.width * .2,
child: Padding(
padding: const EdgeInsets.only(
right: 5, left: 5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Text(
'${'Fee is'.tr} \n${controller.totalPassenger.toStringAsFixed(2)}',
style: AppStyle.subtitle,
),
controller.promoTaken
? const Icon(
Icons.filter_vintage_rounded,
color: AppColor.redColor,
)
: const SizedBox(
height: 0,
)
],
),
),
),
],
),
),

56
lib/views/home/map_widget.dart/main_bottom_Menu_map.dart
View File

@@ -95,22 +95,48 @@ class MainBottomMenuMap extends StatelessWidget {
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text('Nearest Car for you about '.tr),
Container(
decoration: BoxDecoration(
border: Border.all(
controller.noCarString == false
? Text(
'Nearest Car for you about '.tr)
: Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(12),
color: AppColor.redColor,
width: 3)),
child: Padding(
padding: const EdgeInsets.all(4),
child: Text(
(controller.nearestCar != null
? controller
.durationByPassenger
.toString()
: 'N/A')),
),
),
),
child: Padding(
padding:
const EdgeInsets.all(6),
child: Text(
'No Car in your site. Sorry!'
.tr,
style: AppStyle.title
.copyWith(
color: AppColor
.secondaryColor),
),
),
),
controller.noCarString == false
? Container(
decoration: BoxDecoration(
border: Border.all(
color:
AppColor.redColor,
width: 3)),
child: Padding(
padding:
const EdgeInsets.all(4),
child: Text((controller
.nearestCar !=
null
? controller
.durationByPassenger
.toString()
: 'N/A')),
),
)
: const SizedBox(),
],
)
],

10
lib/views/home/map_widget.dart/map_menu_widget.dart
View File

@@ -3,8 +3,10 @@ import 'package:get/get.dart';
import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/views/home/my_wallet/passenger_wallet.dart';
import 'package:ride/views/home/profile/feed_back_page.dart';
import 'package:ride/views/home/profile/order_history.dart';
import 'package:ride/views/home/profile/promos_passenger_page.dart';
import 'package:ride/views/home/profile/taarif_page.dart';
import '../../../constant/colors.dart';
import '../../../controller/home/map_passenger_controller.dart';
@@ -120,7 +122,9 @@ class MapMenuWidget extends StatelessWidget {
icon: Icons.history,
),
IconMainPageMap(
onTap: () {},
onTap: () {
Get.to(() => const TaarifPage());
},
title: 'Tariff',
icon: Icons.money,
),
@@ -160,7 +164,9 @@ class MapMenuWidget extends StatelessWidget {
icon: Icons.settings,
),
IconMainPageMap(
onTap: () {},
onTap: () {
Get.to(() => FeedBackPage());
},
title: 'Feed Back',
icon: Icons.feedback,
),

2
lib/views/home/map_widget.dart/timer_for_cancell_trip_from_passenger.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/views/home/map_page.dart';
import 'package:ride/views/home/map_page_passenger.dart';
import '../../../constant/style.dart';
import '../../../controller/home/map_passenger_controller.dart';