8-20/1

lib/controller/auth/login_controller.dart

@@ -7,6 +7,7 @@ import 'package:get/get.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/constant/links.dart';
 import 'package:ride/controller/functions/crud.dart';
+import 'package:ride/controller/functions/secure_storage.dart';
 import 'package:ride/main.dart';
 import 'package:ride/views/auth/verify_email_page.dart';
 import 'package:ride/views/home/map_page.dart';
@@ -20,7 +21,7 @@ class LoginController extends GetxController {
   TextEditingController passwordController = TextEditingController();
   bool isAgreeTerms = false;
   bool isloading = false;
-  final FlutterSecureStorage _storage = FlutterSecureStorage();
+  final FlutterSecureStorage _storage = const FlutterSecureStorage();
 
   void changeAgreeTerm() {
     isAgreeTerms = !isAgreeTerms;
@@ -33,15 +34,6 @@ class LoginController extends GetxController {
     update();
   }
 
-  void saveData(String key, value) async {
-    await _storage.write(key: key, value: value);
-  }
-
-  Future<String?> readData(String boxName) async {
-    final String? value = await _storage.read(key: boxName);
-    return value;
-  }
-
   void login() async {
     isloading = true;
     update();
@@ -65,7 +57,8 @@ class LoginController extends GetxController {
             box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
             box.write(BoxName.name, jsonDecoeded['data'][0]['first_name']);
             box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
-            saveData(BoxName.passwoerd, passwordController.text);
+            SecureStorage()
+                .saveData(BoxName.passwoerd, passwordController.text);
             Get.offAll(() => MapPage());
             isloading = false;
             update();

lib/controller/functions/digit_obsecur_formate.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/services.dart';
+
+class DigitObscuringFormatter extends TextInputFormatter {
+  @override
+  TextEditingValue formatEditUpdate(
+      TextEditingValue oldValue, TextEditingValue newValue) {
+    final maskedText = maskDigits(newValue.text);
+    return newValue.copyWith(
+        text: maskedText,
+        selection: updateCursorPosition(maskedText, newValue.selection));
+  }
+
+  String maskDigits(String text) {
+    final totalDigits = text.length;
+    final visibleDigits = 4;
+    final hiddenDigits = totalDigits - visibleDigits * 2;
+
+    final firstVisibleDigits = text.substring(0, visibleDigits);
+    final lastVisibleDigits = text.substring(totalDigits - visibleDigits);
+
+    final maskedDigits = List.filled(hiddenDigits, '*').join();
+
+    return '$firstVisibleDigits$maskedDigits$lastVisibleDigits';
+  }
+
+  TextSelection updateCursorPosition(
+      String maskedText, TextSelection currentSelection) {
+    final cursorPosition = currentSelection.baseOffset;
+    final cursorOffset =
+        currentSelection.extentOffset - currentSelection.baseOffset;
+    final totalDigits = maskedText.length;
+    const visibleDigits = 4;
+    final hiddenDigits = totalDigits - visibleDigits * 2;
+
+    final updatedPosition = cursorPosition <= visibleDigits
+        ? cursorPosition
+        : hiddenDigits + visibleDigits + (cursorPosition - visibleDigits);
+
+    return TextSelection.collapsed(
+        offset: updatedPosition, affinity: currentSelection.affinity);
+  }
+}

lib/controller/functions/scan_id_card.dart

@@ -0,0 +1,25 @@
+import 'package:credit_card_scanner/credit_card_scanner.dart';
+import 'package:get/get.dart';
+
+class ScanIdCard extends GetxController {
+  CardDetails? _cardDetails;
+  CardScanOptions scanOptions = const CardScanOptions(
+    scanCardHolderName: true,
+// enableDebugLogs: true,
+    validCardsToScanBeforeFinishingScan: 5,
+    possibleCardHolderNamePositions: [
+      CardHolderNameScanPosition.aboveCardNumber,
+    ],
+  );
+
+  Future<void> scanCard() async {
+    final CardDetails? cardDetails =
+        await CardScanner.scanCard(scanOptions: scanOptions);
+    if (cardDetails == null) {
+      return;
+    }
+
+    _cardDetails = cardDetails;
+    update();
+  }
+}

lib/controller/functions/secure_storage.dart

@@ -0,0 +1,14 @@
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class SecureStorage {
+  final FlutterSecureStorage _storage = const FlutterSecureStorage();
+
+  void saveData(String key, value) async {
+    await _storage.write(key: key, value: value);
+  }
+
+  Future<String?> readData(String boxName) async {
+    final String? value = await _storage.read(key: boxName);
+    return value;
+  }
+}

lib/controller/home/map_page_controller.dart

@@ -48,10 +48,11 @@ class MapController extends GetxController {
   bool isMainBottomMenuMap = true;
   double heightButtomSheetShown = 300;
   double cashConfirmPageShown = 250;
-  double paymentPageShown = 380;
+  double paymentPageShown = Get.height * .6;
   late final LatLng southwest;
   late final LatLng northeast;
   List<CarLocationModel> carLocations = <CarLocationModel>[];
+
 // final mainBottomMenuMap = GlobalKey<AnimatedContainer>();
   void changeButtomSheetShown() {
     isButtomSheetShown = !isButtomSheetShown;
@@ -341,9 +342,9 @@ class MapController extends GetxController {
 
     // Animate the camera to the adjusted bounds
     if (distanceOfDestnation <= 10) {
-      mapController!.animateCamera(CameraUpdate.newLatLngZoom(mylocation, 14));
-    } else if (distanceOfDestnation > 10 && distanceOfDestnation < 16) {
       mapController!.animateCamera(CameraUpdate.newLatLngZoom(mylocation, 12));
+    } else if (distanceOfDestnation > 10 && distanceOfDestnation < 16) {
+      mapController!.animateCamera(CameraUpdate.newLatLngZoom(mylocation, 11));
     } else if (distanceOfDestnation > 16 && distanceOfDestnation < 30) {
       mapController!.animateCamera(CameraUpdate.newLatLngZoom(mylocation, 10));
     } else if (distanceOfDestnation > 30 && distanceOfDestnation < 100) {
@@ -376,18 +377,18 @@ class MapController extends GetxController {
     return distance;
   }
 
-  late double totaME;
-  late double tax;
-  late double totalPassenger;
-  late double totalDriver;
-  late double averageDuration;
-  late double costDuration;
-  late double cost;
-  late double distance;
-  late double duration;
+  late double totaME = 0;
+  late double tax = 0;
+  late double totalPassenger = 0;
+  late double totalDriver = 0;
+  late double averageDuration = 0;
+  late double costDuration = 0;
+  late double cost = 0;
+  late double distance = 0;
+  late double duration = 2;
   DateTime currentTime = DateTime.now();
   late Duration durationToAdd;
-  late DateTime newTime;
+  late DateTime newTime = DateTime.now();
   void bottomSheet() {
     if (data.isNotEmpty) {
       String distanceText = data[0]['distance']['text'];
@@ -395,12 +396,25 @@ class MapController extends GetxController {
       distance = getDistanceFromText(distanceText);
       duration = getDistanceFromText(durationText);
       durationToAdd = Duration(minutes: duration.toInt());
+      DateTime currentTime = DateTime.now();
       newTime = currentTime.add(durationToAdd);
-
-      if (distanceText.contains('km')) {
-        cost = distance * 0.21;
+      update();
+      if (currentTime.hour >= 21) {
+        if (distanceText.contains('km')) {
+          cost = distance * 0.23;
+          update();
+        } else {
+          cost = distance * 0.23 / 1000;
+          update();
+        }
       } else {
-        cost = distance * 0.21 / 1000;
+        if (distanceText.contains('km')) {
+          cost = distance * 0.21;
+          update();
+        } else {
+          cost = distance * 0.21 / 1000;
+          update();
+        }
       }
       averageDuration = duration / distance;
       costDuration = duration * averageDuration * 0.016;
@@ -410,12 +424,15 @@ class MapController extends GetxController {
       totaME = totalPassenger - totalDriver - tax;
       if (totalPassenger < 1) {
         totalPassenger = 1;
+        update();
         if (totalDriver < .5) {
           totalDriver = .85;
           totaME = .11;
+          update();
         } else {
           totalDriver = .95;
           totaME = .05;
+          update();
         }
       }
     }

lib/controller/home/payment/payment_controller.dart

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import '../../../constant/box_name.dart';
+import '../../functions/digit_obsecur_formate.dart';
+import '../../functions/secure_storage.dart';
+
+class CreditCardController extends GetxController {
+  final GlobalKey<FormState> formKey = GlobalKey<FormState>();
+  final TextEditingController cardNumberController = TextEditingController();
+  final TextEditingController cardHolderNameController =
+      TextEditingController();
+  final TextEditingController expiryDateController = TextEditingController();
+  final TextEditingController cvvCodeController = TextEditingController();
+  openPayment() async {
+    String? cardNumber = await SecureStorage().readData(BoxName.cardNumber);
+    String? cardHolderName =
+        await SecureStorage().readData(BoxName.cardHolderName);
+    String? expiryDate = await SecureStorage().readData(BoxName.expiryDate);
+    String? cvvCode = await SecureStorage().readData(BoxName.cvvCode);
+
+    print('cardNumber: $cardNumber');
+    print('cardHolderName: $cardHolderName');
+    print('expiryDate: $expiryDate');
+    print('cvvCode: $cvvCode');
+
+    if (cvvCode != null && cvvCode.isNotEmpty) {
+      final maskedCardNumber = DigitObscuringFormatter()
+          .formatEditUpdate(
+            TextEditingValue.empty,
+            TextEditingValue(text: cardNumber ?? ''),
+          )
+          .text;
+
+      print('maskedCardNumber: $maskedCardNumber');
+
+      cardNumberController.text = maskedCardNumber;
+      cardHolderNameController.text = cardHolderName ?? '';
+      expiryDateController.text = expiryDate ?? '';
+      cvvCodeController.text = cvvCode;
+    }
+  }
+
+  @override
+  void onInit() async {
+    super.onInit();
+    String? cardNumber = await SecureStorage().readData(BoxName.cardNumber);
+    String? cardHolderName =
+        await SecureStorage().readData(BoxName.cardHolderName);
+    String? expiryDate = await SecureStorage().readData(BoxName.expiryDate);
+    String? cvvCode = await SecureStorage().readData(BoxName.cvvCode);
+
+    print('cardNumber: $cardNumber');
+    print('cardHolderName: $cardHolderName');
+    print('expiryDate: $expiryDate');
+    print('cvvCode: $cvvCode');
+
+    if (cvvCode != null && cvvCode.isNotEmpty) {
+      final maskedCardNumber = DigitObscuringFormatter()
+          .formatEditUpdate(
+            TextEditingValue.empty,
+            TextEditingValue(text: cardNumber ?? ''),
+          )
+          .text;
+
+      print('maskedCardNumber: $maskedCardNumber');
+
+      cardNumberController.text = maskedCardNumber;
+      cardHolderNameController.text = cardHolderName ?? '';
+      expiryDateController.text = expiryDate ?? '';
+      cvvCodeController.text = cvvCode;
+    }
+  }
+}
+
+class CreditCardModel {
+  String cardNumber;
+  String cardHolderName;
+  String expiryDate;
+  String cvvCode;
+
+  CreditCardModel({
+    required this.cardNumber,
+    required this.cardHolderName,
+    required this.expiryDate,
+    required this.cvvCode,
+  });
+}