Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-06-14 05:48:58

Browse Source
This commit is contained in:
Hamza-Ayed
2026-06-14 05:48:58 +03:00
parent 2645ed0cf1
commit 8e3b9eca4d
22 changed files with 789 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
siro_rider/lib/views/home/map_widget.dart/apply_order_widget.dart
View File

@@ -293,7 +293,7 @@ class ApplyOrderWidget extends StatelessWidget {
const Icon(Icons.star_rounded,
color: Colors.amber, size: 14),
Text(
" ${controller.driverRate} • ${controller.model}",
" ${controller.driverRate} • ${controller.model}${controller.carColor.isNotEmpty ? ' • ${controller.carColor.tr}' : ''}",
style: TextStyle(
fontSize: 12,
color: Colors.grey[700],
@@ -356,23 +356,25 @@ class ApplyOrderWidget extends StatelessWidget {
final bool isBike = vehicleText.contains('scooter') ||
vehicleText.contains('bike') ||
vehicleText.contains('دراجة');
return Container(
height: 40, // تصغير من 50
width: 40,
decoration: BoxDecoration(
color: carColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
padding: const EdgeInsets.all(4),
child: ColorFiltered(
colorFilter: ColorFilter.mode(carColor, BlendMode.srcIn),
child: Image.asset(
isBike ||
box.read(BoxName.carType) == 'Scooter' ||
box.read(BoxName.carType) == 'Pink Bike'
? 'assets/images/moto.png'
: 'assets/images/car3.png',
fit: BoxFit.contain,
return AnimatedCarIcon(
child: Container(
height: 40, // تصغير من 50
width: 40,
decoration: BoxDecoration(
color: carColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
padding: const EdgeInsets.all(4),
child: ColorFiltered(
colorFilter: ColorFilter.mode(carColor, BlendMode.srcIn),
child: Image.asset(
isBike ||
box.read(BoxName.carType) == 'Scooter' ||
box.read(BoxName.carType) == 'Pink Bike'
? 'assets/images/moto.png'
: 'assets/images/car3.png',
fit: BoxFit.contain,
),
),
),
);
@@ -841,3 +843,48 @@ class TimeDriverToPassenger extends StatelessWidget {
});
}
}
class AnimatedCarIcon extends StatefulWidget {
final Widget child;
const AnimatedCarIcon({Key? key, required this.child}) : super(key: key);
@override
State<AnimatedCarIcon> createState() => _AnimatedCarIconState();
}
class _AnimatedCarIconState extends State<AnimatedCarIcon>
with SingleTickerProviderStateMixin {
late final AnimationController _controller;
late final Animation<Offset> _animation;
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(seconds: 2),
)..repeat(reverse: true);
_animation = Tween<Offset>(
begin: const Offset(-0.06, 0.0),
end: const Offset(0.06, 0.0),
).animate(CurvedAnimation(
parent: _controller,
curve: Curves.easeInOut,
));
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return SlideTransition(
position: _animation,
child: widget.child,
);
}
}

2
siro_rider/lib/views/home/map_widget.dart/ride_begin_passenger.dart
View File

@@ -162,7 +162,7 @@ class RideBeginPassenger extends StatelessWidget {
children: [
Flexible(
child: Text(
'${controller.model} • ',
'${controller.model}${controller.carColor.isNotEmpty ? " • ${controller.carColor.tr}" : ""} • ',
style: TextStyle(fontSize: 12, color: AppColor.grayColor),
maxLines: 1,
overflow: TextOverflow.ellipsis,

9
siro_rider/lib/views/home/map_widget.dart/vip_begin.dart
View File

@@ -97,6 +97,15 @@ class VipRideBeginPassenger extends StatelessWidget {
controller.model,
style: AppStyle.title,
),
if (controller.carColor.isNotEmpty) ...[
const SizedBox(
width: 10,
),
Text(
controller.carColor.tr,
style: AppStyle.title,
),
],
],
),
),

162
siro_rider/lib/views/widgets/mydialoug.dart
View File

@@ -7,6 +7,7 @@ import 'package:get/get.dart';
import '../../constant/colors.dart';
import '../../constant/style.dart';
import '../../controller/functions/tts.dart';
import '../../controller/functions/translate_helper.dart';
// ─────────────────────────────────────────────────────────────────────────────
// Config
@@ -417,6 +418,167 @@ class MyDialog extends GetxController {
barrierColor: _DC.barrierColor,
);
}
void getChatDialog(
String title,
String messageContent,
VoidCallback onPressed, {
IconData? icon,
}) {
HapticFeedback.mediumImpact();
String displayedText = messageContent;
bool isTranslated = false;
bool isLoading = false;
Get.dialog(
StatefulBuilder(
builder: (dialogContext, setState) {
return _DialogShell(
child: _GlassCard(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// ── Body ──────────────────────────────────────────────
Padding(
padding: const EdgeInsets.fromLTRB(24, 28, 24, 20),
child: Column(
children: [
// Icon badge
Container(
width: 56,
height: 56,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: AppColor.primaryColor.withOpacity(0.1),
border: Border.all(
color: AppColor.primaryColor.withOpacity(0.2),
),
),
child: Icon(
icon ?? Icons.chat_bubble_outline_rounded,
color: AppColor.primaryColor,
size: 26,
),
),
const SizedBox(height: 16),
// Title
Text(
title.tr,
textAlign: TextAlign.center,
style: AppStyle.title.copyWith(
fontSize: 18,
fontWeight: FontWeight.w700,
letterSpacing: -0.4,
color: AppColor.writeColor,
),
),
const SizedBox(height: 10),
if (isLoading)
const Padding(
padding: EdgeInsets.symmetric(vertical: 20),
child: Center(
child: CupertinoActivityIndicator(radius: 12),
),
)
else
Text(
displayedText,
textAlign: TextAlign.center,
style: AppStyle.subtitle.copyWith(
fontSize: 14.5,
height: 1.5,
color: Colors.grey[600],
),
),
const SizedBox(height: 16),
// TTS button
_SpeakButton(
texts: [title.tr, displayedText],
),
],
),
),
// ── Actions ───────────────────────────────────────────
Container(
decoration: BoxDecoration(
border: Border(
top: BorderSide(color: Colors.grey.withOpacity(0.15), width: 1),
),
),
child: Row(
children: [
// Translate Toggle
Expanded(
child: _ActionButton(
label: isTranslated ? 'Original'.tr : 'Translate'.tr,
color: AppColor.blueColor,
backgroundColor: AppColor.blueColor.withOpacity(0.07),
onPressed: () async {
if (isLoading) return;
HapticFeedback.lightImpact();
if (isTranslated) {
setState(() {
displayedText = messageContent;
isTranslated = false;
});
} else {
setState(() {
isLoading = true;
});
try {
final targetLang = Get.locale?.languageCode ?? 'ar';
final translated = await TranslateHelper.translateText(messageContent, targetLang);
setState(() {
displayedText = translated;
isTranslated = true;
isLoading = false;
});
} catch (e) {
setState(() {
isLoading = false;
});
}
}
},
isLeft: true,
),
),
Container(width: 1, height: 52, color: Colors.grey.withOpacity(0.15)),
// Confirm
Expanded(
child: _ActionButton(
label: 'OK'.tr,
color: AppColor.primaryColor,
backgroundColor: AppColor.primaryColor.withOpacity(0.07),
onPressed: () {
HapticFeedback.mediumImpact();
Navigator.of(dialogContext, rootNavigator: true).pop();
Future.delayed(const Duration(milliseconds: 100), () {
onPressed();
});
},
isLeft: false,
isBold: true,
),
),
],
),
),
],
),
),
);
},
),
barrierDismissible: true,
barrierColor: _DC.barrierColor,
);
}
}
// ─────────────────────────────────────────────────────────────────────────────