Update: 2026-06-10 18:11:50

This commit is contained in:
Hamza-Ayed
2026-06-10 18:11:50 +03:00
parent a0473a8b0f
commit 977adfe99d
27 changed files with 3946 additions and 206 deletions

View File

@@ -250,19 +250,23 @@ class ApplyOrderWidget extends StatelessWidget {
Row(
children: [
// صورة السائق (أصغر)
Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color: AppColor.primaryColor.withOpacity(0.2), width: 2),
),
child: CircleAvatar(
radius: 22, // تصغير من 28 إلى 22
backgroundColor: Colors.grey[200],
backgroundImage: NetworkImage(
'${AppLink.server}/portrate_captain_image/${controller.driverId}.jpg'),
onBackgroundImageError: (_, __) =>
const Icon(Icons.person, color: Colors.grey, size: 20),
GestureDetector(
onTap: () => _showDriverAvatarDialog(context, controller),
child: Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color: AppColor.primaryColor.withOpacity(0.2),
width: 2),
),
child: CircleAvatar(
radius: 22, // تصغير من 28 إلى 22
backgroundColor: Colors.grey[200],
backgroundImage: NetworkImage(
'${AppLink.server}/portrate_captain_image/${controller.driverId}.jpg'),
onBackgroundImageError: (_, __) =>
const Icon(Icons.person, color: Colors.grey, size: 20),
),
),
),
@@ -299,6 +303,32 @@ class ApplyOrderWidget extends StatelessWidget {
),
],
),
const SizedBox(height: 5),
Wrap(
spacing: 6,
runSpacing: 4,
children: [
_buildDriverBadge(
icon: Icons.verified_rounded,
text: controller.driverTier.tr,
color: AppColor.primaryColor,
),
if (controller.driverCompletedRides != '0')
_buildDriverBadge(
icon: Icons.route_rounded,
text:
'${controller.driverCompletedRides} ${'rides'.tr}',
color: Colors.teal,
),
if (controller.driverRatingCount != '0')
_buildDriverBadge(
icon: Icons.reviews_rounded,
text:
'${controller.driverRatingCount} ${'reviews'.tr}',
color: Colors.amber.shade800,
),
],
),
],
),
),
@@ -320,6 +350,11 @@ class ApplyOrderWidget extends StatelessWidget {
Widget _buildMicroCarIcon(
RideLifecycleController controller, Color Function(String) parseColor) {
Color carColor = parseColor(controller.colorHex);
final String vehicleText =
'${controller.model} ${controller.make}'.toLowerCase();
final bool isBike = vehicleText.contains('scooter') ||
vehicleText.contains('bike') ||
vehicleText.contains('دراجة');
return Container(
height: 40, // تصغير من 50
width: 40,
@@ -331,7 +366,8 @@ class ApplyOrderWidget extends StatelessWidget {
child: ColorFiltered(
colorFilter: ColorFilter.mode(carColor, BlendMode.srcIn),
child: Image.asset(
box.read(BoxName.carType) == 'Scooter' ||
isBike ||
box.read(BoxName.carType) == 'Scooter' ||
box.read(BoxName.carType) == 'Pink Bike'
? 'assets/images/moto.png'
: 'assets/images/car3.png',
@@ -341,6 +377,81 @@ class ApplyOrderWidget extends StatelessWidget {
);
}
Widget _buildDriverBadge({
required IconData icon,
required String text,
required Color color,
}) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 3),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(10),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 11, color: color),
const SizedBox(width: 4),
Text(
text,
style: TextStyle(
color: color,
fontSize: 10.5,
fontWeight: FontWeight.w800,
),
),
],
),
);
}
void _showDriverAvatarDialog(
BuildContext context, RideLifecycleController controller) {
final imageUrl =
'${AppLink.server}/portrate_captain_image/${controller.driverId}.jpg';
Get.dialog(
Dialog(
insetPadding: const EdgeInsets.symmetric(horizontal: 38),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(18)),
child: Padding(
padding: const EdgeInsets.fromLTRB(18, 20, 18, 18),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
CircleAvatar(
radius: 58,
backgroundColor: Colors.grey[200],
backgroundImage: NetworkImage(imageUrl),
onBackgroundImageError: (_, __) {},
),
const SizedBox(height: 14),
Text(
controller.driverName,
textAlign: TextAlign.center,
style: AppStyle.title.copyWith(
fontSize: 18,
fontWeight: FontWeight.w900,
),
),
const SizedBox(height: 6),
Text(
'${controller.driverTier.tr}${controller.driverRate}',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.grey[700],
fontSize: 13,
fontWeight: FontWeight.w600,
),
),
],
),
),
),
barrierDismissible: true,
);
}
Widget _buildSlimLicensePlate(String plateNumber) {
return Container(
width: double.infinity,