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

9/29/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-09-30 09:37:26 +03:00
parent f5b7307f86
commit 659f178737
21 changed files with 416 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/views/auth/captin/login_captin.dart
View File

@@ -1,5 +1,6 @@
import 'dart:io';
import 'package:SEFER/controller/auth/facebook_login.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
@@ -210,10 +211,20 @@ class LoginCaptin extends StatelessWidget {
MyElevatedButton(
title: 'Sign In by Google'.tr,
onPressed: () async {
await GoogleSignInHelper.signInFromLogin();
await GoogleSignInHelper().signInFromLogin();
},
kolor: AppColor.redColor,
),
// Platform.isAndroid
// ? MyElevatedButton(
// title: 'Sign In by Facebook'.tr,
// onPressed: () async {
// await FacebookSignIn()
// .signInWithFacebook();
// },
// kolor: AppColor.blueColor,
// )
// : const SizedBox(),
!Platform.isAndroid
? MyElevatedButton(
title: 'Sign In by Apple'.tr,

29
lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart
View File

@@ -3,6 +3,7 @@ import 'package:SEFER/controller/firebase/local_notification.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/auth/captin/cards/egypt_card_a_i.dart';
import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
import 'package:SEFER/views/auth/captin/login_captin.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:bubble_head/bubble.dart';
@@ -276,20 +277,20 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
// return IconButton(
// onPressed: () async {
// // FirebaseMessagesController().sendNotificationToAnyWithoutData(
// // 'Order'.tr,
// // 'from: ',
// // // jsonDecode(value)['message'].toString(),
// // 'dqK5wNrPTr20HQ8qa5KsgL:APA91bHwPW_XzCIxQtg_IkJmHg1JRd8NRMquvsgedBaHAIgErTs6Uzpw1IX0EIJqkTaZq5dxd1u2z7NVdLlvcmEzrpjjWt1pUsZaa5UU7Cpx6hUzJMUdXvhNlAYFGklM8bWUG4ZXSRf1',
// // 'order.wav');
// // NotificationController().showNotification(
// // 'Order'.tr,
// // 'We regret to inform you that another driver has accepted this order.'
// // .tr,
// // 'order',
// // '');
// // requestLocationPermission();
// // Get.to(SmsSignupEgypt());
// // print(box.read(BoxName.tokenDriver));
// 'Order'.tr,
// 'from: ',
// // jsonDecode(value)['message'].toString(),
// 'dqK5wNrPTr20HQ8qa5KsgL:APA91bHwPW_XzCIxQtg_IkJmHg1JRd8NRMquvsgedBaHAIgErTs6Uzpw1IX0EIJqkTaZq5dxd1u2z7NVdLlvcmEzrpjjWt1pUsZaa5UU7Cpx6hUzJMUdXvhNlAYFGklM8bWUG4ZXSRf1',
// 'order.wav');
// NotificationController1().showNotification(
// 'sdf'.tr,
// 'We regret to inform you that another driver has accepted this order.'
// .tr,
// '',
// '');
// requestLocationPermission();
// Get.to(() => LoginCaptin());
// print(box.read(BoxName.tokenDriver));
// },
// icon: const Icon(
// FontAwesome5.closed_captioning,

8
lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart
View File

@@ -437,8 +437,12 @@ class PassengerInfoWindow extends StatelessWidget {
title: 'I arrive you'.tr,
kolor: AppColor.yellowColor,
onPressed: () async {
if (controller
.calculateDistanceBetweenDriverAndPassengerLocation() <
// Await the result of the distance calculation
double distanceToArrive =
await controller
.calculateDistanceBetweenDriverAndPassengerLocation();
if (distanceToArrive <
40) {
FirebaseMessagesController()
.sendNotificationToPassengerToken(

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

@@ -106,7 +106,7 @@ class PointsCaptain extends StatelessWidget {
.getCaptainWalletFromBuyPoints();
});
}
Get.back();
// Get.back();
}));
},
),