5/11/6

android/app/build.gradle

@@ -53,10 +53,10 @@ android {
         applicationId "com.sefer_driver"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 26
+        minSdkVersion 22
         targetSdkVersion flutter.targetSdkVersion
-        versionCode 21
+        versionCode 22
-        versionName '1.4.5'
+        versionName '1.4.6'
         // manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml']
     }
 

ios/Runner/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>24</string>
+	<string>25</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.12</string>
+	<string>2.0.13</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>

lib/controller/auth/captin/login_captin_controller.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:math';
 
+import 'package:SEFER/controller/functions/location_background_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get/get.dart';
@@ -39,34 +40,8 @@ class LoginCaptinController extends GetxController {
   }
 
   Future<void> getLocationPermission() async {
-    bool serviceEnabled;
+    Get.put(LocationBackgroundController()).requestLocationPermission();
-    PermissionStatus permissionGranted;
 
-    // Check if location services are enabled
-    serviceEnabled = await location.serviceEnabled();
-    if (!serviceEnabled) {
-      serviceEnabled = await location.requestService();
-      if (!serviceEnabled) {
-        // Location services are still not enabled, handle the error
-        return;
-      }
-    }
-
-    // Check if the app has permission to access location
-    permissionGranted = await location.hasPermission();
-    if (permissionGranted == PermissionStatus.denied) {
-      permissionGranted = await location.requestPermission();
-      if (permissionGranted != PermissionStatus.granted) {
-        // Location permission is still not granted, handle the error
-        permissionGranted = await location.requestPermission();
-        return;
-      }
-    }
-    print('permisson is ${permissionGranted.toString()}');
-    if ('PermissionStatus.granted' == permissionGranted.toString()) {
-      box.write(BoxName.locationPermission, 'true');
-      update();
-    }
     update();
   }
 

lib/controller/functions/location_background_controller.dart

@@ -5,28 +5,26 @@ import 'package:background_location/background_location.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 
+import '../../constant/box_name.dart';
+import '../../main.dart';
+
 class LocationBackgroundController extends GetxController {
   @override
   Future<void> onInit() async {
     super.onInit();
-    await requestLocationPermission();
+    // await requestLocationPermission();
     await configureBackgroundLocation();
   }
 
   Future<void> requestLocationPermission() async {
     var status = await Permission.locationAlways.status;
-    if (!status.isGranted) {
+    print(status);
-      Get.defaultDialog(
+    if (status.isDenied) {
-          title: 'Grant Location'.tr,
+      await Permission.locationAlways.request();
-          middleText:
+      if (status.isGranted) {
-              'We use location to get accurate and nearest passengers for you'
+        box.write(BoxName.locationPermission, 'true');
-                  .tr,
+        update();
-          confirm: MyElevatedButton(
+      }
-              kolor: AppColor.greenColor,
-              title: 'Grant Location'.tr,
-              onPressed: () async {
-                await Permission.locationAlways.request();
-              }));
     }
   }
 
@@ -37,11 +35,11 @@ class LocationBackgroundController extends GetxController {
       icon: "@mipmap/ic_launcher",
     );
 
-    BackgroundLocation.setAndroidConfiguration(1000);
+    BackgroundLocation.setAndroidConfiguration(500);
     BackgroundLocation.startLocationService();
     BackgroundLocation.getLocationUpdates((location) {
       // Handle location updates here
-      print("New location: ${location.latitude}, ${location.longitude}");
+      print("Background location: ${location.latitude}, ${location.longitude}");
     });
   }
 

lib/controller/home/splash_screen_controlle.dart

@@ -44,7 +44,7 @@ class SplashScreenController extends GetxController
   }
 
   void startTimer() {
-    Timer(const Duration(seconds: 4), () {
+    Timer(const Duration(seconds: 5), () {
       box.read(BoxName.onBoarding) == null
           ? Get.off(() => OnBoardingPage())
           : box.read(BoxName.emailDriver) != null

lib/splash_screen_page.dart

@@ -33,7 +33,7 @@ class SplashScreen extends StatelessWidget {
                               ? splashScreenController.zoomInAnimation.value
                               : splashScreenController.zoomOutAnimation.value,
                       child: Image.asset(
-                        'assets/images/logo.png',
+                        'assets/images/logo.gif',
                         width: Get.width * .3,
                         height: Get.width * .3,
                       ),
@@ -58,9 +58,9 @@ class SplashScreen extends StatelessWidget {
             ),
             AnimatedTextKit(animatedTexts: [
               TypewriterAnimatedText(
-                'Powered By ${AppInformation.companyName}',
+                'Powered By ${AppInformation.appName}',
                 textStyle:
-                    AppStyle.title.copyWith(color: AppColor.secondaryColor),
+                    AppStyle.title.copyWith(color: AppColor.primaryColor),
                 speed: const Duration(milliseconds: 200),
               ),
             ], isRepeatingAnimation: true)

lib/views/widgets/mycircular.dart

@@ -25,7 +25,7 @@ class MyCircularProgressIndicator extends StatelessWidget {
               children: [
                 Align(
                   alignment: Alignment.center,
-                  child: Image.asset('assets/images/logo.png'),
+                  child: Image.asset('assets/images/logo.gif'),
                 ),
               ],
             ),