diff --git a/android/app/build.gradle b/android/app/build.gradle
index d16ca8c..7235d74 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -53,10 +53,10 @@ android {
applicationId "com.mobileapp.store.ride"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
- minSdkVersion 26
+ minSdkVersion 22
targetSdkVersion flutter.targetSdkVersion
- versionCode 21
- versionName '1.4.5'
+ versionCode 22
+ versionName '1.4.6'
// manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml']
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 89ece84..b667beb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
-
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0cf9f2b..2aba9a2 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -43,8 +43,6 @@ PODS:
- AppAuth/Core
- audio_session (0.0.1):
- Flutter
- - background_location (0.0.1):
- - Flutter
- camera_avfoundation (0.0.1):
- Flutter
- device_info_plus (0.0.1):
@@ -96,13 +94,6 @@ PODS:
- google_maps_flutter_ios (0.0.1):
- Flutter
- GoogleMaps (< 9.0)
- - google_mlkit_commons (0.7.1):
- - Flutter
- - MLKitVision
- - google_mlkit_text_recognition (0.13.0):
- - Flutter
- - google_mlkit_commons
- - GoogleMLKit/TextRecognition (~> 6.0.0)
- google_sign_in_ios (0.0.1):
- AppAuth (>= 1.7.4)
- Flutter
@@ -118,20 +109,10 @@ PODS:
- GoogleMaps/Base (7.4.0)
- GoogleMaps/Maps (7.4.0):
- GoogleMaps/Base
- - GoogleMLKit/MLKitCore (6.0.0):
- - MLKitCommon (~> 11.0.0)
- - GoogleMLKit/TextRecognition (6.0.0):
- - GoogleMLKit/MLKitCore
- - MLKitTextRecognition (~> 4.0.0)
- GoogleSignIn (7.1.0):
- AppAuth (< 2.0, >= 1.7.3)
- GTMAppAuth (< 5.0, >= 4.1.1)
- GTMSessionFetcher/Core (~> 3.3)
- - GoogleToolboxForMac/Defines (4.2.1)
- - GoogleToolboxForMac/Logger (4.2.1):
- - GoogleToolboxForMac/Defines (= 4.2.1)
- - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
- - GoogleToolboxForMac/Defines (= 4.2.1)
- GoogleUtilities/AppDelegateSwizzler (7.13.2):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
@@ -157,8 +138,6 @@ PODS:
- GoogleUtilities/UserDefaults (7.13.2):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- - GoogleUtilitiesComponents (1.1.0):
- - GoogleUtilities/Logger
- GTMAppAuth (4.1.1):
- AppAuth/Core (~> 1.7)
- GTMSessionFetcher/Core (< 4.0, >= 3.3)
@@ -180,27 +159,6 @@ PODS:
- Flutter
- location (0.0.1):
- Flutter
- - MLImage (1.0.0-beta5)
- - MLKitCommon (11.0.0):
- - GoogleDataTransport (< 10.0, >= 9.4.1)
- - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
- - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
- - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0)
- - GoogleUtilitiesComponents (~> 1.0)
- - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
- - MLKitTextRecognition (4.0.0):
- - MLKitCommon (~> 11.0)
- - MLKitTextRecognitionCommon (= 3.0.0)
- - MLKitVision (~> 7.0)
- - MLKitTextRecognitionCommon (3.0.0):
- - MLKitCommon (~> 11.0)
- - MLKitVision (~> 7.0)
- - MLKitVision (7.0.0):
- - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
- - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
- - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
- - MLImage (= 1.0.0-beta5)
- - MLKitCommon (~> 11.0)
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
@@ -274,7 +232,6 @@ PODS:
DEPENDENCIES:
- agora_rtc_engine (from `.symlinks/plugins/agora_rtc_engine/ios`)
- audio_session (from `.symlinks/plugins/audio_session/ios`)
- - background_location (from `.symlinks/plugins/background_location/ios`)
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
@@ -285,8 +242,6 @@ DEPENDENCIES:
- flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
- google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
- - google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`)
- - google_mlkit_text_recognition (from `.symlinks/plugins/google_mlkit_text_recognition/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`)
@@ -320,18 +275,10 @@ SPEC REPOS:
- FMDB
- GoogleDataTransport
- GoogleMaps
- - GoogleMLKit
- GoogleSignIn
- - GoogleToolboxForMac
- GoogleUtilities
- - GoogleUtilitiesComponents
- GTMAppAuth
- GTMSessionFetcher
- - MLImage
- - MLKitCommon
- - MLKitTextRecognition
- - MLKitTextRecognitionCommon
- - MLKitVision
- nanopb
- PromisesObjC
- Stripe
@@ -349,8 +296,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/agora_rtc_engine/ios"
audio_session:
:path: ".symlinks/plugins/audio_session/ios"
- background_location:
- :path: ".symlinks/plugins/background_location/ios"
camera_avfoundation:
:path: ".symlinks/plugins/camera_avfoundation/ios"
device_info_plus:
@@ -371,10 +316,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/geolocator_apple/ios"
google_maps_flutter_ios:
:path: ".symlinks/plugins/google_maps_flutter_ios/ios"
- google_mlkit_commons:
- :path: ".symlinks/plugins/google_mlkit_commons/ios"
- google_mlkit_text_recognition:
- :path: ".symlinks/plugins/google_mlkit_text_recognition/ios"
google_sign_in_ios:
:path: ".symlinks/plugins/google_sign_in_ios/darwin"
image_cropper:
@@ -420,7 +361,6 @@ SPEC CHECKSUMS:
AgoraRtcEngine_iOS: 267c0980c1fb97e056d05b850f8629b05b6e467a
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
audio_session: 4f3e461722055d21515cf3261b64c973c062f345
- background_location: 1b80c1fe3abd9912bca298618f6e365abf6f588f
camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06
@@ -437,16 +377,11 @@ SPEC CHECKSUMS:
FMDB: eae540775bf7d0c87a5af926ae37af69effe5a19
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
google_maps_flutter_ios: 590249c67f34f422122c232f2a626192adbc78ee
- google_mlkit_commons: 96aaca445520311b84a2da013dedf3427fe4cc69
- google_mlkit_text_recognition: 393c2526da49aa6c9c883e6d69100f54af011e24
google_sign_in_ios: 07375bfbf2620bc93a602c0e27160d6afc6ead38
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
- GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
- GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
GoogleUtilities: c56430aef51a1aa57b25da78c3f8397e522c67b7
- GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd
image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25
@@ -455,11 +390,6 @@ SPEC CHECKSUMS:
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
location: d5cf8598915965547c3f36761ae9cc4f4e87d22e
- MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
- MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
- MLKitTextRecognition: c83c18ad25496f2077f6ec93c5940487ff2eb343
- MLKitTextRecognitionCommon: c0b3a63d529296a19bce1f8bc8a513644ed4d1f6
- MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
diff --git a/key/api_key.json b/key/api_key.json
deleted file mode 100644
index a4a598c..0000000
--- a/key/api_key.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "basicAuthCredentials": "wqnmqqsjyvwv:nqrDEV@2101Br",
- "accountSIDTwillo": "ACx4qy857juj0903xuy6238q763q2fj4y1Br",
- "serverAPI": "AAAAobYrrCi:APA91xF1zwTvmSzSdaxuY6f60D8mz1ZzyIzr9od6br7GDyeCaWPRK0G0hx5SaFyx1eDvQDpQPdGk-697MWLi0zs3iYInBtBLOxswg0GecNmsl0PxE3wI-vOpwu8Vv1dkUkBniuxZYXgHBr",
- "mapAPIKEY": "AImqSsCsutRXTtSTLOFQSQkN5v7QZkGJVZbEKa0Br",
- "twilloRecoveryCode": "TQF13XUVU2NJ3VFU8JWBWYBSBr",
- "authTokenTwillo": "14u39ju4628xx8q4u18469u462u8qu75Br",
- "chatGPTkey": "zg-8T67q8YDNGAeUSXqkHowT3BrxgFJfFy3ELw6rm7A6adb0kjwBr",
- "transactionCloude": "Ahcwilomqcoib:API_EMDJX6BHQ67DBGT6WV:DG2XPU7YEN02M0VJ2FBr",
- "visionApi": "0vALyaDDYHpmv73Q59SIkxmeG7Z2mgwJXlBr",
- "stripe_publishableKe": "vg_cjzc_51O4WTODMEVlOCA5SN5j6x8vApF5CPDC3f3Pou18a74NEQAvU5AunZZEN9X2WIqsuIlUTeeh1vUqpnkijLkx3FR5g00vb4iMHGOBr",
- "secretKey": "zg_cjzc_51O4WTODMEVlOCA5SBkqiSS69bNFRsuZd2Tr5ODztYseaLvf0RdBHW3wwfP38Tv78TZ1PQiZi7jHFrrRoQy3lMHPN00Ll9WD3b2Br",
- "chatGPTkeySefer": "zg-OiL08ooza0Dvhvb3rSk2T3BrxgFJ4l9jLLSrUj0Ae5ABVlqPBr"
-}
\ No newline at end of file
diff --git a/lib/controller/admin/captain_admin_controller.dart b/lib/controller/admin/captain_admin_controller.dart
deleted file mode 100644
index f73327f..0000000
--- a/lib/controller/admin/captain_admin_controller.dart
+++ /dev/null
@@ -1,109 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:local_auth/local_auth.dart';
-
-import '../../constant/colors.dart';
-import '../../constant/links.dart';
-import '../functions/crud.dart';
-
-class CaptainAdminController extends GetxController {
- bool isLoading = false;
- Map captainData = {};
- Map captain = {};
- final captainController = TextEditingController();
- final captainPrizeController = TextEditingController();
- final titleNotify = TextEditingController();
- final bodyNotify = TextEditingController();
- final formCaptainKey = GlobalKey();
- final formCaptainPrizeKey = GlobalKey();
-
- Future getCaptainCount() async {
- isLoading = true;
- update();
- var res = await CRUD().get(link: AppLink.getCaptainDetails, payload: {});
- var d = jsonDecode(res);
- if (d['status'] == 'success') {
- captainData = d;
- print(captainData);
- }
-
- isLoading = false;
- update();
- }
-
- Future addCaptainPrizeToWallet() async {
- String? paymentId;
- //todo link to add wallet to captain
- for (var i = 0; i < captainData['message'].length; i++) {
- await CRUD().post(link: AppLink.addDriverPaymentPoints, payload: {
- 'driverID': captainData['message'][i]['id'],
- 'amount': captainPrizeController.text,
- 'paymentMethod': 'Prize',
- }).then((value) {
- paymentId = value['message'].toString();
- });
- await CRUD().post(link: AppLink.addPassengersWallet, payload: {
- 'driverID': captainData['message'][i]['id'],
- 'amount': captainPrizeController.text,
- 'paymentMethod': 'Prize',
- 'paymentID': paymentId.toString(),
- });
- }
-
- Get.back();
- }
-
- void addCaptainsPrizeToWalletSecure() async {
- try {
- // Check if local authentication is available
- bool isAvailable = await LocalAuthentication().isDeviceSupported();
- if (isAvailable) {
- // Authenticate the user
- bool didAuthenticate = await LocalAuthentication().authenticate(
- localizedReason: 'Use Touch ID or Face ID to confirm payment',
- );
- if (didAuthenticate) {
- // User authenticated successfully, proceed with payment
- await addCaptainPrizeToWallet();
- Get.snackbar('Prize Added', '', backgroundColor: AppColor.greenColor);
- } else {
- // Authentication failed, handle accordingly
- Get.snackbar('Authentication failed', '',
- backgroundColor: AppColor.redColor);
- // print(
- // 'Authentication failed');
- }
- } else {
- // Local authentication not available, proceed with payment without authentication
- await addCaptainPrizeToWallet();
- Get.snackbar('Prize Added', '', backgroundColor: AppColor.greenColor);
- }
- } catch (e) {
- rethrow;
- }
- }
-
- Future getCaptains() async {
- var res = await CRUD()
- .get(link: AppLink.getCaptainDetailsByEmailOrIDOrPhone, payload: {
- 'driver_id': captainController.text,
- 'driverEmail': captainController.text,
- 'driverPhone': captainController.text,
- });
- var d = jsonDecode(res);
- // print(d['message']);
- if (d['status'] == 'success') {
- captain = d;
- }
- // print(passengers);
- update();
- }
-
- @override
- void onInit() {
- getCaptainCount();
- super.onInit();
- }
-}
diff --git a/lib/controller/admin/passenger_admin_controller.dart b/lib/controller/admin/passenger_admin_controller.dart
deleted file mode 100644
index ce16916..0000000
--- a/lib/controller/admin/passenger_admin_controller.dart
+++ /dev/null
@@ -1,110 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:local_auth/local_auth.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-
-class PassengerAdminController extends GetxController {
- bool isLoading = false;
- Map passengersData = {};
- Map passengers = {};
- double height = 150;
- final formPassKey = GlobalKey();
- final formPrizeKey = GlobalKey();
- final titleNotify = TextEditingController();
- final bodyNotify = TextEditingController();
- final passengerController = TextEditingController();
- final passengerPrizeController = TextEditingController();
-
- Future getPassengerCount() async {
- isLoading = true;
- update();
- var res = await CRUD().get(link: AppLink.getPassengerDetails, payload: {});
- var d = jsonDecode(res);
- if (d['status'] == 'success') {
- passengersData = d;
- }
-
- isLoading = false;
- update();
- }
-
- Future addPassengerPrizeToWallet() async {
- for (var i = 0; i < passengersData['message'].length; i++) {
- await CRUD().post(link: AppLink.addPassengersWallet, payload: {
- 'passenger_id': passengersData['message'][i]['id'],
- 'balance': passengerPrizeController.text,
- });
- }
-
- Get.back();
- }
-
- void addPassengerPrizeToWalletSecure() async {
- try {
- // Check if local authentication is available
- bool isAvailable = await LocalAuthentication().isDeviceSupported();
- if (isAvailable) {
- // Authenticate the user
- bool didAuthenticate = await LocalAuthentication().authenticate(
- localizedReason: 'Use Touch ID or Face ID to confirm payment',
- );
- if (didAuthenticate) {
- // User authenticated successfully, proceed with payment
- await addPassengerPrizeToWallet();
- Get.snackbar('Prize Added', '', backgroundColor: AppColor.greenColor);
- } else {
- // Authentication failed, handle accordingly
- Get.snackbar('Authentication failed', '',
- backgroundColor: AppColor.redColor);
- // print(
- // 'Authentication failed');
- }
- } else {
- // Local authentication not available, proceed with payment without authentication
- await addPassengerPrizeToWallet();
- Get.snackbar('Prize Added', '', backgroundColor: AppColor.greenColor);
- }
- } catch (e) {
- rethrow;
- }
- }
-
- Future getPassengers() async {
- var res = await CRUD().get(link: AppLink.getPassengerbyEmail, payload: {
- 'passengerEmail': passengerController.text,
- 'passengerId': passengerController.text,
- 'passengerphone': passengerController.text,
- });
- var d = jsonDecode(res);
- // print(d['message']);
- if (d['status'] == 'success') {
- passengers = d;
- }
- // print(passengers);
- update();
- }
-
- changeHeight() {
- if (passengers.isEmpty) {
- height = 0;
- update();
- }
- height = 150;
- update();
- }
-
- void clearPlaces() {
- passengers = {};
- update();
- }
-
- @override
- void onInit() {
- getPassengerCount();
- super.onInit();
- }
-}
diff --git a/lib/controller/admin/ride_admin_controller.dart b/lib/controller/admin/ride_admin_controller.dart
deleted file mode 100644
index 9397b79..0000000
--- a/lib/controller/admin/ride_admin_controller.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-import 'dart:convert';
-
-import 'package:fl_chart/fl_chart.dart';
-import 'package:get/get.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-
-import '../../models/model/admin/monthly_ride.dart';
-
-class RideAdminController extends GetxController {
- bool isLoading = false;
- late List rideData;
- late Map jsonResponse;
- List ridesDetails = [];
- var chartData;
- // late List chartDatasync;
- Future getRidesAdminDash() async {
- isLoading = true;
- update();
- var res = await CRUD().get(link: AppLink.getRidesPerMonth, payload: {});
- jsonResponse = jsonDecode(res);
- rideData = (jsonResponse['message'] as List)
- .map((item) => MonthlyDataModel.fromJson(item))
- .toList();
-
- chartData = rideData
- .map((data) => FlSpot(data.day.toDouble(), data.ridesCount.toDouble()))
- .toList();
-
- // chartDatasync = (jsonResponse['message'] as List)
- // .map((item) => ChartDataS(
- // item['year'],
- // item['month'],
- // item['day'],
- // item['rides_count'],
- // ))
- // .toList();
- isLoading = false;
- update();
- }
-
- Future getRidesDetails() async {
- // isLoading = true;
- // update();
- var res = await CRUD().get(link: AppLink.getRidesDetails, payload: {});
-
- var d = jsonDecode(res);
- ridesDetails = d['message'];
-
- // isLoading = false;
- // update();
- }
-
- @override
- void onInit() async {
- List initializationTasks = [
- getRidesAdminDash(),
- getRidesDetails(),
- ];
- // cameras = await availableCameras();
- await Future.wait(initializationTasks);
- super.onInit();
- }
-}
-
-// class ChartDataS {
-// ChartDataS(this.year, this.month, this.day, this.ridesCount);
-
-// final int year;
-// final int month;
-// final int day;
-// final int ridesCount;
-// }
diff --git a/lib/controller/admin/wallet_admin_controller.dart b/lib/controller/admin/wallet_admin_controller.dart
deleted file mode 100644
index 1f8a534..0000000
--- a/lib/controller/admin/wallet_admin_controller.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-import 'dart:convert';
-
-import 'package:get/get.dart';
-
-import '../../constant/links.dart';
-import '../functions/crud.dart';
-
-class WalletAdminController extends GetxController {
- bool isLoading = false;
-
- late Map jsonResponse;
- List walletDetails = [];
-
- Future getWalletAdminDash() async {
- isLoading = true;
- update();
- var res = await CRUD().get(link: AppLink.getRidesPerMonth, payload: {});
- jsonResponse = jsonDecode(res);
- }
-}
diff --git a/lib/controller/auth/captin/history_captain.dart b/lib/controller/auth/captin/history_captain.dart
deleted file mode 100644
index 9f55437..0000000
--- a/lib/controller/auth/captin/history_captain.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-import 'dart:convert';
-
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:get/get.dart';
-
-import '../../../constant/box_name.dart';
-import '../../../constant/links.dart';
-import '../../../main.dart';
-import '../../../views/home/Captin/history/history_details_page.dart';
-import '../../functions/crud.dart';
-
-class HistoryCaptainController extends GetxController {
- bool isloading = false;
- Map historyData = {};
- Map historyDetailsData = {};
- late String orderID;
- getOrderId(String orderId) {
- orderID = orderId;
- update();
- }
-
- getHistory() async {
- isloading = true;
- var res = await CRUD().get(
- link: AppLink.getDriverOrder,
- payload: {'driver_id': box.read(BoxName.driverID)});
- if (res != 'failure') {
- historyData = jsonDecode(res);
- print(historyData);
- isloading = false;
- update();
- } else {
- Get.defaultDialog(
- title: 'No ride yet'.tr,
- middleText: '',
- barrierDismissible: false,
- confirm: MyElevatedButton(
- title: 'Back'.tr,
- onPressed: () {
- Get.back();
- Get.back();
- }));
- }
- }
-
- getHistoryDetails(String orderId) async {
- isloading = true;
- var res = await CRUD()
- .get(link: AppLink.getRideOrderID, payload: {'id': orderId});
- historyDetailsData = jsonDecode(res);
- print(historyDetailsData);
- isloading = false;
- update();
- Get.to(() => HistoryDetailsPage());
- }
-
- @override
- void onInit() {
- getHistory();
- super.onInit();
- }
-}
diff --git a/lib/controller/auth/captin/login_captin_controller.dart b/lib/controller/auth/captin/login_captin_controller.dart
deleted file mode 100644
index 69f5668..0000000
--- a/lib/controller/auth/captin/login_captin_controller.dart
+++ /dev/null
@@ -1,118 +0,0 @@
-import 'dart:convert';
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/secure_storage.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/verify_email_captain.dart';
-import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
-
-class LoginCaptinController extends GetxController {
- final formKey = GlobalKey();
- TextEditingController emailController = TextEditingController();
- TextEditingController phoneController = TextEditingController();
- TextEditingController passwordController = TextEditingController();
- bool isAgreeTerms = false;
- bool isloading = false;
- final FlutterSecureStorage _storage = const FlutterSecureStorage();
-
- void changeAgreeTerm() {
- isAgreeTerms = !isAgreeTerms;
- print(isAgreeTerms);
- update();
- }
-
- void saveAgreementTerms() {
- box.write(BoxName.agreeTerms, 'agreed');
- update();
- }
-
- void login() async {
- isloading = true;
- update();
- var res = await CRUD().get(link: AppLink.loginCaptin, payload: {
- 'email': emailController.text,
- 'phone': phoneController.text,
- 'password': passwordController.text
- });
- print(res);
- if (res == 'Failure') {
- isloading = false;
- update();
- Get.snackbar('Failure', '', backgroundColor: Colors.red);
- } else {
- var jsonDecoeded = jsonDecode(res);
- // print(jsonDecoeded);
- if (jsonDecoeded.isNotEmpty) {
- if (jsonDecoeded['status'] == 'success') {
- print(jsonDecoeded['data'][0]['verified']);
- if (jsonDecoeded['data'][0]['verified'] == '1') {
- box.write(BoxName.driverID, jsonDecoeded['data'][0]['id']);
- box.write(BoxName.emailDriver, jsonDecoeded['data'][0]['email']);
- box.write(
- BoxName.nameDriver, jsonDecoeded['data'][0]['first_name']);
- box.write(BoxName.phoneDriver, jsonDecoeded['data'][0]['phone']);
- SecureStorage()
- .saveData(BoxName.passwordDriver, passwordController.text);
- Get.offAll(() => HomeCaptain());
- isloading = false;
- update();
- print(box.read(BoxName.driverID).toString());
- print(box.read(BoxName.tokenDriver));
- await CRUD().post(link: AppLink.addTokensDriver, payload: {
- 'token': box.read(BoxName.tokenDriver),
- 'captain_id': box.read(BoxName.driverID).toString()
- }).then((value) => print('cccc'));
- } else {
- isloading = false;
- update();
- Get.defaultDialog(
- title: 'You must Verify email !.'.tr,
- middleText: '',
- backgroundColor: Colors.yellow[300],
- onConfirm: () async {
- int randomNumber = Random().nextInt(100000) + 1;
- await CRUD().post(link: AppLink.sendVerifyEmail, payload: {
- 'email': emailController.text,
- 'token': randomNumber.toString(),
- }).then((value) => print(value));
- Get.to(() => VerifyEmailCaptainPage());
- },
- );
- }
- } else if (jsonDecoeded['status'] == 'Failure') {
- Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
- backgroundColor: Colors.redAccent);
- isloading = false;
- update();
- }
- } else {
- print('res is null');
- isloading = false;
- update();
- }
- }
- }
-
- void loginByBoxData() async {
- Get.to(() => HomeCaptain());
- await CRUD().post(link: AppLink.addTokensDriver, payload: {
- 'token': box.read(BoxName.tokenDriver).toString(),
- 'captain_id': box.read(BoxName.driverID).toString()
- });
- }
-
- @override
- void onInit() async {
- super.onInit();
-
- // if (box.read(BoxName.driverID).toString() != null) {
- // loginByBoxData();
- // }
- }
-}
diff --git a/lib/controller/auth/captin/ml_google_doc.dart b/lib/controller/auth/captin/ml_google_doc.dart
deleted file mode 100644
index 6580a6b..0000000
--- a/lib/controller/auth/captin/ml_google_doc.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'dart:io';
-
-import 'package:get/get.dart';
-import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
-import 'package:image_cropper/image_cropper.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:SEFER/constant/colors.dart';
-import 'package:SEFER/controller/functions/llama_ai.dart';
-
-class CarRegistrationRecognizerController extends GetxController {
- @override
- void onInit() {
- // scanText();
- super.onInit();
- }
-
- // The ImagePicker instance
- final ImagePicker _imagePicker = ImagePicker();
-
- // The GoogleMlKit TextRecognizer instance
- final TextRecognizer _textRecognizer = TextRecognizer();
-
- // The scanned text
- String? scannedText;
- String? jsonOutput;
- final List> lines = [];
- Map extracted = {};
- XFile? image;
- CroppedFile? croppedFile;
- // Picks an image from the camera or gallery and extracts the text
- final List> extractedTextWithCoordinates = [];
-
- Future scanText() async {
- // Pick an image from the camera or gallery
- image = await _imagePicker.pickImage(source: ImageSource.gallery);
- update();
-
- // If no image was picked, return
- if (image == null) {
- return;
- }
-
- // Crop the image
- croppedFile = await ImageCropper().cropImage(
- sourcePath: image!.path,
- aspectRatioPresets: [
- CropAspectRatioPreset.square,
- CropAspectRatioPreset.ratio3x2,
- CropAspectRatioPreset.original,
- CropAspectRatioPreset.ratio4x3,
- CropAspectRatioPreset.ratio16x9
- ],
- uiSettings: [
- AndroidUiSettings(
- toolbarTitle: 'Cropper'.tr,
- toolbarColor: AppColor.blueColor,
- toolbarWidgetColor: AppColor.yellowColor,
- initAspectRatio: CropAspectRatioPreset.original,
- lockAspectRatio: false),
- IOSUiSettings(
- title: 'Cropper'.tr,
- ),
- ],
- );
-
- // If no cropped image was obtained, return
- if (croppedFile == null) {
- return;
- }
-
- // Convert the cropped file to an InputImage object
- final InputImage inputImage = InputImage.fromFile(File(croppedFile!.path));
-
- // Recognize the text in the image
- final RecognizedText recognizedText =
- await _textRecognizer.processImage(inputImage);
- scannedText = recognizedText.text;
-
- // Extract the scanned text line by line
- final List> lines = [];
- for (var i = 0; i < recognizedText.blocks.length; i++) {
- lines.add({
- i.toString(): recognizedText.blocks[i].text,
- });
- }
-
- String result = lines.map((map) => map.values.first.toString()).join(' ');
- // print(result.length);
- if (result.length > 2200) {
- result = result.substring(0, 2200);
- }
- // print('jsonOutput------------------------------');
- // print(result);
- Map result2 = await LlamaAi().getCarRegistrationData(result,
- 'vin,make,made,year,expiration_date,color,owner,registration_date'); //
-
- // Assign the result to the extracted variable
- extracted = result2;
-
- print('extracted is ' + extracted.toString());
- update();
- }
-}
diff --git a/lib/controller/auth/captin/register_captin_controller.dart b/lib/controller/auth/captin/register_captin_controller.dart
deleted file mode 100644
index fd1a94c..0000000
--- a/lib/controller/auth/captin/register_captin_controller.dart
+++ /dev/null
@@ -1,197 +0,0 @@
-import 'dart:convert';
-import 'dart:math';
-
-import 'package:SEFER/controller/auth/captin/login_captin_controller.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/ocr_controller.dart';
-import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/login_captin.dart';
-import 'package:SEFER/views/auth/captin/verify_email_captain.dart';
-
-import '../../../views/auth/captin/ai_page.dart';
-import '../../../views/auth/captin/car_license_page.dart';
-import '../../../views/home/Captin/home_captain/home_captin.dart';
-
-class RegisterCaptainController extends GetxController {
- final formKey = GlobalKey();
-
- TextEditingController emailController = TextEditingController();
- TextEditingController phoneController = TextEditingController();
- TextEditingController passwordController = TextEditingController();
- TextEditingController verifyCode = TextEditingController();
-
- String birthDate = 'Birth Date'.tr;
- String gender = 'Male'.tr;
- bool isLoading = false;
- late String name;
- late String licenseClass;
- late String documentNo;
- late String address;
- late String height;
- late String postalCode;
- late String sex;
- late String stateCode;
- late String expireDate;
- late String dob;
-
- getBirthDate() {
- Get.defaultDialog(
- title: 'Select Date'.tr,
- content: SizedBox(
- width: 300,
- child: CalendarDatePicker(
- initialDate: DateTime.now().subtract(const Duration(days: 18 * 365)),
- firstDate: DateTime.parse('1940-06-01'),
- lastDate: DateTime.now().subtract(const Duration(days: 18 * 365)),
- onDateChanged: (date) {
- // Get the selected date and convert it to a DateTime object
- DateTime dateTime = date;
- // Call the getOrders() function from the controller
- birthDate = dateTime.toString().split(' ')[0];
- update();
- Get.back();
- },
-
- // onDateChanged: (DateTime value) {},
- ),
- ),
- );
- }
-
- void changeGender(String value) {
- gender = value;
- update();
- }
-
- sendVerifications() async {
- var res = await CRUD().post(link: AppLink.verifyEmail, payload: {
- 'email': emailController.text.isEmpty
- ? Get.find().emailController.text.toString()
- : emailController.text,
- 'token': verifyCode.text,
- });
-
- if (res != 'failure') {
- if (Get.find().emailController.text.toString() !=
- '') {
- Get.offAll(() => HomeCaptain());
- } else {
- Get.to(() => CarLicensePage());
- }
- }
- }
-
- void nextToAIDetection() async {
- //Todo dont forget this
- if (formKey.currentState!.validate()) {
- isLoading = true;
- update();
- Get.to(() => AiPage());
- }
- }
-
- Map payloadLisence = {};
-
- void getFromController() {
- name = Get.find().name;
- licenseClass = Get.find().licenseClass.toString();
- documentNo = Get.find().documentNo.toString();
- address = Get.find().address.toString();
- height = Get.find().height.toString();
- postalCode = Get.find().address.toString();
- sex = Get.find().sex.toString();
- stateCode = Get.find().postalCode.toString();
- expireDate = Get.find().expireDate.toString();
- dob = Get.find().dob.toString();
- update();
- }
-
- Future addLisence() async {
- getFromController();
- var res = await CRUD().post(link: AppLink.addLicense, payload: {
- 'name': name,
- 'licenseClass': licenseClass,
- 'documentNo': documentNo,
- 'address': address,
- 'height': height,
- 'postalCode': postalCode,
- 'sex': sex,
- 'stateCode': stateCode,
- 'expireDate': expireDate,
- 'dateOfBirth': dob,
- });
- print(jsonDecode(res));
- isLoading = false;
- update();
- if (jsonDecode(res)['status'] == 'success') {
- // Get.to(() => AiPage()); //todo rplace this
- }
- }
-
- void addRegisrationCarForDriver(String vin, make, model, year, color, owner,
- expirationDate, registrationDate) async {
- getFromController();
- var res = await CRUD().post(link: AppLink.addRegisrationCar, payload: {
- 'vin': vin,
- 'make': make,
- 'model': model,
- 'year': year,
- 'expirationDate': expirationDate,
- 'color': color,
- 'owner': owner,
- 'registrationDate': registrationDate,
- });
- print(jsonDecode(res));
- box.write(BoxName.vin, vin);
- box.write(BoxName.make, make);
- box.write(BoxName.model, model);
- box.write(BoxName.year, year);
- box.write(BoxName.expirationDate, expirationDate);
- box.write(BoxName.color, color);
- box.write(BoxName.owner, owner);
- box.write(BoxName.registrationDate, registrationDate);
- isLoading = false;
- update();
- if (jsonDecode(res)['status'] == 'success') {
- Get.offAll(() => LoginCaptin()); //todo replace this
- }
- }
-
- Future register() async {
- getFromController();
- if (formKey.currentState!.validate()) {
- isLoading = true;
- update();
- var res = await CRUD().post(link: AppLink.signUpCaptin, payload: {
- 'first_name': name.split(' ')[1],
- 'last_name': name.split(' ')[0],
- 'email': emailController.text,
- 'phone': phoneController.text,
- 'password': passwordController.text,
- 'gender': sex,
- 'site': address,
- 'birthdate': dob,
- });
-
- isLoading = false;
- update();
- if (jsonDecode(res)['status'] == 'success') {
- box.write(BoxName.driverID, jsonDecode(res)['message']);
- box.write(BoxName.dobDriver, dob);
- box.write(BoxName.sexDriver, sex);
- box.write(BoxName.phoneDriver, phoneController.text);
- box.write(BoxName.lastNameDriver, name.split(' ')[0]);
- int randomNumber = Random().nextInt(100000) + 1;
- await CRUD().post(link: AppLink.sendVerifyEmail, payload: {
- 'email': emailController.text,
- 'token': randomNumber.toString(),
- }).then((value) => print(value));
- Get.to(() => VerifyEmailCaptainPage());
- }
- }
- }
-}
diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart
index 7fa4c77..ac53fc6 100644
--- a/lib/controller/auth/google_sign.dart
+++ b/lib/controller/auth/google_sign.dart
@@ -3,8 +3,6 @@ import 'package:SEFER/main.dart';
import 'package:get/get.dart';
import 'package:google_sign_in/google_sign_in.dart';
-import '../../views/auth/captin/ai_page.dart';
-
class GoogleSignInHelper {
static final GoogleSignIn _googleSignIn = GoogleSignIn(
scopes: [
@@ -17,7 +15,7 @@ class GoogleSignInHelper {
try {
final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
getDriverInfo();
- Get.to(() => AiPage());
+ // Get.to(() => AiPage());
return googleUser;
} catch (error) {
print('Google Sign-In error: $error');
diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart
index 8fdaea2..86627bb 100644
--- a/lib/controller/auth/login_controller.dart
+++ b/lib/controller/auth/login_controller.dart
@@ -1,5 +1,4 @@
import 'dart:convert';
-import 'dart:io';
import 'dart:math';
import 'package:flutter/material.dart';
@@ -13,9 +12,6 @@ import 'package:SEFER/main.dart';
import 'package:SEFER/views/auth/verify_email_page.dart';
import 'package:SEFER/views/home/map_page_passenger.dart';
-import '../../views/admin/admin_home_page.dart';
-import '../functions/device_info.dart';
-
class LoginController extends GetxController {
final formKey = GlobalKey();
final formKeyAdmin = GlobalKey();
@@ -44,37 +40,37 @@ class LoginController extends GetxController {
update();
}
- void adminDashboardOpen() async {
- if (formKeyAdmin.currentState!.validate()) {
- await DeviceInfoPlus.getDeviceInfo();
- if (Platform.isAndroid) {
- // print(DeviceInfoPlus.deviceDataList['serialNumber']);
- // var res = await CRUD().get(link: AppLink.getAdminUser, payload: {
- // // 'device_number': DeviceInfoPlus.deviceData['serialNumber'].toString(),
- // });
- // var d = jsonDecode(res);
- // // print(d);
- // // if (DeviceInfoPlus.deviceData['serialNumber'] ==
- // d['message']['device_number']) {
- Get.back();
- Get.to(() => const AdminHomePage());
- // }
- }
- if (Platform.isIOS) {
- // print(DeviceInfoPlus.deviceData['identifierForVendor']);
- // var res = await CRUD().get(link: AppLink.getAdminUser, payload: {
- // 'device_number': DeviceInfoPlus.deviceData['identifierForVendor'].toString(),
- // });
- // var d = jsonDecode(res);
- // print(d);
- // if (DeviceInfoPlus.deviceData['serialNumber'] ==
- // d['message']['device_number']) {
- Get.back();
- Get.to(() => const AdminHomePage());
- // }
- }
- }
- }
+ // void adminDashboardOpen() async {
+ // if (formKeyAdmin.currentState!.validate()) {
+ // await DeviceInfoPlus.getDeviceInfo();
+ // if (Platform.isAndroid) {
+ // // print(DeviceInfoPlus.deviceDataList['serialNumber']);
+ // // var res = await CRUD().get(link: AppLink.getAdminUser, payload: {
+ // // // 'device_number': DeviceInfoPlus.deviceData['serialNumber'].toString(),
+ // // });
+ // // var d = jsonDecode(res);
+ // // // print(d);
+ // // // if (DeviceInfoPlus.deviceData['serialNumber'] ==
+ // // d['message']['device_number']) {
+ // Get.back();
+ // Get.to(() => const AdminHomePage());
+ // // }
+ // }
+ // if (Platform.isIOS) {
+ // // print(DeviceInfoPlus.deviceData['identifierForVendor']);
+ // // var res = await CRUD().get(link: AppLink.getAdminUser, payload: {
+ // // 'device_number': DeviceInfoPlus.deviceData['identifierForVendor'].toString(),
+ // // });
+ // // var d = jsonDecode(res);
+ // // print(d);
+ // // if (DeviceInfoPlus.deviceData['serialNumber'] ==
+ // // d['message']['device_number']) {
+ // Get.back();
+ // Get.to(() => const AdminHomePage());
+ // // }
+ // }
+ // }
+ // }
void login() async {
isloading = true;
diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart
index 5abd8fd..7d292cd 100644
--- a/lib/controller/firebase/firbase_messge.dart
+++ b/lib/controller/firebase/firbase_messge.dart
@@ -1,8 +1,5 @@
import 'dart:convert';
import 'dart:io';
-import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
-import 'package:SEFER/controller/home/captin/map_driver_controller.dart';
-import 'package:SEFER/views/home/Captin/home_captain/widget/call_page.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -18,14 +15,10 @@ import '../../constant/links.dart';
import '../../constant/style.dart';
import '../../main.dart';
import '../../views/Rate/rate_captain.dart';
-import '../../views/home/Captin/home_captain/home_captin.dart';
-import '../../views/home/Captin/orderCaptin/order_speed_request.dart';
import '../../views/home/map_page_passenger.dart';
import '../../views/home/map_widget.dart/call_passenger_page.dart';
import '../../views/home/profile/promos_passenger_page.dart';
-import '../../views/home/Captin/orderCaptin/order_request_page.dart';
import '../home/map_passenger_controller.dart';
-import '../payment/payment_controller.dart';
import 'local_notification.dart';
class FirebaseMessagesController extends GetxController {
@@ -121,25 +114,6 @@ class FirebaseMessagesController extends GetxController {
void fireBaseTitles(RemoteMessage message) {
if (message.notification!.title! == 'Order') {
- if (Platform.isAndroid) {
- NotificationController().showNotification('Order', '', 'order');
- }
- var myListString = message.data['DriverList'];
- // var points = message.data['PolylineJson'];
-
- var myList = jsonDecode(myListString) as List;
- // var myPoints = jsonDecode(points) as List;
- driverToken = myList[14].toString();
- // This is for location using and uploading status
- Get.put(HomeCaptainController()).changeRideId();
- update();
- // print('driverToken==============$driverToken');
- Get.to(() => OrderRequestPage(), arguments: {
- 'myListString': myListString,
- 'DriverList': myList,
- // 'PolylineJson': myPoints,
- 'body': message.notification!.body
- });
} else if (message.notification!.title! == 'Apply Ride') {
var passengerList = message.data['passengerList'];
@@ -153,10 +127,6 @@ class FirebaseMessagesController extends GetxController {
NotificationController()
.showNotification('Promo', 'Show latest promo'.tr, 'promo');
Get.to(const PromosPassengerPage());
- } else if (message.notification!.title == 'Cancel Trip') {
- NotificationController().showNotification(
- 'Cancel Trip'.tr, 'Passenger Cancel Trip'.tr, 'cancel');
- cancelTripDialog();
} else if (message.notification!.title! == 'DriverIsGoingToPassenger') {
Get.find().isDriverInPassengerWay = true;
Get.find().update();
@@ -227,26 +197,6 @@ class FirebaseMessagesController extends GetxController {
} catch (e) {
print('Error navigating to PassengerCallPage: $e');
}
- } else if (message.notification!.title! == 'Call Income from Passenger') {
- try {
- var myListString = message.data['passengerList'];
- var driverList = jsonDecode(myListString) as List;
- // if (Platform.isAndroid) {
- NotificationController().showNotification(
- 'Call Income'.tr,
- message.notification!.body!,
- 'iphone_ringtone',
- );
- // }
- // Assuming GetMaterialApp is initialized and context is valid for navigation
- Get.to(() => CallPage(
- // channelName: driverList[1].toString(),
- // token: driverList[0].toString(),
- // remoteID: driverList[2].toString(),
- ));
- } catch (e) {
- print('Error navigating to PassengerCallPage: $e');
- }
} else if (message.notification!.title! == 'Call End') {
try {
var myListString = message.data['passengerList'];
@@ -259,7 +209,7 @@ class FirebaseMessagesController extends GetxController {
);
}
// Assuming GetMaterialApp is initialized and context is valid for navigation
- Get.off(const CallPage());
+ // Get.off(const CallPage());
} catch (e) {
print('Error navigating to PassengerCallPage: $e');
}
@@ -288,21 +238,6 @@ class FirebaseMessagesController extends GetxController {
backgroundColor: AppColor.yellowColor,
snackPosition: SnackPosition.BOTTOM,
);
- } else if (message.notification!.title! == 'OrderSpeed') {
- var myListString = message.data['DriverList'];
- // var points = message.data['PolylineJson'];
-
- var myList = jsonDecode(myListString) as List;
- // var myPoints = jsonDecode(points) as List;
- driverToken = myList[14].toString();
- update();
- // print('driverToken==============$driverToken');
- Get.to(() => OrderSpeedRequest(), arguments: {
- 'myListString': myListString,
- 'DriverList': myList,
- // 'PolylineJson': myPoints,
- 'body': message.notification!.body
- });
} else if (message.notification!.title! == 'Order Applied') {
NotificationController().showNotification(
'The order Accepted by another Driver'.tr,
@@ -334,18 +269,6 @@ class FirebaseMessagesController extends GetxController {
);
}
- Future cancelTripDialog() {
- return Get.defaultDialog(
- barrierDismissible: false,
- title: 'Passenger Cancel Trip'.tr,
- middleText: '',
- confirm: MyElevatedButton(
- title: 'Ok'.tr,
- onPressed: () {
- Get.offAll(HomeCaptain());
- }));
- }
-
Future driverArrivePassengerDialoge() {
return Get.defaultDialog(
barrierDismissible: false,
diff --git a/lib/controller/functions/call_controller.dart b/lib/controller/functions/call_controller.dart
index 9976488..ca4c09e 100644
--- a/lib/controller/functions/call_controller.dart
+++ b/lib/controller/functions/call_controller.dart
@@ -7,7 +7,6 @@ import 'package:permission_handler/permission_handler.dart';
import '../../constant/box_name.dart';
import '../firebase/firbase_messge.dart';
-import '../home/captin/map_driver_controller.dart';
import '../../main.dart';
class CallController extends GetxController {
@@ -23,15 +22,15 @@ class CallController extends GetxController {
@override
void onInit() {
super.onInit();
- if (box.read(BoxName.passengerID) != null) {
- channelName = Get.find().rideId; // 'sefer300'; //
- remoteUid = int.parse(Get.find().driverPhone);
- uid = int.parse(box.read(BoxName.phone));
- } else {
- channelName = Get.find().rideId; // 'sefer300'; //
- remoteUid = int.parse(Get.find().passengerPhone);
- uid = int.parse(box.read(BoxName.phoneDriver));
- }
+ // if (box.read(BoxName.passengerID) != null) {
+ channelName = Get.find().rideId; // 'sefer300'; //
+ remoteUid = int.parse(Get.find().driverPhone);
+ uid = int.parse(box.read(BoxName.phone));
+ // } else {
+ // channelName = Get.find().rideId; // 'sefer300'; //
+ // remoteUid = int.parse(Get.find().passengerPhone);
+ // uid = int.parse(box.read(BoxName.phoneDriver));
+ // }
initAgoraFull();
}
@@ -46,12 +45,8 @@ class CallController extends GetxController {
// join();
FirebaseMessagesController().sendNotificationToPassengerToken(
'Call Income from Passenger',
- box.read(BoxName.passengerID) != null
- ? '${'You have call from Passenger'.tr} ${box.read(BoxName.name)}'
- : '${'You have call from driver'.tr} ${box.read(BoxName.nameDriver)}',
- box.read(BoxName.passengerID) != null
- ? Get.find().driverToken
- : Get.find().tokenPassenger,
+ '${'You have call from Passenger'.tr} ${box.read(BoxName.name)}',
+ Get.find().driverToken,
[
token,
channelName,
@@ -89,10 +84,8 @@ class CallController extends GetxController {
},
onUserJoined: (RtcConnection connection, int remoteUid, int elapsed) {
// Get.snackbar("Remote user uid:$remoteUid joined the channel", '');
- status =
- '${box.read(BoxName.passengerID) != null ? Get.find().driverName : Get.find().passengerName}'
- ' joined'
- .tr;
+ status = Get.find().driverName.toString();
+ ' joined'.tr;
remoteUid = remoteUid;
update();
},
diff --git a/lib/controller/functions/camer_controller.dart b/lib/controller/functions/camer_controller.dart
deleted file mode 100644
index a636fdb..0000000
--- a/lib/controller/functions/camer_controller.dart
+++ /dev/null
@@ -1,245 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:camera/camera.dart';
-import 'package:get/get.dart';
-import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
-import 'package:SEFER/constant/box_name.dart';
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/views/widgets/elevated_btn.dart';
-import 'package:path_provider/path_provider.dart' as path_provider;
-import 'package:path/path.dart' as path;
-import 'package:http/http.dart' as http;
-import '../../main.dart';
-
-class CameraClassController extends GetxController {
- late CameraController cameraController;
- late List cameras;
- bool isCameraInitialized = false;
- final TextRecognizer _textRecognizer = TextRecognizer();
- String? scannedText;
- bool isloading = false;
-
- @override
- void onInit() {
- super.onInit();
- initializeCamera();
- }
-
- Future initializeCamera() async {
- try {
- cameras = await availableCameras();
- //update();
- cameraController = CameraController(
- cameras[0],
- ResolutionPreset.medium,
- enableAudio: false,
- );
- await cameraController.initialize();
- isCameraInitialized = true;
- update();
- } catch (e) {
- if (e is CameraException) {
- switch (e.code) {
- case 'CameraAccessDenied':
- Get.defaultDialog(
- title: 'Camera Access Denied.'.tr,
- middleText: '',
- confirm:
- MyElevatedButton(title: 'Open Settings'.tr, onPressed: () {}),
- );
- break;
- default:
- // Handle other errors here.
- break;
- }
- }
- }
- }
-
- var imgUrl = '';
- Future extractCardId() async {
- // Construct the path for the image file
- final directory = await path_provider.getTemporaryDirectory();
- final imagePath =
- path.join(directory.path, '${box.read(BoxName.driverID)}.png');
-
- // Capture the image and save it to the specified path
- final XFile capturedImage = await cameraController.takePicture();
-
- // Move the captured image to the desired path
- await capturedImage.saveTo(imagePath);
- await uploadImage(File(capturedImage.path));
-
- extractByAPI('${AppLink.server}/card_image/' + box.read(BoxName.driverID));
- }
-
- Future extractByAPI(String imgUrl) async {
- var headers = {'apikey': 'K89368168788957'};
- var request = http.MultipartRequest(
- 'POST', Uri.parse('https://api.ocr.space/parse/image'));
- request.fields.addAll({
- 'language': 'ara',
- 'isOverlayRequired': 'false',
- 'url': imgUrl,
- 'iscreatesearchablepdf': 'false',
- 'issearchablepdfhidetextlayer': 'false'
- });
-
- request.headers.addAll(headers);
-
- http.StreamedResponse response = await request.send();
-
- if (response.statusCode == 200) {
- print(await response.stream.bytesToString());
- } else {
- print(response.reasonPhrase);
- }
- }
-
- Future uploadImage(File imageFile) async {
- String? basicAuthCredentials =
- await storage.read(key: BoxName.basicAuthCredentials);
- var request = http.MultipartRequest(
- 'POST',
- Uri.parse(AppLink.uploadImage),
- );
-
- // Attach the image file to the request
- request.files.add(
- await http.MultipartFile.fromPath('image', imageFile.path),
- ); // Add the headers to the request
- request.headers.addAll({
- "Content-Type": "application/x-www-form-urlencoded",
- 'Authorization':
- 'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
- });
-
- // Add the driverID to the request
- request.fields['driverID'] = box.read(BoxName.driverID);
- // Send the request
- var response = await request.send();
-
- // Read the response
- var responseData = await response.stream.toBytes();
- var responseString = String.fromCharCodes(responseData);
- scannedText = responseString;
- update();
- // Return the link received from the server
- return responseString;
- }
-
- Future takePictureAndMLGoogleScan() async {
- try {
- // Construct the path for the image file
- final directory = await path_provider.getTemporaryDirectory();
- final imagePath =
- path.join(directory.path, '${box.read(BoxName.driverID)}.png');
-
- // Capture the image and save it to the specified path
- final XFile capturedImage = await cameraController.takePicture();
-
- // Move the captured image to the desired path
- await capturedImage.saveTo(imagePath);
-
- // Recognize the text in the image
- final InputImage inputImage =
- InputImage.fromFile(File(capturedImage.path));
- final RecognizedText recognizedText =
- await _textRecognizer.processImage(inputImage);
- scannedText = recognizedText.text;
-
- // Extract the scanned text line by line
- final List> lines = [];
- for (var i = 0; i < recognizedText.blocks.length; i++) {
- lines.add({
- 'line_number': i,
- 'text': recognizedText.blocks[i].text,
- });
- }
-
- // Convert the list of lines to a JSON string
- final String jsonOutput = jsonEncode(lines);
-
- update();
-
- // Print the JSON output
- print(jsonOutput);
-
- // Get.back();
- } catch (e) {
- print('Error capturing image: $e');
- }
- }
-
- String getTextAsJSON(String text) {
- final lines = text.split('\n');
- final jsonList = lines.map((line) {
- return {
- 'line_text': line,
- 'num_words': line.trim().split(' ').length,
- };
- }).toList();
-
- final json = {
- 'lines': jsonList,
- 'num_lines': lines.length,
- };
-
- return jsonEncode(json);
- }
-
- List getTextBlocks(String text) {
- return text.split('\n');
- }
-
-// Future takePictureAndTesseractScan() async {
-// try {
-// // Construct the path for the image file
-// final directory = await path_provider.getTemporaryDirectory();
-// final imagePath =
-// path.join(directory.path, '${box.read(BoxName.driverID)}.png');
-
-// // Capture the image and save it to the specified path
-// final XFile capturedImage = await cameraController.takePicture();
-
-// // Move the captured image to the desired path
-// await capturedImage.saveTo(imagePath);
-
-// // Recognize the text in the image
-// final languages = [
-// 'eng',
-// 'ara'
-// ]; // Specify the languages you want to use for text extraction
-
-// final text = await FlutterTesseractOcr.extractText(imagePath,
-// language: languages.join('+'), // Combine multiple languages with '+'
-// args: {
-// "psm": "4",
-// "preserve_interword_spaces": "1",
-// // "rectangle": const Rect.fromLTWH(100, 100, 200, 200),
-// } // Additional options if needed
-// );
-// isloading = false;
-// final jsonText = getTextAsJSON(text);
-// final textBlocks = getTextBlocks(text);
-// update();
-// scannedText =
-// textBlocks.toString(); // Convert the extracted text to JSON.
-
-// // Print the JSON to the console.
-// print(jsonText);
-// update();
-// // print(text);
-// } catch (e) {
-// print('Error during text extraction: $e');
-// scannedText = '';
-// }
-// }
-
- @override
- void onClose() {
- cameraController.dispose();
- super.onClose();
- }
-}
diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart
index 19cd94e..a4400c7 100644
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -7,8 +7,7 @@ import 'package:http/http.dart' as http;
import 'package:SEFER/env/env.dart';
import '../../constant/api_key.dart';
-import 'gemeni.dart';
-import 'llama_ai.dart';
+
import 'upload_image.dart';
class CRUD {
@@ -106,7 +105,7 @@ class CRUD {
Future.delayed(const Duration(seconds: 2));
String extracted =
await arabicTextExtractByVisionAndAI(imagePath: imagePath);
- await AI().geminiAiExtraction(prompt, extracted);
+ // await AI().geminiAiExtraction(prompt, extracted);
}
Future arabicTextExtractByVisionAndAI({
diff --git a/lib/controller/functions/document_scanner.dart b/lib/controller/functions/document_scanner.dart
deleted file mode 100644
index 198992c..0000000
--- a/lib/controller/functions/document_scanner.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// import 'dart:io';
-//
-// import 'package:get/get.dart';
-// import 'package:image_picker/image_picker.dart';
-// import 'package:google_ml_kit/google_ml_kit.dart';
-//
-// class ImagePickerController extends GetxController {
-// RxBool textScanning = false.obs;
-// RxString scannedText = ''.obs;
-//
-// Future getImage(ImageSource source) async {
-// try {
-// final pickedImage = await ImagePicker().pickImage(source: source);
-// if (pickedImage != null) {
-// textScanning.value = true;
-// final imageFile = File(pickedImage.path);
-// getRecognisedText(imageFile);
-// }
-// } catch (e) {
-// textScanning.value = false;
-// scannedText.value = "Error occurred while scanning";
-// }
-// }
-//
-// Future getRecognisedText(File image) async {
-// final inputImage = InputImage.fromFilePath(image.path);
-// final textDetector = GoogleMlKit.vision.textRecognizer();
-// final RecognizedText recognisedText =
-// await textDetector.processImage(inputImage);
-// await textDetector.close();
-//
-// scannedText.value = '';
-// for (TextBlock block in recognisedText.blocks) {
-// for (TextLine line in block.lines) {
-// scannedText.value += line.text + '\n';
-// }
-// }
-//
-// textScanning.value = false;
-// }
-// }
diff --git a/lib/controller/functions/gemeni.dart b/lib/controller/functions/gemeni.dart
deleted file mode 100644
index 11cb685..0000000
--- a/lib/controller/functions/gemeni.dart
+++ /dev/null
@@ -1,928 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-import 'dart:io';
-import 'package:get/get.dart';
-import 'package:image_cropper/image_cropper.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:http/http.dart' as http;
-import 'package:image/image.dart' as img;
-import 'package:path_provider/path_provider.dart';
-
-import '../../constant/api_key.dart';
-import '../../constant/colors.dart';
-
-class AI extends GetxController {
- final picker = ImagePicker();
- Map responseMap = {};
- Map responseCarLicenseMap = {};
- Map responseBackCarLicenseMap = {};
- Map responseIdCardeMap = {};
- bool isloading = false;
- var image;
- CroppedFile? croppedFile;
- DateTime now = DateTime.now();
- Future pickImage() async {
- final pickedImage = await picker.pickImage(source: ImageSource.gallery);
-
- if (pickedImage != null) {
- image = File(pickedImage.path);
- // Crop the image
- croppedFile = await ImageCropper().cropImage(
- sourcePath: image!.path,
- aspectRatioPresets: [
- CropAspectRatioPreset.square,
- CropAspectRatioPreset.ratio3x2,
- CropAspectRatioPreset.original,
- CropAspectRatioPreset.ratio4x3,
- CropAspectRatioPreset.ratio16x9
- ],
- uiSettings: [
- AndroidUiSettings(
- toolbarTitle: 'Cropper'.tr,
- toolbarColor: AppColor.blueColor,
- toolbarWidgetColor: AppColor.yellowColor,
- initAspectRatio: CropAspectRatioPreset.original,
- lockAspectRatio: false),
- IOSUiSettings(
- title: 'Cropper'.tr,
- ),
- ],
- );
- // image = croppedFile;
-
- // Resize the image
- final rawImage =
- img.decodeImage(File(croppedFile!.path).readAsBytesSync());
- final resizedImage =
- img.copyResize(rawImage!, width: 800); // Adjust the width as needed
-
- final appDir = await getTemporaryDirectory();
- final resizedImagePath = '${appDir.path}/resized_image.jpg';
-
- final resizedImageFile = File(resizedImagePath);
- resizedImageFile.writeAsBytesSync(
- img.encodeJpg(resizedImage)); // Save the resized image as JPEG
-
- image = resizedImageFile;
- update();
- }
- }
-
- Future generateContent() async {
- await pickImage();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- 'write json for all data as first name ,last name,dob,licenseID,expiration date,issued date asdress class type ,output json type',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
-
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- print(jsonString);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future geminiAiExtraction(String prompt, payload) async {
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- // {
- // 'inlineData': {
- // 'mimeType': 'image/jpeg',
- // 'data': imageData,
- // },
- // },
- {
- 'text':
- "Extract the desired information from the following passage as json decoded like $prompt just in this:\n\n$payload"
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safety_settings': [
- {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE"},
- {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE"},
- {
- "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
- "threshold": "BLOCK_NONE"
- },
- {
- "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
- "threshold": "BLOCK_NONE"
- },
- ]
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- // 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro-latest:generateContent?key=AIzaSyCyoLcSkDzK5_SMe00nhut56SSXWPR074w'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
-
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result = responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- print(jsonString);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- }
-
- Future getDriverLicenseJordanContent() async {
- await pickImage();
- isloading = true;
- update();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- 'write json for all data as first name ,last name,dob,id ,expiration date,issued date asdress class type,age in years ,output json type in arabic value and stay engish key and make date format like YYYY-MM-DD , for name please extract name in arabic in Name in json plus first_name ',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
- isloading = false;
- update();
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- responseMap = jsonDecode(jsonString);
- print(jsonString);
- print(responseMap);
- print(responseMap['dob']);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future getCarLicenseJordanContent() async {
- await pickImage();
- isloading = true;
- update();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- '''Extract the following information from the front face of the Jordanian ID card:
-Name
-National ID number
-Gender
-Date of birth
-Output the extracted information in the following JSON format''',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- // 'https://${API_ENDPOINT}/v1/projects/${PROJECT_ID}/locations/${LOCATION_ID}/publishers/google/models/${MODEL_ID}:streamGenerateContent'),
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
- isloading = false;
- update();
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- responseCarLicenseMap = jsonDecode(jsonString);
- print(jsonString);
- print(responseCarLicenseMap);
- print(responseCarLicenseMap['plate_number']);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future jordanID() async {
- await pickImage();
- isloading = true;
- update();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- '''Extract the following information from the front face of the Jordanian ID card:
-Name
-National ID number
-Gender
-Date of birth
-Output the extracted information in the following JSON format''',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
- isloading = false;
- update();
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- responseCarLicenseMap = jsonDecode(jsonString);
- print(jsonString);
- print(responseCarLicenseMap);
- print(responseCarLicenseMap['plate_number']);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future carLicenseJordan() async {
- await pickImage();
- isloading = true;
- update();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- '''Extract the following information from the front face of the car license card in Jordan:
-
-* name
-* Address
-* Vehicle type
-* car_kind
-* car_color
-* Vehicle category
-* car_year
-* car_plate
-* Registration type
-* Usage type
-* expire_date_of_license
-
-Output the extracted information in the following JSON formate and make date format like YYYY-MM-DD''',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-1.0-pro-vision-latest:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
- isloading = false;
- update();
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- responseCarLicenseMap = jsonDecode(jsonString);
- print(jsonString);
- print(responseCarLicenseMap);
- print(responseCarLicenseMap['plate_number']);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future getTextFromCard(String prompt) async {
- await pickImage();
- isloading = true;
- update();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text': prompt,
- },
- ],
- },
- ],
- 'generationConfig': {
- "temperature": 1,
- "topK": 32,
- "topP": 0.1,
- "maxOutputTokens": 4096,
- "stopSequences": []
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-1.0-pro-vision-latest:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
- isloading = false;
- update();
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- responseBackCarLicenseMap = jsonDecode(jsonString);
- // print(jsonString);
- print(responseBackCarLicenseMap);
- // print(responseCarLicenseMap['plate_number']);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future generateBackCarLicenseJordanContent() async {
- await pickImage();
- isloading = true;
- update();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- 'write json output from extracting car license back face for these key ,vin,fuelType,passengerType,curbWeight,insuranceCompany,policyNumber,notes,insuranceType and output it json .dont add data else this image',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 343,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
- isloading = false;
- update();
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- // print(responseData);
-
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- // print(jsonEncode(result));
- // print((result));
- // print(result['dob']);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- responseBackCarLicenseMap = jsonDecode(jsonString);
- // print(jsonString);
- print(responseBackCarLicenseMap);
- // print(responseCarLicenseMap['plate_number']);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- Future getFromCarRegistration() async {
- await pickImage();
- if (image != null) {
- final imageBytes = await image.readAsBytes();
- final imageData = base64Encode(imageBytes);
-
- var requestBody = jsonEncode({
- 'contents': [
- {
- 'parts': [
- {
- 'inlineData': {
- 'mimeType': 'image/jpeg',
- 'data': imageData,
- },
- },
- {
- 'text':
- 'write output json from image for[ vin, make, model, year, expiration_date, color, owner, registration_date ],output json type ',
- },
- ],
- },
- ],
- 'generationConfig': {
- 'temperature': 0.4,
- 'topK': 32,
- 'topP': 1,
- 'maxOutputTokens': 4096,
- 'stopSequences': [],
- },
- 'safetySettings': [
- {
- 'category': 'HARM_CATEGORY_HARASSMENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_HATE_SPEECH',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- {
- 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT',
- 'threshold': 'BLOCK_MEDIUM_AND_ABOVE',
- },
- ],
- });
- print(requestBody);
-
- final response = await http.post(
- Uri.parse(
- 'https://generativelanguage.googleapis.com/v1beta/models/gemini-pro-vision:generateContent?key=${AK.geminiApi}'),
- headers: {'Content-Type': 'application/json'},
- body: requestBody,
- );
-
- if (response.statusCode == 200) {
- var responseData = jsonDecode(response.body);
- // Process the responseData as needed
- var result =
- responseData['candidates'][0]['content']['parts'][0]['text'];
- print(result);
- RegExp regex = RegExp(r"```json([^`]*)```");
- String? jsonString =
- regex.firstMatch(responseData.toString())?.group(1)?.trim();
-
- if (jsonString != null) {
- // Convert the JSON object to a String
- jsonString = jsonEncode(json.decode(jsonString));
- print(jsonString);
- } else {
- print("JSON string not found");
- }
-
- // Rest of your code...
- } else {
- print('Request failed with status: ${response.statusCode}');
- print('Request failed with status: ${response.body}');
- }
- } else {
- print('No image selected');
- }
- }
-
- @override
- void onInit() {
- // generateContent();
- super.onInit();
- }
-}
diff --git a/lib/controller/functions/llama_ai.dart b/lib/controller/functions/llama_ai.dart
deleted file mode 100644
index 6baebb1..0000000
--- a/lib/controller/functions/llama_ai.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'dart:convert';
-
-import 'package:SEFER/constant/links.dart';
-import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/gemeni.dart';
-
-class LlamaAi {
- Future