driver/5/3/5

ios/Runner/Info.plist

@@ -1,13 +1,13 @@
 <?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>
+<dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true />
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-		<string>Sefer</string>
+	<string>Sefer Driver</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleGetInfoString</key>
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>21</string>
+	<string>23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,13 +32,11 @@
 			<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>
+	<string>2.0.1</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>
@@ -51,9 +49,9 @@
 		<string>comgooglemaps</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
-		<true />
+	<true/>
 	<key>NSCameraUsageDescription</key>
-		<string>Sefer app requires access to your camera in order to scan QR codes and capture
+	<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>
@@ -73,7 +71,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Explanation of why your app needs access to the photo library.</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true />
+	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
@@ -98,6 +96,6 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false />
+	<false/>
-	</dict>
+</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,7 +228,6 @@ class LoginCaptin extends StatelessWidget {
   Padding agreedPage() {
     return Padding(
       padding: const EdgeInsets.all(16),
-      child: SingleChildScrollView(
       child: Column(
         children: [
           Row(
@@ -270,8 +269,7 @@ class LoginCaptin extends StatelessWidget {
                               height: 400,
                               width: 400,
                               child: SingleChildScrollView(
-                                  child:
+                                child: HtmlWidget(AppInformation.privacyPolicy),
-                                      HtmlWidget(AppInformation.privacyPolicy),
                               ),
                             ));
                       }),
@@ -284,7 +282,7 @@ class LoginCaptin extends StatelessWidget {
           const SizedBox(
             height: 100,
           ),
-            GetBuilder<LoginController>(
+          GetBuilder<LoginCaptinController>(
             builder: (controller) => Column(
               children: [
                 Row(
@@ -314,7 +312,6 @@ class LoginCaptin extends StatelessWidget {
           )
         ],
       ),
-      ),
     );
   }
 }

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',