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

1/8/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-08 15:55:22 +03:00
parent 37598e517f
commit 7d9bd9f62a
67 changed files with 1524 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/views/home/Captin/orderCaptin/order_request_page.dart
View File

@@ -64,7 +64,7 @@ class OrderRequestPage extends StatelessWidget {
text: 'Passenger Name is '.tr,
style: AppStyle.title,
children: [
TextSpan(text: myList[8], style: AppStyle.headtitle2),
TextSpan(text: myList[8], style: AppStyle.headTitle2),
],
),
),
@@ -78,7 +78,7 @@ class OrderRequestPage extends StatelessWidget {
children: [
TextSpan(
text: double.parse(myList[2]).toStringAsFixed(2),
style: AppStyle.headtitle2),
style: AppStyle.headTitle2),
],
),
),
@@ -92,7 +92,7 @@ class OrderRequestPage extends StatelessWidget {
children: [
TextSpan(
text: myList[11].toString(),
style: AppStyle.headtitle2),
style: AppStyle.headTitle2),
],
),
),
@@ -106,7 +106,7 @@ class OrderRequestPage extends StatelessWidget {
children: [
TextSpan(
text: myList[12].toString(),
style: AppStyle.headtitle2),
style: AppStyle.headTitle2),
],
),
),
@@ -134,7 +134,7 @@ class OrderRequestPage extends StatelessWidget {
children: [
TextSpan(
text: myList[5].toString(),
style: AppStyle.headtitle2),
style: AppStyle.headTitle2),
TextSpan(text: ' KM'.tr, style: AppStyle.title),
]),
),
@@ -148,7 +148,7 @@ class OrderRequestPage extends StatelessWidget {
children: [
TextSpan(
text: myList[4].toString(),
style: AppStyle.headtitle2),
style: AppStyle.headTitle2),
TextSpan(text: ' Minutes'.tr, style: AppStyle.title),
]),
),

2
lib/views/home/Captin/settings_captain.dart
View File

@@ -18,7 +18,7 @@ class SettingsCaptain extends StatelessWidget {
leading: const Icon(Icons.language),
title: Text(
'Language',
style: AppStyle.headtitle2,
style: AppStyle.headTitle2,
),
onTap: () => Get.to(const Language()),
),

2
lib/views/home/map_page_passenger.dart
View File

@@ -15,6 +15,7 @@ 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/points_page_for_rider.dart';
import 'map_widget.dart/timer_for_cancell_trip_from_passenger.dart';
import 'map_widget.dart/timer_to_passenger_from_driver.dart';
@@ -46,6 +47,7 @@ class MapPagePassenger extends StatelessWidget {
const TimerToPassengerFromDriver(),
const RideBeginPassenger(),
cancelRidePage(),
PointsPageForRider()
],
),
),

1
lib/views/home/map_widget.dart/form_search_places.dart
View File

@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/table_names.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';

779
lib/views/home/map_widget.dart/form_serch_multiy_point.dart Normal file
View File

@@ -0,0 +1,779 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/table_names.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
import '../../../controller/functions/toast.dart';
import '../../../controller/home/map_passenger_controller.dart';
import '../../../main.dart';
GetBuilder<MapPassengerController> formSearchPlaces0() {
// DbSql sql = DbSql.instance;
return GetBuilder<MapPassengerController>(
builder: (controller) => Column(
children: [
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.only(),
gapPadding: 4,
borderSide: BorderSide(
color: AppColor.redColor,
width: 2,
)),
suffixIcon: const Icon(Icons.search),
hintText: 'Search for waypoint'.tr,
hintStyle: AppStyle.title,
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.wayPoint0Controller.clear();
controller.clearPlaces0();
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
),
),
controller: controller.wayPoint0Controller,
onChanged: (value) {
if (controller.wayPoint0Controller.text.length > 5) {
controller.getPlacesListsWayPoint0();
controller.changeHeightPlaces0();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
),
),
controller.wayPoint0.isEmpty
? InkWell(
onTap: () {
controller.startLocationFromMap0 = true;
controller.changeMainBottomMenuMap();
controller.changePickerShown();
},
child: Text(
'Choose from Map'.tr,
style:
AppStyle.title.copyWith(color: AppColor.blueColor),
),
)
: const SizedBox(),
Container(
height: controller.wayPoint0.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.wayPoint0.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.wayPoint0[index];
return InkWell(
onTap: () async {
controller.changeHeightPlaces();
if (controller.currentLocationToFormPlaces0 == true) {
controller.newStartPointLocation =
controller.myLocation;
} else {
controller.myLocation =
controller.newStartPointLocation;
}
controller.convertHintTextPlaces0(index);
controller.currentLocationString = res['name'];
controller.wayPoint0 = [];
controller.wayPoint0Controller.clear();
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
Toast.show(
context,
'${res['name']} ${'Saved Sucssefully'.tr}',
AppColor.primaryColor);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
)
],
));
}
GetBuilder<MapPassengerController> formSearchPlaces1() {
// DbSql sql = DbSql.instance;
return GetBuilder<MapPassengerController>(
builder: (controller) => Column(
children: [
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.only(),
gapPadding: 4,
borderSide: BorderSide(
color: AppColor.redColor,
width: 2,
)),
suffixIcon: const Icon(Icons.search),
hintText: 'Search for waypoint'.tr,
hintStyle: AppStyle.title,
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.wayPoint1Controller.clear();
controller.clearPlaces1();
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
),
),
controller: controller.wayPoint1Controller,
onChanged: (value) {
if (controller.wayPoint1Controller.text.length > 5) {
controller.getPlacesListsWayPoint1();
controller.changeHeightPlaces1();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
),
),
controller.wayPoint1.isEmpty
? InkWell(
onTap: () {
controller.startLocationFromMap1 = true;
controller.changeMainBottomMenuMap();
controller.changePickerShown();
},
child: Text(
'Choose from Map'.tr,
style:
AppStyle.title.copyWith(color: AppColor.blueColor),
),
)
: const SizedBox(),
Container(
height: controller.wayPoint1.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.wayPoint1.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.wayPoint1[index];
return InkWell(
onTap: () async {
controller.changeHeightPlaces();
if (controller.currentLocationToFormPlaces1 == true) {
controller.newStartPointLocation =
controller.myLocation;
} else {
controller.myLocation =
controller.newStartPointLocation;
}
controller.convertHintTextPlaces1(index);
controller.currentLocationString = res['name'];
controller.wayPoint1 = [];
controller.wayPoint1Controller.clear();
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
Toast.show(
context,
'${res['name']} ${'Saved Sucssefully'.tr}',
AppColor.primaryColor);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
)
],
));
}
GetBuilder<MapPassengerController> formSearchPlaces2() {
// DbSql sql = DbSql.instance;
return GetBuilder<MapPassengerController>(
builder: (controller) => Column(
children: [
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.only(),
gapPadding: 4,
borderSide: BorderSide(
color: AppColor.redColor,
width: 2,
)),
suffixIcon: const Icon(Icons.search),
hintText: 'Search for waypoint'.tr,
hintStyle: AppStyle.title,
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.wayPoint2Controller.clear();
controller.clearPlaces2();
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
),
),
controller: controller.wayPoint2Controller,
onChanged: (value) {
if (controller.wayPoint2Controller.text.length > 5) {
controller.getPlacesListsWayPoint2();
controller.changeHeightPlaces2();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
),
),
controller.wayPoint2.isEmpty
? InkWell(
onTap: () {
controller.startLocationFromMap2 = true;
controller.changeMainBottomMenuMap();
controller.changePickerShown();
},
child: Text(
'Choose from Map'.tr,
style:
AppStyle.title.copyWith(color: AppColor.blueColor),
),
)
: const SizedBox(),
Container(
height: controller.wayPoint2.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.wayPoint2.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.wayPoint2[index];
return InkWell(
onTap: () async {
controller.changeHeightPlaces();
if (controller.currentLocationToFormPlaces2 == true) {
controller.newStartPointLocation =
controller.myLocation;
} else {
controller.myLocation =
controller.newStartPointLocation;
}
controller.convertHintTextPlaces2(index);
controller.currentLocationString = res['name'];
controller.wayPoint2 = [];
controller.wayPoint2Controller.clear();
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
Toast.show(
context,
'${res['name']} ${'Saved Sucssefully'.tr}',
AppColor.primaryColor);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
)
],
));
}
GetBuilder<MapPassengerController> formSearchPlaces3() {
// DbSql sql = DbSql.instance;
return GetBuilder<MapPassengerController>(
builder: (controller) => Column(
children: [
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.only(),
gapPadding: 4,
borderSide: BorderSide(
color: AppColor.redColor,
width: 2,
)),
suffixIcon: const Icon(Icons.search),
hintText: 'Search for waypoint'.tr,
hintStyle: AppStyle.title,
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.wayPoint3Controller.clear();
controller.clearPlaces3();
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
),
),
controller: controller.wayPoint3Controller,
onChanged: (value) {
if (controller.wayPoint3Controller.text.length > 5) {
controller.getPlacesListsWayPoint3();
controller.changeHeightPlaces3();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
),
),
controller.wayPoint3.isEmpty
? InkWell(
onTap: () {
controller.startLocationFromMap3 = true;
controller.changeMainBottomMenuMap();
controller.changePickerShown();
},
child: Text(
'Choose from Map'.tr,
style:
AppStyle.title.copyWith(color: AppColor.blueColor),
),
)
: const SizedBox(),
Container(
height: controller.wayPoint3.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.wayPoint3.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.wayPoint3[index];
return InkWell(
onTap: () async {
controller.changeHeightPlaces();
if (controller.currentLocationToFormPlaces3 == true) {
controller.newStartPointLocation =
controller.myLocation;
} else {
controller.myLocation =
controller.newStartPointLocation;
}
controller.convertHintTextPlaces3(index);
controller.currentLocationString = res['name'];
controller.wayPoint3 = [];
controller.wayPoint3Controller.clear();
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
Toast.show(
context,
'${res['name']} ${'Saved Sucssefully'.tr}',
AppColor.primaryColor);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
)
],
));
}
GetBuilder<MapPassengerController> formSearchPlaces4() {
// DbSql sql = DbSql.instance;
return GetBuilder<MapPassengerController>(
builder: (controller) => Column(
children: [
Padding(
padding: const EdgeInsets.all(16),
child: Container(
decoration:
const BoxDecoration(color: AppColor.secondaryColor),
child: TextField(
decoration: InputDecoration(
border: const OutlineInputBorder(
borderRadius: BorderRadius.only(),
gapPadding: 4,
borderSide: BorderSide(
color: AppColor.redColor,
width: 2,
)),
suffixIcon: const Icon(Icons.search),
hintText: 'Search for waypoint'.tr,
hintStyle: AppStyle.title,
hintMaxLines: 1,
prefixIcon: IconButton(
onPressed: () {
controller.wayPoint4Controller.clear();
controller.clearPlaces4();
},
icon: Icon(
Icons.clear,
color: Colors.red[300],
),
),
),
controller: controller.wayPoint4Controller,
onChanged: (value) {
if (controller.wayPoint4Controller.text.length > 5) {
controller.getPlacesListsWayPoint4();
controller.changeHeightPlaces4();
}
},
// onEditingComplete: () => controller.changeHeight(),
),
),
),
controller.wayPoint4.isEmpty
? InkWell(
onTap: () {
controller.startLocationFromMap4 = true;
controller.changeMainBottomMenuMap();
controller.changePickerShown();
},
child: Text(
'Choose from Map'.tr,
style:
AppStyle.title.copyWith(color: AppColor.blueColor),
),
)
: const SizedBox(),
Container(
height: controller.wayPoint4.isNotEmpty ? controller.height : 0,
color: AppColor.secondaryColor,
child: ListView.builder(
itemCount: controller.wayPoint4.length,
itemBuilder: (BuildContext context, int index) {
var res = controller.wayPoint4[index];
return InkWell(
onTap: () async {
controller.changeHeightPlaces();
if (controller.currentLocationToFormPlaces4 == true) {
controller.newStartPointLocation =
controller.myLocation;
} else {
controller.myLocation =
controller.newStartPointLocation;
}
controller.convertHintTextPlaces4(index);
controller.currentLocationString = res['name'];
controller.wayPoint4 = [];
controller.wayPoint4Controller.clear();
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Image.network(
res['icon'],
width: 20,
),
IconButton(
onPressed: () async {
await sql.insertData({
'latitude': res['geometry']
['location']['lat'],
'longitude': res['geometry']
['location']['lng'],
'name': res['name'].toString(),
'rate': res['rating'].toString(),
}, TableName.placesFavorite);
Toast.show(
context,
'${res['name']} ${'Saved Sucssefully'.tr}',
AppColor.primaryColor);
},
icon: const Icon(Icons.favorite_border),
),
],
),
Column(
children: [
Text(
res['name'].toString(),
style: AppStyle.title,
),
Text(
res['vicinity'].toString(),
style: AppStyle.subtitle,
),
],
),
Column(
children: [
Text(
'rate',
style: AppStyle.subtitle,
),
Text(
res['rating'].toString(),
style: AppStyle.subtitle,
),
],
),
],
),
const Divider(
thickness: 1,
)
],
),
),
);
},
),
)
],
));
}

293
lib/views/home/map_widget.dart/points_page_for_rider.dart Normal file
View File

@@ -0,0 +1,293 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/views/admin/captain/form_captain.dart';
import '../../../constant/colors.dart';
import '../../../controller/home/map_passenger_controller.dart';
import '../../../controller/home/points_for_rider_controller.dart';
class PointsPageForRider extends StatelessWidget {
PointsPageForRider({
super.key,
});
MapPassengerController mapPassengerController =
Get.put(MapPassengerController());
@override
Widget build(BuildContext context) {
Get.put(WayPointController());
return GetBuilder<WayPointController>(builder: (wayPointController) {
return Container(
decoration: AppStyle.boxDecoration,
height: wayPointController.wayPointHeight,
child: ListView(
children: [
const AppBarPointsPageForRider(),
SizedBox(
height: 300,
child: ReorderableListView(
// The children of the list are the text fields
children:
wayPointController.wayPoints.asMap().entries.map((entry) {
final index = entry.key;
final wayPoint = entry.value;
return Padding(
key: ValueKey(index),
padding: const EdgeInsets.all(6),
child: ListTile(
leading: Container(
decoration: BoxDecoration(
color: AppColor.deepPurpleAccent,
border: Border.all(),
shape: BoxShape.rectangle),
child: Padding(
padding: const EdgeInsets.all(2),
child: Text(
index.toString(),
style: AppStyle.title,
),
)),
title: InkWell(
onTap: () {
// showAddLocationDialog(context);
Get.defaultDialog(
content: SizedBox(
width: Get.width,
height: 400,
child: mapPassengerController
.placeListResponse[index]),
);
},
child: Container(
decoration: BoxDecoration(
border: Border.all(),
color: AppColor.accentColor.withOpacity(.5)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
index == 0
? Text(
'Current Location',
style: AppStyle.title,
)
: Text(
'$wayPoint$index',
style: AppStyle.title,
),
const Icon(
Icons.reorder,
size: 20,
),
],
),
),
),
trailing: index > 0
? IconButton(
icon: const Icon(Icons.close),
onPressed: () {
wayPointController.removeTextField(index);
},
)
: IconButton(
icon: const Icon(
Icons.close,
color: AppColor.secondaryColor,
),
onPressed: () {},
)),
);
}).toList(),
// The callback when the user reorders the text fields
onReorder: (int oldIndex, int newIndex) {
wayPointController.reorderTextFields(oldIndex, newIndex);
},
),
),
ElevatedButton(
onPressed: () {
wayPointController.addWayPoints();
},
child: const Text('Add Text Field'),
),
],
),
);
});
}
// GetBuilder<PointsForRiderController>(
// builder: (controller) => Container(
// decoration: AppStyle.boxDecoration,
// height: Get.height *
// .5, // height: controller.heightPointsPageForRider,
// width: Get.width,
// child: Column(
// children: [
// SizedBox(
// height: 300,
// child: ReorderableListView(
// onReorder: (oldIndex, newIndex) {
// if (oldIndex < newIndex) {
// newIndex -= 1;
// }
// pointsForRiderController.locations.insert(
// newIndex,
// pointsForRiderController.locations
// .removeAt(oldIndex));
// },
// children: [
// for (int i = 0;
// i < pointsForRiderController.locations.length;
// i++)
// ListTile(
// key: Key('$i'),
// title: DragTarget<int>(
// onAccept: (int data) {
// pointsForRiderController.locations
// .insert(i, 'New Text Field');
// },
// builder: (context, candidateData, rejectedData) {
// return Row(
// children: [
// SizedBox(
// width: 300,
// child: TextField(
// controller: TextEditingController(
// text: pointsForRiderController
// .locations[i]),
// onChanged: (value) {
// pointsForRiderController
// .locations[i] = value;
// },
// decoration: InputDecoration(
// prefixIcon: IconButton(
// onPressed: () {
// pointsForRiderController
// .removeLocation(i);
// },
// icon: const Icon(Icons.delete),
// ),
// labelText: 'Text Field ${i + 1}',
// border: const OutlineInputBorder(),
// ),
// ),
// ),
// IconButton(
// onPressed: () {
// // pointsForRiderController.onReorder(
// // index, newIndex);
// },
// icon: const Icon(Icons.reorder),
// ),
// ],
// );
// },
// ),
// ),
// ],
// ),
// ),
// ElevatedButton(
// onPressed: () {
// pointsForRiderController.addLocation('location');
// },
// child: const Text('Add Text Field'),
// ),
// ],
// ),
// ));
}
void showAddLocationDialog(BuildContext context, int index) {
final TextEditingController locationController = TextEditingController();
// Get.put(WayPointController());
showDialog(
context: context,
builder: (context) {
return Dialog.fullscreen(
// title: const Text('Add Location'),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
onPressed: () {
Get.back();
},
icon: const Icon(
Icons.close,
size: 40,
),
),
Text(
'Add Location'.tr,
style: AppStyle.title,
),
const Icon(
Icons.clear,
color: AppColor.secondaryColor,
)
],
),
SizedBox(
width: Get.width,
child: formSearchCaptain(),
),
],
),
);
},
);
}
class AppBarPointsPageForRider extends StatelessWidget {
const AppBarPointsPageForRider({
super.key,
});
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
onPressed: () {},
icon: const Icon(
Icons.arrow_back_ios_new_rounded,
color: AppColor.primaryColor,
),
),
Container(
child: Row(
children: [
const CircleAvatar(
backgroundColor: AppColor.primaryColor,
maxRadius: 15,
child: Icon(
Icons.person,
color: AppColor.secondaryColor,
),
),
TextButton(
onPressed: () {},
child: Text(
"Switch Rider".tr,
style: AppStyle.title,
),
),
],
),
),
const Icon(
Icons.clear,
color: AppColor.secondaryColor,
)
],
);
}
}

2
lib/views/home/my_wallet/walet_captain.dart
View File

@@ -45,7 +45,7 @@ class WaletCaptain extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Text(
'Total Points is ${captainWalletController.totalPoints.toString()} 💎',
style: AppStyle.headtitle2,
style: AppStyle.headTitle2,
),
),
),

2
lib/views/home/profile/passenger_profile_page.dart
View File

@@ -36,7 +36,7 @@ class PassengerProfilePage extends StatelessWidget {
children: [
Text(
'Edit Profile'.tr,
style: AppStyle.headtitle2,
style: AppStyle.headTitle2,
),
ListTile(
title: Text(

2
lib/views/home/profile/profile_captain.dart
View File

@@ -61,7 +61,7 @@ class ProfileCaptain extends StatelessWidget {
thickness: 2,
),
const SizedBox(height: 8.0),
Text('Car Details'.tr, style: AppStyle.headtitle2),
Text('Car Details'.tr, style: AppStyle.headTitle2),
const SizedBox(height: 8.0),
Text('VIN is :${box.read(BoxName.vin)}',
style: AppStyle.title),

2
lib/views/home/profile/promos_passenger_page.dart
View File

@@ -97,7 +97,7 @@ class PromosPassengerPage extends StatelessWidget {
Text(
'Copy this Promo to use it in your Ride!'.tr,
textAlign: TextAlign.center,
style: AppStyle.headtitle2
style: AppStyle.headTitle2
.copyWith(color: AppColor.accentColor),
)
],

23
lib/views/home/profile/taarif_page.dart
View File

@@ -11,9 +11,10 @@ class TaarifPage extends StatelessWidget {
return MyScafolld(isleading: true, title: 'Tariffs'.tr, body: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
child: ListView(
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.stretch,
clipBehavior: Clip.hardEdge,
children: [
Table(
defaultVerticalAlignment: TableCellVerticalAlignment.middle,
@@ -24,45 +25,45 @@ class TaarifPage extends StatelessWidget {
// decoration: AppStyle.boxDecoration,
children: [
Text('Minimum fare'.tr, style: AppStyle.title),
Text('1 USD', style: AppStyle.title),
Text('1 \$', style: AppStyle.title),
],
),
TableRow(
children: [
Text('Maximum fare'.tr, style: AppStyle.title),
Text('200 USD', style: AppStyle.title),
Text('200 \$', style: AppStyle.title),
],
),
TableRow(
children: [
Text('Flag-down fee'.tr, style: AppStyle.title),
Text('0.47 USD', style: AppStyle.title),
Text('0.47 \$', style: AppStyle.title),
],
),
TableRow(
children: [
Text('0.05 USD/min and 0.21 USD/km', style: AppStyle.title),
Text('0.05 \$/min and 0.21 \$/km', style: AppStyle.title),
Text('Including Tax', style: AppStyle.title),
],
),
],
),
const SizedBox(height: 10),
Text('BookingFee'.tr, style: AppStyle.headtitle2),
Text('BookingFee'.tr, style: AppStyle.headTitle2),
const SizedBox(height: 10),
Text('4.17%', style: AppStyle.title),
const SizedBox(height: 20),
Text('Morning', style: AppStyle.headtitle2),
Text('Morning', style: AppStyle.headTitle2),
const SizedBox(height: 10),
Text('from 07:30 till 10:30 (Thursday, Friday, Saturday, Monday)',
style: AppStyle.title),
const SizedBox(height: 20),
Text('Evening', style: AppStyle.headtitle2),
Text('Evening', style: AppStyle.headTitle2),
const SizedBox(height: 10),
Text('from 12:00 till 15:00 (Thursday, Friday, Saturday, Monday)',
style: AppStyle.title),
const SizedBox(height: 20),
Text('Night', style: AppStyle.headtitle2),
Text('Night', style: AppStyle.headTitle2),
const SizedBox(height: 10),
Text('from 23:59 till 05:30', style: AppStyle.title),
],