5/20/1

lib/controller/auth/captin/login_captin_controller.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:SEFER/controller/functions/location_background_controller.dart';
+import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
 import 'package:SEFER/views/auth/captin/register_captin.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -124,10 +125,10 @@ class LoginCaptinController extends GetxController {
     print(res);
     if (res == 'failure') {
       //Failure
-      Get.offAll(const RegisterCaptin());
+      Get.offAll(SmsSignupEgypt());
       isloading = false;
       update();
-      Get.snackbar('Failure', '', backgroundColor: Colors.red);
+      // Get.snackbar('Failure', '', backgroundColor: Colors.red);
     } else {
       var jsonDecoeded = jsonDecode(res);
       // print(jsonDecoeded['data'][0]['is_verified']);
@@ -135,10 +136,11 @@ class LoginCaptinController extends GetxController {
         if (jsonDecoeded['status'] == 'success' &&
             jsonDecoeded['data'][0]['is_verified'] == 1) {
           //
-          Get.offAll(const MyApp());
+          Get.off(HomeCaptain());
         } else {
-          Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
+          Get.offAll(SmsSignupEgypt());
-              backgroundColor: Colors.redAccent);
+          // Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
+          //     backgroundColor: Colors.redAccent);
           isloading = false;
           update();
         }

lib/controller/auth/captin/register_captin_controller.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 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:flutter/material.dart';
 import 'package:get/get.dart';
@@ -112,7 +113,7 @@ class RegisterCaptainController extends GetxController {
             link: AppLink.updateAccountBank,
             payload: {'phone': '+2${phoneController.text}'});
         if (jsonDecode(res1)['status'] == 'success') {
-          Get.to(LoginCaptin());
+          Get.to(EgyptCardAI());
         }
       }
     }

lib/controller/auth/google_sign.dart

@@ -1,11 +1,11 @@
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
 import 'package:SEFER/main.dart';
+import 'package:SEFER/views/auth/captin/cards/sms_signup.dart';
 import 'package:get/get.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 
 import '../../views/auth/captin/ai_page.dart';
-import '../../views/auth/captin/cards/egypt_card_a_i.dart';
 
 class GoogleSignInHelper {
   static final GoogleSignIn _googleSignIn = GoogleSignIn(
@@ -22,7 +22,7 @@ class GoogleSignInHelper {
       if (googleUser != null) {
         await _handleSignUp(googleUser);
         if (box.read(BoxName.countryCode) == 'Egypt') {
-          Get.to(() => EgyptCardAI());
+          Get.to(() => SmsSignupEgypt());
         } else if (box.read(BoxName.countryCode) == 'Jordan') {
           Get.to(() => AiPage());
         }
@@ -76,16 +76,16 @@ class GoogleSignInHelper {
     // Store driver information
     box.write(BoxName.driverID, user.id);
     box.write(BoxName.emailDriver, user.email);
-    box.write(BoxName.nameDriver, user.displayName);
+    // box.write(BoxName.nameDriver, user.displayName);
-    box.write(BoxName.driverPhotoUrl, user.photoUrl);
+    // box.write(BoxName.driverPhotoUrl, user.photoUrl);
 
     // Perform any additional sign-up tasks or API calls here
     // For example, you can send the user data to your server for registration
 
     print('driverID = ${box.read(BoxName.driverID)}');
     print('emailDriver = ${box.read(BoxName.emailDriver)}');
-    print('nameDriver = ${box.read(BoxName.nameDriver)}');
+    // print('nameDriver = ${box.read(BoxName.nameDriver)}');
-    print('driverPhotoUrl = ${box.read(BoxName.driverPhotoUrl)}');
+    // print('driverPhotoUrl = ${box.read(BoxName.driverPhotoUrl)}');
   }
 
   // Method to handle sign-out process

lib/controller/functions/gemeni.dart

@@ -6,7 +6,6 @@ import 'package:SEFER/constant/style.dart';
 import 'package:SEFER/controller/functions/crud.dart';
 import 'package:SEFER/controller/functions/device_info.dart';
 import 'package:SEFER/main.dart';
-import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:image_cropper/image_cropper.dart';

lib/controller/home/splash_screen_controlle.dart

@@ -47,12 +47,14 @@ class SplashScreenController extends GetxController
     Timer(const Duration(seconds: 5), () {
       box.read(BoxName.onBoarding) == null
           ? Get.off(() => OnBoardingPage())
-          : box.read(BoxName.emailDriver) != null &&
+          : box.read(BoxName.emailDriver) != null
+                  // todo
+                  &&
                   box.read(BoxName.deviceInfo) != null &&
                   box.read(BoxName.phoneVerified) == '1'
               // ? Get.off(() => SmsSignupEgypt())
               ? Get.off(() => HomeCaptain())
-              : Get.off(() => SmsSignupEgypt());
+              : Get.off(() => LoginCaptin());
     });
   }
 

lib/views/auth/captin/cards/egypt_card_a_i.dart

@@ -2,7 +2,6 @@ import 'package:SEFER/controller/functions/gemeni.dart';
 import 'package:SEFER/controller/functions/tts.dart';
 import 'package:SEFER/views/widgets/elevated_btn.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 
 import '../../../../constant/colors.dart';