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

5/23/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-05-23 02:10:42 +03:00
parent da6741e24e
commit 3ff0eace3f
10 changed files with 127 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lib/views/auth/login_page.dart
View File

@@ -219,6 +219,15 @@ class LoginPage extends StatelessWidget {
},
kolor: AppColor.blueColor,
),
// MyElevatedButton(
// title: 'Sign In by Google'.tr,
// onPressed: () async {
// print(box.read(BoxName.email));
// print(box.read(BoxName.phone));
// print(box.read(BoxName.isVerified));
// },
// kolor: AppColor.blueColor,
// ),
],
),
)),
@@ -350,36 +359,38 @@ class LoginPage extends StatelessWidget {
}
locationPermissionDialog() {
return Padding(
padding: const EdgeInsets.all(16),
child: Container(
height: Get.height * .4,
decoration: AppStyle.boxDecoration1,
child: Padding(
padding: const EdgeInsets.all(20.0),
child: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Text(
'We use location to get accurate and nearest driver for you'
.tr,
textAlign: TextAlign.center,
style: AppStyle.title,
),
MyElevatedButton(
title: 'Grant Location'.tr,
onPressed: () async {
await controller.getLocationPermission();
},
kolor: AppColor.greenColor,
)
],
return GetBuilder<LoginController>(builder: (controller) {
return Padding(
padding: const EdgeInsets.all(16),
child: Container(
height: Get.height * .4,
decoration: AppStyle.boxDecoration1,
child: Padding(
padding: const EdgeInsets.all(20.0),
child: Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Text(
'We use location to get accurate and nearest driver for you'
.tr,
textAlign: TextAlign.center,
style: AppStyle.title,
),
MyElevatedButton(
title: 'Grant Location'.tr,
onPressed: () async {
await controller.getLocationPermission();
},
kolor: AppColor.greenColor,
)
],
),
),
),
),
),
);
);
});
}
}

4
lib/views/auth/sms_verfy_page.dart
View File

@@ -16,8 +16,8 @@ class SmsSignupEgypt extends StatelessWidget {
title: 'Phone Check'.tr,
body: [
GetBuilder<RegisterController>(builder: (registerController) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
return ListView(
// mainAxisAlignment: MainAxisAlignment.center,
children: [
// Logo at the top
Padding(

3
lib/views/home/map_widget.dart/apply_order_widget.dart
View File

@@ -1,4 +1,5 @@
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/constant/links.dart';
import 'package:SEFER/constant/style.dart';
import 'package:SEFER/controller/firebase/firbase_messge.dart';
import 'package:SEFER/controller/home/map_passenger_controller.dart';
@@ -143,7 +144,7 @@ class ApplyOrderWidget extends StatelessWidget {
backgroundImage: NetworkImage(
// '',
// ),
'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'),
'${AppLink.server}/portrate_captain_image/${controller.driverId}.jpg'),
),
Column(
children: [

61
lib/views/home/map_widget.dart/car_details_widget_to_go.dart
View File

@@ -202,7 +202,7 @@ class CarDetailsTypeToChoose extends StatelessWidget {
)
: carType.carType == 'Lady' &&
(mapPassengerController
.totalPassengerLady >
.totalPassengerSpeed >
20)
? Row(
children: [
@@ -396,8 +396,7 @@ class CarDetailsTypeToChoose extends StatelessWidget {
2) {
box.write(BoxName.carType, 'Lady');
mapPassengerController.totalPassenger =
mapPassengerController
.totalPassengerSpeed;
mapPassengerController.totalPassengerLady;
Get.defaultDialog(
title: 'Lady',
titleStyle: AppStyle.title,
@@ -521,7 +520,7 @@ class HeaderDestination extends StatelessWidget {
right: 5,
child: Container(
decoration: AppStyle.boxDecoration1,
height: Get.height * .16,
height: Get.height * .2,
width: Get.width * .8,
child: InkWell(
onTap: () {
@@ -531,30 +530,38 @@ class HeaderDestination extends StatelessWidget {
mapPassengerController.cancelRide();
});
},
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Text(
'🤢 ${mapPassengerController.startNameAddress}',
style: AppStyle.subtitle,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: SizedBox(
height: Get.height * .12,
child: ListView(
// crossAxisAlignment: CrossAxisAlignment.start,
//
children: [
Text(
'🟢 ${mapPassengerController.startNameAddress}',
style: AppStyle.subtitle,
),
Text(
'🔴 ${mapPassengerController.endNameAddress}',
style: AppStyle.subtitle,
),
],
),
),
Text(
'😡 ${mapPassengerController.endNameAddress}',
style: AppStyle.subtitle,
),
Row(
children: [
Text(
'📍 ${mapPassengerController.distance} ${'KM'.tr} ⌛ ${mapPassengerController.hours > 0 ? '${'Your Ride Duration is '.tr}${mapPassengerController.hours} ${'H and'.tr} ${mapPassengerController.minutes} ${'m'.tr}' : '${'Your Ride Duration is '.tr} ${mapPassengerController.minutes} m'}',
style: AppStyle.subtitle,
),
],
),
],
),
),
Row(
children: [
Text(
'📍 ${mapPassengerController.distance} ${'KM'.tr} ⌛ ${mapPassengerController.hours > 0 ? '${'Your Ride Duration is '.tr}${mapPassengerController.hours} ${'H and'.tr} ${mapPassengerController.minutes} ${'m'.tr}' : '${'Your Ride Duration is '.tr} ${mapPassengerController.minutes} m'}',
style: AppStyle.subtitle,
),
],
),
],
),
),
),

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

@@ -334,41 +334,30 @@ class MainBottomMenuMap extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: 30,
height: 25,
child: Text('${'Where to'.tr} ${box.read(BoxName.name)}')),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
controller.noCarString == false
? Text('Nearest Car for you about '.tr)
: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: AppColor.redColor,
),
child: null
// 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.nearestDistance.toStringAsFixed(0)
: 'N/A')),
),
)
: const SizedBox(),
if (controller.noCarString)
Text('Nearest Car for you about '.tr)
else
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: AppColor.redColor,
),
child: null,
),
if (!controller.noCarString)
Padding(
padding: const EdgeInsets.all(4),
child: Text(
(controller.nearestCar != null
? controller.nearestDistance.toStringAsFixed(0)
: ''),
),
),
],
)
],