25-1/28/1

2025-01-28 01:03:39 +03:00
parent 63681f104c
commit f217b5a34f
102 changed files with 7253 additions and 3945 deletions
--- a/lib/views/auth/login_page.dart
+++ b/lib/views/auth/login_page.dart
@@ -1,5 +1,6 @@
 import 'dart:io';

+import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -90,7 +91,8 @@ class LoginPage extends StatelessWidget {
                  User? user = await authController.signInWithApple();
                  if (user != null) {
                    box.write(BoxName.passengerID, user.uid);
-                    box.write(BoxName.email, user.email);
+                    box.write(BoxName.email,
+                        encryptionHelper.encryptData(user.email.toString()));
                    await controller.loginUsingCredentials(
                      box.read(BoxName.passengerID).toString(),
                      box.read(BoxName.email).toString(),
--- a/lib/views/home/map_widget.dart/left_main_menu_icons.dart
+++ b/lib/views/home/map_widget.dart/left_main_menu_icons.dart
@@ -6,6 +6,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
 import '../../../constant/box_name.dart';
 import '../../../constant/colors.dart';
 import '../../../constant/table_names.dart';
+import '../../../controller/functions/encrypt_decrypt.dart';
 import '../../../controller/functions/tts.dart';
 import '../../../controller/home/map_passenger_controller.dart';
 import '../../../controller/home/vip_waitting_page.dart';
@@ -15,13 +16,10 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
  return GetBuilder<MapPassengerController>(
    builder: (controller) => Positioned(
      top: Get.height * .008,
-      left: box.read(BoxName.lang) != 'ar' ? Get.width * .2 : null,
-      right: box.read(BoxName.lang) != 'ar'
-          ? Get.width * .2
-          : null, // Adjust left position for better spacing
+      left: Get.width * .16,
+      right: Get.width * .16, // Adjust left position for better spacing
      child: Row(
-        mainAxisAlignment:
-            MainAxisAlignment.spaceAround, // Distribute space evenly
+        mainAxisAlignment: MainAxisAlignment.center, // Distribute space evenly
        children: [
          _buildIconButtonWithAnimation(
            controller: controller,
@@ -62,11 +60,21 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
          // const SizedBox(width: 8),
          // _buildIconButtonWithAnimation(
          //   controller: controller,
-          //   icon: Octicons.telescope,
+          //   icon: Octicons.screen_full,
          //   onPressed: () async {
-          //     final result = await sql.getCustomQuery('''
-          //       SELECT * FROM ${TableName.recentLocations} ORDER BY createdAt DESC
-          //     ''');
+          //     final plainText = 'Hello, Safar App!';
+          //     debugPrint('Plain Text: $plainText');
+
+          //     // Encrypt the data
+          //     final encryptedData = encryptionHelper.encryptData(plainText);
+          //     debugPrint('Encrypted: $encryptedData');
+
+          //     // Decrypt the data
+          //     final decryptedData = encryptionHelper
+          //         .decryptData(encryptedData); // Use the encryptedData variable
+          //     debugPrint('Decrypted: $decryptedData');
+          //     //kVb4a+11Scs9jQWwzeVfx0PxSDiPWDCuMI/RWYxafMU=
+          //     //kVb4a+11Scs9jQWwzeVfx0PxSDiPWDCuMI/RWYxafMU=
          //   },
          //   tooltip: 'Recent Locations', // More descriptive tooltip
          // ),
--- a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart
+++ b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart
@@ -1,3 +1,4 @@
+import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
 import 'package:SEFER/views/widgets/my_textField.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -457,7 +458,8 @@ class MainBottomMenuMap extends StatelessWidget {
        Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-            Text('${'Where to'.tr} ${box.read(BoxName.name)}',
+            Text(
+                '${'Where to'.tr} ${encryptionHelper.decryptData(box.read(BoxName.name).toString().split(' ')[0]).toString()} ${encryptionHelper.decryptData(box.read(BoxName.name).toString().split(' ')[1]).toString()}',
                style: AppStyle.subtitle),
            // if (controller.noCarString)
            //   Text('Nearest Car: ~'.tr,
--- a/lib/views/home/map_widget.dart/new_main_bottom_sheet.dart
+++ b/lib/views/home/map_widget.dart/new_main_bottom_sheet.dart
@@ -5,6 +5,8 @@ import 'package:SEFER/main.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

+import '../../../controller/functions/encrypt_decrypt.dart';
+
 class NewMainBottomSheet extends StatelessWidget {
  const NewMainBottomSheet({super.key});

@@ -70,7 +72,7 @@ class NewMainBottomSheet extends StatelessWidget {
                      children: [
                        const Icon(Icons.search),
                        Text(
-                          "${"Where you want go ".tr}${box.read(BoxName.name)} ?",
+                          "${"Where you want go ".tr}${encryptionHelper.decryptData(box.read(BoxName.name).toString().split(' ')[0]).toString()} ?",
                        ),
                      ],
                    ),
--- a/lib/views/home/my_wallet/passenger_wallet.dart
+++ b/lib/views/home/my_wallet/passenger_wallet.dart
@@ -7,6 +7,7 @@ import '../../../constant/box_name.dart';
 import '../../../constant/colors.dart';
 import '../../../constant/info.dart';
 import '../../../constant/style.dart';
+import '../../../controller/functions/encrypt_decrypt.dart';
 import '../../../controller/functions/toast.dart';
 import '../../../controller/home/payment/credit_card_controller.dart';
 import '../../../controller/payment/payment_controller.dart';
@@ -221,7 +222,10 @@ class CardSeferWallet extends StatelessWidget {
                Align(
                  alignment: Alignment.bottomRight,
                  child: Text(
-                    box.read(BoxName.name),
+                    encryptionHelper
+                        .decryptData(
+                            box.read(BoxName.name).toString().split(' ')[0])
+                        .toString(),
                    style: AppStyle.title.copyWith(
                      color: CupertinoColors.secondaryLabel,
                      fontSize: 16,
--- a/lib/views/home/profile/complaint_page.dart
+++ b/lib/views/home/profile/complaint_page.dart
@@ -125,7 +125,7 @@ class ComplaintPage extends StatelessWidget {
                        ),
                        const SizedBox(height: 24),
                        CupertinoFormSection(
-                          header: Text('SEFER answer'.tr),
+                          header: Text('SWIFTI answer'.tr),
                          children: [
                            SizedBox(
                              height: 100,
--- a/lib/views/home/profile/passenger_profile_page.dart
+++ b/lib/views/home/profile/passenger_profile_page.dart
@@ -1,3 +1,4 @@
+import 'package:SEFER/controller/functions/encrypt_decrypt.dart';
 import 'package:SEFER/views/auth/login_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -53,7 +54,7 @@ class PassengerProfilePage extends StatelessWidget {
                              ),
                              trailing: const Icon(Icons.arrow_forward_ios),
                              subtitle: Text(
-                                  '${controller.prfoileData['first_name']} ${controller.prfoileData['last_name']}'),
+                                  '${encryptionHelper.decryptData(controller.prfoileData['first_name'])} ${encryptionHelper.decryptData(controller.prfoileData['last_name'])}'),
                              onTap: () {
                                controller.updatField(
                                    'first_name', TextInputType.name);
@@ -69,8 +70,8 @@ class PassengerProfilePage extends StatelessWidget {
                                width: 35,
                              ),
                              trailing: const Icon(Icons.arrow_forward_ios),
-                              subtitle: Text(
-                                  controller.prfoileData['gender'].toString()),
+                              subtitle: Text(encryptionHelper.decryptData(
+                                  controller.prfoileData['gender'].toString())),
                              onTap: () {
                                Get.defaultDialog(
                                    title: 'Update Gender'.tr,
@@ -83,7 +84,9 @@ class PassengerProfilePage extends StatelessWidget {
                                            controller.updateColumn({
                                              'id': controller.prfoileData['id']
                                                  .toString(),
-                                              'gender': controller.gender,
+                                              'gender':
+                                                  encryptionHelper.encryptData(
+                                                      controller.gender),
                                            });
                                            Get.back();
                                          },
@@ -178,7 +181,9 @@ class PassengerProfilePage extends StatelessWidget {
                                size: 35,
                              ),
                              trailing: const Icon(Icons.arrow_forward_ios),
-                              subtitle: Text(controller.prfoileData['sosPhone']
+                              subtitle: Text(encryptionHelper
+                                  .decryptData(
+                                      controller.prfoileData['sosPhone'])
                                  .toString()),
                              onTap: () async {
                                await controller.updatField(