6/27/1

lib/controller/auth/apple_signin_controller.dart

@@ -7,28 +7,40 @@ class AuthController extends GetxController {
 
   Future<User?> signInWithApple() async {
     try {
+      print('Starting Apple Sign In process');
+
       final appleCredential = await SignInWithApple.getAppleIDCredential(
         scopes: [
           AppleIDAuthorizationScopes.email,
           AppleIDAuthorizationScopes.fullName,
         ],
       );
+      print('Apple ID Credential obtained');
 
       final oAuthProvider = OAuthProvider('apple.com');
       final credential = oAuthProvider.credential(
         idToken: appleCredential.identityToken,
         accessToken: appleCredential.authorizationCode,
       );
+      print('OAuth credential created');
 
       UserCredential userCredential =
           await _auth.signInWithCredential(credential);
+      print('User signed in successfully: ${userCredential.user?.uid}');
+
       return userCredential.user;
     } catch (error) {
+      print('Error during Apple Sign In: $error');
       return null;
     }
   }
 
-  void signOut() async {
-    await _auth.signOut();
+  Future<void> signOut() async {
+    try {
+      await _auth.signOut();
+      print('User signed out successfully');
+    } catch (error) {
+      print('Error during sign out: $error');
+    }
   }
 }

lib/controller/auth/login_controller.dart

@@ -4,7 +4,6 @@ import 'dart:math';
 import 'package:SEFER/controller/firebase/firbase_messge.dart';
 import 'package:SEFER/views/auth/sms_verfy_page.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/constant/links.dart';
@@ -25,7 +24,6 @@ class LoginController extends GetxController {
   TextEditingController adminNameController = TextEditingController();
   bool isAgreeTerms = false;
   bool isloading = false;
-  final FlutterSecureStorage _storage = const FlutterSecureStorage();
 
   void changeAgreeTerm() {
     isAgreeTerms = !isAgreeTerms;
@@ -74,8 +72,8 @@ class LoginController extends GetxController {
                 box.read(BoxName.tokenFCM)) {
               Get.put(FirebaseMessagesController())
                   .sendNotificationToAnyWithoutData(
-                'token change',
-                'change device',
+                'token change'.tr,
+                'change device'.tr,
                 jsonDecode(token)['data'][0]['token'].toString(),
               );
               Future.delayed(const Duration(seconds: 1));
@@ -83,10 +81,20 @@ class LoginController extends GetxController {
                 'token': box.read(BoxName.tokenFCM),
                 'passengerID': box.read(BoxName.passengerID).toString()
               });
-              Get.offAll(() => const MapPagePassenger());
+              Get.defaultDialog(
+                title: 'Device Change Detected'.tr,
+                middleText:
+                    'You can only use one device at a time. This device will now be set as your active device.'
+                        .tr,
+                textConfirm: 'OK'.tr,
+                confirmTextColor: Colors.white,
+                onConfirm: () {
+                  Get.back();
+                  Get.offAll(() => const MapPagePassenger());
+                },
+              );
             }
           }
-
           Get.offAll(() => const MapPagePassenger());
         } else {
           Get.offAll(() => SmsSignupEgypt());

lib/controller/auth/register_controller.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
 
@@ -27,10 +28,10 @@ class RegisterController extends GetxController {
   TextEditingController siteController = TextEditingController();
   TextEditingController verfyCode = TextEditingController();
   TextEditingController verifyCode = TextEditingController();
-
+  int remainingTime = 300; // 5 minutes in seconds
   bool isSent = false;
   bool isLoading = false;
-
+  Timer? _timer;
   String birthDate = 'Birth Date'.tr;
   String gender = 'Male'.tr;
   @override
@@ -38,6 +39,17 @@ class RegisterController extends GetxController {
     super.onInit();
   }
 
+  void startTimer() {
+    _timer?.cancel(); // Cancel any existing timer
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (remainingTime > 0) {
+        remainingTime--;
+      } else {
+        timer.cancel();
+      }
+    });
+  }
+
   getBirthDate() {
     Get.defaultDialog(
         title: 'Select Date'.tr,
@@ -84,6 +96,8 @@ class RegisterController extends GetxController {
         await smsEgyptController.sendSmsEgypt(
             phoneController.text.toString(), randomNumber.toString());
         isSent = true;
+        remainingTime = 300; // Reset to 5 minutes
+        startTimer();
         isLoading = false;
         update();
       }
@@ -159,4 +173,10 @@ class RegisterController extends GetxController {
       }
     }
   }
+
+  @override
+  void onClose() {
+    _timer?.cancel();
+    super.onClose();
+  }
 }