This commit is contained in:
Hamza-Ayed
2023-09-21 00:29:25 +03:00
parent 5f402a0b65
commit 9bc121f07a
19 changed files with 253 additions and 181 deletions

View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/credential.dart';
import 'package:ride/constant/style.dart';
import '../../../controller/functions/locaton_controller.dart';
@@ -23,21 +24,33 @@ class HomeCaptin extends StatelessWidget {
),
body: [
GetBuilder<LocationController>(
builder: (locationController) => Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'${locationController.mylocation}',
style: AppStyle.subtitle,
builder: (locationController) => Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'${locationController.mylocation}',
style: AppStyle.subtitle,
),
Text(
'${DateTime.now()}',
style: AppStyle.subtitle,
)
],
),
Text(
'${DateTime.now()}',
style: AppStyle.subtitle,
)
],
),
),
TextButton(
onPressed: () {
MyClass().exampleUsage();
},
child: Text(
"Text Button",
),
),
],
))
],
isleading: false);

View File

@@ -286,7 +286,7 @@ class MapPage extends StatelessWidget {
const CashConfirmPageShown(),
const PaymentMethodPage(),
timerForCancellTripFromPassenger(),
const DriverTimeArrivePassenger(),
const DriverTimeArrivePassengerPage(),
],
),
),

View File

@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
import '../../../controller/home/map_page_controller.dart';
import 'hexegone_clipper.dart';
@@ -20,7 +19,7 @@ GetBuilder<MapController> hexagonClipper() {
duration: const Duration(microseconds: 300),
height: 250,
width: 250,
decoration: AppStyle.boxDecoration(),
decoration: AppStyle.boxDecoration,
// gradient: const LinearGradient(
// colors: [AppColor.greenColor, AppColor.secondaryColor],
// begin: Alignment.topLeft,

View File

@@ -5,8 +5,8 @@ import 'package:ride/views/home/map_widget.dart/hexegone_clipper.dart';
import '../../../constant/style.dart';
import '../../../controller/home/map_page_controller.dart';
class DriverTimeArrivePassenger extends StatelessWidget {
const DriverTimeArrivePassenger({super.key});
class DriverTimeArrivePassengerPage extends StatelessWidget {
const DriverTimeArrivePassengerPage({super.key});
@override
Widget build(BuildContext context) {
@@ -23,15 +23,24 @@ class DriverTimeArrivePassenger extends StatelessWidget {
alignment: Alignment.center,
children: [
Container(
decoration: AppStyle.boxDecoration(),
decoration: AppStyle.boxDecoration,
// width: 50,
// height: 50,
child: Padding(
padding: const EdgeInsetsDirectional.only(
start: 5, end: 5),
child: Text(
controller.duratioByPassenger.toString(),
style: AppStyle.title,
child: Column(
children: [
Text(
controller.duratioByPassenger.toString() +
' to arrive you.'.tr,
style: AppStyle.title,
),
Text(
controller.newTime1.toString(),
style: AppStyle.title,
),
],
),
))
],

View File

@@ -32,7 +32,7 @@ class MapMenuWidget extends StatelessWidget {
opacity: 1, // Adjust the opacity value as needed
child: AnimatedContainer(
width: Get.width * .6,
decoration: AppStyle.boxDecoration(),
decoration: AppStyle.boxDecoration,
transform: Matrix4.translationValues(
controller.heightMenu * .1, 1, 1),
curve: Curves.easeOutCubic,

View File

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/box_name.dart';
import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/controller/home/payment/credit_card_Controller.dart';
import 'package:ride/controller/home/payment/credit_card_controller.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart';

View File

@@ -12,7 +12,7 @@ import '../../../constant/box_name.dart';
import '../../../constant/colors.dart';
import '../../../constant/info.dart';
import '../../../controller/functions/secure_storage.dart';
import '../../../controller/home/payment/credit_card_Controller.dart';
import '../../../controller/home/payment/credit_card_controller.dart';
import '../../../main.dart';
import '../../widgets/elevated_btn.dart';
import '../map_widget.dart/payment_method.page.dart';