This commit is contained in:
Hamza-Ayed
2024-11-17 22:13:31 +02:00
parent e8c72d79a9
commit 5aeb3cf685
45 changed files with 856 additions and 284 deletions

View File

@@ -14,6 +14,7 @@ import 'package:share/share.dart';
import '../../../main.dart';
import '../../../print.dart';
import '../../../views/widgets/error_snakbar.dart';
import '../../functions/launch.dart';
import '../../notification/notification_captain_controller.dart';
@@ -103,10 +104,11 @@ Download the SEFER app now and enjoy your ride!
// TODO: Implement the actual server upload logic here
// Simulating a server request
await Future.delayed(Duration(seconds: 2));
Get.snackbar('Success'.tr,
mySnackbarSuccess(
'${selectedContacts.length} contacts saved to server'.tr);
} catch (e) {
Get.snackbar('Error'.tr,
mySnackeBarError(
'An error occurred while saving contacts to server: $e'.tr);
}
}
@@ -134,16 +136,13 @@ Download the SEFER app now and enjoy your ride!
update();
if (contacts.isEmpty) {
Get.snackbar('No contacts available'.tr,
'Please add contacts to your phone.'.tr);
mySnackeBarError('Please add contacts to your phone.'.tr);
}
} else {
Get.snackbar('Permission denied'.tr,
'Contact permission is required to pick contacts'.tr);
mySnackeBarError('Contact permission is required to pick contacts'.tr);
}
} catch (e) {
Get.snackbar(
'Error'.tr, 'An error occurred while picking contacts: $e'.tr);
mySnackeBarError('An error occurred while picking contacts: $e'.tr);
}
}
@@ -267,7 +266,7 @@ Download the SEFER app now and enjoy your ride!
void sendInvite() async {
if (invitePhoneController.text.isEmpty) {
Get.snackbar('Error', 'Please enter an phone address'.tr);
mySnackeBarError('Please enter an phone address'.tr);
return;
}
@@ -281,8 +280,7 @@ Download the SEFER app now and enjoy your ride!
if (response != 'failure') {
var d = jsonDecode(response);
Get.snackbar('Success', 'Invite sent successfully'.tr);
mySnackbarSuccess('Invite sent successfully'.tr);
String message = '${'*SEFER DRIVER CODE*'.tr}\n\n'
'${"Use this code in registration".tr}\n'
'${"To get a gift for both".tr}\n\n'
@@ -297,18 +295,14 @@ Download the SEFER app now and enjoy your ride!
invitePhoneController.clear();
} else {
Get.snackbar('Error'.tr, "Invite code already used".tr,
backgroundColor: AppColor.redColor,
duration: const Duration(seconds: 4));
mySnackeBarError("Invite code already used".tr);
}
// } catch (e) {
// Get.snackbar('Error', 'An error occurred'.tr);
// }
}
void sendInviteToPassenger() async {
if (invitePhoneController.text.isEmpty) {
Get.snackbar('Error', 'Please enter an phone address'.tr);
mySnackeBarError('Please enter an phone address'.tr);
return;
}
@@ -323,7 +317,8 @@ Download the SEFER app now and enjoy your ride!
if (response != 'failure') {
var d = jsonDecode(response);
Get.snackbar('Success', 'Invite sent successfully'.tr);
mySnackbarSuccess('Invite sent successfully'.tr);
String message = '${'*SEFER APP CODE*'.tr}\n\n'
'${"Use this code in registration".tr}\n'
@@ -339,13 +334,10 @@ Download the SEFER app now and enjoy your ride!
invitePhoneController.clear();
} else {
Get.snackbar('Error'.tr, "Invite code already used".tr,
backgroundColor: AppColor.redColor,
duration: const Duration(seconds: 4));
mySnackeBarError(
"Invite code already used".tr,
);
}
// } catch (e) {
// Get.snackbar('Error', 'An error occurred'.tr);
// }
}
}

View File

@@ -1,12 +1,10 @@
import 'dart:convert';
import 'dart:math';
import 'package:SEFER/constant/colors.dart';
import 'package:SEFER/controller/functions/location_background_controller.dart';
import 'package:SEFER/print.dart';
import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
import 'package:SEFER/views/auth/captin/login_captin.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import 'package:SEFER/views/widgets/error_snakbar.dart';
import 'package:flutter/material.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:get/get.dart';
@@ -164,7 +162,7 @@ class LoginDriverController extends GetxController {
box.write(BoxName.carTypeOfDriver, 'Pink Bike');
}
} else if (int.parse(jsonDecoeded['data'][0]['year'].toString()) >
2017) {
2016) {
if (jsonDecoeded['data'][0]['gender'].toString() != 'Male') {
box.write(BoxName.carTypeOfDriver, 'Lady');
} else {
@@ -172,7 +170,7 @@ class LoginDriverController extends GetxController {
}
} else if (int.parse(jsonDecoeded['data'][0]['year'].toString()) >
2002 &&
int.parse(jsonDecoeded['data'][0]['year'].toString()) < 2017) {
int.parse(jsonDecoeded['data'][0]['year'].toString()) < 2016) {
box.write(BoxName.carTypeOfDriver, 'Speed');
} else if (int.parse(jsonDecoeded['data'][0]['year'].toString()) <
2002) {
@@ -204,7 +202,7 @@ class LoginDriverController extends GetxController {
'token': box.read(BoxName.tokenDriver),
'captain_id': box.read(BoxName.driverID).toString()
});
CRUD().post(
await CRUD().post(
link:
"${AppLink.seferAlexandriaServer}/ride/firebase/addDriver.php",
payload: {
@@ -212,30 +210,29 @@ class LoginDriverController extends GetxController {
'captain_id':
box.read(BoxName.driverID).toString()
});
CRUD().post(
link:
"${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
payload: {
'token': box.read(BoxName.tokenDriver),
'captain_id':
box.read(BoxName.driverID).toString()
});
// await CRUD().post(
// link:
// "${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
// payload: {
// 'token': box.read(BoxName.tokenDriver),
// 'captain_id':
// box.read(BoxName.driverID).toString()
// });
Get.back();
}));
}
}
Get.off(() => HomeCaptain());
// Get.off(() => LoginCaptin());
} else {
Get.offAll(() => SmsSignupEgypt());
// Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
// backgroundColor: Colors.redAccent);
isloading = false;
update();
}
} else {
Get.snackbar('failure'.tr, '', backgroundColor: AppColor.redColor);
mySnackbarSuccess('');
isloading = false;
update();
}
@@ -263,7 +260,6 @@ class LoginDriverController extends GetxController {
isloading = false;
update();
// Get.snackbar('Failure', '', backgroundColor: Colors.red);
} else {
var jsonDecoeded = jsonDecode(res);
if (jsonDecoeded.isNotEmpty) {
@@ -321,7 +317,7 @@ class LoginDriverController extends GetxController {
'change device'.tr,
jsonDecode(token)['data'][0]['token'].toString(),
[],
'promo.wav');
'ding.wav');
Get.defaultDialog(
title: 'you will use this device?'.tr,
middleText: '',
@@ -333,7 +329,7 @@ class LoginDriverController extends GetxController {
'token': box.read(BoxName.tokenDriver),
'captain_id': box.read(BoxName.driverID).toString()
});
CRUD().post(
await CRUD().post(
link:
"${AppLink.seferAlexandriaServer}/ride/firebase/addDriver.php",
payload: {
@@ -341,7 +337,7 @@ class LoginDriverController extends GetxController {
'captain_id':
box.read(BoxName.driverID).toString()
});
CRUD().post(
await CRUD().post(
link:
"${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
payload: {
@@ -358,13 +354,13 @@ class LoginDriverController extends GetxController {
// Get.off(() => LoginCaptin());
} else {
Get.offAll(() => SmsSignupEgypt());
// Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
// backgroundColor: Colors.redAccent);
isloading = false;
update();
}
} else {
Get.snackbar('failure'.tr, '', backgroundColor: AppColor.redColor);
mySnackeBarError('');
isloading = false;
update();
}

View File

@@ -4,6 +4,7 @@ import 'dart:math';
import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
import 'package:SEFER/views/auth/captin/cards/egypt_card_a_i.dart';
import 'package:SEFER/views/auth/captin/register_captin.dart';
import 'package:SEFER/views/widgets/error_snakbar.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:SEFER/constant/box_name.dart';
@@ -152,8 +153,9 @@ class RegisterCaptainController extends GetxController {
update();
}
} else {
Get.snackbar('Phone Number wrong'.tr, '',
backgroundColor: AppColor.redColor);
mySnackeBarError(
'Phone Number wrong'.tr,
);
}
}
}
@@ -235,11 +237,7 @@ class RegisterCaptainController extends GetxController {
// Handle case where phone number is already verified
_handleAlreadyVerified() {
Get.snackbar(
'Phone number is already verified'.tr,
'',
backgroundColor: AppColor.greenColor,
);
mySnackbarSuccess('Phone number is already verified'.tr);
box.write(BoxName.phoneVerified, '1');
box.write(BoxName.phone, '+2${phoneController.text}');
Get.put(LoginDriverController()).loginUsingCredentials(
@@ -263,7 +261,6 @@ class RegisterCaptainController extends GetxController {
},
);
// Get.snackbar('', '');
await smsEgyptController.sendSmsEgypt(phoneNumber, randomNumber.toString());
lastOtpSentTime = DateTime.now(); // Update the last OTP sent time
@@ -274,11 +271,7 @@ class RegisterCaptainController extends GetxController {
// Show error message in case of invalid phone number
void _showErrorMessage(String message) {
Get.snackbar(
message.tr,
'',
backgroundColor: AppColor.redColor,
);
mySnackeBarError(message);
}
verifySMSCode() async {
@@ -315,8 +308,7 @@ class RegisterCaptainController extends GetxController {
// }
}
} else {
Get.snackbar('Error'.tr, 'you must insert token code '.tr,
backgroundColor: AppColor.redColor);
mySnackeBarError('you must insert token code '.tr);
}
}

View File

@@ -6,6 +6,7 @@ import 'package:SEFER/controller/functions/crud.dart';
import 'package:SEFER/main.dart';
import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
import 'package:SEFER/views/home/on_boarding_page.dart';
import 'package:SEFER/views/widgets/error_snakbar.dart';
import 'package:get/get.dart';
import 'package:google_sign_in/google_sign_in.dart';
@@ -116,8 +117,7 @@ class GoogleSignInHelper {
return googleUser;
} catch (error) {
Get.snackbar('Google Sign-In error', '$error',
backgroundColor: AppColor.redColor);
mySnackeBarError('$error');
addError(error.toString(), 'GoogleSignInAccount?> signInFromLogin()');
return null;
}

View File

@@ -1,6 +1,7 @@
import 'dart:convert';
import 'dart:math';
import 'package:SEFER/views/widgets/error_snakbar.dart';
import 'package:flutter/material.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:get/get.dart';
@@ -50,7 +51,7 @@ class LoginController extends GetxController {
update();
if (res == 'failure') {
//Failure
Get.snackbar('Failure', '', backgroundColor: Colors.red);
mySnackeBarError('');
} else {
var jsonDecoeded = jsonDecode(res);
if (jsonDecoeded.isNotEmpty) {
@@ -90,8 +91,7 @@ class LoginController extends GetxController {
);
}
} else if (jsonDecoeded['status'] == 'Failure') {
Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
backgroundColor: Colors.redAccent);
mySnackeBarError(jsonDecoeded['data']);
isloading = false;
update();
}

View File

@@ -1,5 +1,6 @@
import 'dart:convert';
import 'package:SEFER/views/widgets/error_snakbar.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
@@ -31,7 +32,7 @@ class TokenController extends GetxController {
update();
var jsonToken = jsonDecode(res.body);
if (jsonToken['status'] == 'The token has been updated successfully.') {
Get.snackbar('token updated'.tr, '');
mySnackbarSuccess('token updated'.tr);
}
}
}