driver/5/3/5

ios/Runner/Info.plist

@@ -1,103 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true />
-		<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleDisplayName</key>
-		<string>Sefer</string>
-		<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleGetInfoString</key>
-		<string></string>
-		<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>Sefer Driver</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>21</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleURLTypes</key>
-		<array>
-			<dict>
-				<key>CFBundleTypeRole</key>
-				<string>Editor</string>
-				<key>CFBundleURLSchemes</key>
-				<array>
-					<string>com.googleusercontent.apps.594687661098-9fnj82nef9oagl98prigdf8qne3ddbto</string>
-					<!--
-					<string>com.googleusercontent.apps.594687661098-8e26699cris2k3nj5msj1osi59it9kpf</string> -->
-				</array>
-			</dict>
-		</array>
-		<key>CFBundleVersion</key>
-		<string>1.41</string>
-		<key>FirebaseAppDelegateProxyEnabled</key>
-		<string>NO</string>
-		<key>GMSApiKey</key>
-		<string>YOUR_API_KEY</string>
-		<key>LSApplicationCategoryType</key>
-		<string></string>
-		<key>LSApplicationQueriesSchemes</key>
-		<array>
-			<string>googlechromes</string>
-			<string>comgooglemaps</string>
-		</array>
-		<key>LSRequiresIPhoneOS</key>
-		<true />
-		<key>NSCameraUsageDescription</key>
-		<string>Sefer app requires access to your camera in order to scan QR codes and capture
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Sefer Driver</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Sefer Driver</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>23</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.594687661098-9fnj82nef9oagl98prigdf8qne3ddbto</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>2.0.1</string>
+	<key>FirebaseAppDelegateProxyEnabled</key>
+	<string>NO</string>
+	<key>GMSApiKey</key>
+	<string>YOUR_API_KEY</string>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>googlechromes</string>
+		<string>comgooglemaps</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>This app requires access to your camera in order to scan QR codes and capture
 			images for uploading and access to connect to a call.</string>
-		<key>NSFaceIDUsageDescription</key>
-		<string>Use Face ID to securely authenticate payment accounts.</string>
-		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-		<string>This app needs access to your location to provide you with the best ride experience.
+	<key>NSFaceIDUsageDescription</key>
+	<string>Use Face ID to securely authenticate payment accounts.</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>This app needs access to your location to provide you with the best ride experience.
 			Your location data will be used to find the nearest available cars and connect you with
 			the closest captain for efficient and convenient rides.</string>
-		<key>NSLocationAlwaysUsageDescription</key>
-		<string>This app needs access to location.</string>
-		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>This app needs access to your location to provide you with the best ride experience.
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>This app needs access to location.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app needs access to your location to provide you with the best ride experience.
 			Your location data will be used to find the nearest available cars and connect you with
 			the closest captain for efficient and convenient rides.</string>
-		<key>NSMicrophoneUsageDescription</key>
-		<string>This app requires access to your microphone to record audio, allowing you to add
+	<key>NSMicrophoneUsageDescription</key>
+	<string>This app requires access to your microphone to record audio, allowing you to add
 			voice recordings to your photos and videos and access to connect to a call.</string>
-		<key>NSPhotoLibraryUsageDescription</key>
-		<string>Explanation of why your app needs access to the photo library.</string>
-		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true />
-		<key>UIBackgroundModes</key>
-		<array>
-			<string>fetch</string>
-			<string>location</string>
-			<string>remote-notification</string>
-		</array>
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
-		<string>Main</string>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false />
-	</dict>
-</plist>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Explanation of why your app needs access to the photo library.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+		<string>location</string>
+		<string>remote-notification</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
+</plist>

lib/controller/auth/captin/login_captin_controller.dart

@@ -32,6 +32,11 @@ class LoginCaptinController extends GetxController {
     update();
   }
 
+  void saveCountryCode(String countryCode) {
+    box.write(BoxName.countryCode, countryCode);
+    update();
+  }
+
   void login() async {
     isloading = true;
     update();
@@ -51,7 +56,7 @@ class LoginCaptinController extends GetxController {
       if (jsonDecoeded.isNotEmpty) {
         if (jsonDecoeded['status'] == 'success') {
           print(jsonDecoeded['data'][0]['verified']);
-          if (jsonDecoeded['data'][0]['verified'] == '1') {
+          if (jsonDecoeded['data'][0]['verified'] == 1) {
             box.write(BoxName.driverID, jsonDecoeded['data'][0]['id']);
             box.write(BoxName.emailDriver, jsonDecoeded['data'][0]['email']);
             box.write(

lib/views/auth/captin/login_captin.dart

@@ -25,13 +25,13 @@ class LoginCaptin extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Get.put(LoginCaptinController());
-
+    final controller = Get.put(LoginController());
     return GetBuilder<LoginCaptinController>(
       builder: (controller) => MyScafolld(
         title: 'Login Driver'.tr,
         isleading: false,
         body: [
-          if (box.read(BoxName.agreeTerms) != 'agreed')
+          if (box.read(BoxName.agreeTerms).toString() != 'agreed')
             agreedPage()
           else if (box.read(BoxName.countryCode) == null)
             CountryPicker()
@@ -228,92 +228,89 @@ class LoginCaptin extends StatelessWidget {
   Padding agreedPage() {
     return Padding(
       padding: const EdgeInsets.all(16),
-      child: SingleChildScrollView(
-        child: Column(
-          children: [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Image.asset(
-                  'assets/images/notepad.png',
-                  width: Get.width * .2,
+      child: Column(
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Image.asset(
+                'assets/images/notepad.png',
+                width: Get.width * .2,
+              ),
+              SizedBox(
+                width: Get.width * .7,
+                child: Text(
+                  'Accept Ride\'s Terms & Review Privacy Notice'.tr,
+                  style: AppStyle.headTitle2,
                 ),
-                SizedBox(
-                  width: Get.width * .7,
-                  child: Text(
-                    'Accept Ride\'s Terms & Review Privacy Notice'.tr,
-                    style: AppStyle.headTitle2,
-                  ),
+              ),
+            ],
+          ),
+          const SizedBox(
+            height: 30,
+          ),
+          RichText(
+            text: TextSpan(
+              text:
+                  'By selecting "I Agree" below, I have reviewed and agree to the Terms of Use and acknowledge the '
+                      .tr,
+              style: AppStyle.title,
+              children: <TextSpan>[
+                TextSpan(
+                    text: 'Privacy Notice'.tr,
+                    style: const TextStyle(
+                        decoration: TextDecoration.underline,
+                        color: AppColor.blueColor),
+                    recognizer: TapGestureRecognizer()
+                      ..onTap = () {
+                        Get.defaultDialog(
+                            title: ''.tr,
+                            content: const SizedBox(
+                              height: 400,
+                              width: 400,
+                              child: SingleChildScrollView(
+                                child: HtmlWidget(AppInformation.privacyPolicy),
+                              ),
+                            ));
+                      }),
+                const TextSpan(
+                  text: '. I am at least 18 years of age.',
                 ),
               ],
             ),
-            const SizedBox(
-              height: 30,
+          ),
+          const SizedBox(
+            height: 100,
+          ),
+          GetBuilder<LoginCaptinController>(
+            builder: (controller) => Column(
+              children: [
+                Row(
+                  children: [
+                    Checkbox.adaptive(
+                      autofocus: true,
+                      tristate: true,
+                      splashRadius: 25,
+                      activeColor: AppColor.primaryColor,
+                      value: controller.isAgreeTerms,
+                      onChanged: (value) => controller.changeAgreeTerm(),
+                    ),
+                    Text(
+                      'I Agree'.tr,
+                      style: controller.isAgreeTerms
+                          ? AppStyle.title
+                          : AppStyle.title
+                              .copyWith(color: AppColor.accentColor),
+                    ),
+                  ],
+                ),
+                MyElevatedButton(
+                    title: 'Submit'.tr,
+                    onPressed: () => controller.saveAgreementTerms()),
+              ],
             ),
-            RichText(
-              text: TextSpan(
-                text:
-                    'By selecting "I Agree" below, I have reviewed and agree to the Terms of Use and acknowledge the '
-                        .tr,
-                style: AppStyle.title,
-                children: <TextSpan>[
-                  TextSpan(
-                      text: 'Privacy Notice'.tr,
-                      style: const TextStyle(
-                          decoration: TextDecoration.underline,
-                          color: AppColor.blueColor),
-                      recognizer: TapGestureRecognizer()
-                        ..onTap = () {
-                          Get.defaultDialog(
-                              title: ''.tr,
-                              content: const SizedBox(
-                                height: 400,
-                                width: 400,
-                                child: SingleChildScrollView(
-                                  child:
-                                      HtmlWidget(AppInformation.privacyPolicy),
-                                ),
-                              ));
-                        }),
-                  const TextSpan(
-                    text: '. I am at least 18 years of age.',
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(
-              height: 100,
-            ),
-            GetBuilder<LoginController>(
-              builder: (controller) => Column(
-                children: [
-                  Row(
-                    children: [
-                      Checkbox.adaptive(
-                        autofocus: true,
-                        tristate: true,
-                        splashRadius: 25,
-                        activeColor: AppColor.primaryColor,
-                        value: controller.isAgreeTerms,
-                        onChanged: (value) => controller.changeAgreeTerm(),
-                      ),
-                      Text(
-                        'I Agree'.tr,
-                        style: controller.isAgreeTerms
-                            ? AppStyle.title
-                            : AppStyle.title
-                                .copyWith(color: AppColor.accentColor),
-                      ),
-                    ],
-                  ),
-                  MyElevatedButton(
-                      title: 'Submit'.tr,
-                      onPressed: () => controller.saveAgreementTerms()),
-                ],
-              ),
-            )
-          ],
-        ),
+          )
+        ],
       ),
     );
   }

lib/views/home/profile/passenger_profile_page.dart

@@ -1,3 +1,4 @@
+import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
 import 'package:SEFER/views/auth/captin/login_captin.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -12,7 +13,6 @@ import 'package:SEFER/views/widgets/my_scafold.dart';
 import 'package:SEFER/views/widgets/my_textField.dart';
 import 'package:SEFER/views/widgets/mycircular.dart';
 
-import '../../../controller/auth/login_controller.dart';
 import '../../../controller/functions/log_out.dart';
 
 class PassengerProfilePage extends StatelessWidget {
@@ -372,7 +372,7 @@ class CountryPicker extends StatelessWidget {
             MyElevatedButton(
               title: 'Select Country'.tr, // Use translated text for button
               onPressed: () {
-                Get.find<LoginController>().saveCountryCode(controller
+                Get.find<LoginCaptinController>().saveCountryCode(controller
                     .selectedCountry
                     .toString()); // No conversion needed
                 box.write(
@@ -391,7 +391,8 @@ class CountryPicker extends StatelessWidget {
 
 class CountryPickerFromSetting extends StatelessWidget {
   final ProfileController controller = Get.put(ProfileController());
-  final LoginController loginController = Get.put(LoginController());
+  final LoginCaptinController loginController =
+      Get.put(LoginCaptinController());
 
   final List<String> countryOptions = [
     'Jordan',