Hamza/tripz-llc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

إضافة الهوية الجديدة Tripz

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-29 02:31:04 +03:00
parent ecbe245b77
commit b9a97effe5
634 changed files with 5149 additions and 5294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/driver/lib/views/home/Captin/About Us/about_us.dart
+6 -6
View File
@@ -1,7 +1,7 @@
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -26,7 +26,7 @@ class AboutPage extends StatelessWidget {
Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
'Siro LLC\n${(box.read(BoxName.countryCode)?.toString() ?? 'Syria').tr}',
'Tripz LLC\n${(box.read(BoxName.countryCode)?.toString() ?? 'Syria').tr}',
style: AppStyle.headTitle2,
textAlign: TextAlign.center,
),
@@ -34,7 +34,7 @@ class AboutPage extends StatelessWidget {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Text(
'Siro is a ride-sharing app designed with your safety and affordability in mind. We connect you with reliable drivers in your area, ensuring a convenient and stress-free travel experience.\n\nHere are some of the key features that set us apart:'
'Tripz is a ride-sharing app designed with your safety and affordability in mind. We connect you with reliable drivers in your area, ensuring a convenient and stress-free travel experience.\n\nHere are some of the key features that set us apart:'
.tr,
style: AppStyle.title,
textAlign: TextAlign.center,
apps/driver/lib/views/home/Captin/About Us/frequantly_question.dart
+11 -11
View File
@@ -1,5 +1,5 @@
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -28,7 +28,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
),
children: [
Text(
'Step-by-step instructions on how to request a ride through the Siro app.'
'Step-by-step instructions on how to request a ride through the Tripz app.'
.tr,
style: AppStyle.title,
),
@@ -43,7 +43,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
),
children: [
Text(
'Siro offers a variety of vehicle options to suit your needs, including economy, comfort, and luxury. Choose the option that best fits your budget and passenger count.'
'Tripz offers a variety of vehicle options to suit your needs, including economy, comfort, and luxury. Choose the option that best fits your budget and passenger count.'
.tr,
style: AppStyle.title,
),
@@ -58,7 +58,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
),
children: [
Text(
'Siro offers multiple payment methods for your convenience. Choose between cash payment or credit/debit card payment during ride confirmation.'
'Tripz offers multiple payment methods for your convenience. Choose between cash payment or credit/debit card payment during ride confirmation.'
.tr,
style: AppStyle.title,
),
@@ -73,7 +73,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
),
children: [
Text(
'Yes, you can cancel your ride under certain conditions (e.g., before driver is assigned). See the Siro cancellation policy for details.'
'Yes, you can cancel your ride under certain conditions (e.g., before driver is assigned). See the Tripz cancellation policy for details.'
.tr,
style: AppStyle.title,
),
@@ -98,7 +98,7 @@ class FrequentlyQuestionsPage extends StatelessWidget {
});
},
child: Text(
'Visit our website or contact Siro support for information on driver registration and requirements.'
'Visit our website or contact Tripz support for information on driver registration and requirements.'
.tr,
style: AppStyle.title,
),
@@ -115,22 +115,22 @@ class FrequentlyQuestionsPage extends StatelessWidget {
),
children: [
Text(
'Siro provides in-app chat functionality to allow you to communicate with your driver or passenger during your ride.'
'Tripz provides in-app chat functionality to allow you to communicate with your driver or passenger during your ride.'
.tr,
style: AppStyle.title,
),
],
),
// Question 8: What safety measures does Siro offer?
// Question 8: What safety measures does Tripz offer?
ExpansionTile(
title: Text(
'What safety measures does Siro offer?'.tr,
'What safety measures does Tripz offer?'.tr,
style: AppStyle.title,
),
children: [
Text(
'Siro prioritizes your safety. We offer features like driver verification, in-app trip tracking, and emergency contact options.'
'Tripz prioritizes your safety. We offer features like driver verification, in-app trip tracking, and emergency contact options.'
.tr,
style: AppStyle.title,
),
apps/driver/lib/views/home/Captin/About Us/settings_captain.dart
+5 -5
View File
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/profile/setting_controller.dart';
import 'package:siro_driver/views/lang/languages.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/controller/profile/setting_controller.dart';
import 'package:tripz_driver/views/lang/languages.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
// تأكد من صحة مسارات الاستيراد هذه
import '../../../../controller/functions/vibrate.dart'; // Controller with isVibrate
apps/driver/lib/views/home/Captin/About Us/using_app_page.dart
+5 -5
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
// 1. إنشاء Class لتمثيل بيانات كل سؤال وجواب
class FaqItem {
@@ -43,13 +43,13 @@ class UsingAppPage extends StatelessWidget {
question: "What is the feature of our wallet?".tr,
icon: Icons.account_balance_wallet_outlined,
answer: Text(
'''Siro Wallet Features:
'''Tripz Wallet Features:
- Transfer money multiple times.
- Transfer to anyone.
- Make purchases.
- Charge your account.
- Charge a friend's Siro account.
- Charge a friend's Tripz account.
- Store your money with us and receive it in your bank as a monthly salary.'''
.tr,
style:
@@ -57,10 +57,10 @@ class UsingAppPage extends StatelessWidget {
),
),
FaqItem(
question: "What is Types of Trips in Siro?".tr,
question: "What is Types of Trips in Tripz?".tr,
icon: Icons.map_outlined,
answer: Text(
'''Types of Trips in Siro:
'''Types of Trips in Tripz:
- Comfort: For cars newer than 2017 with air conditioning.
- Lady: For girl drivers.
apps/driver/lib/views/home/Captin/About Us/video_page.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/info.dart';
import 'package:tripz_driver/constant/info.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:video_player/video_player.dart';
apps/driver/lib/views/home/Captin/bottom_bar.dart
+1 -1
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:tripz_driver/constant/colors.dart';
class BottomBarController extends GetxController {
var currentIndex = 0.obs;
apps/driver/lib/views/home/Captin/camer_widget.dart
+5 -5
View File
@@ -1,10 +1,10 @@
// import 'package:flutter/material.dart';
// import 'package:get/get.dart';
// import 'package:siro_driver/constant/colors.dart';
// import 'package:siro_driver/constant/style.dart';
// import 'package:siro_driver/controller/functions/camer_controller.dart';
// import 'package:siro_driver/views/widgets/elevated_btn.dart';
// import 'package:siro_driver/views/widgets/my_scafold.dart';
// import 'package:tripz_driver/constant/colors.dart';
// import 'package:tripz_driver/constant/style.dart';
// import 'package:tripz_driver/controller/functions/camer_controller.dart';
// import 'package:tripz_driver/views/widgets/elevated_btn.dart';
// import 'package:tripz_driver/views/widgets/my_scafold.dart';
// class CameraWidgetCardId extends StatelessWidget {
// final CameraClassController cameraClassController =
apps/driver/lib/views/home/Captin/driver_map_page.dart
+4 -4
View File
@@ -1,10 +1,10 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/controller/home/captin/map_driver_controller.dart';
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/controller/home/captin/map_driver_controller.dart';
import 'package:tripz_driver/constant/currency.dart';
import '../../../constant/colors.dart';
import '../../../controller/functions/location_controller.dart';
import '../../Rate/rate_passenger.dart';
apps/driver/lib/views/home/Captin/history/history_captain.dart
+2 -2
View File
@@ -1,11 +1,11 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import '../../../../constant/finance_design_system.dart';
import '../../../../controller/auth/captin/history_captain.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
class HistoryCaptain extends StatelessWidget {
const HistoryCaptain({super.key});
apps/driver/lib/views/home/Captin/history/history_details_page.dart
+3 -3
View File
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_driver/constant/api_key.dart';
import 'package:tripz_driver/constant/api_key.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:siro_driver/controller/auth/captin/history_captain.dart';
import 'package:siro_driver/controller/functions/launch.dart';
import 'package:tripz_driver/controller/auth/captin/history_captain.dart';
import 'package:tripz_driver/controller/functions/launch.dart';
class HistoryDetailsPage extends StatefulWidget {
const HistoryDetailsPage({super.key});
apps/driver/lib/views/home/Captin/home_captain/drawer_captain.dart
+23 -23
View File
@@ -3,30 +3,30 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/links.dart';
import 'package:siro_driver/controller/functions/upload_image.dart';
import 'package:siro_driver/controller/home/captin/home_captain_controller.dart';
import 'package:siro_driver/device_compatibility_page.dart';
import 'package:siro_driver/main.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/links.dart';
import 'package:tripz_driver/controller/functions/upload_image.dart';
import 'package:tripz_driver/controller/home/captin/home_captain_controller.dart';
import 'package:tripz_driver/device_compatibility_page.dart';
import 'package:tripz_driver/main.dart';
// استيراد الصفحات الأخرى... تأكد من صحة المسارات
import 'package:siro_driver/views/Rate/rate_app_page.dart';
import 'package:siro_driver/views/auth/captin/contact_us_page.dart';
import 'package:siro_driver/views/auth/captin/invite_driver_screen.dart';
import 'package:siro_driver/views/home/statistics/statistics_dashboard.dart';
import 'package:siro_driver/views/gamification/challenges_page.dart';
import 'package:siro_driver/views/gamification/leaderboard_page.dart';
import 'package:siro_driver/views/gamification/referral_center_page.dart';
import 'package:siro_driver/views/home/journal/schedule_page.dart';
import 'package:siro_driver/views/notification/available_rides_page.dart';
import 'package:siro_driver/views/auth/captin/logout_captain.dart';
import 'package:siro_driver/views/home/Captin/history/history_captain.dart';
import 'package:siro_driver/views/home/Captin/home_captain/help_captain.dart';
import 'package:siro_driver/views/home/Captin/About Us/settings_captain.dart';
import 'package:siro_driver/views/home/my_wallet/walet_captain.dart';
import 'package:siro_driver/views/home/profile/profile_captain.dart';
import 'package:siro_driver/views/notification/notification_captain.dart';
import 'package:tripz_driver/views/Rate/rate_app_page.dart';
import 'package:tripz_driver/views/auth/captin/contact_us_page.dart';
import 'package:tripz_driver/views/auth/captin/invite_driver_screen.dart';
import 'package:tripz_driver/views/home/statistics/statistics_dashboard.dart';
import 'package:tripz_driver/views/gamification/challenges_page.dart';
import 'package:tripz_driver/views/gamification/leaderboard_page.dart';
import 'package:tripz_driver/views/gamification/referral_center_page.dart';
import 'package:tripz_driver/views/home/journal/schedule_page.dart';
import 'package:tripz_driver/views/notification/available_rides_page.dart';
import 'package:tripz_driver/views/auth/captin/logout_captain.dart';
import 'package:tripz_driver/views/home/Captin/history/history_captain.dart';
import 'package:tripz_driver/views/home/Captin/home_captain/help_captain.dart';
import 'package:tripz_driver/views/home/Captin/About Us/settings_captain.dart';
import 'package:tripz_driver/views/home/my_wallet/walet_captain.dart';
import 'package:tripz_driver/views/home/profile/profile_captain.dart';
import 'package:tripz_driver/views/notification/notification_captain.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../../constant/colors.dart';
import '../About Us/video_page.dart';
@@ -321,7 +321,7 @@ class UserHeader extends StatelessWidget {
shadows: [Shadow(blurRadius: 2, color: Colors.black26)]),
),
accountEmail:
box.read(BoxName.emailDriver).toString().contains('siroapp')
box.read(BoxName.emailDriver).toString().contains('tripzapp')
? Text('Your email not updated yet'.tr)
: Text(box.read(BoxName.emailDriver)),
currentAccountPicture: GetBuilder<ImageController>(
apps/driver/lib/views/home/Captin/home_captain/help_captain.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/controller/home/captin/help/help_controller.dart';
import 'package:siro_driver/views/home/Captin/home_captain/help_details_replay_page.dart';
import 'package:tripz_driver/controller/home/captin/help/help_controller.dart';
import 'package:tripz_driver/views/home/Captin/home_captain/help_details_replay_page.dart';
import 'package:flutter/cupertino.dart';
apps/driver/lib/views/home/Captin/home_captain/help_details_replay_page.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../../controller/functions/encrypt_decrypt.dart';
import '../../../../controller/home/captin/help/help_controller.dart';
apps/driver/lib/views/home/Captin/home_captain/home_captin.dart
+31 -14
View File
@@ -6,8 +6,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:siro_driver/views/home/Captin/home_captain/drawer_captain.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/views/home/Captin/home_captain/drawer_captain.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../../constant/box_name.dart';
import '../../../../constant/colors.dart';
@@ -115,7 +115,8 @@ class HomeCaptain extends StatelessWidget {
const Center(
child: Padding(
padding: EdgeInsets.only(bottom: 24),
child: Icon(Icons.pin_drop_rounded, size: 48, color: Colors.red),
child: Icon(Icons.pin_drop_rounded,
size: 48, color: Colors.red),
),
),
Positioned(
@@ -124,7 +125,8 @@ class HomeCaptain extends StatelessWidget {
right: 20,
child: Card(
color: _Token.surfaceCard(context),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16)),
elevation: 10,
child: Padding(
padding: const EdgeInsets.all(16),
@@ -133,7 +135,8 @@ class HomeCaptain extends StatelessWidget {
children: [
Text(
'Move map to select destination'.tr,
style: const TextStyle(fontWeight: FontWeight.bold),
style:
const TextStyle(fontWeight: FontWeight.bold),
),
const SizedBox(height: 12),
Row(
@@ -141,10 +144,13 @@ class HomeCaptain extends StatelessWidget {
Expanded(
child: TextButton(
onPressed: () {
destCtrl.isSelectingDestinationOnMap = false;
destCtrl.isSelectingDestinationOnMap =
false;
destCtrl.update();
},
child: Text('Cancel'.tr, style: const TextStyle(color: Colors.grey)),
child: Text('Cancel'.tr,
style: const TextStyle(
color: Colors.grey)),
),
),
const SizedBox(width: 12),
@@ -152,19 +158,30 @@ class HomeCaptain extends StatelessWidget {
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppColor.primaryColor,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(10)),
),
onPressed: () async {
final pickerPos = homeCaptainController.currentCameraPosition?.target ??
homeCaptainController.mapHomeCaptainController?.cameraPosition?.target;
final pickerPos = homeCaptainController
.currentCameraPosition?.target ??
homeCaptainController
.mapHomeCaptainController
?.cameraPosition
?.target;
if (pickerPos != null) {
destCtrl.isSelectingDestinationOnMap = false;
destCtrl.isSelectingDestinationOnMap =
false;
destCtrl.update();
final name = await destCtrl.reverseGeocode(pickerPos);
destCtrl.saveDestination(pickerPos, name);
final name = await destCtrl
.reverseGeocode(pickerPos);
destCtrl.saveDestination(
pickerPos, name);
}
},
child: Text('Confirm Location'.tr, style: const TextStyle(color: Colors.white)),
child: Text('Confirm Location'.tr,
style: const TextStyle(
color: Colors.white)),
),
),
],
apps/driver/lib/views/home/Captin/home_captain/osm_view_map.dart
+8 -3
View File
@@ -24,7 +24,8 @@ class OsmMapView extends StatelessWidget {
final double currentHeading = locationController.heading;
final cityPolygon = CountryLogic.getCurrentCityPolygon();
final bool inServiceArea = CountryLogic.isPointInPolygon(currentLocation, cityPolygon);
final bool inServiceArea =
CountryLogic.isPointInPolygon(currentLocation, cityPolygon);
return Stack(
children: [
@@ -65,12 +66,16 @@ class OsmMapView extends StatelessWidget {
left: 20,
right: 20,
child: Container(
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
padding:
const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
decoration: BoxDecoration(
color: Colors.redAccent.withOpacity(0.9),
borderRadius: BorderRadius.circular(12),
boxShadow: const [
BoxShadow(color: Colors.black26, blurRadius: 4, offset: Offset(0, 2))
BoxShadow(
color: Colors.black26,
blurRadius: 4,
offset: Offset(0, 2))
],
),
child: const Row(
apps/driver/lib/views/home/Captin/home_captain/widget/connect.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'package:siro_driver/controller/functions/tts.dart';
import 'package:tripz_driver/controller/functions/tts.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:tripz_driver/controller/home/payment/captain_wallet_controller.dart';
import '../../../../../constant/style.dart';
import '../../../../widgets/elevated_btn.dart';
apps/driver/lib/views/home/Captin/home_captain/widget/destination_bottom_sheet.dart
+24 -12
View File
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/home/captin/destination_controller.dart';
import 'package:siro_driver/controller/functions/tts.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/controller/home/captin/destination_controller.dart';
import 'package:tripz_driver/controller/functions/tts.dart';
class DestinationBottomSheet extends StatelessWidget {
const DestinationBottomSheet({super.key});
@@ -67,7 +67,9 @@ class DestinationBottomSheet extends StatelessWidget {
init: Get.find<TextToSpeechController>(),
builder: (tts) => IconButton(
icon: Icon(
tts.isSpeaking ? Icons.volume_up_rounded : Icons.volume_mute_rounded,
tts.isSpeaking
? Icons.volume_up_rounded
: Icons.volume_mute_rounded,
color: AppColor.primaryColor,
size: 26,
),
@@ -109,10 +111,12 @@ class DestinationBottomSheet extends StatelessWidget {
side: BorderSide(color: Colors.green.withOpacity(0.3)),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
padding: const EdgeInsets.symmetric(
horizontal: 14, vertical: 12),
child: Row(
children: [
const Icon(Icons.check_circle_rounded, color: Colors.green, size: 22),
const Icon(Icons.check_circle_rounded,
color: Colors.green, size: 22),
const SizedBox(width: 10),
Expanded(
child: Column(
@@ -163,7 +167,8 @@ class DestinationBottomSheet extends StatelessWidget {
fillColor: Theme.of(context).brightness == Brightness.dark
? const Color(0xFF202B4B)
: Colors.grey.withOpacity(0.1),
contentPadding: const EdgeInsets.symmetric(vertical: 14, horizontal: 16),
contentPadding: const EdgeInsets.symmetric(
vertical: 14, horizontal: 16),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(14),
borderSide: BorderSide.none,
@@ -190,21 +195,28 @@ class DestinationBottomSheet extends StatelessWidget {
itemBuilder: (context, index) {
final place = c.placesSuggestions[index];
return ListTile(
leading: const Icon(Icons.place_rounded, color: Colors.grey),
leading: const Icon(Icons.place_rounded,
color: Colors.grey),
title: Text(
place['name'] ?? "",
style: const TextStyle(fontSize: 13),
),
subtitle: Text(
place['description'] ?? "",
style: const TextStyle(fontSize: 11, color: Colors.grey),
style: const TextStyle(
fontSize: 11, color: Colors.grey),
),
onTap: () {
FocusScope.of(context).unfocus();
Get.back(); // Close sheet
final lat = double.tryParse(place['latitude']?.toString() ?? '0') ?? 0.0;
final lng = double.tryParse(place['longitude']?.toString() ?? '0') ?? 0.0;
c.saveDestination(LatLng(lat, lng), place['name'] ?? 'Destination');
final lat = double.tryParse(
place['latitude']?.toString() ?? '0') ??
0.0;
final lng = double.tryParse(
place['longitude']?.toString() ?? '0') ??
0.0;
c.saveDestination(LatLng(lat, lng),
place['name'] ?? 'Destination');
},
);
},
apps/driver/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart
+9 -9
View File
@@ -1,14 +1,14 @@
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/controller/firebase/local_notification.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/home/Captin/driver_map_page.dart';
import 'package:siro_driver/views/home/Captin/orderCaptin/vip_order_page.dart';
import 'package:siro_driver/views/auth/syria/registration_view.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/controller/firebase/local_notification.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/home/Captin/driver_map_page.dart';
import 'package:tripz_driver/views/home/Captin/orderCaptin/vip_order_page.dart';
import 'package:tripz_driver/views/auth/syria/registration_view.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
import 'package:siro_driver/controller/home/captin/home_captain_controller.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/controller/home/captin/home_captain_controller.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import '../../../../../constant/links.dart';
import '../../../../../controller/firebase/notification_service.dart';
@@ -16,7 +16,7 @@ import '../../../../../controller/functions/crud.dart';
import '../../../../../controller/home/captin/order_request_controller.dart';
import '../../../../../print.dart';
import '../../../../Rate/ride_calculate_driver.dart';
import 'package:siro_driver/views/home/statistics/statistics_dashboard.dart';
import 'package:tripz_driver/views/home/statistics/statistics_dashboard.dart';
// ─────────────────────────────────────────────
// Design Tokens (Responsive)
apps/driver/lib/views/home/Captin/maintain_center_page.dart
+5 -5
View File
@@ -1,8 +1,8 @@
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/controller/home/captin/help/maintain_center_controller.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/controller/home/captin/help/maintain_center_controller.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
apps/driver/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
apps/driver/lib/views/home/Captin/mapDriverWidgets/google_driver_map_page.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_driver/constant/api_key.dart';
import 'package:tripz_driver/constant/api_key.dart';
import '../../../../controller/functions/location_controller.dart';
import '../../../../controller/home/captin/map_driver_controller.dart';
@@ -26,7 +26,7 @@ class GoogleDriverMap extends StatelessWidget {
builder: (controller) => Listener(
onPointerDown: (_) => controller.onUserMapInteraction(),
child: IntaleqMap(
apiKey: AK.mapAPIKEY,
apiKey: AK.mapSaasKey,
onMapCreated: (mapController) {
controller.onMapCreated(mapController);
},
apps/driver/lib/views/home/Captin/mapDriverWidgets/google_map_app.dart
+3 -3
View File
@@ -1,6 +1,6 @@
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/controller/home/captin/map_driver_controller.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/controller/home/captin/map_driver_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
apps/driver/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart
+3 -3
View File
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/home/captin/map_driver_controller.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/controller/home/captin/map_driver_controller.dart';
import '../../../../constant/box_name.dart';
import '../../../../constant/style.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import '../../../../controller/voice_call_controller.dart';
import '../../../../controller/functions/launch.dart';
import '../../../../controller/functions/location_controller.dart';
apps/driver/lib/views/home/Captin/mapDriverWidgets/sos_connect.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/views/widgets/error_snakbar.dart';
import 'package:siro_driver/views/widgets/my_textField.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart'; // Checked import
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
import 'package:tripz_driver/views/widgets/my_textField.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart'; // Checked import
import 'package:flutter_font_icons/flutter_font_icons.dart';
import '../../../../constant/box_name.dart';
apps/driver/lib/views/home/Captin/orderCaptin/marker_generator.dart
+2 -1
View File
@@ -153,7 +153,8 @@ class MarkerGenerator {
..strokeWidth = 3.0;
canvas.drawCircle(const Offset(size / 2, size / 2), size / 2.5, paint);
canvas.drawCircle(const Offset(size / 2, size / 2), size / 2.5, borderPaint);
canvas.drawCircle(
const Offset(size / 2, size / 2), size / 2.5, borderPaint);
TextPainter iconPainter = TextPainter(textDirection: TextDirection.ltr);
iconPainter.text = TextSpan(
apps/driver/lib/views/home/Captin/orderCaptin/order_over_lay.dart
+2 -2
View File
@@ -5,8 +5,8 @@ import 'package:flutter_overlay_window/flutter_overlay_window.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:just_audio/just_audio.dart';
import 'package:siro_driver/constant/api_key.dart';
import 'package:siro_driver/models/overlay_service.dart';
import 'package:tripz_driver/constant/api_key.dart';
import 'package:tripz_driver/models/overlay_service.dart';
import '../../../../constant/box_name.dart';
import '../../../../constant/links.dart';
import '../../../../controller/firebase/local_notification.dart';
apps/driver/lib/views/home/Captin/orderCaptin/order_request_page.dart
+7 -6
View File
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_driver/constant/api_key.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/home/captin/order_request_controller.dart';
import 'package:siro_driver/constant/currency.dart';
import 'package:siro_driver/views/widgets/driver_earnings_badge.dart';
import 'package:tripz_driver/constant/api_key.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/controller/home/captin/order_request_controller.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:tripz_driver/views/widgets/driver_earnings_badge.dart';
class OrderRequestPage extends StatelessWidget {
const OrderRequestPage({super.key});
@@ -198,7 +198,8 @@ class OrderRequestPage extends StatelessWidget {
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text("${controller.tripPrice} ${CurrencyHelper.currency}",
Text(
"${controller.tripPrice} ${CurrencyHelper.currency}",
style: const TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
apps/driver/lib/views/home/Captin/orderCaptin/order_speed_request.dart
+7 -7
View File
@@ -2,14 +2,14 @@
// import 'package:flutter/material.dart';
// import 'package:get/get.dart';
// import 'package:intaleq_maps/intaleq_maps.dart';
// import 'package:tripz_maps/tripz_maps.dart';
// import 'package:siro_driver/controller/home/captin/home_captain_controller.dart';
// import 'package:siro_driver/constant/box_name.dart';
// import 'package:siro_driver/controller/firebase/firbase_messge.dart';
// import 'package:siro_driver/main.dart';
// import 'package:siro_driver/print.dart';
// import 'package:siro_driver/views/home/Captin/driver_map_page.dart';
// import 'package:tripz_driver/controller/home/captin/home_captain_controller.dart';
// import 'package:tripz_driver/constant/box_name.dart';
// import 'package:tripz_driver/controller/firebase/firbase_messge.dart';
// import 'package:tripz_driver/main.dart';
// import 'package:tripz_driver/print.dart';
// import 'package:tripz_driver/views/home/Captin/driver_map_page.dart';
// import '../../../../constant/colors.dart';
// import '../../../../constant/links.dart';
apps/driver/lib/views/home/Captin/orderCaptin/test_order_page.dart
+2 -2
View File
@@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:siro_driver/constant/api_key.dart';
import 'package:tripz_driver/constant/api_key.dart';
import 'dart:math' as math;
import '../../../../constant/colors.dart';
@@ -62,7 +62,7 @@ class _OrderRequestPageTestState extends State<OrderRequestPageTest> {
SizedBox(
height: Get.height * .33,
child: Obx(() => IntaleqMap(
apiKey: AK.mapAPIKEY,
apiKey: AK.mapSaasKey,
initialCameraPosition: CameraPosition(
zoom: 12,
target:
apps/driver/lib/views/home/Captin/orderCaptin/vip_order_page.dart
+4 -4
View File
@@ -1,9 +1,9 @@
import 'dart:convert';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/links.dart';
import 'package:siro_driver/controller/functions/crud.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/links.dart';
import 'package:tripz_driver/controller/functions/crud.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
apps/driver/lib/views/home/Captin/text_scanner.dart
+1 -1
View File
@@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../controller/functions/ocr_controller.dart';
apps/driver/lib/views/home/my_wallet/card_wallet_widget.dart
+2 -2
View File
@@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:siro_driver/views/home/my_wallet/pay_out_screen.dart';
import 'package:tripz_driver/views/home/my_wallet/pay_out_screen.dart';
import '../../../constant/box_name.dart';
import '../../../constant/colors.dart';
@@ -96,7 +96,7 @@ class CardSeferWalletDriver extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
'رصيد سيرو',
'رصيد تريبز',
style: AppStyle.headTitle.copyWith(
fontFamily: 'Amiri', // خط يوحي بالفخامة
color: Colors.white,
apps/driver/lib/views/home/my_wallet/pay_out_screen.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:local_auth/local_auth.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/main.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/main.dart';
import '../../../controller/payment/smsPaymnet/pay_out_syria_controller.dart';
apps/driver/lib/views/home/my_wallet/payment_history_driver_page.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:siro_driver/constant/finance_design_system.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/constant/finance_design_system.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../controller/payment/driver_payment_controller.dart';
import 'widgets/transaction_preview_item.dart';
apps/driver/lib/views/home/my_wallet/points_captain.dart
+6 -6
View File
@@ -1,12 +1,12 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:local_auth/local_auth.dart';
import 'package:siro_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:siro_driver/controller/payment/payment_controller.dart';
import 'package:siro_driver/controller/payment/smsPaymnet/payment_services.dart';
import 'package:tripz_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:tripz_driver/controller/payment/payment_controller.dart';
import 'package:tripz_driver/controller/payment/smsPaymnet/payment_services.dart';
import 'package:webview_flutter/webview_flutter.dart';
import '../../../constant/box_name.dart';
@@ -188,13 +188,13 @@ class PointsCaptain extends StatelessWidget {
_buildPaymentMethodTile(
icon: Icons.qr_code_scanner_rounded,
title: 'CliQ'.tr,
subtitle: 'Pay via CliQ (Alias: siroapp)'.tr,
subtitle: 'Pay via CliQ (Alias: tripzapp)'.tr,
color: Colors.purple,
onTap: () {
Get.back();
MyDialog().getDialog(
'CliQ Payment'.tr,
'Please transfer the amount to alias: siroapp'.tr,
'Please transfer the amount to alias: tripzapp'.tr,
() => Get.back());
},
),
apps/driver/lib/views/home/my_wallet/transfer_budget_page.dart
+7 -7
View File
@@ -1,12 +1,12 @@
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/my_textField.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/my_textField.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import '../../../controller/home/payment/captain_wallet_controller.dart';
apps/driver/lib/views/home/my_wallet/walet_captain.dart
+15 -15
View File
@@ -1,21 +1,21 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:siro_driver/constant/recharge_tiers.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:tripz_driver/constant/recharge_tiers.dart';
import 'package:local_auth/local_auth.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/finance_design_system.dart';
import 'package:siro_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/my_textField.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:siro_driver/views/widgets/error_snakbar.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/links.dart';
import 'package:siro_driver/controller/functions/crud.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/home/my_wallet/payment_history_driver_page.dart';
import 'package:siro_driver/controller/payment/driver_payment_controller.dart';
import 'package:tripz_driver/constant/finance_design_system.dart';
import 'package:tripz_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/views/widgets/my_textField.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/links.dart';
import 'package:tripz_driver/controller/functions/crud.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/home/my_wallet/payment_history_driver_page.dart';
import 'package:tripz_driver/controller/payment/driver_payment_controller.dart';
// Import new widgets
import 'points_captain.dart';
apps/driver/lib/views/home/my_wallet/weekly_payment_page.dart
+3 -3
View File
@@ -1,9 +1,9 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/finance_design_system.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/constant/finance_design_system.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../controller/payment/driver_payment_controller.dart';
import 'widgets/transaction_preview_item.dart';
apps/driver/lib/views/home/my_wallet/widgets/balance_card.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../../constant/finance_design_system.dart';
apps/driver/lib/views/home/my_wallet/widgets/financial_summary_card.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../../constant/finance_design_system.dart';
apps/driver/lib/views/home/my_wallet/widgets/transaction_preview_item.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../../constant/finance_design_system.dart';
apps/driver/lib/views/home/on_boarding_page.dart
+4 -4
View File
@@ -1,7 +1,7 @@
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/auth/onboarding_controller.dart';
import 'package:siro_driver/onbording_page.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/controller/auth/onboarding_controller.dart';
import 'package:tripz_driver/onbording_page.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
apps/driver/lib/views/home/profile/captains_cars.dart
+8 -8
View File
@@ -1,11 +1,11 @@
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/controller/functions/encrypt_decrypt.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/controller/functions/encrypt_decrypt.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
import 'package:get/get.dart';
apps/driver/lib/views/home/profile/cars_inserting_page.dart
+2 -2
View File
@@ -1,5 +1,5 @@
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
apps/driver/lib/views/home/profile/complaint_page.dart
+7 -7
View File
@@ -2,12 +2,12 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/controller/home/profile/complaint_controller.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/controller/home/profile/complaint_controller.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart';
import '../../../controller/functions/audio_recorder_controller.dart';
@@ -199,7 +199,7 @@ class ComplaintPage extends StatelessWidget {
leading: const Icon(
Icons.support_agent_outlined,
color: AppColor.primaryColor),
title: Text("Siro's Response".tr,
title: Text("Tripz's Response".tr,
style: AppStyle.title),
subtitle: Text(
controller.driverReport?['body']
apps/driver/lib/views/home/profile/feed_back_page.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/controller/home/profile/feed_back_controller.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/controller/home/profile/feed_back_controller.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../widgets/elevated_btn.dart';
apps/driver/lib/views/home/profile/passenger_profile_page.dart
+9 -9
View File
@@ -1,15 +1,15 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/controller/profile/profile_controller.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/my_textField.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/controller/profile/profile_controller.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/my_textField.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../controller/functions/log_out.dart';
apps/driver/lib/views/home/profile/profile_captain.dart
+7 -7
View File
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/controller/profile/captain_profile_controller.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:siro_driver/views/widgets/mycircular.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/controller/profile/captain_profile_controller.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/views/widgets/mycircular.dart';
import '../../../constant/links.dart';
import '../../../controller/functions/crud.dart';
import 'behavior_page.dart';
@@ -259,7 +259,7 @@ void showShamCashInput() {
child: TextField(
controller: nameController,
decoration: InputDecoration(
hintText: "مثال: siro",
hintText: "مثال: tripz",
hintStyle: TextStyle(color: Colors.grey[400], fontSize: 13),
border: InputBorder.none,
prefixIcon: const Icon(Icons.person_outline_rounded,
@@ -461,7 +461,7 @@ class PersonalInfoCard extends StatelessWidget {
label: 'Phone Number'.tr,
value: data['phone'] ?? ''),
if (data['email'] != null &&
data['email'].toString().contains('siroapp')) ...[
data['email'].toString().contains('tripzapp')) ...[
TextFormField(
controller: controller.emailController,
keyboardType:
apps/driver/lib/views/home/profile/promos_passenger_page.dart
+2 -2
View File
@@ -1,8 +1,8 @@
import 'package:animated_text_kit/animated_text_kit.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/controller/home/profile/promos_controller.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/controller/home/profile/promos_controller.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import '../../../constant/colors.dart';
import '../../../constant/style.dart';
apps/driver/lib/views/home/profile/taarif_page.dart
+4 -4
View File
@@ -1,9 +1,9 @@
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/main.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/main.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/style.dart';
import 'package:siro_driver/views/widgets/my_scafold.dart';
import 'package:tripz_driver/constant/style.dart';
import 'package:tripz_driver/views/widgets/my_scafold.dart';
import '../../../constant/colors.dart';
apps/driver/lib/views/home/statistics/statistics_dashboard.dart
+3 -3
View File
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/constant/finance_design_system.dart';
import 'package:siro_driver/controller/gamification/gamification_controller.dart';
import 'package:siro_driver/controller/home/statistics/statistics_controller.dart';
import 'package:tripz_driver/constant/finance_design_system.dart';
import 'package:tripz_driver/controller/gamification/gamification_controller.dart';
import 'package:tripz_driver/controller/home/statistics/statistics_controller.dart';
import 'widgets/stat_summary_card.dart';
import 'widgets/daily_goal_widget.dart';
apps/driver/lib/views/home/statistics/widgets/daily_goal_widget.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../../constant/finance_design_system.dart';
apps/driver/lib/views/home/statistics/widgets/monthly_chart_widget.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:fl_chart/fl_chart.dart';
apps/driver/lib/views/home/statistics/widgets/today_chart_widget.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:siro_driver/controller/home/captin/home_captain_controller.dart';
import 'package:tripz_driver/controller/home/captin/home_captain_controller.dart';
import '../../../../constant/finance_design_system.dart';
class TodayChartWidget extends StatelessWidget {
apps/driver/lib/views/home/statistics/widgets/weekly_chart_widget.dart
+1 -1
View File
@@ -1,4 +1,4 @@
import 'package:siro_driver/constant/currency.dart';
import 'package:tripz_driver/constant/currency.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:fl_chart/fl_chart.dart';