diff --git a/.env b/.env index bb08e18..723b079 100644 --- a/.env +++ b/.env @@ -2,13 +2,17 @@ basicAuthCredentials=wqnmqqsjyvwv:nqrYJP@1737XrXlBl accountSIDTwillo=QFx0qy456juj3839xuy2194q629q1fj0y7XrXlBl visionApi=3pALsqSSYTvzp69Q5FMIgbzjG6Z1zktJXrXlBl serverPHP=https://api.sefer.live/sefer +seferAlexandriaServer=https://seferalexandria.site/sefer +seferPaymentServer=https://seferpw.shop/sefer/ride +seferCairoServer=https://sefer.click/sefer +seferGizaServer=https://gizasefer.online/sefer serverPHPContabo=https://globalsefer.online/sefer ocpApimSubscriptionKey=0f5dacccdbce4131b1a5f952996302e3 smsPasswordEgypt="J)Vh=qb/@MXrXlBl" keyOfApp=nqryjp@1737wqnmqqsjyzjujljksvceiXrXlBl emailService=seferservice@sefer.live anthropicAIkeySeferNew=zg-qbc-qvo39-n4VdMQ5nuJeIYhMN4PDYr7qox3-t2i1Lh7aNTDfYF-Gf8whUJZCs47EeelKn8_UcmUMmiSLaf0UJg0DvUlQrDt-76CRrkQQXrXlBl - +anthropicAIkeySeferNewHamzaayedpython=zg-qbc-qvo39-vCB-WnzEwFNArO0YlTapvfhtmguKWsXJSKqg_NZSjHBYVXMZK1yUK88SobdckV0KuPaBh0c_WHtGsRO_439PBk-e2QqgkQQXrXlBl a=q b=x diff --git a/.metadata b/.metadata index 6eb54a1..8973d6c 100644 --- a/.metadata +++ b/.metadata @@ -18,21 +18,6 @@ migration: - platform: android create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - - platform: ios - create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - - platform: linux - create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - - platform: macos - create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - - platform: web - create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - - platform: windows - create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 - base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49 # User provided section diff --git a/android/app/build.gradle b/android/app/build.gradle index 1f11725..a720919 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,8 +43,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdk = 23 targetSdk = flutter.targetSdkVersion - versionCode = 7 - versionName = '1.07' + versionCode = 12 + versionName = '1.12' } buildTypes { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a05fa66..0efeeb3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -7,54 +7,64 @@ PODS: - AppAuth/Core - device_info_plus (0.0.1): - Flutter - - Firebase/Auth (10.27.0): + - Firebase/Auth (11.0.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.27.0) - - Firebase/CoreOnly (10.27.0): - - FirebaseCore (= 10.27.0) - - Firebase/Messaging (10.27.0): + - FirebaseAuth (~> 11.0.0) + - Firebase/CoreOnly (11.0.0): + - FirebaseCore (= 11.0.0) + - Firebase/Messaging (11.0.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.27.0) - - firebase_auth (5.1.1): - - Firebase/Auth (= 10.27.0) + - FirebaseMessaging (~> 11.0.0) + - firebase_auth (5.2.0): + - Firebase/Auth (= 11.0.0) - firebase_core - Flutter - - firebase_core (3.1.1): - - Firebase/CoreOnly (= 10.27.0) + - firebase_core (3.4.0): + - Firebase/CoreOnly (= 11.0.0) - Flutter - - firebase_messaging (15.0.2): - - Firebase/Messaging (= 10.27.0) + - firebase_messaging (15.1.0): + - Firebase/Messaging (= 11.0.0) - firebase_core - Flutter - - FirebaseAppCheckInterop (10.27.0) - - FirebaseAuth (10.27.0): - - FirebaseAppCheckInterop (~> 10.17) - - FirebaseCore (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/Environment (~> 7.8) - - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseAppCheckInterop (11.2.0) + - FirebaseAuth (11.0.0): + - FirebaseAppCheckInterop (~> 11.0) + - FirebaseAuthInterop (~> 11.0) + - FirebaseCore (~> 11.0) + - FirebaseCoreExtension (~> 11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/Environment (~> 8.0) + - GTMSessionFetcher/Core (~> 3.4) - RecaptchaInterop (~> 100.0) - - FirebaseCore (10.27.0): - - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.12) - - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.27.0): - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.27.0): - - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.27.0): - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.0) - - GoogleDataTransport (~> 9.3) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Reachability (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - nanopb (< 2.30911.0, >= 2.30908.0) + - FirebaseAuthInterop (11.2.0) + - FirebaseCore (11.0.0): + - FirebaseCoreInternal (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreExtension (11.2.0): + - FirebaseCore (~> 11.0) + - FirebaseCoreInternal (11.2.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseInstallations (11.2.0): + - FirebaseCore (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - FirebaseMessaging (11.0.0): + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - GoogleDataTransport (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Reachability (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - nanopb (~> 3.30910.0) - Flutter (1.0.0) + - flutter_image_compress_common (1.0.0): + - Flutter + - Mantle + - SDWebImage + - SDWebImageWebPCoder - flutter_secure_storage (6.0.0): - Flutter - google_sign_in_ios (0.0.1): @@ -63,62 +73,87 @@ PODS: - FlutterMacOS - GoogleSignIn (~> 7.1) - GTMSessionFetcher (>= 3.4.0) - - GoogleDataTransport (9.4.1): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30911.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) + - GoogleDataTransport (10.1.0): + - nanopb (~> 3.30910.0) + - PromisesObjC (~> 2.4) - GoogleSignIn (7.1.0): - AppAuth (< 2.0, >= 1.7.3) - GTMAppAuth (< 5.0, >= 4.1.1) - GTMSessionFetcher/Core (~> 3.3) - - GoogleUtilities/AppDelegateSwizzler (7.13.3): + - GoogleUtilities/AppDelegateSwizzler (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - GoogleUtilities/Privacy - - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Environment (8.0.2): - GoogleUtilities/Privacy - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.13.3): + - GoogleUtilities/Logger (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Privacy - - GoogleUtilities/Network (7.13.3): + - GoogleUtilities/Network (8.0.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.13.3)": + - "GoogleUtilities/NSData+zlib (8.0.2)": - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (7.13.3) - - GoogleUtilities/Reachability (7.13.3): + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (7.13.3): + - GoogleUtilities/UserDefaults (8.0.2): - GoogleUtilities/Logger - GoogleUtilities/Privacy - GTMAppAuth (4.1.1): - AppAuth/Core (~> 1.7) - GTMSessionFetcher/Core (< 4.0, >= 3.3) - - GTMSessionFetcher (3.4.1): - - GTMSessionFetcher/Full (= 3.4.1) - - GTMSessionFetcher/Core (3.4.1) - - GTMSessionFetcher/Full (3.4.1): + - GTMSessionFetcher (3.5.0): + - GTMSessionFetcher/Full (= 3.5.0) + - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Full (3.5.0): - GTMSessionFetcher/Core - - nanopb (2.30910.0): - - nanopb/decode (= 2.30910.0) - - nanopb/encode (= 2.30910.0) - - nanopb/decode (2.30910.0) - - nanopb/encode (2.30910.0) + - image_cropper (0.0.4): + - Flutter + - TOCropViewController (~> 2.7.4) + - image_picker_ios (0.0.1): + - Flutter + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): + - libwebp/webp + - libwebp/mux (1.3.2): + - libwebp/demux + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv + - Mantle (2.2.0): + - Mantle/extobjc (= 2.2.0) + - Mantle/extobjc (2.2.0) + - nanopb (3.30910.0): + - nanopb/decode (= 3.30910.0) + - nanopb/encode (= 3.30910.0) + - nanopb/decode (3.30910.0) + - nanopb/encode (3.30910.0) - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - PromisesObjC (2.4.0) - RecaptchaInterop (100.0.0) + - SDWebImage (5.19.7): + - SDWebImage/Core (= 5.19.7) + - SDWebImage/Core (5.19.7) + - SDWebImageWebPCoder (0.14.6): + - libwebp (~> 1.0) + - SDWebImage/Core (~> 5.17) - share (0.0.1): - Flutter - sqflite (0.0.3): - Flutter - FlutterMacOS + - TOCropViewController (2.7.4) - url_launcher_ios (0.0.1): - Flutter - vibration (1.7.5): @@ -130,8 +165,11 @@ DEPENDENCIES: - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) + - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`) + - image_cropper (from `.symlinks/plugins/image_cropper/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - share (from `.symlinks/plugins/share/ios`) - sqflite (from `.symlinks/plugins/sqflite/darwin`) @@ -144,7 +182,9 @@ SPEC REPOS: - Firebase - FirebaseAppCheckInterop - FirebaseAuth + - FirebaseAuthInterop - FirebaseCore + - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseInstallations - FirebaseMessaging @@ -153,9 +193,14 @@ SPEC REPOS: - GoogleUtilities - GTMAppAuth - GTMSessionFetcher + - libwebp + - Mantle - nanopb - PromisesObjC - RecaptchaInterop + - SDWebImage + - SDWebImageWebPCoder + - TOCropViewController EXTERNAL SOURCES: device_info_plus: @@ -168,10 +213,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: :path: Flutter + flutter_image_compress_common: + :path: ".symlinks/plugins/flutter_image_compress_common/ios" flutter_secure_storage: :path: ".symlinks/plugins/flutter_secure_storage/ios" google_sign_in_ios: :path: ".symlinks/plugins/google_sign_in_ios/darwin" + image_cropper: + :path: ".symlinks/plugins/image_cropper/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" share: @@ -186,30 +237,40 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d - Firebase: 26b040b20866a55f55eb3611b9fcf3ae64816b86 - firebase_auth: cc4ea3f47dda7afc4c64f59540aa570aca60814d - firebase_core: f8d0424c45e0f1e596811085fc12c638d628457c - firebase_messaging: 8b29edaf5adfd3b52b5bfa5af8128c44164670c6 - FirebaseAppCheckInterop: 0dd062c9926a76332ca5711dbed6f1a9ac540b54 - FirebaseAuth: 77a012b7e08042bf44d0db835ca2e86e6ca7bbd3 - FirebaseCore: a2b95ae4ce7c83ceecfbbbe3b6f1cddc7415a808 - FirebaseCoreInternal: 4b297a2d56063dbea2c1d0d04222d44a8d058862 - FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869 - FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e + Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9 + firebase_auth: 16ac5db3d064db837ecd845080d7e18e4be7c66d + firebase_core: ceec591a66629daaee82d3321551692c4a871493 + firebase_messaging: 15d8b557010f3bb7b98d0302e1c7c8fbcd244425 + FirebaseAppCheckInterop: ea21450529cf0ebd132788dd8916a0269abc684f + FirebaseAuth: d5cf28be74d7e82257f6a3f717509eff70d3cf4a + FirebaseAuthInterop: 47c09558af5d1b31f16fb352387c72d4804f4a24 + FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383 + FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de + FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5 + FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a + FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 google_sign_in_ios: 07375bfbf2620bc93a602c0e27160d6afc6ead38 - GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db - GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de - GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd - nanopb: 438bc412db1928dac798aa6fd75726007be04262 + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf + image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 + Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d + nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 + SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3 + SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 share: 0b2c3e82132f5888bccca3351c504d0003b3b410 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec + TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe vibration: 7d883d141656a1c1a6d8d238616b2042a51a1241 diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 9074fee..6266644 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import Flutter import UIKit -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/lib/constant/api_key.dart b/lib/constant/api_key.dart index 99cdd27..8e89f04 100644 --- a/lib/constant/api_key.dart +++ b/lib/constant/api_key.dart @@ -12,6 +12,8 @@ class AK { static final String ocpApimSubscriptionKey = Env.ocpApimSubscriptionKey; static final String anthropicAIkeySeferNew = X.r(X.r(X.r(Env.anthropicAIkeySeferNew, cn), cC), cs); + static final String anthropicAIkeySeferNewHamzaayedpython = + X.r(X.r(X.r(Env.anthropicAIkeySeferNewHamzaayedpython, cn), cC), cs); static final String emailService = (Env.emailService); /////////// diff --git a/lib/constant/box_name.dart b/lib/constant/box_name.dart index bf87d51..0e98b58 100644 --- a/lib/constant/box_name.dart +++ b/lib/constant/box_name.dart @@ -6,6 +6,7 @@ class BoxName { static const String tokenParent = "tokenParent"; static const String lang = "lang"; static const String gender = "gender"; + static const String serverChosen = "serverChosen"; static const String carType = "carType"; static const String carPlate = "carPlate"; static const String isVerified = '0'; diff --git a/lib/constant/links.dart b/lib/constant/links.dart index 18da907..5fa86cd 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -1,7 +1,19 @@ import '../env/env.dart'; +import '../main.dart'; +import 'box_name.dart'; class AppLink { - static final String server = Env.serverPHP; + // static final String seferPaymentServer = Env.seferPaymentServer; + // // static final String seferPaymentServer = '${Env.seferCairoServer}/ride'; + + static final String seferAlexandriaServer = Env.seferAlexandriaServer; + static final String seferCairoServer = Env.seferCairoServer; + static final String seferGizaServer = Env.seferGizaServer; + // static final String server = Env.serverPHP; + + static final String endPoint = box.read(BoxName.serverChosen); + static final String server = Env.seferCairoServer; + // static const String server = "https://sefer.click/sefer/sefer"; static String googleMapsLink = 'https://maps.googleapis.com/maps/api/'; static String llama = 'https://api.llama-api.com/chat/completions'; static String getTokens = "$server/ride/firebase/get.php"; @@ -30,7 +42,7 @@ class AppLink { static String updateAccountBank = "$authCaptin/updateAccountBank.php"; static String getAccount = "$authCaptin/getAccount.php"; static String test = "$server/test.php"; - static String serviceApp = "$server/serviceApp"; + static String serviceApp = "$server/serviceapp"; static String getPassengersByPhone = "$server/serviceApp/getPassengersByPhone.php"; static String getDriverByPhone = "$serviceApp/getDriverByPhone.php"; @@ -42,6 +54,7 @@ class AppLink { "$serviceApp/getPassengersNotCompleteRegistration.php"; static String addNotesDriver = "$serviceApp/addNotesDriver.php"; static String getCarPlateNotEdit = "$serviceApp/getCarPlateNotEdit.php"; + static String getdriverWithoutCar = "$serviceApp/getdriverWithoutCar.php"; static String addNotesPassenger = "$serviceApp/addNotesPassenger.php"; static String editCarPlate = "$serviceApp/editCarPlate.php"; static String getComplaintAllData = "$serviceApp/getComplaintAllData.php"; @@ -50,6 +63,7 @@ class AppLink { static String addCriminalDocuments = "$authCaptin/addCriminalDocuments.php"; static String ride = '$server/ride'; static String addRegisrationCar = "$ride/RegisrationCar/add.php"; + static String addCartoDriver = "$serviceApp/addCartoDriver.php"; static String getRegisrationCar = "$ride/RegisrationCar/get.php"; static String updateRegisrationCar = "$ride/RegisrationCar/update.php"; } diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index a461154..e87f75a 100644 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -143,6 +143,7 @@ class CRUD { Log.print('payload: ${payload}'); Log.print('response.request: ${response.request}'); Log.print('response.body: ${response.body}'); + Log.print('response.reasonPhrase: ${response.reasonPhrase}'); // print(response.statusCode); var jsonData = jsonDecode(response.body); if (response.statusCode == 200) { @@ -150,6 +151,7 @@ class CRUD { return response.body; } else { String errorMessage = jsonData['message']; + Log.print('errorMessage: ${errorMessage}'); // Get.snackbar('Error'.tr, errorMessage.tr, // backgroundColor: AppColor.redColor); return (jsonData['status']); diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index efe796a..10bc4e6 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -14,19 +14,24 @@ class MyTranslation extends Translations { "orange": "برتقالي", "pink": "وردي", "brown": "بني", - "gray": "رمادي", "Eggplant": "باذنجان", - "Dark Red": "نبيتي", - "Sky Blue": "ازرق سماوي", - "Mocha": "موكا", + "gray": "رمادي", "cyan": "سماوي", - "magenta": "أرجواني داكن", + "magenta": "بنفسجي", "lime": "ليموني", "indigo": "نيلي", "violet": "بنفسجي", + "raw gray": "رمادي ", "gold": "ذهبي", "silver": "فضي", "teal": "تركوازي", "navy": "كحلي", + "Eggplant": "باذنجان", + "Dark Red": "نبيتي", + "Sky Blue": "أزرق سماوي", + "Mocha": "موكا", + "Champagne": "شامبان", + "Bronze": "برونزي", + "Maroon": "ماروني", "Capture an Image of Your Criminal Record": "التقط صورة لسجلك الجنائي", "IssueDate": "تاريخ الإصدار", diff --git a/lib/controller/login_controller.dart b/lib/controller/login_controller.dart index 5644a73..ee94109 100644 --- a/lib/controller/login_controller.dart +++ b/lib/controller/login_controller.dart @@ -2,32 +2,40 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:service/constant/api_key.dart'; -import 'package:service/constant/box_name.dart'; import 'package:service/constant/links.dart'; import 'package:service/controller/functions/crud.dart'; -import 'package:service/main.dart'; import '../views/home/main.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; + class LoginController extends GetxController { var email = TextEditingController(); var password = TextEditingController(); final formKey = GlobalKey(); + // Use FlutterSecureStorage instead of GetStorage + final FlutterSecureStorage storage = const FlutterSecureStorage(); + void login() async { - if (box.read(BoxName.email) == AK.emailService) { - Get.off(Main()); + String? storedEmail = await storage.read(key: 'email'); + + if (storedEmail != null) { + Get.off(() => Main()); } else { if (formKey.currentState!.validate()) { var res = await CRUD().get(link: AppLink.login, payload: { "email": email.text, "password": password.text, }); + if (res != 'failure') { var d = jsonDecode(res); if (d['message'] == "Login successful") { - box.write(BoxName.email, email.text); + // Save data securely in FlutterSecureStorage + await storage.write(key: 'email', value: d['data']['email']); + await storage.write(key: 'name', value: d['data']['first_name']); + await storage.write(key: 'driverID', value: d['data']['id']); Get.off(() => Main()); } diff --git a/lib/controller/mainController/main_controller.dart b/lib/controller/mainController/main_controller.dart index 23594bc..3a62cd3 100644 --- a/lib/controller/mainController/main_controller.dart +++ b/lib/controller/mainController/main_controller.dart @@ -202,6 +202,91 @@ class MainController extends GetxController { } } + List driverWithoutCar = []; + getdriverWithoutCar() async { + var res = await CRUD().get(link: AppLink.getdriverWithoutCar, payload: {}); + if (res != 'failure') { + var d = jsonDecode(res)['message']; + driverWithoutCar = d; + update(); + } else { + MyDialog().getDialog('No Car found yet'.tr, 'thanks'.tr, const SizedBox(), + () { + Get.back(); + }); + } + } + + Future addRegistrationCarEgyptHandling({ + required String driverId, + required String carPlate, + required String color, + required String colorHex, + required String year, + required String make, + required String model, + required String expirationDate, + required String owner, + }) async { + try { + isLoading = true; + update(); + + var payload = { + 'driverID': driverId, + 'vin': 'vin', + 'car_plate': carPlate, + 'make': make, + 'model': model, + 'year': year, + 'expiration_date': expirationDate, + 'color': color, + 'owner': owner, + 'color_hex': colorHex, + 'address': 'addressCar', + 'displacement': 'displacement', + 'fuel': 'fuel', + 'registration_date': '2024-09-06', + }; + + Log.print('Payload: $payload'); + + var res = + await CRUD().post(link: AppLink.addCartoDriver, payload: payload); + + isLoading = false; + update(); + + var status = jsonDecode(res); + Log.print('res: $res'); + Log.print('status: $status'); + + if (status['status'] == 'success') { + await Future.wait([ + CRUD().post( + link: + '${AppLink.seferAlexandriaServer}/ride/RegisrationCar/add.php', + payload: payload), + CRUD().post( + link: '${AppLink.seferGizaServer}/ride/RegisrationCar/add.php', + payload: payload), + ]); + + Get.snackbar('Success', 'Registration successful', + backgroundColor: AppColor.greenColor); + Get.back(); + } else { + Log.print('Error: Unexpected status: ${status['status']}'); + Get.snackbar('Error', 'Registration failed', + backgroundColor: Colors.red); + } + } catch (e) { + Log.print('Error: $e'); + Get.snackbar('Error', 'An error occurred during registration', + backgroundColor: Colors.red); + } + } + editCarPlateNotEdit( String driverId, String carPlate, @@ -226,13 +311,14 @@ class MainController extends GetxController { }); Log.print('res: ${res}'); if (res != 'failure') { - Get.snackbar(res, '', backgroundColor: AppColor.greenColor); + // Get.snackbar(res, '', backgroundColor: AppColor.greenColor); + Get.back(); carplateController.clear(); yearController.clear(); makeController.clear(); modelController.clear(); ownerController.clear(); - Get.back(); + await getCarPlateNotEdit(); update(); } else { diff --git a/lib/controller/mainController/pages/add_car.dart b/lib/controller/mainController/pages/add_car.dart new file mode 100644 index 0000000..14d4137 --- /dev/null +++ b/lib/controller/mainController/pages/add_car.dart @@ -0,0 +1,318 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:intl/intl.dart'; +import 'package:service/constant/style.dart'; +import 'package:service/controller/mainController/pages/edit_car.dart'; +import 'package:service/views/widgets/my_scafold.dart'; + +import '../../../constant/colors.dart'; +import '../../../constant/links.dart'; +import '../../../print.dart'; +import '../../../views/widgets/my_textField.dart'; +import '../../functions/crud.dart'; +import '../main_controller.dart'; + +class AddCar extends StatelessWidget { + const AddCar({super.key}); + + @override + Widget build(BuildContext context) { + Get.put(MainController()); + + return GetBuilder(builder: (mainController) { + return MyScaffold( + title: 'Edit car details'.tr, + isleading: true, + body: [ + Expanded( + child: ListView.builder( + padding: const EdgeInsets.all(16.0), + itemCount: mainController + .driverWithoutCar.length, // 10 fields + 1 save button + itemBuilder: (context, index) { + var carData = mainController.driverWithoutCar[index]; + return Padding( + padding: const EdgeInsets.all(8.0), + child: InkWell( + onTap: () { + Get.to(AddCarForm(carData: carData)); + }, + child: Container( + decoration: AppStyle.boxDecoration1, + child: Text(carData['name_arabic'])), + ), + ); + }), + ), + ], + ); + }); + } +} + +class AddCarForm extends StatelessWidget { + final Map carData; + const AddCarForm({super.key, required this.carData}); + @override + Widget build(BuildContext context) { + Get.put(MainController()); + + return GetBuilder(builder: (mainController) { + return MyScaffold(title: 'Add Car', isleading: true, body: [ + ListView( + children: [ + Column( + children: [ + Image.network( + 'https://sefer.click/sefer/card_image/car_front-${carData['id']}.jpg', + height: 200, + width: double.maxFinite, + fit: BoxFit.fill, + ), + Image.network( + 'https://sefer.click/sefer/card_image/car_back-${carData['id']}.jpg', + height: 200, + width: double.maxFinite, + fit: BoxFit.fill, + ), + ], + ), + const SizedBox(height: 9), + Form( + key: mainController.formKey, + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + SizedBox( + width: Get.width * .6, + child: MyTextForm( + controller: mainController.carplateController, + label: 'car plate'.tr, + hint: 'car plate'.tr, + type: TextInputType.name, + ), + ), + IconButton( + onPressed: () async { + if (mainController.formKey.currentState!.validate()) { + await mainController + .addRegistrationCarEgyptHandling( + driverId: carData['id'].toString(), + carPlate: mainController.carplateController.text, + color: mainController.colorController.text, + colorHex: + mainController.colorHex.value.toString(), + year: mainController.yearController.text, + make: mainController.makeController.text, + model: mainController.modelController.text, + expirationDate: + mainController.expirationDateController.text, + owner: mainController.ownerController.text, + ); + } + }, + icon: const Icon( + Icons.upload_outlined, + color: AppColor.blueColor, + ), + ), + ], + ), + // Other fields + + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + SizedBox( + width: Get.width * .4, + child: MyTextForm( + controller: mainController.yearController, + label: 'Year'.tr, + hint: 'Year'.tr, + type: TextInputType.number, + ), + ), + SizedBox( + width: Get.width * .4, + child: DropdownButtonFormField( + decoration: InputDecoration( + labelText: 'Color'.tr, // Localized label + ), + value: mainController.colorHex.value.isEmpty + ? null + : mainController.colorHex + .value, // Use the hex value as the current value + items: [ + {'red'.tr: '#FF0000'}, + {'green'.tr: '#008000'}, + {'blue'.tr: '#0000FF'}, + {'black'.tr: '#000000'}, + {'white'.tr: '#FFFFFF'}, + {'yellow'.tr: '#FFFF00'}, + {'purple'.tr: '#800080'}, + {'orange'.tr: '#FFA500'}, + {'pink'.tr: '#FFC0CB'}, + {'brown'.tr: '#A52A2A'}, + {'gray'.tr: '#808080'}, + {'cyan'.tr: '#00FFFF'}, + {'magenta'.tr: '#FF00FF'}, + {'lime'.tr: '#00FF00'}, + {'indigo'.tr: '#4B0082'}, + {'violet'.tr: '#EE82EE'}, + {'gold'.tr: '#FFD700'}, + {'silver'.tr: '#C0C0C0'}, + {'teal'.tr: '#008080'}, + {'navy'.tr: '#000080'}, + ].map((colorMap) { + String colorName = colorMap.keys.first; + String colorValue = colorMap.values.first; + return DropdownMenuItem( + value: colorValue, + child: Text(colorName), + ); + }).toList(), + onChanged: (value) { + if (value != null) { + // Find the selected color name based on the hex value + String selectedColorName = ''; + for (var colorMap in [ + {'red'.tr: '#FF0000'}, + {'green'.tr: '#008000'}, + {'blue'.tr: '#0000FF'}, + {'black'.tr: '#000000'}, + {'white'.tr: '#FFFFFF'}, + {'yellow'.tr: '#FFFF00'}, + {'purple'.tr: '#800080'}, + {'orange'.tr: '#FFA500'}, + {'pink'.tr: '#FFC0CB'}, + {'brown'.tr: '#A52A2A'}, + {'gray'.tr: '#808080'}, + {'cyan'.tr: '#00FFFF'}, + {'magenta'.tr: '#FF00FF'}, + {'lime'.tr: '#00FF00'}, + {'indigo'.tr: '#4B0082'}, + {'violet'.tr: '#EE82EE'}, + {'gold'.tr: '#FFD700'}, + {'silver'.tr: '#C0C0C0'}, + {'teal'.tr: '#008080'}, + {'navy'.tr: '#000080'}, + ]) { + if (colorMap.values.first == value) { + selectedColorName = colorMap.keys.first; + break; + } + } + + mainController.colorController.text = + selectedColorName; + mainController.colorHex.value = value; + } + }, + ), + ), + ], + ), + + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + SizedBox( + width: Get.width * .4, + child: MyTextForm( + controller: mainController.makeController, + label: 'Make'.tr, + hint: 'Make'.tr, + type: TextInputType.name, + ), + ), + SizedBox( + width: Get.width * .4, + child: MyTextForm( + controller: mainController.modelController, + label: 'Model'.tr, + hint: 'Model'.tr, + type: TextInputType.name, + ), + ), + ], + ), + + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + SizedBox( + width: Get.width * .4, + child: TextField( + controller: mainController.expirationDateController, + decoration: InputDecoration( + labelText: 'Expiration Date'.tr, + hintText: 'Expiration Date'.tr, + ), + readOnly: + true, // Make the field read-only to prevent manual input + onTap: () async { + DateTime pickedDate = + DateTime.now(); // Declare the variable here + + await showCupertinoModalPopup( + context: context, + builder: (context) => Container( + height: 250, + color: Colors.white, + child: Column( + children: [ + SizedBox( + height: 150, + child: CupertinoDatePicker( + initialDateTime: pickedDate, + minimumDate: DateTime( + 1955), // Set the starting date + maximumDate: DateTime( + 2034), // Set the ending date + mode: CupertinoDatePickerMode.date, + onDateTimeChanged: (DateTime dateTime) { + pickedDate = dateTime; + }, + ), + ), + CupertinoButton( + child: Text('Done'.tr), + onPressed: () { + String formattedDate = + DateFormat('yyyy-MM-dd') + .format(pickedDate); + mainController.expirationDateController + .text = formattedDate.toString(); + Navigator.of(context).pop(); + }, + ), + ], + ), + ), + ); + }, + ), + ), + SizedBox( + width: Get.width * .4, + child: MyTextForm( + controller: mainController.ownerController, + label: 'Owner'.tr, + hint: 'Owner'.tr, + type: TextInputType.name, + ), + ), + ], + ), + ], + ), + ) + ], + ) + ]); + }); + } +} diff --git a/lib/controller/mainController/pages/edit_car.dart b/lib/controller/mainController/pages/edit_car.dart index f0b9a1f..70ca1f1 100644 --- a/lib/controller/mainController/pages/edit_car.dart +++ b/lib/controller/mainController/pages/edit_car.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; @@ -21,16 +22,36 @@ class EditCar extends StatelessWidget { Column( children: [ Image.network( - 'https://api.sefer.live/sefer/card_image/car_front-${carData['driverID']}.jpg', + 'https://sefer.click/sefer/card_image/car_front-${carData['driverID']}.jpg', height: 200, width: double.maxFinite, fit: BoxFit.fill, + errorBuilder: (BuildContext context, Object exception, + StackTrace? stackTrace) { + // If the image fails to load, use the _copy version + return Image.network( + 'https://sefer.click/sefer/card_image/car_front-${carData['driverID']}_copy.jpg', + height: 200, + width: double.maxFinite, + fit: BoxFit.fill, + ); + }, ), Image.network( - 'https://api.sefer.live/sefer/card_image/car_back-${carData['driverID']}.jpg', + 'https://sefer.click/sefer/card_image/car_back-${carData['driverID']}.jpg', height: 200, width: double.maxFinite, fit: BoxFit.fill, + errorBuilder: (BuildContext context, Object exception, + StackTrace? stackTrace) { + // If the image fails to load, use the _copy version + return Image.network( + 'https://sefer.click/sefer/card_image/car_back-${carData['driverID']}_copy.jpg', + height: 200, + width: double.maxFinite, + fit: BoxFit.fill, + ); + }, ), ], ), @@ -198,33 +219,55 @@ class EditCar extends StatelessWidget { children: [ SizedBox( width: Get.width * .4, - child: SizedBox( - width: Get.width * .4, - child: TextField( - controller: mainController.expirationDateController, - decoration: InputDecoration( - labelText: 'Expiration Date'.tr, - hintText: 'Expiration Date'.tr, - ), - readOnly: - true, // Make the field read-only to prevent manual input - onTap: () async { - DateTime? pickedDate = await showDatePicker( - context: context, - initialDate: DateTime.now(), - firstDate: - DateTime(2000), // Set the starting date - lastDate: DateTime(2101), // Set the ending date - ); - - if (pickedDate != null) { - String formattedDate = - DateFormat('yyyy-MM-dd').format(pickedDate); - mainController.expirationDateController.text = - formattedDate.toString(); - } - }, + child: TextField( + controller: mainController.expirationDateController, + decoration: InputDecoration( + labelText: 'Expiration Date'.tr, + hintText: 'Expiration Date'.tr, ), + readOnly: + true, // Make the field read-only to prevent manual input + onTap: () async { + DateTime pickedDate = + DateTime.now(); // Declare the variable here + + await showCupertinoModalPopup( + context: context, + builder: (context) => Container( + height: 250, + color: Colors.white, + child: Column( + children: [ + SizedBox( + height: 150, + child: CupertinoDatePicker( + initialDateTime: pickedDate, + minimumDate: DateTime( + 1955), // Set the starting date + maximumDate: DateTime( + 2034), // Set the ending date + mode: CupertinoDatePickerMode.date, + onDateTimeChanged: (DateTime dateTime) { + pickedDate = dateTime; + }, + ), + ), + CupertinoButton( + child: Text('Done'.tr), + onPressed: () { + String formattedDate = + DateFormat('yyyy-MM-dd') + .format(pickedDate); + mainController.expirationDateController + .text = formattedDate.toString(); + Navigator.of(context).pop(); + }, + ), + ], + ), + ), + ); + }, ), ), SizedBox( diff --git a/lib/controller/mainController/registration_captain_controller.dart b/lib/controller/mainController/registration_captain_controller.dart index 3ca36af..8dadf4e 100644 --- a/lib/controller/mainController/registration_captain_controller.dart +++ b/lib/controller/mainController/registration_captain_controller.dart @@ -451,6 +451,7 @@ class RegisterCaptainController extends GetxController { Future addDriverEgypt() async { isLoading = true; update(); + var added = await storage.read(key: 'name'); var payload = { 'first_name': responseIdEgyptDriverLicense['firstName']?.toString() ?? @@ -495,8 +496,7 @@ class RegisterCaptainController extends GetxController { 'status': 'yet', 'birthdate': extractDOB( responseIdEgyptDriverLicense['national_number'].toString()), - 'maritalStatus': - responseIdEgyptBack['maritalStatus']?.toString() ?? 'Not specified', + 'maritalStatus': added.toString(), 'site': responseIdEgyptDriverLicense['address']?.toString() ?? 'Not specified', 'employmentType': @@ -510,6 +510,14 @@ class RegisterCaptainController extends GetxController { // Handle response if (status1['status'] == 'success') { isDriverSaved = true; + var res = CRUD().post( + link: '${AppLink.seferGizaServer}/auth/captin/register.php', + payload: payload); + Log.print('res: ${res}'); + var res1 = CRUD().post( + link: '${AppLink.seferAlexandriaServer}/auth/captin/register.php', + payload: payload); + Log.print('res: ${res1}'); Get.snackbar('Success', 'Driver data saved successfully', backgroundColor: AppColor.greenColor); } else { @@ -521,7 +529,7 @@ class RegisterCaptainController extends GetxController { Future addDriverEgyptHanding() async { isLoading = true; update(); - + var added = await storage.read(key: 'name'); var payload = { 'first_name': firstName.value.isNotEmpty ? firstName.value @@ -581,9 +589,7 @@ class RegisterCaptainController extends GetxController { ? extractDOB(responseIdEgyptBack['nationalID']) : extractDOB( responseIdEgyptDriverLicense['national_number'].toString()), - 'maritalStatus': maritalStatus.value.isNotEmpty - ? maritalStatus.value - : responseIdEgyptBack['maritalStatus'], + 'maritalStatus': added.toString(), 'site': site.value.isNotEmpty ? site.value : responseIdEgyptDriverLicense['address'], @@ -600,6 +606,12 @@ class RegisterCaptainController extends GetxController { // Handle response if (status1['status'] == 'success') { isDriverSaved = true; + CRUD().post( + link: '${AppLink.seferGizaServer}/auth/captin/register.php', + payload: payload); + CRUD().post( + link: '${AppLink.seferAlexandriaServer}/auth/captin/register.php', + payload: payload); Get.snackbar('Success', 'Driver data saved successfully', backgroundColor: AppColor.greenColor); } else { @@ -616,6 +628,22 @@ class RegisterCaptainController extends GetxController { }); if (res != 'failure') { Get.snackbar('uploaded sucssefuly'.tr, ''); + CRUD().post( + link: + '${AppLink.seferAlexandriaServer}/auth/captin/addCriminalDocuments.php', + payload: { + "driverId": box.read(BoxName.driverID), + "IssueDate": responseCriminalRecordEgypt['IssueDate'], + "InspectionResult": responseCriminalRecordEgypt['InspectionResult'], + }); + CRUD().post( + link: + '${AppLink.seferGizaServer}/auth/captin/addCriminalDocuments.php', + payload: { + "driverId": box.read(BoxName.driverID), + "IssueDate": responseCriminalRecordEgypt['IssueDate'], + "InspectionResult": responseCriminalRecordEgypt['InspectionResult'], + }); } } @@ -686,6 +714,54 @@ class RegisterCaptainController extends GetxController { var status = jsonDecode(res); if (status['status'] == 'success') { isCarSaved = true; + CRUD().post( + link: + '${AppLink.seferAlexandriaServer}/ride/RegisrationCar/add.php', + payload: { + 'driverID': driverId, + 'vin': responseIdCardDriverEgyptBack['chassis'].toString(), + 'car_plate': + responseIdCardDriverEgyptFront['car_plate'].toString(), + 'make': responseIdCardDriverEgyptBack['make'].toString(), + 'model': responseIdCardDriverEgyptBack['model'], + 'year': responseIdCardDriverEgyptBack['year'].toString(), + 'expiration_date': + responseIdCardDriverEgyptFront['LicenseExpirationDate'] + .toString(), + 'color': responseIdCardDriverEgyptBack['color'], + 'owner': responseIdCardDriverEgyptFront['owner'], + 'color_hex': + responseIdCardDriverEgyptBack['color_hex'].toString(), + 'address': responseIdCardDriverEgyptFront['address'].toString(), + 'displacement': + responseIdCardDriverEgyptBack['engine'].toString(), + 'fuel': responseIdCardDriverEgyptBack['fuel'].toString(), + 'registration_date': '$inspectionDateTime', + }); + CRUD().post( + link: '${AppLink.seferGizaServer}/ride/RegisrationCar/add.php', + payload: { + 'driverID': driverId, + 'vin': responseIdCardDriverEgyptBack['chassis'].toString(), + 'car_plate': + responseIdCardDriverEgyptFront['car_plate'].toString(), + 'make': responseIdCardDriverEgyptBack['make'].toString(), + 'model': responseIdCardDriverEgyptBack['model'], + 'year': responseIdCardDriverEgyptBack['year'].toString(), + 'expiration_date': + responseIdCardDriverEgyptFront['LicenseExpirationDate'] + .toString(), + 'color': responseIdCardDriverEgyptBack['color'], + 'owner': responseIdCardDriverEgyptFront['owner'], + 'color_hex': + responseIdCardDriverEgyptBack['color_hex'].toString(), + 'address': responseIdCardDriverEgyptFront['address'].toString(), + 'displacement': + responseIdCardDriverEgyptBack['engine'].toString(), + 'fuel': responseIdCardDriverEgyptBack['fuel'].toString(), + 'registration_date': '$inspectionDateTime', + }); + Get.snackbar('Success', 'message', backgroundColor: AppColor.greenColor); } @@ -758,6 +834,14 @@ class RegisterCaptainController extends GetxController { if (status['status'] == 'success') { isCarSaved = true; + CRUD().post( + link: + '${AppLink.seferAlexandriaServer}/ride/RegisrationCar/add.php', + payload: payload); + + CRUD().post( + link: '${AppLink.seferGizaServer}/ride/RegisrationCar/add.php', + payload: payload); Get.snackbar('Success', 'Registration successful', backgroundColor: AppColor.greenColor); Get.back(); @@ -775,30 +859,31 @@ class RegisterCaptainController extends GetxController { String getColorHex(String colorName) { Map colorMap = { - 'red'.tr: '#FF0000', - 'green'.tr: '#008000', - 'blue'.tr: '#0000FF', - 'black'.tr: '#000000', 'white'.tr: '#FFFFFF', - 'yellow'.tr: '#FFFF00', - 'purple'.tr: '#800080', - 'orange'.tr: '#FFA500', - 'pink'.tr: '#FFC0CB', - 'brown'.tr: '#A52A2A', + 'maroon'.tr: '#800000', // Nabeeti + 'red'.tr: '#FF0000', 'gray'.tr: '#808080', - 'cyan'.tr: '#00FFFF', - 'magenta'.tr: '#FF00FF', - 'lime'.tr: '#00FF00', - 'indigo'.tr: '#4B0082', - 'violet'.tr: '#EE82EE', - 'gold'.tr: '#FFD700', + 'green'.tr: '#008000', + 'navy blue'.tr: '#000080', + 'pink'.tr: '#FFC0CB', + 'black'.tr: '#000000', + 'dark blue'.tr: '#003366', + 'turquoise'.tr: '#40E0D0', + 'blue'.tr: '#0000FF', + 'red ochre'.tr: '#C72C48', 'silver'.tr: '#C0C0C0', - 'teal'.tr: '#008080', - 'navy'.tr: '#000080', - 'Eggplant'.tr: '#800000', // Eggplant - 'Dark Red'.tr: '#8B0000', // Dark Red (Maroon) - 'Sky Blue'.tr: '#87CEEB', // Sky Blue - 'Mocha'.tr: '#C3B091', // Mocha + 'mocha'.tr: '#3B2E2A', + 'tawny'.tr: '#D2B48C', + 'gold'.tr: '#FFD700', + 'verdi'.tr: '#008000', + 'orange'.tr: '#FFA500', + 'peach'.tr: '#FFDAB9', + 'brown'.tr: '#A52A2A', + 'raw gray'.tr: '#6C6E6E', + 'champagne'.tr: '#F7E7CE', // Champagne + 'bronze'.tr: '#CD7F32', // Bronze + 'red'.tr: '#FF0000', // Red + 'maroon'.tr: '#800000' // Maroon }; return colorMap[colorName.toLowerCase()] ?? @@ -879,15 +964,16 @@ class RegisterCaptainController extends GetxController { final response = await http.post( Uri.parse('https://api.anthropic.com/v1/messages'), headers: { - 'x-api-key': AK.anthropicAIkeySeferNew, + 'x-api-key': AK.anthropicAIkeySeferNewHamzaayedpython, 'anthropic-version': '2023-06-01', 'content-type': 'application/json' }, body: requestBody, ); - + Log.print('responseData: ${response.body}'); if (response.statusCode == 200) { var responseData = jsonDecode(utf8.decode(response.bodyBytes)); + Log.print('responseData: ${responseData}'); // Process the responseData as needed if (idType == 'car_back') { responseIdCardDriverEgyptBack = diff --git a/lib/env/env.dart b/lib/env/env.dart index f1922f6..4f68fb8 100644 --- a/lib/env/env.dart +++ b/lib/env/env.dart @@ -19,9 +19,26 @@ abstract class Env { @EnviedField(varName: 'serverPHP', obfuscate: true) static final String serverPHP = _Env.serverPHP; + @EnviedField(varName: 'seferAlexandriaServer', obfuscate: true) + static final String seferAlexandriaServer = _Env.seferAlexandriaServer; + + @EnviedField(varName: 'seferPaymentServer', obfuscate: true) + static final String seferPaymentServer = _Env.seferPaymentServer; + + @EnviedField(varName: 'seferCairoServer', obfuscate: true) + static final String seferCairoServer = _Env.seferCairoServer; + + @EnviedField(varName: 'seferGizaServer', obfuscate: true) + static final String seferGizaServer = _Env.seferGizaServer; + @EnviedField(varName: 'anthropicAIkeySeferNew', obfuscate: true) static final String anthropicAIkeySeferNew = _Env.anthropicAIkeySeferNew; + @EnviedField( + varName: 'anthropicAIkeySeferNewHamzaayedpython', obfuscate: true) + static final String anthropicAIkeySeferNewHamzaayedpython = + _Env.anthropicAIkeySeferNewHamzaayedpython; + @EnviedField(varName: 'A', obfuscate: true) static final String A = _Env.A; diff --git a/lib/env/env.g.dart b/lib/env/env.g.dart index 3c4ca5c..4278b72 100644 --- a/lib/env/env.g.dart +++ b/lib/env/env.g.dart @@ -10,69 +10,69 @@ part of 'env.dart'; // ignore_for_file: type=lint final class _Env { static const List _enviedkeybasicAuthCredentials = [ - 4271332490, - 741285038, - 3890551357, - 2969468822, - 3298912777, - 285971608, - 734512416, - 3966720953, - 3669772569, - 4029650785, - 2365909470, - 3252048899, - 665085524, - 882337256, - 1775379256, - 782629773, - 1653524737, - 1581541550, - 2131008669, - 1480927037, - 2381996087, - 209491040, - 3781262706, - 2865596003, - 1189563889, - 3635375786, - 2370642200, - 1527164422, - 3462851634, - 453178882, + 3343412887, + 25994839, + 1505491043, + 3107875630, + 1896553006, + 2729711164, + 1135405293, + 2186140691, + 278421488, + 2566521006, + 2590417462, + 4219000796, + 4153320058, + 1917092300, + 737918386, + 3855108830, + 3637150784, + 873680458, + 1826219588, + 1650988755, + 110302950, + 4170374274, + 1626482558, + 1057211791, + 2660785146, + 1996517917, + 2783919308, + 1737283180, + 752945099, + 1721898769, ]; static const List _envieddatabasicAuthCredentials = [ - 4271332605, - 741285087, - 3890551379, - 2969468923, - 3298912888, - 285971689, - 734512467, - 3966720979, - 3669772640, - 4029650711, - 2365909417, - 3252049013, - 665085550, - 882337158, - 1775379273, - 782629887, - 1653524824, - 1581541604, - 2131008717, - 1480927101, - 2381996038, - 209491031, - 3781262657, - 2865595988, - 1189563817, - 3635375832, - 2370642240, - 1527164522, - 3462851696, - 453178990, + 3343412960, + 25994790, + 1505490957, + 3107875651, + 1896553055, + 2729711181, + 1135405214, + 2186140793, + 278421385, + 2566521048, + 2590417473, + 4219000746, + 4153320000, + 1917092258, + 737918403, + 3855108780, + 3637150745, + 873680384, + 1826219540, + 1650988691, + 110302935, + 4170374325, + 1626482509, + 1057211832, + 2660785058, + 1996517999, + 2783919252, + 1737283072, + 752945033, + 1721898877, ]; static final String basicAuthCredentials = String.fromCharCodes( @@ -85,85 +85,85 @@ final class _Env { _enviedkeybasicAuthCredentials[i])); static const List _enviedkeyvisionApi = [ - 2195418489, - 1438376812, - 3205076404, - 2052134025, - 405486497, - 2457944955, - 3288645880, - 4284106946, - 3492464021, - 2029567873, - 2216743504, - 4134329042, - 490044520, - 664536439, - 2469587509, - 4006796325, - 3356872204, - 2845233252, - 2514268427, - 1806105889, - 2777769828, - 3866348895, - 2287948427, - 3559167301, - 1485512721, - 1406023785, - 3337847444, - 3883305539, - 1056144763, - 2881637106, - 3587627574, - 1998051979, - 983706298, - 1797213595, - 3131855867, - 666688344, - 149645933, - 3773683369, + 3534614768, + 3632522503, + 3744298753, + 143752490, + 4089039761, + 984435222, + 2592956577, + 2225215755, + 336847453, + 3960240959, + 1248237419, + 2986102856, + 2197774372, + 2060418629, + 1385472449, + 1538787777, + 2782451422, + 3716123233, + 641205486, + 2469039232, + 3437414706, + 809712070, + 870778170, + 1029458869, + 2380467266, + 141118684, + 1642844507, + 281486214, + 3118447633, + 4231283448, + 2290108975, + 1488942307, + 79338812, + 2819776986, + 4248927040, + 2616789836, + 864127157, + 1858322081, ]; static const List _envieddatavisionApi = [ - 2195418442, - 1438376732, - 3205076469, - 2052134085, - 405486546, - 2457944842, - 3288645803, - 4284106897, - 3492464076, - 2029567957, - 2216743462, - 4134329000, - 490044440, - 664536385, - 2469587468, - 4006796404, - 3356872249, - 2845233186, - 2514268486, - 1806105960, - 2777769731, - 3866348861, - 2287948529, - 3559167279, - 1485512790, - 1406023775, - 3337847502, - 3883305586, - 1056144641, - 2881637017, - 3587627586, - 1998052033, - 983706338, - 1797213673, - 3131855779, - 666688308, - 149645871, - 3773683397, + 3534614723, + 3632522615, + 3744298816, + 143752550, + 4089039842, + 984435303, + 2592956658, + 2225215832, + 336847364, + 3960241003, + 1248237341, + 2986102834, + 2197774420, + 2060418675, + 1385472504, + 1538787728, + 2782451435, + 3716123175, + 641205411, + 2469039305, + 3437414741, + 809712036, + 870778176, + 1029458911, + 2380467205, + 141118698, + 1642844417, + 281486263, + 3118447723, + 4231283347, + 2290109019, + 1488942249, + 79338852, + 2819776936, + 4248927000, + 2616789792, + 864127223, + 1858322125, ]; static final String visionApi = String.fromCharCodes(List.generate( @@ -173,41 +173,41 @@ final class _Env { ).map((int i) => _envieddatavisionApi[i] ^ _enviedkeyvisionApi[i])); static const List _enviedkeysmsPasswordEgypt = [ - 2247798146, - 2163977542, - 29050108, - 1880417915, - 1497579982, - 3337593391, - 1680910399, - 3789186271, - 2550779950, - 2794956908, - 923602056, - 3927690241, - 162095915, - 3689776503, - 72608618, - 127437252, + 2856442956, + 1079140821, + 2347229274, + 358409151, + 431887991, + 3544943292, + 755719386, + 653106648, + 1481074336, + 2980629434, + 353442331, + 1623172440, + 1086292895, + 2991275012, + 468737644, + 3567078258, ]; static const List _envieddatasmsPasswordEgypt = [ - 2247798216, - 2163977583, - 29050026, - 1880417811, - 1497580019, - 3337593438, - 1680910429, - 3789186288, - 2550780014, - 2794956833, - 923602128, - 3927690355, - 162095987, - 3689776411, - 72608552, - 127437224, + 2856442886, + 1079140860, + 2347229196, + 358409175, + 431887946, + 3544943309, + 755719352, + 653106679, + 1481074400, + 2980629495, + 353442371, + 1623172394, + 1086292935, + 2991275112, + 468737582, + 3567078174, ]; static final String smsPasswordEgypt = String.fromCharCodes( @@ -219,73 +219,73 @@ final class _Env { _envieddatasmsPasswordEgypt[i] ^ _enviedkeysmsPasswordEgypt[i])); static const List _enviedkeyocpApimSubscriptionKey = [ - 160401101, - 467780958, - 941458277, - 2062952547, - 834902546, - 1939352146, - 130767826, - 3537236756, - 4097656136, - 2941876117, - 2667002599, - 2565141654, - 812262258, - 788543938, - 1982631524, - 1205909072, - 2134319838, - 3007453817, - 1946150072, - 963843122, - 2759454558, - 425256588, - 1264872793, - 1971284826, - 689324380, - 2298006332, - 1376986613, - 1640910083, - 2844639101, - 1644650037, - 1835692850, - 2872069392, + 1848316248, + 3125360627, + 4103113674, + 4032768888, + 927597389, + 3736895145, + 2206031723, + 1333823146, + 2220035162, + 2438448601, + 1268048756, + 653808300, + 438033726, + 1768287860, + 378599946, + 289219063, + 1452316493, + 3207200615, + 4154554530, + 1117374407, + 4284462946, + 898720404, + 3988529742, + 2701667402, + 115050277, + 3967666125, + 1641054667, + 3391549399, + 3221487538, + 1841092389, + 4196501790, + 3569959675, ]; static const List _envieddataocpApimSubscriptionKey = [ - 160401149, - 467780920, - 941458256, - 2062952455, - 834902643, - 1939352113, - 130767793, - 3537236855, - 4097656108, - 2941876215, - 2667002500, - 2565141747, - 812262214, - 788543987, - 1982631511, - 1205909089, - 2134319804, - 3007453768, - 1946150105, - 963843079, - 2759454520, - 425256629, - 1264872812, - 1971284840, - 689324389, - 2298006277, - 1376986563, - 1640910128, - 2844639053, - 1644649991, - 1835692887, - 2872069411, + 1848316264, + 3125360533, + 4103113727, + 4032768796, + 927597356, + 3736895178, + 2206031624, + 1333823177, + 2220035134, + 2438448571, + 1268048663, + 653808329, + 438033674, + 1768287813, + 378599993, + 289219014, + 1452316463, + 3207200598, + 4154554563, + 1117374450, + 4284462852, + 898720429, + 3988529787, + 2701667448, + 115050268, + 3967666164, + 1641054717, + 3391549412, + 3221487490, + 1841092375, + 4196501883, + 3569959624, ]; static final String ocpApimSubscriptionKey = String.fromCharCodes( @@ -298,65 +298,65 @@ final class _Env { _enviedkeyocpApimSubscriptionKey[i])); static const List _enviedkeyserverPHP = [ - 3339055252, - 1947180857, - 122716488, - 2641116858, - 1502729916, - 604625745, - 3666906835, - 1765598889, - 979829229, - 162149189, - 1218274121, - 1479277938, - 2258459999, - 1864840930, - 2718131683, - 1370915420, - 1921531757, - 4204494046, - 394217454, - 749171991, - 1403838915, - 3084842735, - 1702460263, - 2381658546, - 2713574400, - 3306975509, - 3451414090, - 1614776215, + 1603711220, + 153743229, + 975125905, + 580196702, + 2163289988, + 620801245, + 1510128853, + 3565662189, + 2404538189, + 1439825044, + 1310564259, + 3735619335, + 3586186090, + 4018634919, + 3141408670, + 2744288492, + 4214145099, + 1377682672, + 1222742405, + 3670022181, + 3301596337, + 3146252530, + 568178076, + 2534254956, + 3936511583, + 4166600499, + 462921167, + 3571848888, ]; static const List _envieddataserverPHP = [ - 3339055356, - 1947180877, - 122716476, - 2641116874, - 1502729935, - 604625771, - 3666906876, - 1765598854, - 979829132, - 162149173, - 1218274080, - 1479277916, - 2258459948, - 1864840839, - 2718131589, - 1370915385, - 1921531679, - 4204494064, - 394217346, - 749172094, - 1403838901, - 3084842634, - 1702460232, - 2381658561, - 2713574501, - 3306975603, - 3451414063, - 1614776293, + 1603711132, + 153743113, + 975125989, + 580196654, + 2163290103, + 620801255, + 1510128890, + 3565662146, + 2404538156, + 1439825124, + 1310564298, + 3735619369, + 3586186009, + 4018634946, + 3141408760, + 2744288393, + 4214145081, + 1377682654, + 1222742505, + 3670022220, + 3301596359, + 3146252439, + 568178099, + 2534254879, + 3936511546, + 4166600533, + 462921130, + 3571848906, ]; static final String serverPHP = String.fromCharCodes(List.generate( @@ -365,238 +365,534 @@ final class _Env { growable: false, ).map((int i) => _envieddataserverPHP[i] ^ _enviedkeyserverPHP[i])); + static const List _enviedkeyseferAlexandriaServer = [ + 1038911136, + 2509717604, + 1642570781, + 758636419, + 3011581009, + 1804109540, + 2457731411, + 3870141809, + 3766947084, + 599869394, + 739137316, + 751989904, + 488904797, + 2351282039, + 3814357716, + 674163206, + 3897580703, + 3611422100, + 4236300172, + 2485812265, + 1496938860, + 2280988300, + 1073623790, + 2628481426, + 2258433749, + 759648860, + 4039282829, + 3194463872, + 822271881, + 1803002684, + 471246258, + 3268848765, + 1518270872, + 1092288329, + ]; + + static const List _envieddataseferAlexandriaServer = [ + 1038911176, + 2509717520, + 1642570857, + 758636531, + 3011580962, + 1804109534, + 2457731452, + 3870141790, + 3766947199, + 599869367, + 739137346, + 751990005, + 488904751, + 2351281942, + 3814357688, + 674163299, + 3897580775, + 3611422197, + 4236300258, + 2485812301, + 1496938782, + 2280988389, + 1073623695, + 2628481468, + 2258433702, + 759648821, + 4039282937, + 3194463973, + 822271910, + 1803002703, + 471246295, + 3268848667, + 1518270973, + 1092288315, + ]; + + static final String seferAlexandriaServer = String.fromCharCodes( + List.generate( + _envieddataseferAlexandriaServer.length, + (int i) => i, + growable: false, + ).map((int i) => + _envieddataseferAlexandriaServer[i] ^ + _enviedkeyseferAlexandriaServer[i])); + + static const List _enviedkeyseferPaymentServer = [ + 2981046051, + 3916157585, + 318003501, + 4290492730, + 2744961346, + 4001684849, + 252629598, + 1374838494, + 991135124, + 2674023988, + 2035898962, + 2720952979, + 664304796, + 546440723, + 3146983633, + 2315139807, + 397487018, + 4181243717, + 898628051, + 3332017471, + 2162295917, + 2046642775, + 2940771884, + 2841491339, + 1375079118, + 1578057297, + 2081041084, + 2573611276, + 1059297990, + 342518595, + 1190590475, + ]; + + static const List _envieddataseferPaymentServer = [ + 2981046091, + 3916157669, + 318003545, + 4290492746, + 2744961329, + 4001684811, + 252629617, + 1374838513, + 991135207, + 2674024017, + 2035898932, + 2720953078, + 664304878, + 546440803, + 3146983590, + 2315139825, + 397487065, + 4181243693, + 898628028, + 3332017487, + 2162295874, + 2046642724, + 2940771913, + 2841491437, + 1375079083, + 1578057251, + 2081041043, + 2573611390, + 1059297967, + 342518567, + 1190590574, + ]; + + static final String seferPaymentServer = String.fromCharCodes( + List.generate( + _envieddataseferPaymentServer.length, + (int i) => i, + growable: false, + ).map((int i) => + _envieddataseferPaymentServer[i] ^ _enviedkeyseferPaymentServer[i])); + + static const List _enviedkeyseferCairoServer = [ + 3837467923, + 2087608188, + 502476402, + 451103890, + 4241154698, + 1998234296, + 1019390222, + 707328947, + 3826786575, + 2974149048, + 2245275143, + 3994536713, + 1216503096, + 1541440863, + 3958568544, + 3353904406, + 519279938, + 733649536, + 489512790, + 2259528463, + 3902194474, + 1145048899, + 127400212, + 3448917008, + 2641926905, + ]; + + static const List _envieddataseferCairoServer = [ + 3837468027, + 2087608072, + 502476294, + 451103970, + 4241154809, + 1998234242, + 1019390241, + 707328924, + 3826786684, + 2974149085, + 2245275233, + 3994536812, + 1216503114, + 1541440881, + 3958568451, + 3353904506, + 519279915, + 733649635, + 489512765, + 2259528480, + 3902194521, + 1145048870, + 127400306, + 3448917109, + 2641926795, + ]; + + static final String seferCairoServer = String.fromCharCodes( + List.generate( + _envieddataseferCairoServer.length, + (int i) => i, + growable: false, + ).map((int i) => + _envieddataseferCairoServer[i] ^ _enviedkeyseferCairoServer[i])); + + static const List _enviedkeyseferGizaServer = [ + 3871272497, + 2828705169, + 136706989, + 3025488881, + 2750922996, + 2948619466, + 406771097, + 3120390602, + 3734363522, + 508985825, + 1847906315, + 1506029666, + 2841685713, + 639538530, + 3735542273, + 2389521129, + 232758545, + 1546897934, + 1428409014, + 1914876310, + 1798297538, + 713791671, + 1707132525, + 1383609989, + 1545726964, + 2591777767, + 3784514560, + 1083921715, + 3017732274, + 1355942387, + ]; + + static const List _envieddataseferGizaServer = [ + 3871272537, + 2828705253, + 136707033, + 3025488769, + 2750922887, + 2948619504, + 406771126, + 3120390629, + 3734363621, + 508985736, + 1847906417, + 1506029571, + 2841685666, + 639538439, + 3735542375, + 2389521036, + 232758627, + 1546897952, + 1428409049, + 1914876408, + 1798297518, + 713791710, + 1707132419, + 1383610080, + 1545726939, + 2591777684, + 3784514661, + 1083921749, + 3017732311, + 1355942273, + ]; + + static final String seferGizaServer = String.fromCharCodes(List.generate( + _envieddataseferGizaServer.length, + (int i) => i, + growable: false, + ).map( + (int i) => _envieddataseferGizaServer[i] ^ _enviedkeyseferGizaServer[i])); + static const List _enviedkeyanthropicAIkeySeferNew = [ - 2611045148, - 335904894, - 631235918, - 3093245005, - 1611020031, - 1673133536, - 3227501371, - 3182450493, - 1191896880, - 2980551565, - 2940153520, - 2543400596, - 1260759781, - 2888239686, - 2459278622, - 1885772041, - 3292697462, - 3943802616, - 3743215262, - 1166282399, - 677963534, - 1889399300, - 2317986828, - 844883764, - 2006558403, - 3471706808, - 1406396403, - 4212693549, - 3470505618, - 1662836814, - 3107737028, - 714492230, - 450840923, - 258707320, - 1765257202, - 2353804053, - 348871133, - 3884878411, - 2098167478, - 3352252201, - 2919962250, - 2707095372, - 3333151500, - 1602567700, - 474624510, - 1138090226, - 370915373, - 2059519836, - 3887048375, - 3154656834, - 165843811, - 2888067078, - 1226231041, - 3250369623, - 2588594584, - 1951636401, - 1963034280, - 1950210541, - 663666461, - 3489093475, - 1378097227, - 3272037870, - 3918731095, - 3610020500, - 570652256, - 4056716478, - 1576546559, - 97734187, - 771505336, - 3883123376, - 3479639395, - 3767805689, - 3582492146, - 3095177960, - 1853565518, - 2341951288, - 3438421981, - 1041733896, - 2276459457, - 232938143, - 1867483501, - 2301556629, - 2362646200, - 3255691225, - 446925541, - 3189649080, - 2481264299, - 194267208, - 3032808315, - 2987335625, - 228008653, - 508628288, - 1876807280, - 408533642, - 3057417854, - 1713617172, - 3610082797, - 188064665, - 3025957411, - 3442342821, - 597663524, - 2985655156, - 3952925594, - 2836480569, - 1251317244, - 1966349982, - 3132122965, - 2391408049, - 2746282420, - 1468910323, - 3153895347, - 3043301972, - 3647350752, - 168504020, + 948000331, + 1940723739, + 1466933606, + 1882001734, + 447083063, + 2864764351, + 4058056621, + 3339910800, + 2308440731, + 883250975, + 2955085299, + 2738313732, + 1568932420, + 4108558446, + 3398851265, + 77689088, + 3810480931, + 2894437379, + 3411289933, + 3601244738, + 54568101, + 3743808332, + 1344631232, + 363605277, + 2229398589, + 3208222024, + 2963614481, + 4150571065, + 1112989807, + 2941108804, + 1236450294, + 3779959080, + 2706057710, + 567144268, + 3133213115, + 4005501186, + 1168537252, + 1510188941, + 576575487, + 1884106655, + 3664180244, + 2770047339, + 3917343914, + 3694760595, + 4067527088, + 1719223951, + 382370292, + 3375616833, + 993638879, + 1245730286, + 757620695, + 2436218556, + 1975653466, + 877029394, + 2336047561, + 1638200286, + 1302018289, + 3763030, + 3389956498, + 688040406, + 3746267656, + 504702303, + 2504218741, + 130287964, + 3147919959, + 842075536, + 3253791234, + 1965396668, + 232421523, + 2792725671, + 2402182982, + 737975191, + 3489287137, + 1215031606, + 4163245288, + 211997226, + 2645176942, + 1296862695, + 3492404266, + 2610903810, + 666591586, + 2717029822, + 4260978019, + 3030567690, + 646959632, + 3011305006, + 759201390, + 3081458502, + 2702398346, + 1329547056, + 563499023, + 1452725528, + 437593502, + 2309590949, + 1891305050, + 157551885, + 645935795, + 4245659505, + 821531883, + 1693255647, + 766219161, + 3850113746, + 2197449933, + 1874832650, + 792286258, + 1809307037, + 1217541957, + 2844699363, + 2015549028, + 730154670, + 3678418068, + 2906141710, + 2094788735, + 72660032, ]; static const List _envieddataanthropicAIkeySeferNew = [ - 2611045222, - 335904793, - 631235939, - 3093244988, - 1611019933, - 1673133443, - 3227501334, - 3182450508, - 1191896902, - 2980551650, - 2940153475, - 2543400621, - 1260759752, - 2888239656, - 2459278634, - 1885772127, - 3292697362, - 3943802549, - 3743215311, - 1166282410, - 677963616, - 1889399409, - 2317986886, - 844883793, - 2006558346, - 3471706849, - 1406396315, - 4212693600, - 3470505692, - 1662836858, - 3107736980, - 714492162, - 450840834, - 258707210, - 1765257157, - 2353804132, - 348871090, - 3884878387, - 2098167429, - 3352252164, - 2919962366, - 2707095422, - 3333151589, - 1602567717, - 474624434, - 1138090138, - 370915354, - 2059519805, - 3887048441, - 3154656790, - 165843751, - 2888067168, - 1226231128, - 3250369553, - 2588594613, - 1951636470, - 1963034318, - 1950210517, - 663666538, - 3489093387, - 1378097182, - 3272037796, - 3918731021, - 3610020567, - 570652179, - 4056716426, - 1576546504, - 97734254, - 771505373, - 3883123413, - 3479639311, - 3767805618, - 3582492060, - 3095177936, - 1853565457, - 2341951341, - 3438421950, - 1041733989, - 2276459412, - 232938194, - 1867483392, - 2301556732, - 2362646251, - 3255691157, - 446925444, - 3189649118, - 2481264283, - 194267165, - 3032808241, - 2987335598, - 228008701, - 508628228, - 1876807174, - 408533727, - 3057417746, - 1713617221, - 3610082719, - 188064733, - 3025957463, - 3442342792, - 597663507, - 2985655106, - 3952925657, - 2836480619, - 1251317134, - 1966350069, - 3132122884, - 2391408096, - 2746282476, - 1468910209, - 3153895403, - 3043301944, - 3647350690, - 168503992, + 948000305, + 1940723836, + 1466933579, + 1882001719, + 447083093, + 2864764380, + 4058056576, + 3339910881, + 2308440813, + 883251056, + 2955085248, + 2738313789, + 1568932457, + 4108558336, + 3398851317, + 77689174, + 3810480967, + 2894437454, + 3411289884, + 3601244791, + 54568139, + 3743808313, + 1344631178, + 363605368, + 2229398644, + 3208221969, + 2963614585, + 4150571124, + 1112989729, + 2941108848, + 1236450214, + 3779959148, + 2706057655, + 567144254, + 3133213068, + 4005501299, + 1168537291, + 1510189045, + 576575436, + 1884106674, + 3664180320, + 2770047321, + 3917343939, + 3694760610, + 4067527164, + 1719224039, + 382370243, + 3375616800, + 993638801, + 1245730234, + 757620627, + 2436218586, + 1975653379, + 877029460, + 2336047588, + 1638200217, + 1302018199, + 3763054, + 3389956581, + 688040382, + 3746267741, + 504702229, + 2504218671, + 130287903, + 3147919908, + 842075556, + 3253791285, + 1965396729, + 232421622, + 2792725698, + 2402182954, + 737975260, + 3489287055, + 1215031566, + 4163245239, + 211997311, + 2645176845, + 1296862602, + 3492404351, + 2610903887, + 666591503, + 2717029847, + 4260977968, + 3030567750, + 646959729, + 3011305032, + 759201374, + 3081458451, + 2702398400, + 1329547095, + 563499071, + 1452725596, + 437593576, + 2309591024, + 1891305014, + 157551964, + 645935809, + 4245659445, + 821531807, + 1693255666, + 766219182, + 3850113764, + 2197449870, + 1874832728, + 792286272, + 1809307126, + 1217541908, + 2844699314, + 2015548988, + 730154716, + 3678418124, + 2906141794, + 2094788669, + 72660012, ]; static final String anthropicAIkeySeferNew = String.fromCharCodes( @@ -608,9 +904,254 @@ final class _Env { _envieddataanthropicAIkeySeferNew[i] ^ _enviedkeyanthropicAIkeySeferNew[i])); - static const List _enviedkeyA = [554468137]; + static const List _enviedkeyanthropicAIkeySeferNewHamzaayedpython = + [ + 1345568169, + 3835343652, + 334665195, + 1592443682, + 424777267, + 3739956900, + 1932848473, + 3897729357, + 3821852900, + 2859099775, + 2940815332, + 672453691, + 827013096, + 2711744667, + 2218628414, + 2415764100, + 2798485842, + 2232421916, + 1256126267, + 3033664817, + 4259296484, + 918012995, + 604957516, + 3849120303, + 493544925, + 408296126, + 1381008176, + 709606929, + 3865365843, + 2934263611, + 3037214365, + 289426455, + 502478487, + 704459701, + 2131874782, + 300992591, + 147704718, + 2899879783, + 2055695343, + 3240194842, + 3354049791, + 116460015, + 3281714598, + 3597884117, + 3455339050, + 1465968511, + 1321748602, + 3441370812, + 1121958057, + 218954593, + 3797811403, + 2009961232, + 3480944460, + 1302167166, + 1042923427, + 3506045699, + 1145918927, + 3341340630, + 4079566217, + 4025989812, + 4078916688, + 3575448421, + 357793580, + 571583000, + 146456330, + 2665827112, + 2120365278, + 1465509128, + 3048854875, + 685432850, + 1984993274, + 1417560477, + 236947589, + 450880627, + 2295080916, + 404951124, + 3665338323, + 3891603668, + 3927841167, + 1847707162, + 999402603, + 2683306680, + 3715081157, + 3447070397, + 2795013291, + 1190385970, + 3136563993, + 2740052210, + 137924380, + 3683333501, + 1083377103, + 1109438670, + 896112639, + 2769353011, + 1858778426, + 3359640173, + 1357486529, + 343202989, + 1545222868, + 4199963787, + 4076367766, + 224771278, + 505595508, + 1132503577, + 2685918732, + 957989361, + 1859649942, + 1498028302, + 1455823241, + 3855750069, + 1382898866, + 3081726467, + 976441494, + 2806513558, + ]; - static const List _envieddataA = [554468216]; + static const List _envieddataanthropicAIkeySeferNewHamzaayedpython = + [ + 1345568211, + 3835343683, + 334665158, + 1592443731, + 424777297, + 3739956935, + 1932848500, + 3897729340, + 3821852818, + 2859099664, + 2940815319, + 672453634, + 827013061, + 2711744749, + 2218628477, + 2415764166, + 2798485887, + 2232421963, + 1256126293, + 3033664843, + 4259296417, + 918012980, + 604957450, + 3849120353, + 493544860, + 408296140, + 1381008255, + 709606945, + 3865365770, + 2934263639, + 3037214409, + 289426550, + 502478567, + 704459715, + 2131874744, + 300992551, + 147704826, + 2899879690, + 2055695240, + 3240194927, + 3354049716, + 116459960, + 3281714645, + 3597884045, + 3455339104, + 1465968428, + 1321748529, + 3441370829, + 1121958094, + 218954558, + 3797811333, + 2009961290, + 3480944415, + 1302167060, + 1042923499, + 3506045761, + 1145918870, + 3341340544, + 4079566289, + 4025989881, + 4078916618, + 3575448366, + 357793565, + 571583073, + 146456415, + 2665827171, + 2120365286, + 1465509168, + 3048854792, + 685432957, + 1984993176, + 1417560569, + 236947686, + 450880536, + 2295080834, + 404951140, + 3665338264, + 3891603617, + 3927841247, + 1847707259, + 999402537, + 2683306704, + 3715081205, + 3447070430, + 2795013364, + 1190386021, + 3136564049, + 2740052102, + 137924443, + 3683333390, + 1083377053, + 1109438593, + 896112544, + 2769352967, + 1858778377, + 3359640148, + 1357486481, + 343203055, + 1545222847, + 4199963814, + 4076367859, + 224771324, + 505595429, + 1132503656, + 2685918827, + 957989274, + 1859649991, + 1498028383, + 1455823313, + 3855750087, + 1382898922, + 3081726575, + 976441556, + 2806513658, + ]; + + static final String anthropicAIkeySeferNewHamzaayedpython = + String.fromCharCodes(List.generate( + _envieddataanthropicAIkeySeferNewHamzaayedpython.length, + (int i) => i, + growable: false, + ).map((int i) => + _envieddataanthropicAIkeySeferNewHamzaayedpython[i] ^ + _enviedkeyanthropicAIkeySeferNewHamzaayedpython[i])); + + static const List _enviedkeyA = [2864200202]; + + static const List _envieddataA = [2864200283]; static final String A = String.fromCharCodes(List.generate( _envieddataA.length, @@ -618,9 +1159,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataA[i] ^ _enviedkeyA[i])); - static const List _enviedkeyB = [3764276200]; + static const List _enviedkeyB = [3342624576]; - static const List _envieddataB = [3764276144]; + static const List _envieddataB = [3342624536]; static final String B = String.fromCharCodes(List.generate( _envieddataB.length, @@ -628,9 +1169,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataB[i] ^ _enviedkeyB[i])); - static const List _enviedkeyC = [3984768381]; + static const List _enviedkeyC = [4268695945]; - static const List _envieddataC = [3984768315]; + static const List _envieddataC = [4268696015]; static final String C = String.fromCharCodes(List.generate( _envieddataC.length, @@ -638,9 +1179,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataC[i] ^ _enviedkeyC[i])); - static const List _enviedkeyD = [879813472]; + static const List _enviedkeyD = [1136560218]; - static const List _envieddataD = [879813433]; + static const List _envieddataD = [1136560131]; static final String D = String.fromCharCodes(List.generate( _envieddataD.length, @@ -648,9 +1189,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataD[i] ^ _enviedkeyD[i])); - static const List _enviedkeyE = [3674144091]; + static const List _enviedkeyE = [880042735]; - static const List _envieddataE = [3674144017]; + static const List _envieddataE = [880042661]; static final String E = String.fromCharCodes(List.generate( _envieddataE.length, @@ -658,9 +1199,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataE[i] ^ _enviedkeyE[i])); - static const List _enviedkeyF = [3833220904]; + static const List _enviedkeyF = [1055363467]; - static const List _envieddataF = [3833220989]; + static const List _envieddataF = [1055363550]; static final String F = String.fromCharCodes(List.generate( _envieddataF.length, @@ -668,9 +1209,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataF[i] ^ _enviedkeyF[i])); - static const List _enviedkeyG = [994528426]; + static const List _enviedkeyG = [3850553236]; - static const List _envieddataG = [994528481]; + static const List _envieddataG = [3850553311]; static final String G = String.fromCharCodes(List.generate( _envieddataG.length, @@ -678,9 +1219,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataG[i] ^ _enviedkeyG[i])); - static const List _enviedkeyH = [1698644610]; + static const List _enviedkeyH = [3528012263]; - static const List _envieddataH = [1698644693]; + static const List _envieddataH = [3528012208]; static final String H = String.fromCharCodes(List.generate( _envieddataH.length, @@ -688,9 +1229,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataH[i] ^ _enviedkeyH[i])); - static const List _enviedkeyI = [3495943914]; + static const List _enviedkeyI = [912926166]; - static const List _envieddataI = [3495943845]; + static const List _envieddataI = [912926105]; static final String I = String.fromCharCodes(List.generate( _envieddataI.length, @@ -698,9 +1239,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataI[i] ^ _enviedkeyI[i])); - static const List _enviedkeyJ = [128717529]; + static const List _enviedkeyJ = [3964118617]; - static const List _envieddataJ = [128717468]; + static const List _envieddataJ = [3964118556]; static final String J = String.fromCharCodes(List.generate( _envieddataJ.length, @@ -708,9 +1249,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataJ[i] ^ _enviedkeyJ[i])); - static const List _enviedkeyK = [2336248456]; + static const List _enviedkeyK = [3166751300]; - static const List _envieddataK = [2336248527]; + static const List _envieddataK = [3166751235]; static final String K = String.fromCharCodes(List.generate( _envieddataK.length, @@ -718,9 +1259,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataK[i] ^ _enviedkeyK[i])); - static const List _enviedkeyL = [3279279913]; + static const List _enviedkeyL = [3197659186]; - static const List _envieddataL = [3279279995]; + static const List _envieddataL = [3197659232]; static final String L = String.fromCharCodes(List.generate( _envieddataL.length, @@ -728,9 +1269,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataL[i] ^ _enviedkeyL[i])); - static const List _enviedkeyM = [3873082713]; + static const List _enviedkeyM = [1485783119]; - static const List _envieddataM = [3873082647]; + static const List _envieddataM = [1485783041]; static final String M = String.fromCharCodes(List.generate( _envieddataM.length, @@ -738,9 +1279,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataM[i] ^ _enviedkeyM[i])); - static const List _enviedkeyN = [732159427]; + static const List _enviedkeyN = [1266347531]; - static const List _envieddataN = [732159361]; + static const List _envieddataN = [1266347593]; static final String N = String.fromCharCodes(List.generate( _envieddataN.length, @@ -748,9 +1289,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataN[i] ^ _enviedkeyN[i])); - static const List _enviedkeyO = [81094435]; + static const List _enviedkeyO = [1989026941]; - static const List _envieddataO = [81094506]; + static const List _envieddataO = [1989026868]; static final String O = String.fromCharCodes(List.generate( _envieddataO.length, @@ -758,9 +1299,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataO[i] ^ _enviedkeyO[i])); - static const List _enviedkeyP = [4050563990]; + static const List _enviedkeyP = [3793286623]; - static const List _envieddataP = [4050564032]; + static const List _envieddataP = [3793286537]; static final String P = String.fromCharCodes(List.generate( _envieddataP.length, @@ -768,9 +1309,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataP[i] ^ _enviedkeyP[i])); - static const List _enviedkeyQ = [3149519534]; + static const List _enviedkeyQ = [3116734088]; - static const List _envieddataQ = [3149519599]; + static const List _envieddataQ = [3116734153]; static final String Q = String.fromCharCodes(List.generate( _envieddataQ.length, @@ -778,9 +1319,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataQ[i] ^ _enviedkeyQ[i])); - static const List _enviedkeyR = [894101604]; + static const List _enviedkeyR = [2540752261]; - static const List _envieddataR = [894101544]; + static const List _envieddataR = [2540752329]; static final String R = String.fromCharCodes(List.generate( _envieddataR.length, @@ -788,9 +1329,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataR[i] ^ _enviedkeyR[i])); - static const List _enviedkeyS = [2126030903]; + static const List _enviedkeyS = [774754386]; - static const List _envieddataS = [2126030957]; + static const List _envieddataS = [774754312]; static final String S = String.fromCharCodes(List.generate( _envieddataS.length, @@ -798,9 +1339,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataS[i] ^ _enviedkeyS[i])); - static const List _enviedkeyT = [3226089034]; + static const List _enviedkeyT = [836867252]; - static const List _envieddataT = [3226088969]; + static const List _envieddataT = [836867319]; static final String T = String.fromCharCodes(List.generate( _envieddataT.length, @@ -808,9 +1349,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataT[i] ^ _enviedkeyT[i])); - static const List _enviedkeyU = [3539988209]; + static const List _enviedkeyU = [2427531527]; - static const List _envieddataU = [3539988153]; + static const List _envieddataU = [2427531599]; static final String U = String.fromCharCodes(List.generate( _envieddataU.length, @@ -818,9 +1359,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataU[i] ^ _enviedkeyU[i])); - static const List _enviedkeyV = [3367719973]; + static const List _enviedkeyV = [1255011257]; - static const List _envieddataV = [3367720053]; + static const List _envieddataV = [1255011305]; static final String V = String.fromCharCodes(List.generate( _envieddataV.length, @@ -828,9 +1369,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataV[i] ^ _enviedkeyV[i])); - static const List _enviedkeyW = [2753593982]; + static const List _enviedkeyW = [3108207775]; - static const List _envieddataW = [2753593898]; + static const List _envieddataW = [3108207819]; static final String W = String.fromCharCodes(List.generate( _envieddataW.length, @@ -838,9 +1379,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataW[i] ^ _enviedkeyW[i])); - static const List _enviedkeyX = [926765366]; + static const List _enviedkeyX = [1854413477]; - static const List _envieddataX = [926765426]; + static const List _envieddataX = [1854413537]; static final String X = String.fromCharCodes(List.generate( _envieddataX.length, @@ -848,9 +1389,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataX[i] ^ _enviedkeyX[i])); - static const List _enviedkeyY = [2011767360]; + static const List _enviedkeyY = [919955547]; - static const List _envieddataY = [2011767315]; + static const List _envieddataY = [919955464]; static final String Y = String.fromCharCodes(List.generate( _envieddataY.length, @@ -858,9 +1399,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataY[i] ^ _enviedkeyY[i])); - static const List _enviedkeyZ = [4238677823]; + static const List _enviedkeyZ = [3492996254]; - static const List _envieddataZ = [4238677874]; + static const List _envieddataZ = [3492996307]; static final String Z = String.fromCharCodes(List.generate( _envieddataZ.length, @@ -868,9 +1409,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataZ[i] ^ _enviedkeyZ[i])); - static const List _enviedkeya = [3204845275]; + static const List _enviedkeya = [2589230731]; - static const List _envieddataa = [3204845226]; + static const List _envieddataa = [2589230842]; static final String a = String.fromCharCodes(List.generate( _envieddataa.length, @@ -878,9 +1419,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataa[i] ^ _enviedkeya[i])); - static const List _enviedkeyb = [4211609872]; + static const List _enviedkeyb = [1548597041]; - static const List _envieddatab = [4211609960]; + static const List _envieddatab = [1548597065]; static final String b = String.fromCharCodes(List.generate( _envieddatab.length, @@ -888,9 +1429,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatab[i] ^ _enviedkeyb[i])); - static const List _enviedkeyc = [258792921]; + static const List _enviedkeyc = [1600753342]; - static const List _envieddatac = [258792895]; + static const List _envieddatac = [1600753368]; static final String c = String.fromCharCodes(List.generate( _envieddatac.length, @@ -898,9 +1439,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatac[i] ^ _enviedkeyc[i])); - static const List _enviedkeyd = [589940007]; + static const List _enviedkeyd = [1585586244]; - static const List _envieddatad = [589940062]; + static const List _envieddatad = [1585586237]; static final String d = String.fromCharCodes(List.generate( _envieddatad.length, @@ -908,9 +1449,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatad[i] ^ _enviedkeyd[i])); - static const List _enviedkeye = [540089316]; + static const List _enviedkeye = [4189186999]; - static const List _envieddatae = [540089230]; + static const List _envieddatae = [4189187037]; static final String e = String.fromCharCodes(List.generate( _envieddatae.length, @@ -918,9 +1459,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatae[i] ^ _enviedkeye[i])); - static const List _enviedkeyf = [4031419054]; + static const List _enviedkeyf = [3979116397]; - static const List _envieddataf = [4031419099]; + static const List _envieddataf = [3979116312]; static final String f = String.fromCharCodes(List.generate( _envieddataf.length, @@ -928,9 +1469,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataf[i] ^ _enviedkeyf[i])); - static const List _enviedkeyg = [3340256835]; + static const List _enviedkeyg = [1205707873]; - static const List _envieddatag = [3340256808]; + static const List _envieddatag = [1205707786]; static final String g = String.fromCharCodes(List.generate( _envieddatag.length, @@ -938,9 +1479,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatag[i] ^ _enviedkeyg[i])); - static const List _enviedkeyh = [2728610744]; + static const List _enviedkeyh = [433956944]; - static const List _envieddatah = [2728610767]; + static const List _envieddatah = [433956903]; static final String h = String.fromCharCodes(List.generate( _envieddatah.length, @@ -948,9 +1489,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatah[i] ^ _enviedkeyh[i])); - static const List _enviedkeyi = [4172270125]; + static const List _enviedkeyi = [1380486097]; - static const List _envieddatai = [4172270146]; + static const List _envieddatai = [1380486078]; static final String i = String.fromCharCodes(List.generate( _envieddatai.length, @@ -958,9 +1499,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatai[i] ^ _enviedkeyi[i])); - static const List _enviedkeyj = [3690710003]; + static const List _enviedkeyj = [3772664411]; - static const List _envieddataj = [3690709910]; + static const List _envieddataj = [3772664382]; static final String j = String.fromCharCodes(List.generate( _envieddataj.length, @@ -968,9 +1509,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataj[i] ^ _enviedkeyj[i])); - static const List _enviedkeyk = [2535250567]; + static const List _enviedkeyk = [3362996376]; - static const List _envieddatak = [2535250656]; + static const List _envieddatak = [3362996479]; static final String k = String.fromCharCodes(List.generate( _envieddatak.length, @@ -978,9 +1519,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatak[i] ^ _enviedkeyk[i])); - static const List _enviedkeyl = [3347313798]; + static const List _enviedkeyl = [27532105]; - static const List _envieddatal = [3347313908]; + static const List _envieddatal = [27532091]; static final String l = String.fromCharCodes(List.generate( _envieddatal.length, @@ -988,9 +1529,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatal[i] ^ _enviedkeyl[i])); - static const List _enviedkeym = [3368792862]; + static const List _enviedkeym = [610736892]; - static const List _envieddatam = [3368792944]; + static const List _envieddatam = [610736786]; static final String m = String.fromCharCodes(List.generate( _envieddatam.length, @@ -998,9 +1539,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatam[i] ^ _enviedkeym[i])); - static const List _enviedkeyn = [3166135307]; + static const List _enviedkeyn = [2622806450]; - static const List _envieddatan = [3166135401]; + static const List _envieddatan = [2622806480]; static final String n = String.fromCharCodes(List.generate( _envieddatan.length, @@ -1008,9 +1549,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatan[i] ^ _enviedkeyn[i])); - static const List _enviedkeyo = [3597819058]; + static const List _enviedkeyo = [783886497]; - static const List _envieddatao = [3597819099]; + static const List _envieddatao = [783886536]; static final String o = String.fromCharCodes(List.generate( _envieddatao.length, @@ -1018,9 +1559,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatao[i] ^ _enviedkeyo[i])); - static const List _enviedkeyp = [3858205651]; + static const List _enviedkeyp = [3646533580]; - static const List _envieddatap = [3858205605]; + static const List _envieddatap = [3646533562]; static final String p = String.fromCharCodes(List.generate( _envieddatap.length, @@ -1028,9 +1569,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatap[i] ^ _enviedkeyp[i])); - static const List _enviedkeyq = [4073585502]; + static const List _enviedkeyq = [2415906306]; - static const List _envieddataq = [4073585471]; + static const List _envieddataq = [2415906403]; static final String q = String.fromCharCodes(List.generate( _envieddataq.length, @@ -1038,9 +1579,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataq[i] ^ _enviedkeyq[i])); - static const List _enviedkeyr = [4012302099]; + static const List _enviedkeyr = [2642579043]; - static const List _envieddatar = [4012302207]; + static const List _envieddatar = [2642578959]; static final String r = String.fromCharCodes(List.generate( _envieddatar.length, @@ -1048,9 +1589,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatar[i] ^ _enviedkeyr[i])); - static const List _enviedkeys = [198252528]; + static const List _enviedkeys = [2786484058]; - static const List _envieddatas = [198252426]; + static const List _envieddatas = [2786484000]; static final String s = String.fromCharCodes(List.generate( _envieddatas.length, @@ -1058,9 +1599,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatas[i] ^ _enviedkeys[i])); - static const List _enviedkeyt = [2213303340]; + static const List _enviedkeyt = [975674143]; - static const List _envieddatat = [2213303375]; + static const List _envieddatat = [975674236]; static final String t = String.fromCharCodes(List.generate( _envieddatat.length, @@ -1068,9 +1609,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatat[i] ^ _enviedkeyt[i])); - static const List _enviedkeyu = [2852794589]; + static const List _enviedkeyu = [3296229826]; - static const List _envieddatau = [2852794549]; + static const List _envieddatau = [3296229802]; static final String u = String.fromCharCodes(List.generate( _envieddatau.length, @@ -1078,9 +1619,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatau[i] ^ _enviedkeyu[i])); - static const List _enviedkeyv = [2431817007]; + static const List _enviedkeyv = [3567084563]; - static const List _envieddatav = [2431817055]; + static const List _envieddatav = [3567084643]; static final String v = String.fromCharCodes(List.generate( _envieddatav.length, @@ -1088,9 +1629,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatav[i] ^ _enviedkeyv[i])); - static const List _enviedkeyw = [692019672]; + static const List _enviedkeyw = [3187046637]; - static const List _envieddataw = [692019628]; + static const List _envieddataw = [3187046553]; static final String w = String.fromCharCodes(List.generate( _envieddataw.length, @@ -1098,9 +1639,9 @@ final class _Env { growable: false, ).map((int i) => _envieddataw[i] ^ _enviedkeyw[i])); - static const List _enviedkeyx = [779136924]; + static const List _enviedkeyx = [2694682091]; - static const List _envieddatax = [779137016]; + static const List _envieddatax = [2694681999]; static final String x = String.fromCharCodes(List.generate( _envieddatax.length, @@ -1108,9 +1649,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatax[i] ^ _enviedkeyx[i])); - static const List _enviedkeyy = [2518439340]; + static const List _enviedkeyy = [3945057701]; - static const List _envieddatay = [2518439391]; + static const List _envieddatay = [3945057750]; static final String y = String.fromCharCodes(List.generate( _envieddatay.length, @@ -1118,9 +1659,9 @@ final class _Env { growable: false, ).map((int i) => _envieddatay[i] ^ _enviedkeyy[i])); - static const List _enviedkeyz = [4252401697]; + static const List _enviedkeyz = [3009880448]; - static const List _envieddataz = [4252401740]; + static const List _envieddataz = [3009880557]; static final String z = String.fromCharCodes(List.generate( _envieddataz.length, @@ -1129,55 +1670,55 @@ final class _Env { ).map((int i) => _envieddataz[i] ^ _enviedkeyz[i])); static const List _enviedkeyemailService = [ - 1529971233, - 1420186468, - 2887272317, - 2364415619, - 903982909, - 2095400158, - 3131075177, - 3960902706, - 4184566706, - 3431239715, - 3019411814, - 2602766349, - 1503415822, - 1060896018, - 4221862395, - 323713252, - 321526989, - 130496032, - 3325251537, - 1008283748, - 3349200177, - 237758508, - 606766199, + 2175621454, + 1251046692, + 767111324, + 3811906657, + 1958331096, + 1689818817, + 950859180, + 2776951938, + 1492795480, + 3621935221, + 3466908093, + 1406461104, + 742769633, + 291280791, + 744826422, + 1529890566, + 1829985876, + 694148504, + 86388575, + 739990142, + 45865392, + 403297565, + 2351890323, ]; static const List _envieddataemailService = [ - 1529971282, - 1420186369, - 2887272219, - 2364415718, - 903982927, - 2095400109, - 3131075084, - 3960902720, - 4184566724, - 3431239754, - 3019411717, - 2602766440, - 1503415886, - 1060896097, - 4221862302, - 323713154, - 321526952, - 130496082, - 3325251583, - 1008283656, - 3349200216, - 237758554, - 606766098, + 2175621437, + 1251046721, + 767111418, + 3811906564, + 1958331050, + 1689818802, + 950859209, + 2776952048, + 1492795438, + 3621935132, + 3466908126, + 1406461141, + 742769569, + 291280868, + 744826451, + 1529890656, + 1829985841, + 694148586, + 86388593, + 739990034, + 45865433, + 403297643, + 2351890422, ]; static final String emailService = String.fromCharCodes(List.generate( @@ -1187,85 +1728,85 @@ final class _Env { ).map((int i) => _envieddataemailService[i] ^ _enviedkeyemailService[i])); static const List _enviedkeykeyOfApp = [ - 2517718456, - 1478997662, - 1370326345, - 229190262, - 3300137116, - 3093795113, - 2657867974, - 414697464, - 1366230055, - 1451508210, - 831588037, - 31269301, - 2980233781, - 265557381, - 2643073289, - 778337923, - 1630542430, - 563909024, - 3631293484, - 2977145149, - 3484183047, - 835707670, - 2187273134, - 627312908, - 693214677, - 2937675817, - 2326880562, - 98573970, - 4254568929, - 3449624572, - 2472562767, - 4209919531, - 374291633, - 4142777811, - 1255412088, - 2849985911, - 4178684572, - 854316047, + 2137474282, + 3945671376, + 954427131, + 1872682838, + 622840305, + 1058947797, + 1787421072, + 497699436, + 2561779739, + 4147680506, + 1524848549, + 239645726, + 515265400, + 2571180820, + 6395533, + 2943185337, + 1201864453, + 2455376760, + 537511209, + 3088540112, + 3245249927, + 3382739278, + 3684640525, + 1283755845, + 1603677839, + 2423961817, + 202561925, + 1807939712, + 2390066339, + 53946992, + 3618870097, + 153924988, + 2546098714, + 3539801751, + 3025060296, + 775435459, + 1915491704, + 3079601133, ]; static const List _envieddatakeyOfApp = [ - 2517718486, - 1478997743, - 1370326331, - 229190159, - 3300137206, - 3093795161, - 2657867910, - 414697417, - 1366230032, - 1451508161, - 831588082, - 31269314, - 2980233796, - 265557483, - 2643073380, - 778338034, - 1630542383, - 563909075, - 3631293510, - 2977145156, - 3484183165, - 835707772, - 2187273179, - 627312998, - 693214649, - 2937675843, - 2326880601, - 98574049, - 4254568855, - 3449624479, - 2472562730, - 4209919554, - 374291689, - 4142777761, - 1255412000, - 2849985819, - 4178684638, - 854316131, + 2137474180, + 3945671329, + 954427017, + 1872682799, + 622840219, + 1058947749, + 1787421136, + 497699421, + 2561779756, + 4147680457, + 1524848530, + 239645801, + 515265289, + 2571180922, + 6395616, + 2943185352, + 1201864564, + 2455376651, + 537511235, + 3088540073, + 3245250045, + 3382739236, + 3684640632, + 1283755823, + 1603677923, + 2423961779, + 202562030, + 1807939827, + 2390066389, + 53946899, + 3618870068, + 153924885, + 2546098754, + 3539801829, + 3025060240, + 775435439, + 1915491642, + 3079601025, ]; static final String keyOfApp = String.fromCharCodes(List.generate( diff --git a/lib/main.dart b/lib/main.dart index 937794b..6d29be6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -19,25 +19,25 @@ const storage = FlutterSecureStorage(); void main() async { WidgetsFlutterBinding.ensureInitialized(); - if (Platform.isAndroid || Platform.isIOS) { - await Firebase.initializeApp( - options: DefaultFirebaseOptions.currentPlatform, - ); - await FirebaseMessagesController().requestFirebaseMessagingPermission(); + // if (Platform.isAndroid || Platform.isIOS) { + // await Firebase.initializeApp( + // options: DefaultFirebaseOptions.currentPlatform, + // ); + // await FirebaseMessagesController().requestFirebaseMessagingPermission(); - // FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler); + // // FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler); - List initializationTasks = [ - FirebaseMessagesController().getNotificationSettings(), - FirebaseMessagesController().getToken(), - ]; - // cameras = await availableCameras(); - await Future.wait(initializationTasks); - SystemChrome.setPreferredOrientations([ - DeviceOrientation.portraitUp, - DeviceOrientation.portraitDown, - ]); - } + // List initializationTasks = [ + // FirebaseMessagesController().getNotificationSettings(), + // FirebaseMessagesController().getToken(), + // ]; + // // cameras = await availableCameras(); + // await Future.wait(initializationTasks); + // SystemChrome.setPreferredOrientations([ + // DeviceOrientation.portraitUp, + // DeviceOrientation.portraitDown, + // ]); + // } runApp(MyApp()); } diff --git a/lib/models/cloudpanel.md b/lib/models/cloudpanel.md new file mode 100644 index 0000000..23a4a07 --- /dev/null +++ b/lib/models/cloudpanel.md @@ -0,0 +1,115 @@ +## Site + +IP Address: 92.113.25.174 +Domain Name: https://sefer.click +Site User: sefer +Password: katm5g2LLY55a7SJcnxK + +## Database + +Host: 127.0.0.1 +Port: 3306 +Database Name: sefer +Database User Name: sefer +Database User Password: la7CdYFwa9uxwnozk7ok + +## WordPress + +Admin E-Mail: admin@sefer.click +Admin User Name: admin +Admin Password: F12WeBpJLY4z1qHsFqMt +Admin Url: https://sefer.click/wp-admin/ + +ssh password is malDEV@2101mehmet + +giza hostinger kvm2 pass gizaDEV@2101 + +contabo cloud panel new +Site + +--- + +IP Address: 100.42.191.131 +Domain Name: https://seferalexandria.site +Site User: seferalexandria +Password: x91LgGr2Q8IervoVgcgc + +## Database + +Host: 127.0.0.1 +Port: 3306 +Database Name: seferalexandria +Database User Name: seferalexandria +Database User Password: 812UvStGfCfNLMCsRR9a + +## WordPress + +Admin E-Mail: admin@seferalexandria.site +Admin User Name: admin +Admin Password: N9gv90TdnoOdjVch5V3J +Admin Url: https://seferalexandria.site/wp-admin/ + +##### alexandria + +86IU5xU2HSiNNSAU5cwF username db ==>> alexandriadbUsername vps 2 100.42.191.131 + +- JCndq5xXLnoYOTuRqnZA for ssh alexandria ssh user + +seferalexandria userAdmin cloudPanel 49prvH5MGGupjWrDPLGm + +# cloudpanel username is sefercairo and pass is malDEV@2101 + +##### + +oMnEK3IbvCbQ5G5FfK9W username db ==>> seferdbUsername vps 3 185.209.230.169 # db name is sefercairodb + +H6JIiEOpyDVoMBBi5cCH sefercairoadmin + +Q6MikBy4ktZn9zumyPli sefercairo ssh user 85.209.230.169 + +# cloudpanel username is sefercairo and pass is malDEV@2101 + +##### wallet + +qG6Bn1P9IRvwk0tLW85v username db ==>> walletdbUsername vps 2 156.67.82.188 # db name is seferPaymentDB + +- JCndq5xXLnoYOTuRqnZA for ssh wallet ssh user + +seferwallet userAdmin cloudPanel 49prvH5MGGupjWrDPLGm + +# cloudpanel username is seferpayment and pass is dKsmZkbdWP9hj13qjNiY and seferpayment@sefer.live + +##### + +##### giza + +TE6VUrMcjnIsipqP9yQj username db ==>> gizaUsername vps 1 31.220.94.107 db name is sefergizaDB + +- rylDg624ifiDXsWmaMST for ssh sefergizacp ssh user + +# cloudpanel username is sefergiza and pass is 4O2IUSbwZxVnMJYaRTog gizasefer.online + +#### + +#AaPOFHEwHVyXG6AgZ7i password test kvm1 + +4zB9qoYfxCn7uHx7i5cgUl7JR password contabo vps 3 alexandria +SLqWj2QTD66Gr password contabo vps 1 payment +uREd8QKKzpHXGL25UVi3quK password contabo vps 2 cairo sefer.click user cloud panel is +uREd8QKKzpHXGL25UVi3quK password contabo vps 1 payment seferpw.website user cloud panel is seferpayment +C3vGlIV7VM0priWXgdzc password contabo vps 2 giza seferpw.website user cloud panel is seferpayment + +================================================================== +Congratulations! Installed successfully! +================================================================== +webmin Internal Address: https://31.220.94.106:10000/ +username: seferpayment +password: d7b064c3 +Warning: +If you cannot access the panel, +release the following port (32368|888|80|443|20|21) in the security group + +Database user profile +User: +Password: 38d7a66a0e435 +================================================================== diff --git a/lib/models/sql b/lib/models/sql new file mode 100644 index 0000000..570e02a --- /dev/null +++ b/lib/models/sql @@ -0,0 +1,66 @@ +-- to check duplicate CarRegistration +SELECT + `driverID`, + COUNT(*) AS `count`,created_at +FROM + `CarRegistration` +GROUP BY + `driverID` +HAVING + COUNT(*) > 1; +-- + + +-- to delete duplicate +WITH CTE AS ( + SELECT + MIN(`id`) AS `min_id` + FROM + `CarRegistration` + GROUP BY + `driverID` +) +DELETE FROM + `CarRegistration` +WHERE + `id` NOT IN (SELECT `min_id` FROM CTE); + +-- get for employee +SELECT + d.`maritalStatus` AS NAME, + COUNT(*) AS `count` +FROM + `driver` d +WHERE + d.`maritalStatus` IN('Maryam', 'Salma', 'Mena') AND DATE(d.created_at) = CURDATE() +GROUP BY + d.`maritalStatus` +ORDER BY + COUNT +DESC + + + -- get driver without cars + + SELECT + d.id, d.phone +FROM + `driver` d +WHERE + d.id NOT IN (SELECT driverID FROM CarRegistration); + + + -- car without drivers + + SELECT + cr.created_at, cr.driverID +FROM + `CarRegistration` cr +WHERE + cr.driverID NOT IN (SELECT id FROM driver); + + + +----- driver + SELECT phone,email,name_arabic,national_number FROM `driver` WHERE national_number ='29209290106392' +ORDER BY `driver`.`created_at` DESC \ No newline at end of file diff --git a/lib/views/home/main.dart b/lib/views/home/main.dart index 43df14b..3f3cfad 100644 --- a/lib/views/home/main.dart +++ b/lib/views/home/main.dart @@ -8,6 +8,7 @@ import 'package:service/views/widgets/my_dialog.dart'; import 'package:service/views/widgets/my_textField.dart'; import '../../constant/style.dart'; +import '../../controller/mainController/pages/add_car.dart'; import '../../controller/mainController/pages/drivers_cant_register.dart'; import '../../controller/mainController/pages/welcome_call.dart'; import '../widgets/my_scafold.dart'; @@ -134,11 +135,30 @@ class Main extends StatelessWidget { const SizedBox( height: 20, ), + InkWell( + onTap: () async { + await mainController.getdriverWithoutCar(); + if (mainController.driverWithoutCar.isNotEmpty) { + Get.to(() => const AddCar()); + } + }, + child: Container( + decoration: AppStyle.boxDecoration, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + 'Add car'.tr, + style: AppStyle.title, + textAlign: TextAlign.center, + ), + ), + ), + ), InkWell( onTap: () async { await mainController.getCarPlateNotEdit(); if (mainController.carPlateNotEdit.isNotEmpty) { - Get.to(() => EditCarPlate()); + Get.to(() => const EditCarPlate()); } }, child: Container( @@ -160,7 +180,7 @@ class Main extends StatelessWidget { onTap: () async { // await mainController.getCarPlateNotEdit(); // if (mainController.carPlateNotEdit.isNotEmpty) { - Get.to(() => Complaint()); + Get.to(() => const Complaint()); // } }, child: Container( diff --git a/pubspec.lock b/pubspec.lock index 08c9dba..d0117d9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,26 +5,31 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" _flutterfire_internals: dependency: transitive description: name: _flutterfire_internals - sha256: b46f62516902afb04befa4b30eb6a12ac1f58ca8cb25fb9d632407259555dd3d + sha256: "9371d13b8ee442e3bfc08a24e3a1b3742c839abbfaf5eef11b79c4b862c89bf7" url: "https://pub.dev" source: hosted - version: "1.3.39" + version: "1.3.41" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" archive: dependency: transitive description: @@ -93,18 +98,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.12" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -181,18 +186,18 @@ packages: dependency: transitive description: name: cross_file - sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" url: "https://pub.dev" source: hosted - version: "0.3.4+1" + version: "0.3.4+2" crypto: dependency: "direct main" description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" cupertino_icons: dependency: "direct main" description: @@ -205,26 +210,26 @@ packages: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" device_info_plus: dependency: transitive description: name: device_info_plus - sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91 + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 url: "https://pub.dev" source: hosted - version: "10.1.0" + version: "10.1.2" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" envied: dependency: "direct main" description: @@ -261,10 +266,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: @@ -301,82 +306,82 @@ packages: dependency: transitive description: name: file_selector_windows - sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0 + sha256: "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69" url: "https://pub.dev" source: hosted - version: "0.9.3+1" + version: "0.9.3+2" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: a41b56878fa6aef3ea52962329b47eee333672d4b0ecc406e071b9fc729f242c + sha256: "6f5792bdc208416bfdfbfe3363b78ce01667b6ebc4c5cb47cfa891f2fca45ab7" url: "https://pub.dev" source: hosted - version: "5.1.2" + version: "5.2.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: d1c68097588f3b75ef79a22102ff96c311735c254353bccf6824d19f1a7e86b9 + sha256: "80237bb8a92bb0a5e3b40de1c8dbc80254e49ac9e3907b4b47b8e95ac3dd3fad" url: "https://pub.dev" source: hosted - version: "7.4.2" + version: "7.4.4" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: e66ec0ae5697ee39ccd4865d6887cb0df220dd4ea0b21404910c68ca4c1a731a + sha256: "9d315491a6be65ea83511cb0e078544a309c39dd54c0ee355c51dbd6d8c03cc8" url: "https://pub.dev" source: hosted - version: "5.12.4" + version: "5.12.6" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "5159984ce9b70727473eb388394650677c02c925aaa6c9439905e1f30966a4d5" + sha256: "06537da27db981947fa535bb91ca120b4e9cb59cb87278dbdde718558cafc9ff" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.4.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb" + sha256: f7d7180c7f99babd4b4c517754d41a09a4943a0f7a69b65c894ca5c68ba66315 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.2.1" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "23509cb3cddfb3c910c143279ac3f07f06d3120f7d835e4a5d4b42558e978712" + sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88" url: "https://pub.dev" source: hosted - version: "2.17.3" + version: "2.17.5" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "156c4292aa63a6a7d508c68ded984cb38730d2823c3265e573cb1e94983e2025" + sha256: "29941ba5a3204d80656c0e52103369aa9a53edfd9ceae05a2bb3376f24fda453" url: "https://pub.dev" source: hosted - version: "15.0.3" + version: "15.1.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "10408c5ca242b7fc632dd5eab4caf8fdf18ebe88db6052980fa71a18d88bd200" + sha256: "26c5370d3a79b15c8032724a68a4741e28f63e1f1a45699c4f0a8ae740aadd72" url: "https://pub.dev" source: hosted - version: "4.5.41" + version: "4.5.43" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: c7a756e3750679407948de665735e69a368cb902940466e5d68a00ea7aba1aaa + sha256: "58276cd5d9e22a9320ef9e5bc358628920f770f93c91221f8b638e8346ed5df4" url: "https://pub.dev" source: hosted - version: "3.8.11" + version: "3.8.13" fixnum: dependency: transitive description: @@ -458,10 +463,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e + sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" url: "https://pub.dev" source: hosted - version: "2.0.20" + version: "2.0.22" flutter_secure_storage: dependency: "direct main" description: @@ -556,10 +561,10 @@ packages: dependency: transitive description: name: google_identity_services_web - sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8" + sha256: "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6" url: "https://pub.dev" source: hosted - version: "0.3.1+1" + version: "0.3.1+4" google_sign_in: dependency: "direct main" description: @@ -572,18 +577,18 @@ packages: dependency: transitive description: name: google_sign_in_android - sha256: d30fb34b659679ea74397e9748b4ab5d720720d57dcc79538f1b3c4a68654cb3 + sha256: "0608de03fc541ece4f91ba3e01a68b17cce7a6cf42bd59e40bbe5c55cc3a49d8" url: "https://pub.dev" source: hosted - version: "6.1.27" + version: "6.1.30" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - sha256: a058c9880be456f21e2e8571c1126eaacd570bdc5b6c6d9d15aea4bdf22ca9fe + sha256: "4898410f55440049e1ba8f15411612d9f89299d89c61cd9baf7e02d56ff81ac7" url: "https://pub.dev" source: hosted - version: "5.7.6" + version: "5.7.7" google_sign_in_platform_interface: dependency: transitive description: @@ -596,10 +601,10 @@ packages: dependency: transitive description: name: google_sign_in_web - sha256: d606264c7a1a526a3aa79d938b85a601d8589731a478bd4a3dcbdeb14a572228 + sha256: "042805a21127a85b0dc46bba98a37926f17d2439720e8a459d27045d8ef68055" url: "https://pub.dev" source: hosted - version: "0.12.4+1" + version: "0.12.4+2" graphs: dependency: transitive description: @@ -676,18 +681,18 @@ packages: dependency: transitive description: name: image_picker_android - sha256: cea2bd5b9fcff039a4901d3b13c67fe747f940be9ba76bde1bcd218d168eeb7f + sha256: c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85 url: "https://pub.dev" source: hosted - version: "0.8.12+6" + version: "0.8.12+13" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "5d6eb13048cd47b60dbf1a5495424dea226c5faf3950e20bf8120a58efb5b5f3" + sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.5" image_picker_ios: dependency: transitive description: @@ -764,18 +769,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -800,6 +805,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -812,26 +825,26 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" package_config: dependency: transitive description: @@ -852,18 +865,18 @@ packages: dependency: transitive description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e" + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.7" + version: "2.2.10" path_provider_foundation: dependency: transitive description: @@ -1016,10 +1029,10 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.5.4+2" stack_trace: dependency: transitive description: @@ -1056,10 +1069,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255 url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.2.0" term_glyph: dependency: transitive description: @@ -1072,10 +1085,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" timing: dependency: transitive description: @@ -1104,10 +1117,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac" + sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab url: "https://pub.dev" source: hosted - version: "6.3.5" + version: "6.3.10" url_launcher_ios: dependency: transitive description: @@ -1120,10 +1133,10 @@ packages: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: @@ -1144,18 +1157,18 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" vector_math: dependency: transitive description: @@ -1184,10 +1197,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" watcher: dependency: transitive description: @@ -1224,18 +1237,18 @@ packages: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.4" win32_registry: dependency: transitive description: name: win32_registry - sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.1.5" xdg_directories: dependency: transitive description: @@ -1261,5 +1274,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.3 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index aa028b8..2e7e30c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -100,7 +100,7 @@ flutter_launcher_icons: # To add assets to your application, add an assets section, like this: assets: - - assets/ + - assets/images # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware