diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6c1228e..f76d10a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -28,14 +28,14 @@ - + تحذير أمني - تم اكتشاف مشكلة أمنية أو تعديل على هذا الجهاز. لا يمكن تشغيل التطبيق على هذا الجهاز. + تم اكتشاف مشكلة أمنية أو تعديل على هذا الجهاز. لا يمكن + تشغيل التطبيق على هذا الجهاز. إغلاق التطبيق الجهاز آمن. الاستمرار بشكل طبيعي. + انطلق درايفر \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index aab98d2..e12eac8 100755 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ AIzaSyACAeqD8qnNYwHKj1qRec6F3AKzdo__CiQ Security Warning AIzaSyB04YNW3LbvmQ5lX1t2bOwEU18-KUoovzw + Intaleq Driver A security issue or modification has been detected on this device. The app cannot run on this device. diff --git a/assets/images/logo1.png b/assets/images/logo1.png old mode 100755 new mode 100644 index 8507dbc..eb862d0 Binary files a/assets/images/logo1.png and b/assets/images/logo1.png differ diff --git a/bubble-master/lib/bubble.dart b/bubble-master/lib/bubble.dart index eb5ce12..aeab526 100755 --- a/bubble-master/lib/bubble.dart +++ b/bubble-master/lib/bubble.dart @@ -21,7 +21,7 @@ class Bubble { /// puts app in background and shows floaty-bubble head Future startBubbleHead({bool sendAppToBackground = true}) async { ByteData bytes = await rootBundle.load( - 'assets/images/logo.png', + 'assets/images/logo1.png', ); var buffer = bytes.buffer; var encodedImage = base64.encode(Uint8List.view(buffer)); diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index d42adee..a731240 100755 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -191,9 +191,9 @@ class CRUD { 'Bearer ${r(box.read(BoxName.jwt)).toString().split(Env.addd)[0]}' }, ); - // Log.print('response: ${response.body}'); - // Log.print('req: ${response.request}'); - // Log.print('payload: ${payload}'); + Log.print('response: ${response.body}'); + Log.print('req: ${response.request}'); + Log.print('payload: ${payload}'); if (response.statusCode == 200) { var jsonData = jsonDecode(response.body); diff --git a/lib/controller/home/captin/contact_us_controller.dart b/lib/controller/home/captin/contact_us_controller.dart index 8e200b8..b8876ab 100755 --- a/lib/controller/home/captin/contact_us_controller.dart +++ b/lib/controller/home/captin/contact_us_controller.dart @@ -7,8 +7,8 @@ import '../../../constant/colors.dart'; import '../../functions/launch.dart'; class ContactUsController extends GetxController { - final String phone1 = '+201018805430'; - final String phone2 = '+201080182934'; + final String phone1 = '+963992952235'; + final String phone2 = '+963992952235'; final TimeOfDay workStartTime = const TimeOfDay(hour: 12, minute: 0); final TimeOfDay workEndTime = const TimeOfDay(hour: 19, minute: 0); @@ -44,7 +44,7 @@ class ContactUsController extends GetxController { if (!_isWithinWorkTime(now)) CupertinoActionSheetAction( child: Text( - 'Work time is from 12:00 - 19:00.\nYou can send a WhatsApp message or email.' + 'Work time is from 10:00 - 17:00.\nYou can send a WhatsApp message or email.' .tr), onPressed: () => Navigator.pop(context), ), diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index 6197e81..d1a55d2 100755 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -803,10 +803,10 @@ Raih Gai: For same-day return trips longer than 50km. "لم نجد أي سائقين بعد. ضع في اعتبارك زيادة رسوم رحلتك لجعل عرضك أكثر جاذبية للسائقين.", "Allow Location Access": "السماح بالوصول إلى الموقع", "Show My Trip Count": "عرض عدد رحلاتي", - "Intaleq is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 15%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.": - "انطلق هو التطبيق الأكثر أمانًا لمشاركة الركوب الذي يقدم العديد من الميزات لكل من السائقين والركاب. نحن نقدم أقل عمولة بنسبة 15% فقط، مما يضمن حصولك على أفضل قيمة لرحلاتك. يتضمن تطبيقنا التأمين لأفضل السائقين، الصيانة المنتظمة للسيارات مع أفضل المهندسين، والخدمات على الطريق لضمان تجربة محترمة وعالية الجودة لجميع المستخدمين.", - "You can contact us during working hours from 12:00 - 19:00.": - "يمكنك الاتصال بنا خلال ساعات العمل من 12:00 - 7:00.", + "Intaleq is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.": + "انطلق هو التطبيق الأكثر أمانًا لمشاركة الركوب الذي يقدم العديد من الميزات لكل من السائقين والركاب. نحن نقدم أقل عمولة بنسبة 8% فقط، مما يضمن حصولك على أفضل قيمة لرحلاتك. يتضمن تطبيقنا التأمين لأفضل السائقين، الصيانة المنتظمة للسيارات مع أفضل المهندسين، والخدمات على الطريق لضمان تجربة محترمة وعالية الجودة لجميع المستخدمين.", + "You can contact us during working hours from 10:00 - 17:00.": + "يمكنك الاتصال بنا خلال ساعات العمل من 10:00 - 17:00.", "Show maintenance center near my location": "أظهر مركز الصيانة بالقرب من موقعي", "How do I request a ride?": "كيف أطلب رحلة؟", @@ -866,8 +866,8 @@ Raih Gai: For same-day return trips longer than 50km. "You can change the vibration feedback for all buttons": "يمكنك تغيير اهتزاز الرج لجميع الأزرار", "About Us": "نبذة عنا", - "Work time is from 12:00 - 19:00.\nYou can send a WhatsApp message or email.": - "ساعات العمل من 12:00 - 19:00.\nيمكنك إرسال رسالة عبر واتساب أو بريد إلكتروني.", + "Work time is from 10:00 - 17:00.\nYou can send a WhatsApp message or email.": + "ساعات العمل من 10:00 - 17:00.\nيمكنك إرسال رسالة عبر واتساب أو بريد إلكتروني.", "Most Secure Methods": "أساليب الأمان الأكثر فاعلية", "In-App VOIP Calls": "مكالمات VOIP داخل التطبيق", "Recorded Trips for Safety": "تسجيل الرحلات من أجل السلامة", diff --git a/lib/main.dart b/lib/main.dart index 5dfb9df..e55f5b3 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -129,7 +129,7 @@ void notificationTapBackground(NotificationResponse notificationResponse) { void overlayMain() async { WidgetsFlutterBinding.ensureInitialized(); await GetStorage.init(); - await initFirebaseIfNeeded(); + // await initFirebaseIfNeeded(); if (!Get.isRegistered()) { Get.put(NotificationController()); diff --git a/lib/views/auth/captin/contact_us_page.dart b/lib/views/auth/captin/contact_us_page.dart index 9ec2230..95b8f73 100755 --- a/lib/views/auth/captin/contact_us_page.dart +++ b/lib/views/auth/captin/contact_us_page.dart @@ -35,7 +35,7 @@ class ContactUsPage extends StatelessWidget { IconButton( onPressed: () async { Get.put(TextToSpeechController()).speakText( - 'Intaleq is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 15%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' + 'Intaleq is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' .tr); }, icon: const Icon(Icons.headphones), @@ -43,7 +43,7 @@ class ContactUsPage extends StatelessWidget { Padding( padding: const EdgeInsets.all(8.0), child: Text( - 'Intaleq is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 15%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' + 'Intaleq is the safest ride-sharing app that introduces many features for both captains and passengers. We offer the lowest commission rate of just 8%, ensuring you get the best value for your rides. Our app includes insurance for the best captains, regular maintenance of cars with top engineers, and on-road services to ensure a respectful and high-quality experience for all users.' .tr, style: AppStyle.title, textAlign: TextAlign.center, @@ -60,7 +60,7 @@ class ContactUsPage extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(8.0), child: Text( - "You can contact us during working hours from 12:00 - 19:00." + "You can contact us during working hours from 10:00 - 17:00." .tr, style: AppStyle.title, textAlign: TextAlign.center, diff --git a/lib/views/home/Captin/home_captain/home_captin.dart b/lib/views/home/Captin/home_captain/home_captin.dart index 6ad8e16..3143760 100755 --- a/lib/views/home/Captin/home_captain/home_captin.dart +++ b/lib/views/home/Captin/home_captain/home_captin.dart @@ -498,7 +498,7 @@ class FloatingActionButtons extends StatelessWidget { Bubble().startBubbleHead(sendAppToBackground: true); }, icon: Image.asset( - 'assets/images/logo.png', + 'assets/images/logo1.png', fit: BoxFit.cover, width: 35, height: 35, diff --git a/lib/views/home/profile/cars_inserting_page.dart b/lib/views/home/profile/cars_inserting_page.dart index 58c806d..00b6f0f 100755 --- a/lib/views/home/profile/cars_inserting_page.dart +++ b/lib/views/home/profile/cars_inserting_page.dart @@ -17,17 +17,17 @@ class CarsInsertingPage extends StatelessWidget { Widget build(BuildContext context) { Get.put(AI()); return MyScafolld( - title: 'Insert New Car'.tr, + title: "Add new car".tr, body: [ Container( color: AppColor.accentColor.withOpacity(.2), child: Padding( - padding: const EdgeInsets.all(8.0), + padding: const EdgeInsets.all(22), child: ListView( // crossAxisAlignment: CrossAxisAlignment.center, children: [ - egyptCarLicenceFront(), - egyptCarLicenceBack(), + syriaCarLicenceFront(), + syriaCarLicenceBack(), const SizedBox(height: 10), Text('Please make sure to read the license carefully.'.tr), Text( @@ -66,7 +66,7 @@ class CarsInsertingPage extends StatelessWidget { } } -GetBuilder egyptCarLicenceFront() { +GetBuilder syriaCarLicenceFront() { return GetBuilder( builder: (ai) { if (ai.responseIdCardDriverEgyptFront.isNotEmpty) { @@ -162,7 +162,7 @@ GetBuilder egyptCarLicenceFront() { ); } -GetBuilder egyptCarLicenceBack() { +GetBuilder syriaCarLicenceBack() { return GetBuilder( builder: (ai) { if (ai.responseIdCardDriverEgyptBack.isNotEmpty) { diff --git a/pubspec.yaml b/pubspec.yaml index f3622bf..6b750be 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -103,6 +103,7 @@ dependencies: battery_plus: ^6.2.2 internet_connection_checker: ^3.0.1 connectivity_plus: ^6.1.5 + # pip_view: ^0.9.7 dev_dependencies: flutter_test: