feat(apps): الخريطة وطلب الرحلة ودورة السائق — المرحلة 4
## حسم تعارض الخرائط (docs/38 §7) لصالح القرار الأحدث 2026-07-20: كل الخرائط — البلاطات والبحث والعكسي والمسار — مباشرة إلى map-saas بترويسة x-api-key، بلا مرور بباك إند تريبز. نقاط /maps/* في الباك إند لا تُستعمل، وإحداها (geocode) معطوبة على المنشور. العقد تُحقّق حيّاً بـcurl قبل كتابة سطر. ## النواة المشتركة - core/api/antlaq_api.dart: عميل منفصل بلا AuthInterceptor — توكن تريبز لا شأن لخادم الخرائط به، وإرساله إليه تسريب بلا مقابل - core/realtime: Socket.IO واحد (trip:update · driver:location · trip:offer · trip:offer_taken) - core/location: نقطة الموقع الوحيدة بمرشّح 25 متراً - features/trip/data: سبعة نماذج + MapsRepository + TripRepository متطابق حرفياً بين التوأمين ## الراكب RideCubit بستّ مراحل + RidePage وثمانية ويدجت: الخريطة · دبّوس المنتصف · المخطّط · الخط الزمني · اختيار النوع · التأكيد · البحث عن سائق · الرحلة. ## السائق DutyCubit بأربع مراحل + DutyPage: مفتاح الاتصال · العرض بمؤقّت · الرحلة. ## قرارات تحمي الأداء والصحّة - GeoPoint مستقلّ عن حزمة الخريطة؛ intaleq_maps مستوردة في ملف واحد فقط لكل تطبيق. تبديل محرّك الخريطة لا يلمس منطقاً - الخريطة خارج BlocBuilder الورقة ولها BlocSelector خاص: نبضة موقع كل 25م لا تعيد بناء الشاشة - مهلة بحث محليّة 90ث + استطلاع كل 5ث: الخادم قد لا يُطلق expired/no_drivers أبداً (ثغرة R1)، وانتظار حدث قد لا يصل = شاشة بحث أبدية - offeredDrivers == 0 جواب نهائي فوري بلا انتظار المهلة - الأجرة لا تُعرض إلا إن كانت صالحة: /tariff/quote يرجّع 200 بقيم null صامتة - موقع السائق بمسارين عمداً: REST لمطابقة Redis والسوكت لخريطة الراكب flutter analyze نظيف · الراكب 70 ملف/5,294 سطر · السائق 67 ملف/4,771 سطر. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
co-authored by
Claude Opus 5
Claude Opus 5
parent
c52338f3bb
commit
1156299d09
@@ -0,0 +1,188 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../core/design/tokens.dart';
|
||||
import '../../../core/design/tripz_colors.dart';
|
||||
import '../../../core/di.dart';
|
||||
import '../../../core/l10n/l10n.dart';
|
||||
import '../../../core/ui/tripz_button.dart';
|
||||
import '../cubit/ride_cubit.dart';
|
||||
import '../cubit/ride_state.dart';
|
||||
import '../data/models/geo_point.dart';
|
||||
import 'widgets/active_trip_sheet.dart';
|
||||
import 'widgets/center_pin.dart';
|
||||
import 'widgets/confirm_sheet.dart';
|
||||
import 'widgets/planner_sheet.dart';
|
||||
import 'widgets/ride_map.dart';
|
||||
import 'widgets/searching_sheet.dart';
|
||||
|
||||
/// شاشة الراكب: خريطة ثابتة + ورقة سفلية تتبدّل بالمرحلة (docs/39 §3).
|
||||
///
|
||||
/// الخريطة **لا تُعاد بناؤها** عند تبدّل الورقة: هي خارج الـ`BlocBuilder`
|
||||
/// الذي يبني الورقة، ولها `BlocSelector` خاص بما تحتاجه وحدها. هذا هو الفرق
|
||||
/// بين خريطة سلسة وأخرى تهتزّ عند كل تحديث حالة.
|
||||
class RidePage extends StatefulWidget {
|
||||
const RidePage({super.key});
|
||||
|
||||
@override
|
||||
State<RidePage> createState() => _RidePageState();
|
||||
}
|
||||
|
||||
class _RidePageState extends State<RidePage> {
|
||||
late final RideCubit _cubit = sl<RideCubit>()..init();
|
||||
GeoPoint? _mapCenter;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_cubit.close();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocProvider.value(
|
||||
value: _cubit,
|
||||
child: Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
// ── الخريطة ────────────────────────────────────────────────
|
||||
BlocSelector<RideCubit, RideState, _MapData>(
|
||||
selector: (s) => _MapData(
|
||||
origin: s.origin,
|
||||
destination: s.destination,
|
||||
driver: s.driverLocation,
|
||||
route: s.route,
|
||||
camera: s.cameraTarget,
|
||||
),
|
||||
builder: (context, data) => RideMap(
|
||||
origin: data.origin,
|
||||
destination: data.destination,
|
||||
driver: data.driver,
|
||||
route: data.route,
|
||||
cameraTarget: data.camera,
|
||||
onCameraIdle: (p) => _mapCenter = p,
|
||||
),
|
||||
),
|
||||
|
||||
// ── دبّوس الاختيار ─────────────────────────────────────────
|
||||
BlocSelector<RideCubit, RideState, bool>(
|
||||
selector: (s) => s.phase == RidePhase.pickingOnMap,
|
||||
builder: (context, picking) =>
|
||||
picking ? const CenterPin() : const SizedBox.shrink(),
|
||||
),
|
||||
|
||||
// ── الورقة السفلية ─────────────────────────────────────────
|
||||
Align(
|
||||
alignment: Alignment.bottomCenter,
|
||||
child: BlocBuilder<RideCubit, RideState>(
|
||||
builder: (context, state) => _Sheet(
|
||||
state: state,
|
||||
onConfirmPick: () {
|
||||
final center = _mapCenter;
|
||||
if (center != null) _cubit.confirmMapPick(center);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// ما تحتاجه الخريطة وحدها — تغيّرُ أي شيء آخر في الحالة لا يعيد بناءها.
|
||||
class _MapData {
|
||||
const _MapData({
|
||||
this.origin,
|
||||
this.destination,
|
||||
this.driver,
|
||||
this.route,
|
||||
this.camera,
|
||||
});
|
||||
|
||||
final GeoPoint? origin;
|
||||
final GeoPoint? destination;
|
||||
final GeoPoint? driver;
|
||||
final dynamic route;
|
||||
final GeoPoint? camera;
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
other is _MapData &&
|
||||
other.origin == origin &&
|
||||
other.destination == destination &&
|
||||
other.driver == driver &&
|
||||
other.route == route &&
|
||||
other.camera == camera;
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(origin, destination, driver, route, camera);
|
||||
}
|
||||
|
||||
class _Sheet extends StatelessWidget {
|
||||
const _Sheet({required this.state, required this.onConfirmPick});
|
||||
|
||||
final RideState state;
|
||||
final VoidCallback onConfirmPick;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final child = switch (state.phase) {
|
||||
RidePhase.idle => const _Collapsed(),
|
||||
RidePhase.planning => PlannerSheet(state: state),
|
||||
RidePhase.pickingOnMap => _PickConfirm(onConfirm: onConfirmPick),
|
||||
RidePhase.confirming => ConfirmSheet(state: state),
|
||||
RidePhase.searching => const SearchingSheet(),
|
||||
RidePhase.active => ActiveTripSheet(trip: state.trip!),
|
||||
};
|
||||
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: context.colors.surface,
|
||||
borderRadius: Radii.sheetTop,
|
||||
),
|
||||
child: SafeArea(
|
||||
top: false,
|
||||
child: Padding(
|
||||
padding: Space.page,
|
||||
child: AnimatedSize(
|
||||
duration: Motion.inScreen,
|
||||
curve: Motion.curve,
|
||||
alignment: Alignment.bottomCenter,
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Collapsed extends StatelessWidget {
|
||||
const _Collapsed();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TripzButton.secondary(
|
||||
label: context.l10n.rideWhereTo,
|
||||
icon: Icons.search_rounded,
|
||||
expanded: true,
|
||||
onPressed: context.read<RideCubit>().openPlanner,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _PickConfirm extends StatelessWidget {
|
||||
const _PickConfirm({required this.onConfirm});
|
||||
|
||||
final VoidCallback onConfirm;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TripzButton.primary(
|
||||
label: context.l10n.rideConfirmPoint,
|
||||
onPressed: onConfirm,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/design/typography.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../../../core/ui/tripz_button.dart';
|
||||
import '../../cubit/ride_cubit.dart';
|
||||
import '../../data/models/trip.dart';
|
||||
import 'driver_badge.dart';
|
||||
|
||||
/// بطاقة الرحلة الجارية: حالة واضحة ثم بيانات السائق ثم فعل واحد.
|
||||
class ActiveTripSheet extends StatelessWidget {
|
||||
const ActiveTripSheet({super.key, required this.trip});
|
||||
|
||||
final Trip trip;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
final canCancel = const {
|
||||
TripStatus.assigned,
|
||||
TripStatus.driverArriving,
|
||||
}.contains(trip.status);
|
||||
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Text(_statusText(context), style: context.texts.titleMedium),
|
||||
const SizedBox(height: Space.md),
|
||||
DriverBadge(trip: trip),
|
||||
if (trip.priceForPassenger != null) ...[
|
||||
const SizedBox(height: Space.md),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
l10n.rideConfirmTrip,
|
||||
style: context.texts.bodyMedium?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
'${trip.priceForPassenger} ${trip.currency}',
|
||||
style: numericStyle(context.texts.titleLarge),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
if (canCancel) ...[
|
||||
const SizedBox(height: Space.md),
|
||||
TripzButton.text(
|
||||
label: l10n.rideCancelTrip,
|
||||
expanded: true,
|
||||
onPressed: context.read<RideCubit>().cancelTrip,
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
String _statusText(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return switch (trip.status) {
|
||||
TripStatus.assigned => l10n.tripAssigned,
|
||||
TripStatus.driverArriving => l10n.tripDriverArriving,
|
||||
TripStatus.driverArrived => l10n.tripDriverArrived,
|
||||
TripStatus.inProgress => l10n.tripInProgress,
|
||||
TripStatus.completed || TripStatus.paid => l10n.tripCompleted,
|
||||
_ => l10n.rideSearchingTitle,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
|
||||
/// دبّوس ثابت في منتصف الشاشة أثناء الاختيار من الخريطة.
|
||||
///
|
||||
/// النمط الصحيح المثبت ميدانياً: **المستخدم يحرّك الخريطة لا الدبّوس**
|
||||
/// (docs/39 §3) — الدبّوس لا يُسحب، فلا يضيع تحت الإصبع.
|
||||
class CenterPin extends StatelessWidget {
|
||||
const CenterPin({super.key, this.isOrigin = false});
|
||||
|
||||
final bool isOrigin;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final color =
|
||||
isOrigin ? context.tripzColors.mapOrigin : context.tripzColors.mapDestination;
|
||||
return IgnorePointer(
|
||||
child: Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(Icons.location_on, size: Sizes.iconLg, color: color),
|
||||
// ظلّ صغير يثبّت الإحساس بموضع النقطة على الأرض.
|
||||
Container(
|
||||
width: 8,
|
||||
height: 4,
|
||||
margin: const EdgeInsets.only(top: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black.withValues(alpha: 0.25),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Sizes.iconLg),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/design/typography.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../../../core/ui/status_banner.dart';
|
||||
import '../../../../core/ui/tripz_button.dart';
|
||||
import '../../cubit/ride_cubit.dart';
|
||||
import '../../cubit/ride_state.dart';
|
||||
import 'ride_type_picker.dart';
|
||||
import 'route_timeline.dart';
|
||||
|
||||
/// التأكيد: نوع الرحلة والأجرة والمسافة والمدة — ثم زر واحد.
|
||||
class ConfirmSheet extends StatelessWidget {
|
||||
const ConfirmSheet({super.key, required this.state});
|
||||
|
||||
final RideState state;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
final cubit = context.read<RideCubit>();
|
||||
final route = state.route;
|
||||
final quote = state.quote;
|
||||
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
RouteTimeline(
|
||||
originLabel: state.originLabel,
|
||||
destinationLabel: state.destinationLabel,
|
||||
stopCount: state.stops.length,
|
||||
onTapDestination: cubit.clearDestination,
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
RideTypePicker(
|
||||
types: state.rideTypes,
|
||||
selected: state.selectedRideType,
|
||||
onSelect: cubit.selectRideType,
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
if (route != null)
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
_Metric(
|
||||
icon: Icons.route_outlined,
|
||||
value: l10n.rideDistanceKm(route.distanceKm.toStringAsFixed(1)),
|
||||
),
|
||||
_Metric(
|
||||
icon: Icons.schedule_rounded,
|
||||
value: l10n.rideEta(route.durationMin.round().toString()),
|
||||
),
|
||||
// الأجرة لا تُعرض إلا إن كانت صالحة: النقطة ترجّع 200 بقيم
|
||||
// `null` عند المدخلات الخطأ (docs/38 §7).
|
||||
if (quote != null && quote.isUsable)
|
||||
Text(
|
||||
'${quote.total!.toStringAsFixed(2)} ${quote.currency}',
|
||||
style: numericStyle(context.texts.titleLarge),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (quote?.hasSurge == true) ...[
|
||||
const SizedBox(height: Space.sm),
|
||||
StatusBanner(
|
||||
message: l10n.rideSurge,
|
||||
tone: BannerTone.warning,
|
||||
icon: Icons.trending_up_rounded,
|
||||
),
|
||||
],
|
||||
if (state.error == RideError.quoteFailed) ...[
|
||||
const SizedBox(height: Space.sm),
|
||||
StatusBanner(
|
||||
message: l10n.rideQuoteFailed,
|
||||
tone: BannerTone.danger,
|
||||
),
|
||||
],
|
||||
if (state.error == RideError.noDrivers) ...[
|
||||
const SizedBox(height: Space.sm),
|
||||
StatusBanner(message: l10n.rideNoDrivers, tone: BannerTone.warning),
|
||||
],
|
||||
const SizedBox(height: Space.md),
|
||||
TripzButton.primary(
|
||||
label: l10n.rideConfirmTrip,
|
||||
loading: state.busy,
|
||||
onPressed: state.canConfirm ? cubit.requestTrip : null,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Metric extends StatelessWidget {
|
||||
const _Metric({required this.icon, required this.value});
|
||||
|
||||
final IconData icon;
|
||||
final String value;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(icon, size: Sizes.iconSm, color: context.colors.onSurfaceVariant),
|
||||
const SizedBox(width: Space.xxs),
|
||||
Text(value, style: numericStyle(context.texts.bodyMedium)),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/design/typography.dart';
|
||||
import '../../data/models/trip.dart';
|
||||
|
||||
/// بطاقة السائق ولوحة المركبة — أهم ما يبحث عنه الراكب في الشارع، فيأخذ
|
||||
/// أوضح موضع وأكبر تباين.
|
||||
class DriverBadge extends StatelessWidget {
|
||||
const DriverBadge({super.key, required this.trip});
|
||||
|
||||
final Trip trip;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (trip.driverName == null) return const SizedBox.shrink();
|
||||
return Row(
|
||||
children: [
|
||||
CircleAvatar(
|
||||
radius: 24,
|
||||
backgroundColor: context.colors.primaryContainer,
|
||||
child: Icon(
|
||||
Icons.person_rounded,
|
||||
color: context.colors.onPrimaryContainer,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: Space.sm),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(trip.driverName!, style: context.texts.titleSmall),
|
||||
if (trip.vehicleModel != null)
|
||||
Text(
|
||||
trip.vehicleModel!,
|
||||
style: context.texts.bodySmall?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
if (trip.driverRating != null)
|
||||
Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.star_rounded,
|
||||
size: Sizes.iconSm,
|
||||
color: context.tripzColors.warning,
|
||||
),
|
||||
const SizedBox(width: Space.xxs),
|
||||
Text(
|
||||
trip.driverRating!,
|
||||
style: numericStyle(context.texts.bodySmall),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (trip.vehiclePlate != null) _Plate(plate: trip.vehiclePlate!),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// لوحة مرسومة لا نصّ عادي — تُقرأ من بعيد ومن زاوية.
|
||||
class _Plate extends StatelessWidget {
|
||||
const _Plate({required this.plate});
|
||||
|
||||
final String plate;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: Space.sm,
|
||||
vertical: Space.xxs,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: Radii.field_,
|
||||
border: Border.all(color: context.colors.outline, width: 1.5),
|
||||
color: context.tripzColors.surfaceRaised,
|
||||
),
|
||||
child: Text(
|
||||
plate,
|
||||
textDirection: TextDirection.ltr,
|
||||
style: numericStyle(context.texts.titleMedium).copyWith(
|
||||
letterSpacing: 1.5,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../../../core/ui/tripz_button.dart';
|
||||
import '../../../../core/ui/tripz_text_field.dart';
|
||||
import '../../cubit/ride_cubit.dart';
|
||||
import '../../cubit/ride_state.dart';
|
||||
import 'route_timeline.dart';
|
||||
|
||||
/// المخطّط الموسّع بترتيبه المثبت ميدانياً (docs/39 §3):
|
||||
/// الخط الزمني للمسار ← البحث ← تحديد من الخريطة.
|
||||
class PlannerSheet extends StatefulWidget {
|
||||
const PlannerSheet({super.key, required this.state});
|
||||
|
||||
final RideState state;
|
||||
|
||||
@override
|
||||
State<PlannerSheet> createState() => _PlannerSheetState();
|
||||
}
|
||||
|
||||
class _PlannerSheetState extends State<PlannerSheet> {
|
||||
final _query = TextEditingController();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_query.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
final cubit = context.read<RideCubit>();
|
||||
final state = widget.state;
|
||||
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
RouteTimeline(
|
||||
originLabel: state.originLabel,
|
||||
destinationLabel: state.destinationLabel,
|
||||
stopCount: state.stops.length,
|
||||
onTapOrigin: () => cubit.startMapPick(PickTarget.origin),
|
||||
onTapDestination: () => cubit.startMapPick(PickTarget.destination),
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
TripzTextField(
|
||||
controller: _query,
|
||||
hint: l10n.rideSearchHint,
|
||||
prefixIcon: Icons.search_rounded,
|
||||
onChanged: cubit.searchPlaces,
|
||||
),
|
||||
if (state.searching)
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(top: Space.md),
|
||||
child: LinearProgressIndicator(minHeight: 2),
|
||||
),
|
||||
if (state.searchResults.isNotEmpty)
|
||||
Flexible(
|
||||
child: ListView.separated(
|
||||
shrinkWrap: true,
|
||||
padding: const EdgeInsets.only(top: Space.xs),
|
||||
itemCount: state.searchResults.length,
|
||||
separatorBuilder: (context, i) => const Divider(height: 1),
|
||||
itemBuilder: (context, i) {
|
||||
final place = state.searchResults[i];
|
||||
return ListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: const Icon(Icons.place_outlined),
|
||||
title: Text(place.label),
|
||||
subtitle: place.address.isEmpty ? null : Text(place.address),
|
||||
onTap: () {
|
||||
_query.clear();
|
||||
cubit.pickPlace(place, PickTarget.destination);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
TripzButton.secondary(
|
||||
label: l10n.ridePickOnMap,
|
||||
icon: Icons.map_outlined,
|
||||
expanded: true,
|
||||
onPressed: () => cubit.startMapPick(PickTarget.destination),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intaleq_maps/intaleq_maps.dart' as im;
|
||||
|
||||
import '../../../../core/config.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../data/models/geo_point.dart';
|
||||
import '../../data/models/route_info.dart';
|
||||
|
||||
/// الخريطة — **الطبقة الوحيدة التي تعرف `intaleq_maps`**. ما فوقها يتعامل
|
||||
/// مع `GeoPoint` وحده، فتبديل محرّك الخريطة لاحقاً لا يلمس منطقاً.
|
||||
///
|
||||
/// البلاطات تُجلب مباشرة من map-saas بمفتاح مقيّد ببصمة التطبيق
|
||||
/// (قرار 2026-07-20).
|
||||
class RideMap extends StatefulWidget {
|
||||
const RideMap({
|
||||
super.key,
|
||||
this.origin,
|
||||
this.destination,
|
||||
this.driver,
|
||||
this.route,
|
||||
this.cameraTarget,
|
||||
this.onCameraIdle,
|
||||
});
|
||||
|
||||
final GeoPoint? origin;
|
||||
final GeoPoint? destination;
|
||||
final GeoPoint? driver;
|
||||
final RouteInfo? route;
|
||||
final GeoPoint? cameraTarget;
|
||||
|
||||
/// مركز الخريطة عند استقرارها — يغذّي اختيار النقطة بالدبّوس الثابت.
|
||||
final ValueChanged<GeoPoint>? onCameraIdle;
|
||||
|
||||
@override
|
||||
State<RideMap> createState() => _RideMapState();
|
||||
}
|
||||
|
||||
class _RideMapState extends State<RideMap> {
|
||||
im.IntaleqMapController? _controller;
|
||||
im.LatLng? _center;
|
||||
|
||||
static const _fallback = im.LatLng(31.9539, 35.9106); // عمّان
|
||||
|
||||
@override
|
||||
void didUpdateWidget(RideMap old) {
|
||||
super.didUpdateWidget(old);
|
||||
final target = widget.cameraTarget;
|
||||
if (target != null && target != old.cameraTarget) {
|
||||
_controller?.animateCamera(
|
||||
im.CameraUpdate.newLatLng(im.LatLng(target.lat, target.lng)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colors = context.tripzColors;
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
return im.IntaleqMap(
|
||||
apiKey: AppConfig.mapApiKey,
|
||||
initialCameraPosition: im.CameraPosition(
|
||||
target: widget.origin == null
|
||||
? _fallback
|
||||
: im.LatLng(widget.origin!.lat, widget.origin!.lng),
|
||||
zoom: 15,
|
||||
),
|
||||
// الخريطة تبدّل ستايلها مع الثيم — خريطة نهارية في وضع ليلي تكسر
|
||||
// الغرض (docs/26 §2).
|
||||
styleUrl: isDark
|
||||
? im.IntaleqStyles.obsidian(AppConfig.mapApiKey)
|
||||
: im.IntaleqStyles.light(AppConfig.mapApiKey),
|
||||
myLocationEnabled: true,
|
||||
compassEnabled: false,
|
||||
zoomControlsEnabled: false,
|
||||
onMapCreated: (c) => _controller = c,
|
||||
onCameraMove: (position) => _center = position.target,
|
||||
onCameraIdle: () {
|
||||
final c = _center;
|
||||
if (c != null) widget.onCameraIdle?.call(GeoPoint(c.latitude, c.longitude));
|
||||
},
|
||||
markers: {
|
||||
if (widget.origin != null)
|
||||
_marker('origin', widget.origin!),
|
||||
if (widget.destination != null)
|
||||
_marker('destination', widget.destination!),
|
||||
if (widget.driver != null) _marker('driver', widget.driver!),
|
||||
},
|
||||
polylines: {
|
||||
if (widget.route != null && widget.route!.encodedPoints.isNotEmpty)
|
||||
im.Polyline(
|
||||
polylineId: const im.PolylineId('route'),
|
||||
points: im.PolylineUtils.decode(widget.route!.encodedPoints),
|
||||
color: colors.mapRoute,
|
||||
width: 5,
|
||||
),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
im.Marker _marker(String id, GeoPoint p) => im.Marker(
|
||||
markerId: im.MarkerId(id),
|
||||
position: im.LatLng(p.lat, p.lng),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../data/models/ride_type.dart';
|
||||
|
||||
/// قائمة الأنواع تُبنى من `GET /ride-types` لا من قائمة مكتوبة (docs/38 §7).
|
||||
/// `women_only` علامة مرئية لا فلتر صامت.
|
||||
class RideTypePicker extends StatelessWidget {
|
||||
const RideTypePicker({
|
||||
super.key,
|
||||
required this.types,
|
||||
required this.selected,
|
||||
required this.onSelect,
|
||||
});
|
||||
|
||||
final List<RideType> types;
|
||||
final RideType? selected;
|
||||
final ValueChanged<RideType> onSelect;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (types.isEmpty) return const SizedBox.shrink();
|
||||
final lang = Localizations.localeOf(context).languageCode;
|
||||
|
||||
return SizedBox(
|
||||
height: 44,
|
||||
child: ListView.separated(
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount: types.length,
|
||||
separatorBuilder: (context, i) => const SizedBox(width: Space.xs),
|
||||
itemBuilder: (context, i) {
|
||||
final type = types[i];
|
||||
final isSelected = type.id == selected?.id;
|
||||
return ChoiceChip(
|
||||
selected: isSelected,
|
||||
onSelected: (_) => onSelect(type),
|
||||
avatar: type.womenOnly
|
||||
? const Icon(Icons.female_rounded, size: Sizes.iconSm)
|
||||
: Icon(
|
||||
type.vehicleKind == 'moto'
|
||||
? Icons.two_wheeler_rounded
|
||||
: Icons.directions_car_rounded,
|
||||
size: Sizes.iconSm,
|
||||
),
|
||||
label: Text(type.nameFor(lang)),
|
||||
labelStyle: context.texts.labelLarge,
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
|
||||
/// الخط الزمني للمسار: المصدر ← المحطات ← الوجهة، بنقاط ملوّنة تطابق
|
||||
/// علامات الخريطة كي يربط المستخدم بينهما بلا شرح.
|
||||
class RouteTimeline extends StatelessWidget {
|
||||
const RouteTimeline({
|
||||
super.key,
|
||||
required this.originLabel,
|
||||
required this.destinationLabel,
|
||||
this.stopCount = 0,
|
||||
this.onTapOrigin,
|
||||
this.onTapDestination,
|
||||
});
|
||||
|
||||
final String originLabel;
|
||||
final String destinationLabel;
|
||||
final int stopCount;
|
||||
final VoidCallback? onTapOrigin;
|
||||
final VoidCallback? onTapDestination;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
final colors = context.tripzColors;
|
||||
return Column(
|
||||
children: [
|
||||
_Row(
|
||||
color: colors.mapOrigin,
|
||||
label: l10n.rideOrigin,
|
||||
value: originLabel,
|
||||
onTap: onTapOrigin,
|
||||
),
|
||||
if (stopCount > 0)
|
||||
for (var i = 0; i < stopCount; i++)
|
||||
_Row(
|
||||
color: colors.info,
|
||||
label: l10n.rideStop(i + 1),
|
||||
value: '',
|
||||
),
|
||||
_Row(
|
||||
color: colors.mapDestination,
|
||||
label: l10n.rideDestination,
|
||||
value: destinationLabel,
|
||||
onTap: onTapDestination,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Row extends StatelessWidget {
|
||||
const _Row({
|
||||
required this.color,
|
||||
required this.label,
|
||||
required this.value,
|
||||
this.onTap,
|
||||
});
|
||||
|
||||
final Color color;
|
||||
final String label;
|
||||
final String value;
|
||||
final VoidCallback? onTap;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return InkWell(
|
||||
onTap: onTap,
|
||||
borderRadius: Radii.field_,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: Space.sm),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 10,
|
||||
height: 10,
|
||||
decoration: BoxDecoration(color: color, shape: BoxShape.circle),
|
||||
),
|
||||
const SizedBox(width: Space.sm),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
label,
|
||||
style: context.texts.labelSmall?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
value.isEmpty ? '—' : value,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: context.texts.bodyMedium,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (onTap != null)
|
||||
Icon(
|
||||
Icons.chevron_left_rounded,
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../../../core/ui/tripz_button.dart';
|
||||
import '../../cubit/ride_cubit.dart';
|
||||
|
||||
/// نافذة البحث عن سائق.
|
||||
///
|
||||
/// **لا تُغلق بالسحب — بزر الإلغاء وحده** (قرار تصميمي مثبت ميدانياً،
|
||||
/// docs/39 §3): المستخدم لا يزيح شاشة البحث بالخطأ فيفقد أثر رحلته.
|
||||
/// الويدجت «غبي» بلا منطق — المهلة والاستطلاع في الكيوبت.
|
||||
class SearchingSheet extends StatefulWidget {
|
||||
const SearchingSheet({super.key});
|
||||
|
||||
@override
|
||||
State<SearchingSheet> createState() => _SearchingSheetState();
|
||||
}
|
||||
|
||||
class _SearchingSheetState extends State<SearchingSheet>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late final AnimationController _radar = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(seconds: 2),
|
||||
)..repeat();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_radar.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 120,
|
||||
child: Center(
|
||||
child: RepaintBoundary(
|
||||
child: AnimatedBuilder(
|
||||
animation: _radar,
|
||||
builder: (context, _) => CustomPaint(
|
||||
size: const Size(120, 120),
|
||||
painter: _RadarPainter(
|
||||
progress: _radar.value,
|
||||
color: context.colors.primary,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
Text(
|
||||
l10n.rideSearchingTitle,
|
||||
textAlign: TextAlign.center,
|
||||
style: context.texts.titleMedium,
|
||||
),
|
||||
const SizedBox(height: Space.xxs),
|
||||
Text(
|
||||
l10n.rideSearchingLead,
|
||||
textAlign: TextAlign.center,
|
||||
style: context.texts.bodySmall?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Space.lg),
|
||||
TripzButton.secondary(
|
||||
label: l10n.rideCancelSearch,
|
||||
expanded: true,
|
||||
onPressed: context.read<RideCubit>().cancelTrip,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RadarPainter extends CustomPainter {
|
||||
const _RadarPainter({required this.progress, required this.color});
|
||||
|
||||
final double progress;
|
||||
final Color color;
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final center = size.center(Offset.zero);
|
||||
final maxRadius = size.width / 2;
|
||||
|
||||
// ثلاث حلقات متتابعة الطور — إحساس بالبثّ المستمر لا بنبضة واحدة.
|
||||
for (var i = 0; i < 3; i++) {
|
||||
final t = (progress + i / 3) % 1.0;
|
||||
canvas.drawCircle(
|
||||
center,
|
||||
maxRadius * t,
|
||||
Paint()
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = 2
|
||||
..color = color.withValues(alpha: (1 - t) * 0.6),
|
||||
);
|
||||
}
|
||||
canvas.drawCircle(center, 8, Paint()..color = color);
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(_RadarPainter old) => old.progress != progress;
|
||||
}
|
||||
Reference in New Issue
Block a user