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

chore: أرشفة تطبيقات ولوحات تريبز التي سيحلّ محلها كود سيرو

Browse Source 
استكمال قرار 2026-07-27 (كوميت fff76c9 أرشف الباك إند):
  apps/rider          → apps/rider-archive-cubit
  apps/driver         → apps/driver-archive-cubit
  dashboards/admin-web    → dashboards/admin-web-archive
  dashboards/service-web  → dashboards/service-web-archive

إعادة تسمية بلا تعديل محتوى. rider/driver كانا إعادة بناء Cubit مبنية على
عقد NestJS المؤرشف. admin-web و service-web نموذجان بملف HTML واحد (164 و
128 سطراً) — يحلّ محلهما siro_admin و siro_service المكتملان.

يُحمل من المؤرشف ولا يُعاد اكتشافه: عقد map-saas المثبَّت بالتجربة في
apps/rider-archive-cubit/lib/core/api/ (x-api-key ترويسة، reverse مصفوفة،
route في points) ودرس مسار FCM.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
2026-07-27 05:12:04 +03:00
co-authored by Claude Opus 5
parent fff76c949f
commit 9909d9b4c1
809 changed files with 0 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/driver-archive-cubit/lib/app.dart
+93
View File
@@ -0,0 +1,93 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import 'core/di.dart';
import 'core/router.dart';
import 'core/design/theme.dart';
import 'features/auth/cubit/auth_cubit.dart';
import 'features/auth/data/auth_repository.dart';
import 'features/settings/cubit/settings_cubit.dart';
import 'features/auth/cubit/auth_state.dart';
import 'features/home/cubit/driver_cubit.dart';
import 'features/offers/bloc/offers_bloc.dart';
import 'features/trip/bloc/driver_trip_bloc.dart';
import 'features/trip/data/fcm_service.dart';
class TripzDriverApp extends StatelessWidget {
const TripzDriverApp({super.key});
@override
Widget build(BuildContext context) {
return MultiBlocProvider(
providers: [
BlocProvider(
create: (_) => SettingsCubit(),
),
BlocProvider(
create: (_) => AuthCubit(getIt<AuthRepository>())..checkAuth(),
),
// Blocs for Phase 3 — provided from getIt (lazy singletons).
// They persist across navigation and are disposed manually at logout.
BlocProvider.value(value: getIt<DriverCubit>()..loadProfile()),
BlocProvider.value(
value: getIt<OffersBloc>()..add(const OffersStarted()),
),
BlocProvider.value(
value: getIt<DriverTripBloc>()..add(const DriverTripCheckActive()),
),
],
child: _AppListener(
child: Builder(
builder: (context) {
final settings = context.watch<SettingsCubit>();
final auth = context.read<AuthCubit>();
final router = buildRouter(auth);
return MaterialApp.router(
title: 'Tripz Driver',
debugShowCheckedModeBanner: false,
theme: buildTheme(
brightness: Brightness.light,
locale: settings.state.locale,
),
darkTheme: buildTheme(
brightness: Brightness.dark,
locale: settings.state.locale,
),
themeMode: settings.state.themeMode,
locale: settings.state.locale,
supportedLocales: AppLocalizations.supportedLocales,
localizationsDelegates: AppLocalizations.localizationsDelegates,
routerConfig: router,
);
},
),
),
);
}
}
/// يستمع لتغيير حالة المصادقة ويُهيّئ FCM بعد تسجيل الدخول.
class _AppListener extends StatefulWidget {
final Widget child;
const _AppListener({required this.child});
@override
State<_AppListener> createState() => _AppListenerState();
}
class _AppListenerState extends State<_AppListener> {
@override
void initState() {
super.initState();
final auth = context.read<AuthCubit>();
auth.stream.listen((state) {
if (state.status == AuthStatus.authenticated) {
getIt<DriverFcmService>().init();
}
});
}
@override
Widget build(BuildContext context) => widget.child;
}
apps/driver-archive-cubit/lib/core/api/api_client.dart
+105
View File
@@ -0,0 +1,105 @@
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:device_info_plus/device_info_plus.dart';
import '../config.dart';
import '../storage/token_store.dart';
/// عميل HTTP لكل نداءات الـAPI (docs/23 §4).
///
/// **نقطة الشبكة الوحيدة** في التطبيق: لا `http.get` ولا `Dio` آخر في أي
/// مكان. السبب أن كل ما يفرضه السيرفر (المستأجر · التوكن · بصمة الجهاز ·
/// التوقيع) يُحقن هنا مرة واحدة؛ نداءٌ يلتفّ حول هذا الملف هو نداء بلا
/// مصادقة يفشل عند تفعيل الحراسات على السيرفر.
class ApiClient {
final Dio dio;
final TokenStore _store;
/// بصمة الجهاز (docs/17 — D2). تُحسب مرة وتُخزَّن: قراءتها من النظام في كل
/// طلب استدعاءُ قناة أصيلة بلا داعٍ.
static String? _deviceId;
ApiClient(this._store)
: dio = Dio(BaseOptions(
baseUrl: AppConfig.baseUrl,
connectTimeout: const Duration(seconds: 15),
receiveTimeout: const Duration(seconds: 20),
headers: {'Content-Type': 'application/json'},
)) {
dio.interceptors.add(InterceptorsWrapper(
onRequest: (options, handler) async {
options.headers['x-tenant-id'] = AppConfig.tenantSlug;
// راكب أم سائق — هويتان منفصلتان لنفس الرقم (قرار المالك 2026-07-20 — ب).
options.headers['x-app-role'] = AppConfig.appRole;
final device = await _resolveDeviceId();
if (device != null) options.headers['x-device-id'] = device;
final token = await _store.access();
if (token != null && token.isNotEmpty) {
options.headers['Authorization'] = 'Bearer $token';
}
handler.next(options);
},
onError: (e, handler) async {
// تجديد التوكن عند 401 — **مرة واحدة**. بلا علامة `_retried` يعيد
// الطلبُ الفاشل تجديداً يفشل فيعيد… حلقة لانهائية تستنزف البطارية
// وتغرق السيرفر عند انتهاء الجلسة فعلاً.
final isAuthError = e.response?.statusCode == 401;
final alreadyRetried = e.requestOptions.extra['_retried'] == true;
final isRefreshCall = e.requestOptions.path.contains('/auth/refresh');
if (!isAuthError || alreadyRetried || isRefreshCall) {
return handler.next(e);
}
final refreshed = await _tryRefresh();
if (!refreshed) {
await _store.clear(); // الجلسة انتهت فعلاً — لا نُبقي توكناً ميتاً
return handler.next(e);
}
try {
e.requestOptions.extra['_retried'] = true;
final retry = await dio.fetch(e.requestOptions);
return handler.resolve(retry);
} on DioException catch (err) {
return handler.next(err);
}
},
));
}
Future<bool> _tryRefresh() async {
final rt = await _store.refresh();
if (rt == null || rt.isEmpty) return false;
try {
// Dio نظيف: المرور بالعميل نفسه يُدخل التوكن المنتهي في الترويسة.
final plain = Dio(BaseOptions(baseUrl: AppConfig.baseUrl));
final r = await plain.post('/auth/refresh', data: {'refresh_token': rt});
await _store.save(
r.data['access_token'] as String,
(r.data['refresh_token'] ?? rt) as String,
);
return true;
} catch (_) {
return false;
}
}
static Future<String?> _resolveDeviceId() async {
if (_deviceId != null) return _deviceId;
try {
final info = DeviceInfoPlugin();
if (Platform.isAndroid) {
_deviceId = (await info.androidInfo).id;
} else if (Platform.isIOS) {
_deviceId = (await info.iosInfo).identifierForVendor;
}
} catch (_) {
// تعذّر قراءة الجهاز: نُرسل بلا الترويسة بدل إسقاط الطلب. السيرفر
// يرفض عند تفعيل الربط، وهذا أوضح من فشل صامت هنا.
_deviceId = null;
}
return _deviceId;
}
}
apps/driver-archive-cubit/lib/core/api/api_exception.dart
+77
View File
@@ -0,0 +1,77 @@
/// استثناءات الشبكة الموحّدة — كل خطأ يتحول إلى صنف هنا.
/// docs/23 §4
class ApiException implements Exception {
ApiException(this.message, {this.statusCode, this.type});
final String message;
final int? statusCode;
final ApiExceptionType? type;
@override
String toString() => 'ApiException($statusCode): $message';
}
enum ApiExceptionType {
network,
timeout,
unauthorized,
forbidden,
notFound,
server,
unknown,
}
/// تحليل DioException إلى ApiException
ApiException fromDioError(Object error) {
final dio = error;
final type = switch (dio.runtimeType.toString()) {
'DioException' => _mapDioType(dio),
_ => ApiExceptionType.unknown,
};
final statusCode = _extractStatusCode(dio);
final message = _extractMessage(dio, statusCode);
return ApiException(message, statusCode: statusCode, type: type);
}
int? _extractStatusCode(Object error) {
try {
return (error as dynamic).response?.statusCode as int?;
} catch (_) {
return null;
}
}
String _extractMessage(Object error, int? statusCode) {
try {
final data = (error as dynamic).response?.data;
if (data is Map) {
return (data['message'] ?? data['error'] ?? 'خطأ غير معروف').toString();
}
} catch (_) {}
return switch (statusCode) {
401 => 'انتهت الجلسة',
403 => 'غير مصرح',
404 => 'غير موجود',
500 => 'خطأ في السيرفر',
_ => 'خطأ غير معروف',
};
}
ApiExceptionType _mapDioType(Object error) {
try {
final dioType = (error as dynamic).type;
return switch (dioType.toString()) {
'DioExceptionType.connectionTimeout' => ApiExceptionType.timeout,
'DioExceptionType.sendTimeout' => ApiExceptionType.timeout,
'DioExceptionType.receiveTimeout' => ApiExceptionType.timeout,
'DioExceptionType.connectionError' => ApiExceptionType.network,
'DioExceptionType.badResponse' => ApiExceptionType.server,
'DioExceptionType.cancel' => ApiExceptionType.unknown,
_ => ApiExceptionType.unknown,
};
} catch (_) {
return ApiExceptionType.unknown;
}
}
apps/driver-archive-cubit/lib/core/build_config.dart
+60
View File
@@ -0,0 +1,60 @@
/// مُولَّد من المانيفست عبر سكربت N3 — لا يُحرَّر يدوياً.
/// يحتوي على أعلام الميزات `const` + إعداد المستأجر الثابت.
/// docs/22 §1.5
class BuildConfig {
static const String tenantSlug = 'siro';
static const String baseUrl = 'https://tripz-api.intaleqapp.com/api';
static const String appName = 'Tripz Driver';
static const String appRole = 'driver';
// ألوان المستأجر (البذرة)
static const int primaryColorValue = 0xFF0E7C66;
static const int secondaryColorValue = 0xFF0E7C66;
// أعلام الميزات — const: tree-shaking يحذف الكود المطفأ في release
// docs/22 §1.5, docs/23 §5
static const bool rideClassesSet = true;
static const bool tariffEngineFull = true;
static const bool liveTrackingPro = true;
static const bool coupons = true;
static const bool walletPayment = true;
static const bool chat = true;
static const bool aiDocumentProcessing = false;
static const bool heatmap = false;
static const bool predictiveDemand = false;
static const bool geofence = false;
static const bool targetedPromo = false;
static const bool whatsappCampaigns = false;
static const bool marketingEngine = false;
static const bool dynamicPricing = false;
static const bool transit = false;
static const bool paymentGateways = false;
static const bool smsSettlement = false;
static const bool negotiator = false;
static const bool driverTiers = false;
static const bool driverAssurance = false;
}
/// اختصار وصول للاستعمال في شروط Features.xxx
abstract final class Features {
static const bool rideClassesSet = BuildConfig.rideClassesSet;
static const bool tariffEngineFull = BuildConfig.tariffEngineFull;
static const bool liveTrackingPro = BuildConfig.liveTrackingPro;
static const bool coupons = BuildConfig.coupons;
static const bool walletPayment = BuildConfig.walletPayment;
static const bool chat = BuildConfig.chat;
static const bool aiDocumentProcessing = BuildConfig.aiDocumentProcessing;
static const bool heatmap = BuildConfig.heatmap;
static const bool predictiveDemand = BuildConfig.predictiveDemand;
static const bool geofence = BuildConfig.geofence;
static const bool targetedPromo = BuildConfig.targetedPromo;
static const bool whatsappCampaigns = BuildConfig.whatsappCampaigns;
static const bool marketingEngine = BuildConfig.marketingEngine;
static const bool dynamicPricing = BuildConfig.dynamicPricing;
static const bool transit = BuildConfig.transit;
static const bool paymentGateways = BuildConfig.paymentGateways;
static const bool smsSettlement = BuildConfig.smsSettlement;
static const bool negotiator = BuildConfig.negotiator;
static const bool driverTiers = BuildConfig.driverTiers;
static const bool driverAssurance = BuildConfig.driverAssurance;
}
apps/driver-archive-cubit/lib/core/config.dart
+24
View File
@@ -0,0 +1,24 @@
/// إعداد وقت التشغيل — يُمرَّر عبر --dart-define عند البناء.
///
/// ما يخصّ **المستأجر** (اسمه، ألوانه، أعلام ميزاته) لا يوضع هنا: مكانه
/// `build_config.dart` المُولَّد من المانيفست (docs/22 §1.5). هذا الملف
/// للإعداد التقني المشترك بين كل المستأجرين.
class AppConfig {
/// الـAPI عبر TLS حصراً (docs/20). المنفذ الخام مغلق على مستوى الشبكة،
/// فأي عودة إلى http تعني تطبيقاً لا يتصل أصلاً.
static const String baseUrl = String.fromEnvironment(
'BASE_URL',
defaultValue: 'https://tripz-api.intaleqapp.com/api',
);
/// slug المستأجر. الافتراض للتطوير؛ البناء المولَّد يمرّره صراحةً.
static const String tenantSlug = String.fromEnvironment(
'TENANT',
defaultValue: 'siro',
);
static const String appName = 'Tripz Driver';
/// دور هذا التطبيق — يميّز تطبيق السائق عن الراكب عند التسجيل.
static const String appRole = 'driver';
}
apps/driver-archive-cubit/lib/core/design/theme.dart
+88
View File
@@ -0,0 +1,88 @@
import 'package:flutter/material.dart';
import 'tripz_colors.dart';
import 'typography.dart';
/// بناء الثيم — المدخلان الوحيدان: السطوع واللغة.
/// docs/26 §2, §4
ThemeData buildTheme({required Brightness brightness, required Locale locale}) {
final bool isDark = brightness == Brightness.dark;
final seed = const Color(0xFF0E7C66); // أخضر تركوازي — بذرة المستأجر
final colorScheme = ColorScheme.fromSeed(
seedColor: seed,
brightness: brightness,
);
final textTheme = buildTextTheme(locale);
return ThemeData(
useMaterial3: true,
brightness: brightness,
colorScheme: colorScheme,
textTheme: textTheme,
extensions: [
isDark ? TripzColors.dark : TripzColors.light,
],
appBarTheme: AppBarTheme(
backgroundColor: colorScheme.surface,
foregroundColor: colorScheme.onSurface,
elevation: 0,
scrolledUnderElevation: 0,
centerTitle: false,
titleTextStyle: textTheme.titleLarge?.copyWith(
color: colorScheme.onSurface,
),
),
inputDecorationTheme: InputDecorationTheme(
filled: true,
fillColor: colorScheme.surfaceContainerHighest,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: colorScheme.outline),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: colorScheme.outline),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: colorScheme.primary, width: 2),
),
errorBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide(color: colorScheme.error),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
labelStyle: textTheme.bodyLarge,
hintStyle: textTheme.bodyLarge?.copyWith(color: colorScheme.onSurfaceVariant),
),
filledButtonTheme: FilledButtonThemeData(
style: FilledButton.styleFrom(
minimumSize: const Size.fromHeight(52),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
textStyle: textTheme.labelLarge,
),
),
outlinedButtonTheme: OutlinedButtonThemeData(
style: OutlinedButton.styleFrom(
minimumSize: const Size.fromHeight(52),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
textStyle: textTheme.labelLarge,
),
),
cardTheme: CardThemeData(
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
side: BorderSide(color: colorScheme.outlineVariant),
),
margin: EdgeInsets.zero,
),
bottomSheetTheme: const BottomSheetThemeData(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
showDragHandle: true,
),
);
}
apps/driver-archive-cubit/lib/core/design/tokens.dart
+41
View File
@@ -0,0 +1,41 @@
/// الرموز الثابتة — كل قيمة هنا `const` ولا تُخترَع في الشاشات.
/// docs/26 §3
abstract final class T {
// ── المسافات (مضاعفات 4) ──
static const double s4 = 4;
static const double s8 = 8;
static const double s12 = 12;
static const double s16 = 16;
static const double s24 = 24;
static const double s32 = 32;
static const double s48 = 48;
/// حشوة الصفحة الافتراضية
static const double pagePadding = s16;
// ── الزوايا ──
static const double r8 = 8; // حقول / شارات
static const double r12 = 12; // أزرار / بطاقات
static const double r16 = 16; // بطاقات كبيرة
static const double r24 = 24; // bottom sheets
static const double rCircle = 999; // avatars
// ── الحركة (أزمنة) ──
static const Duration fast = Duration(milliseconds: 120); // لمسة
static const Duration medium = Duration(milliseconds: 240); // انتقال ضمن الشاشة
static const Duration slow = Duration(milliseconds: 400); // sheet / صفحة
// ── الأيقونات ──
static const double iconSm = 20;
static const double iconMd = 24;
static const double iconLg = 32;
// ── الارتفاعات ──
static const double buttonHeight = 52;
static const double inputHeight = 52;
static const double touchTarget = 48;
// ── عناصر الخريطة ──
static const double markerSize = 40;
static const double polylineWidth = 6;
}
apps/driver-archive-cubit/lib/core/design/tripz_colors.dart
+88
View File
@@ -0,0 +1,88 @@
import 'package:flutter/material.dart';
/// الأدوار الدلالية غير الموجودة في ColorScheme الأساسي.
/// الشاشة تستدعيها عبر `context.tripzColors` — لا تقرّر درجة اللون بنفسها.
/// docs/26 §2
@immutable
class TripzColors extends ThemeExtension<TripzColors> {
const TripzColors({
required this.success,
required this.warning,
required this.danger,
required this.info,
required this.surfaceRaised,
required this.mapOverlayDark,
required this.mapOverlayLight,
});
final Color success;
final Color warning;
final Color danger;
final Color info;
final Color surfaceRaised;
final Color mapOverlayDark;
final Color mapOverlayLight;
@override
TripzColors copyWith({
Color? success,
Color? warning,
Color? danger,
Color? info,
Color? surfaceRaised,
Color? mapOverlayDark,
Color? mapOverlayLight,
}) {
return TripzColors(
success: success ?? this.success,
warning: warning ?? this.warning,
danger: danger ?? this.danger,
info: info ?? this.info,
surfaceRaised: surfaceRaised ?? this.surfaceRaised,
mapOverlayDark: mapOverlayDark ?? this.mapOverlayDark,
mapOverlayLight: mapOverlayLight ?? this.mapOverlayLight,
);
}
@override
TripzColors lerp(TripzColors? other, double t) {
if (other is! TripzColors) return this;
return TripzColors(
success: Color.lerp(success, other.success, t)!,
warning: Color.lerp(warning, other.warning, t)!,
danger: Color.lerp(danger, other.danger, t)!,
info: Color.lerp(info, other.info, t)!,
surfaceRaised: Color.lerp(surfaceRaised, other.surfaceRaised, t)!,
mapOverlayDark: Color.lerp(mapOverlayDark, other.mapOverlayDark, t)!,
mapOverlayLight: Color.lerp(mapOverlayLight, other.mapOverlayLight, t)!,
);
}
// ── الوضع النهاري ──
static const light = TripzColors(
success: Color(0xFF2E7D32),
warning: Color(0xFFF9A825),
danger: Color(0xFFD32F2F),
info: Color(0xFF1565C0),
surfaceRaised: Color(0xFFF5F5F5),
mapOverlayDark: Color(0xCC1A1A2E),
mapOverlayLight: Color(0xCCFFFFFF),
);
// ── الوضع الليلي ──
static const dark = TripzColors(
success: Color(0xFF66BB6A),
warning: Color(0xFFFFD54F),
danger: Color(0xFFEF5350),
info: Color(0xFF42A5F5),
surfaceRaised: Color(0xFF2C2C3A),
mapOverlayDark: Color(0xCC0D0D1A),
mapOverlayLight: Color(0xCC1A1A2E),
);
}
/// امتداد مريح للوصول السريع من السياق
extension TripzColorsExtension on BuildContext {
TripzColors get tripzColors =>
Theme.of(this).extension<TripzColors>() ?? TripzColors.light;
}
apps/driver-archive-cubit/lib/core/design/typography.dart
+34
View File
@@ -0,0 +1,34 @@
import 'package:flutter/material.dart';
/// الخطوط المضمّنة محلياً — Inter + IBM Plex Sans Arabic.
/// لا حزمة google_fonts — الاتصال لا يُراهَن عليه.
/// docs/26 §1
///
/// الأوزان المضمّنة: Regular(400) · Medium(500) · SemiBold(600) · Bold(700)
/// لكل خط (٨ ملفات في `assets/fonts/`).
TextTheme buildTextTheme(Locale locale) {
final bool isArabic = locale.languageCode == 'ar';
// الخط الرئيسي: عربي ⇒ Plex Arabic، إنجليزي ⇒ Inter
final String primary = isArabic ? 'IBMPlexSansArabic' : 'Inter';
// الاحتياطي: العكس
final String fallback = isArabic ? 'Inter' : 'IBMPlexSansArabic';
return TextTheme(
displayLarge: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w700, fontSize: 57, height: 1.12),
displayMedium: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w700, fontSize: 45, height: 1.16),
displaySmall: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w700, fontSize: 36, height: 1.22),
headlineLarge: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w700, fontSize: 32, height: 1.25),
headlineMedium: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w600, fontSize: 28, height: 1.29),
headlineSmall: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w600, fontSize: 24, height: 1.33),
titleLarge: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w600, fontSize: 22, height: 1.27),
titleMedium: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w500, fontSize: 16, height: 1.50, letterSpacing: 0.15),
titleSmall: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w500, fontSize: 14, height: 1.43, letterSpacing: 0.1),
bodyLarge: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w400, fontSize: 16, height: 1.50, letterSpacing: 0.5),
bodyMedium: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w400, fontSize: 14, height: 1.43, letterSpacing: 0.25),
bodySmall: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w400, fontSize: 12, height: 1.33, letterSpacing: 0.4),
labelLarge: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w500, fontSize: 14, height: 1.43, letterSpacing: 0.1),
labelMedium: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w500, fontSize: 12, height: 1.33, letterSpacing: 0.5),
labelSmall: TextStyle(fontFamily: primary, fontFamilyFallback: [fallback], fontWeight: FontWeight.w500, fontSize: 11, height: 1.45, letterSpacing: 0.5),
);
}
apps/driver-archive-cubit/lib/core/di.dart
+67
View File
@@ -0,0 +1,67 @@
import 'package:get_it/get_it.dart';
import 'api/api_client.dart';
import 'storage/token_store.dart';
import '../features/auth/data/auth_repository.dart';
import '../features/home/data/driver_repository.dart';
import '../features/home/cubit/driver_cubit.dart';
import '../features/offers/data/offers_repository.dart';
import '../features/offers/bloc/offers_bloc.dart';
import '../features/trip/data/driver_trip_repository.dart';
import '../features/trip/data/driver_socket_service.dart';
import '../features/trip/data/trip_event_merger.dart';
import '../features/trip/data/fcm_service.dart';
import '../features/trip/bloc/driver_trip_bloc.dart';
final GetIt getIt = GetIt.instance;
/// حقن التبعيات (docs/23 §1).
///
/// **هذه نقطة إقفال الميزات المدفوعة**: الموديول المحروس يُسجَّل داخل
/// `if (Features.x)` فلا يوجد أصلاً حين لا تكون الميزة مشتراة — بدل فحص
/// متناثر في كل شاشة يُنسى أحدها (docs/22 §1.5).
Future<void> setupDi() async {
getIt.registerLazySingleton<TokenStore>(() => TokenStore());
getIt.registerLazySingleton<ApiClient>(() => ApiClient(getIt<TokenStore>()));
getIt.registerLazySingleton<AuthRepository>(
() => AuthRepository(getIt<ApiClient>(), getIt<TokenStore>()),
);
// ── Driver Phase 3: Data Layer ──
getIt.registerLazySingleton<DriverRepository>(
() => DriverRepository(getIt<ApiClient>()),
);
getIt.registerLazySingleton<OffersRepository>(
() => OffersRepository(getIt<ApiClient>()),
);
getIt.registerLazySingleton<DriverTripRepository>(
() => DriverTripRepository(getIt<ApiClient>()),
);
getIt.registerLazySingleton<DriverTripEventMerger>(
() => DriverTripEventMerger(),
);
getIt.registerLazySingleton<DriverSocketService>(
() => DriverSocketService(getIt<TokenStore>(), getIt<DriverTripEventMerger>()),
);
getIt.registerLazySingleton<DriverFcmService>(
() => DriverFcmService(getIt<DriverTripEventMerger>()),
);
// ── Driver Phase 3: Bloc/Cubit (lazy singletons — يُدمَّرون يدوياً عند logout) ──
getIt.registerLazySingleton<DriverCubit>(
() => DriverCubit(getIt<DriverRepository>()),
);
getIt.registerLazySingleton<OffersBloc>(
() => OffersBloc(
offersRepo: getIt<OffersRepository>(),
socket: getIt<DriverSocketService>(),
merger: getIt<DriverTripEventMerger>(),
),
);
getIt.registerLazySingleton<DriverTripBloc>(
() => DriverTripBloc(
tripRepo: getIt<DriverTripRepository>(),
socket: getIt<DriverSocketService>(),
merger: getIt<DriverTripEventMerger>(),
),
);
}
apps/driver-archive-cubit/lib/core/l10n/app_ar.arb
+121
View File
@@ -0,0 +1,121 @@
{
"@@locale": "ar",
"appName": "Tripz",
"appTagline": "اسحب، وصل، وصل",
"phoneTitle": "أدخل رقم هاتفك للمتابعة",
"phoneLabel": "رقم الهاتف",
"phoneHint": "07XXXXXXXX",
"sendCode": "إرسال الرمز",
"otpTitle": "أدخل رمز التحقق",
"otpSentTo": "أُرسل إلى {phone}",
"@otpSentTo": {
"placeholders": {
"phone": {"type": "String"}
}
},
"otpLabel": "الرمز",
"confirm": "تأكيد",
"welcome": "مرحباً {name}",
"@welcome": {
"placeholders": {
"name": {"type": "String"}
}
},
"welcomeBack": "مرحباً بعودتك",
"whereTo": "إلى أين؟",
"myTrips": "رحلاتي",
"wallet": "المحفظة",
"coupons": "الكوبونات والدعوات",
"settings": "الإعدادات",
"support": "الدعم",
"logout": "تسجيل الخروج",
"language": "اللغة",
"arabic": "العربية",
"english": "English",
"theme": "المظهر",
"lightMode": "الوضع النهاري",
"darkMode": "الوضع الليلي",
"systemMode": "تلقائي",
"errorGeneric": "حدث خطأ ما",
"retry": "أعد المحاولة",
"emptyGeneric": "لا توجد عناصر بعد",
"loading": "جارٍ التحميل...",
"cancel": "إلغاء",
"save": "حفظ",
"close": "إغلاق",
"next": "التالي",
"back": "رجوع",
"search": "بحث",
"noResults": "لا توجد نتائج",
"connectionError": "تحقق من اتصالك بالإنترنت",
"authError": "تعذّر إرسال الرمز",
"invalidOtp": "رمز غير صحيح",
"phoneEmpty": "أدخل رقم الهاتف",
"selectDestination": "اختر وجهتك",
"pickupLocation": "نقطة الانطلاق",
"dropoffLocation": "الوجهة",
"chooseOnMap": "اختر من الخريطة",
"favorites": "المفضلة",
"home": "البيت",
"work": "العمل",
"searchPlaces": "ابحث عن مكان...",
"rideClasses": "فئة الرحلة",
"cash": "نقدي",
"walletPayment": "المحفظة",
"couponCode": "كود الخصم",
"scheduleRide": "جدولة رحلة",
"requestRide": "اطلب رحلة",
"searchingDriver": "جارٍ البحث عن سائق...",
"cancelSearch": "إلغاء البحث",
"driverAccepted": "قبل سائقك الرحلة",
"driverArriving": "السائق في طريقه إليك",
"driverArrived": "وصل سائقك",
"rideInProgress": "الرحلة جارية",
"rideCompleted": "انتهت الرحلة",
"rateDriver": "قيّم سائقك",
"tripFare": "أجرة الرحلة",
"waitingFee": "رسوم الانتظار",
"discount": "الخصم",
"paymentMethod": "طريقة الدفع",
"total": "المجموع",
"submitRating": "إرسال التقييم",
"skipRating": "تخطي",
"freeWaitMinutes": "دقائق انتظار مجانية",
"minutes": "دقائق",
"callDriver": "اتصل بالسائق",
"chatWithDriver": "دردشة مع السائق",
"shareTrip": "مشاركة الرحلة",
"emergencySOS": "طارئ SOS",
"plateNumber": "رقم اللوحة",
"vehicleInfo": "معلومات المركبة",
"driverRating": "تقييم السائق",
"eta": "الوصول المتوقع",
"km": "كم",
"min": "د",
"searchTimeout": "لم نجد سائقاً متاحاً حالياً. حاول مرة أخرى",
"goOnline": "الاتصال",
"goOffline": "الانقطاع",
"online": "مُتصل",
"offline": "مُنقطع",
"accept": "قبول",
"reject": "رفض",
"offersAvailable": "عروض متاحة",
"tripAssigned": "رحلة جديدة مُعيّنة",
"onTheWay": "في الطريق",
"arrivedAtPickup": "وصلت",
"startTrip": "بدء الرحلة",
"completeTrip": "إتمام الرحلة",
"tripInProgress": "الرحلة جارية",
"tripCompleted": "أُتمّت الرحلة",
"cancelTrip": "إلغاء الرحلة",
"cancelTripConfirm": "هل أنت متأكد من إلغاء هذه الرحلة؟",
"yes": "نعم",
"no": "لا",
"callClient": "اتصال بالعميل",
"chat": "محادثة",
"trip": "الرحلة",
"anonymous": "السائق",
"noMessagesYet": "لا توجد رسائل بعد",
"typeMessage": "اكتب رسالة..."
}
apps/driver-archive-cubit/lib/core/l10n/app_en.arb
+121
View File
@@ -0,0 +1,121 @@
{
"@@locale": "en",
"appName": "Tripz",
"appTagline": "Tap, ride, arrive",
"phoneTitle": "Enter your phone number to continue",
"phoneLabel": "Phone number",
"phoneHint": "07XXXXXXXX",
"sendCode": "Send code",
"otpTitle": "Enter verification code",
"otpSentTo": "Sent to {phone}",
"@otpSentTo": {
"placeholders": {
"phone": {"type": "String"}
}
},
"otpLabel": "Code",
"confirm": "Confirm",
"welcome": "Welcome {name}",
"@welcome": {
"placeholders": {
"name": {"type": "String"}
}
},
"welcomeBack": "Welcome back",
"whereTo": "Where to?",
"myTrips": "My trips",
"wallet": "Wallet",
"coupons": "Coupons & invites",
"settings": "Settings",
"support": "Support",
"logout": "Logout",
"language": "Language",
"arabic": "العربية",
"english": "English",
"theme": "Theme",
"lightMode": "Light",
"darkMode": "Dark",
"systemMode": "System",
"errorGeneric": "Something went wrong",
"retry": "Try again",
"emptyGeneric": "Nothing here yet",
"loading": "Loading...",
"cancel": "Cancel",
"save": "Save",
"close": "Close",
"next": "Next",
"back": "Back",
"search": "Search",
"noResults": "No results found",
"connectionError": "Check your internet connection",
"authError": "Failed to send code",
"invalidOtp": "Invalid code",
"phoneEmpty": "Enter your phone number",
"selectDestination": "Choose your destination",
"pickupLocation": "Pickup location",
"dropoffLocation": "Destination",
"chooseOnMap": "Choose on map",
"favorites": "Favorites",
"home": "Home",
"work": "Work",
"searchPlaces": "Search for a place...",
"rideClasses": "Ride class",
"cash": "Cash",
"walletPayment": "Wallet",
"couponCode": "Coupon code",
"scheduleRide": "Schedule a ride",
"requestRide": "Request a ride",
"searchingDriver": "Looking for a driver...",
"cancelSearch": "Cancel search",
"driverAccepted": "Your driver accepted",
"driverArriving": "Driver is on the way",
"driverArrived": "Your driver has arrived",
"rideInProgress": "Ride in progress",
"rideCompleted": "Ride completed",
"rateDriver": "Rate your driver",
"tripFare": "Trip fare",
"waitingFee": "Waiting fee",
"discount": "Discount",
"paymentMethod": "Payment method",
"total": "Total",
"submitRating": "Submit rating",
"skipRating": "Skip",
"freeWaitMinutes": "Free wait minutes",
"minutes": "minutes",
"callDriver": "Call driver",
"chatWithDriver": "Chat with driver",
"shareTrip": "Share trip",
"emergencySOS": "Emergency SOS",
"plateNumber": "Plate number",
"vehicleInfo": "Vehicle info",
"driverRating": "Driver rating",
"eta": "Estimated arrival",
"km": "km",
"min": "min",
"searchTimeout": "No drivers available right now. Please try again",
"goOnline": "Go online",
"goOffline": "Go offline",
"online": "Online",
"offline": "Offline",
"accept": "Accept",
"reject": "Reject",
"offersAvailable": "offers available",
"tripAssigned": "New trip assigned",
"onTheWay": "On my way",
"arrivedAtPickup": "I've arrived",
"startTrip": "Start trip",
"completeTrip": "Complete trip",
"tripInProgress": "Trip in progress",
"tripCompleted": "Trip completed",
"cancelTrip": "Cancel trip",
"cancelTripConfirm": "Are you sure you want to cancel this trip?",
"yes": "Yes",
"no": "No",
"callClient": "Call client",
"chat": "Chat",
"trip": "Trip",
"anonymous": "Driver",
"noMessagesYet": "No messages yet",
"typeMessage": "Type a message..."
}
apps/driver-archive-cubit/lib/core/l10n/app_localizations.dart
+775
View File
@@ -0,0 +1,775 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:intl/intl.dart' as intl;
import 'app_localizations_ar.dart';
import 'app_localizations_en.dart';
// ignore_for_file: type=lint
/// Callers can lookup localized strings with an instance of AppLocalizations
/// returned by `AppLocalizations.of(context)`.
///
/// Applications need to include `AppLocalizations.delegate()` in their app's
/// `localizationDelegates` list, and the locales they support in the app's
/// `supportedLocales` list. For example:
///
/// ```dart
/// import 'l10n/app_localizations.dart';
///
/// return MaterialApp(
/// localizationsDelegates: AppLocalizations.localizationsDelegates,
/// supportedLocales: AppLocalizations.supportedLocales,
/// home: MyApplicationHome(),
/// );
/// ```
///
/// ## Update pubspec.yaml
///
/// Please make sure to update your pubspec.yaml to include the following
/// packages:
///
/// ```yaml
/// dependencies:
/// # Internationalization support.
/// flutter_localizations:
/// sdk: flutter
/// intl: any # Use the pinned version from flutter_localizations
///
/// # Rest of dependencies
/// ```
///
/// ## iOS Applications
///
/// iOS applications define key application metadata, including supported
/// locales, in an Info.plist file that is built into the application bundle.
/// To configure the locales supported by your app, you’ll need to edit this
/// file.
///
/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
/// Then, in the Project Navigator, open the Info.plist file under the Runner
/// project’s Runner folder.
///
/// Next, select the Information Property List item, select Add Item from the
/// Editor menu, then select Localizations from the pop-up menu.
///
/// Select and expand the newly-created Localizations item then, for each
/// locale your application supports, add a new item and select the locale
/// you wish to add from the pop-up menu in the Value field. This list should
/// be consistent with the languages listed in the AppLocalizations.supportedLocales
/// property.
abstract class AppLocalizations {
AppLocalizations(String locale)
: localeName = intl.Intl.canonicalizedLocale(locale.toString());
final String localeName;
static AppLocalizations? of(BuildContext context) {
return Localizations.of<AppLocalizations>(context, AppLocalizations);
}
static const LocalizationsDelegate<AppLocalizations> delegate =
_AppLocalizationsDelegate();
/// A list of this localizations delegate along with the default localizations
/// delegates.
///
/// Returns a list of localizations delegates containing this delegate along with
/// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
/// and GlobalWidgetsLocalizations.delegate.
///
/// Additional delegates can be added by appending to this list in
/// MaterialApp. This list does not have to be used at all if a custom list
/// of delegates is preferred or required.
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
<LocalizationsDelegate<dynamic>>[
delegate,
GlobalMaterialLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
];
/// A list of this localizations delegate's supported locales.
static const List<Locale> supportedLocales = <Locale>[
Locale('ar'),
Locale('en')
];
/// No description provided for @appName.
///
/// In ar, this message translates to:
/// **'Tripz'**
String get appName;
/// No description provided for @appTagline.
///
/// In ar, this message translates to:
/// **'اسحب، وصل، وصل'**
String get appTagline;
/// No description provided for @phoneTitle.
///
/// In ar, this message translates to:
/// **'أدخل رقم هاتفك للمتابعة'**
String get phoneTitle;
/// No description provided for @phoneLabel.
///
/// In ar, this message translates to:
/// **'رقم الهاتف'**
String get phoneLabel;
/// No description provided for @phoneHint.
///
/// In ar, this message translates to:
/// **'07XXXXXXXX'**
String get phoneHint;
/// No description provided for @sendCode.
///
/// In ar, this message translates to:
/// **'إرسال الرمز'**
String get sendCode;
/// No description provided for @otpTitle.
///
/// In ar, this message translates to:
/// **'أدخل رمز التحقق'**
String get otpTitle;
/// No description provided for @otpSentTo.
///
/// In ar, this message translates to:
/// **'أُرسل إلى {phone}'**
String otpSentTo(String phone);
/// No description provided for @otpLabel.
///
/// In ar, this message translates to:
/// **'الرمز'**
String get otpLabel;
/// No description provided for @confirm.
///
/// In ar, this message translates to:
/// **'تأكيد'**
String get confirm;
/// No description provided for @welcome.
///
/// In ar, this message translates to:
/// **'مرحباً {name}'**
String welcome(String name);
/// No description provided for @welcomeBack.
///
/// In ar, this message translates to:
/// **'مرحباً بعودتك'**
String get welcomeBack;
/// No description provided for @whereTo.
///
/// In ar, this message translates to:
/// **'إلى أين؟'**
String get whereTo;
/// No description provided for @myTrips.
///
/// In ar, this message translates to:
/// **'رحلاتي'**
String get myTrips;
/// No description provided for @wallet.
///
/// In ar, this message translates to:
/// **'المحفظة'**
String get wallet;
/// No description provided for @coupons.
///
/// In ar, this message translates to:
/// **'الكوبونات والدعوات'**
String get coupons;
/// No description provided for @settings.
///
/// In ar, this message translates to:
/// **'الإعدادات'**
String get settings;
/// No description provided for @support.
///
/// In ar, this message translates to:
/// **'الدعم'**
String get support;
/// No description provided for @logout.
///
/// In ar, this message translates to:
/// **'تسجيل الخروج'**
String get logout;
/// No description provided for @language.
///
/// In ar, this message translates to:
/// **'اللغة'**
String get language;
/// No description provided for @arabic.
///
/// In ar, this message translates to:
/// **'العربية'**
String get arabic;
/// No description provided for @english.
///
/// In ar, this message translates to:
/// **'English'**
String get english;
/// No description provided for @theme.
///
/// In ar, this message translates to:
/// **'المظهر'**
String get theme;
/// No description provided for @lightMode.
///
/// In ar, this message translates to:
/// **'الوضع النهاري'**
String get lightMode;
/// No description provided for @darkMode.
///
/// In ar, this message translates to:
/// **'الوضع الليلي'**
String get darkMode;
/// No description provided for @systemMode.
///
/// In ar, this message translates to:
/// **'تلقائي'**
String get systemMode;
/// No description provided for @errorGeneric.
///
/// In ar, this message translates to:
/// **'حدث خطأ ما'**
String get errorGeneric;
/// No description provided for @retry.
///
/// In ar, this message translates to:
/// **'أعد المحاولة'**
String get retry;
/// No description provided for @emptyGeneric.
///
/// In ar, this message translates to:
/// **'لا توجد عناصر بعد'**
String get emptyGeneric;
/// No description provided for @loading.
///
/// In ar, this message translates to:
/// **'جارٍ التحميل...'**
String get loading;
/// No description provided for @cancel.
///
/// In ar, this message translates to:
/// **'إلغاء'**
String get cancel;
/// No description provided for @save.
///
/// In ar, this message translates to:
/// **'حفظ'**
String get save;
/// No description provided for @close.
///
/// In ar, this message translates to:
/// **'إغلاق'**
String get close;
/// No description provided for @next.
///
/// In ar, this message translates to:
/// **'التالي'**
String get next;
/// No description provided for @back.
///
/// In ar, this message translates to:
/// **'رجوع'**
String get back;
/// No description provided for @search.
///
/// In ar, this message translates to:
/// **'بحث'**
String get search;
/// No description provided for @noResults.
///
/// In ar, this message translates to:
/// **'لا توجد نتائج'**
String get noResults;
/// No description provided for @connectionError.
///
/// In ar, this message translates to:
/// **'تحقق من اتصالك بالإنترنت'**
String get connectionError;
/// No description provided for @authError.
///
/// In ar, this message translates to:
/// **'تعذّر إرسال الرمز'**
String get authError;
/// No description provided for @invalidOtp.
///
/// In ar, this message translates to:
/// **'رمز غير صحيح'**
String get invalidOtp;
/// No description provided for @phoneEmpty.
///
/// In ar, this message translates to:
/// **'أدخل رقم الهاتف'**
String get phoneEmpty;
/// No description provided for @selectDestination.
///
/// In ar, this message translates to:
/// **'اختر وجهتك'**
String get selectDestination;
/// No description provided for @pickupLocation.
///
/// In ar, this message translates to:
/// **'نقطة الانطلاق'**
String get pickupLocation;
/// No description provided for @dropoffLocation.
///
/// In ar, this message translates to:
/// **'الوجهة'**
String get dropoffLocation;
/// No description provided for @chooseOnMap.
///
/// In ar, this message translates to:
/// **'اختر من الخريطة'**
String get chooseOnMap;
/// No description provided for @favorites.
///
/// In ar, this message translates to:
/// **'المفضلة'**
String get favorites;
/// No description provided for @home.
///
/// In ar, this message translates to:
/// **'البيت'**
String get home;
/// No description provided for @work.
///
/// In ar, this message translates to:
/// **'العمل'**
String get work;
/// No description provided for @searchPlaces.
///
/// In ar, this message translates to:
/// **'ابحث عن مكان...'**
String get searchPlaces;
/// No description provided for @rideClasses.
///
/// In ar, this message translates to:
/// **'فئة الرحلة'**
String get rideClasses;
/// No description provided for @cash.
///
/// In ar, this message translates to:
/// **'نقدي'**
String get cash;
/// No description provided for @walletPayment.
///
/// In ar, this message translates to:
/// **'المحفظة'**
String get walletPayment;
/// No description provided for @couponCode.
///
/// In ar, this message translates to:
/// **'كود الخصم'**
String get couponCode;
/// No description provided for @scheduleRide.
///
/// In ar, this message translates to:
/// **'جدولة رحلة'**
String get scheduleRide;
/// No description provided for @requestRide.
///
/// In ar, this message translates to:
/// **'اطلب رحلة'**
String get requestRide;
/// No description provided for @searchingDriver.
///
/// In ar, this message translates to:
/// **'جارٍ البحث عن سائق...'**
String get searchingDriver;
/// No description provided for @cancelSearch.
///
/// In ar, this message translates to:
/// **'إلغاء البحث'**
String get cancelSearch;
/// No description provided for @driverAccepted.
///
/// In ar, this message translates to:
/// **'قبل سائقك الرحلة'**
String get driverAccepted;
/// No description provided for @driverArriving.
///
/// In ar, this message translates to:
/// **'السائق في طريقه إليك'**
String get driverArriving;
/// No description provided for @driverArrived.
///
/// In ar, this message translates to:
/// **'وصل سائقك'**
String get driverArrived;
/// No description provided for @rideInProgress.
///
/// In ar, this message translates to:
/// **'الرحلة جارية'**
String get rideInProgress;
/// No description provided for @rideCompleted.
///
/// In ar, this message translates to:
/// **'انتهت الرحلة'**
String get rideCompleted;
/// No description provided for @rateDriver.
///
/// In ar, this message translates to:
/// **'قيّم سائقك'**
String get rateDriver;
/// No description provided for @tripFare.
///
/// In ar, this message translates to:
/// **'أجرة الرحلة'**
String get tripFare;
/// No description provided for @waitingFee.
///
/// In ar, this message translates to:
/// **'رسوم الانتظار'**
String get waitingFee;
/// No description provided for @discount.
///
/// In ar, this message translates to:
/// **'الخصم'**
String get discount;
/// No description provided for @paymentMethod.
///
/// In ar, this message translates to:
/// **'طريقة الدفع'**
String get paymentMethod;
/// No description provided for @total.
///
/// In ar, this message translates to:
/// **'المجموع'**
String get total;
/// No description provided for @submitRating.
///
/// In ar, this message translates to:
/// **'إرسال التقييم'**
String get submitRating;
/// No description provided for @skipRating.
///
/// In ar, this message translates to:
/// **'تخطي'**
String get skipRating;
/// No description provided for @freeWaitMinutes.
///
/// In ar, this message translates to:
/// **'دقائق انتظار مجانية'**
String get freeWaitMinutes;
/// No description provided for @minutes.
///
/// In ar, this message translates to:
/// **'دقائق'**
String get minutes;
/// No description provided for @callDriver.
///
/// In ar, this message translates to:
/// **'اتصل بالسائق'**
String get callDriver;
/// No description provided for @chatWithDriver.
///
/// In ar, this message translates to:
/// **'دردشة مع السائق'**
String get chatWithDriver;
/// No description provided for @shareTrip.
///
/// In ar, this message translates to:
/// **'مشاركة الرحلة'**
String get shareTrip;
/// No description provided for @emergencySOS.
///
/// In ar, this message translates to:
/// **'طارئ SOS'**
String get emergencySOS;
/// No description provided for @plateNumber.
///
/// In ar, this message translates to:
/// **'رقم اللوحة'**
String get plateNumber;
/// No description provided for @vehicleInfo.
///
/// In ar, this message translates to:
/// **'معلومات المركبة'**
String get vehicleInfo;
/// No description provided for @driverRating.
///
/// In ar, this message translates to:
/// **'تقييم السائق'**
String get driverRating;
/// No description provided for @eta.
///
/// In ar, this message translates to:
/// **'الوصول المتوقع'**
String get eta;
/// No description provided for @km.
///
/// In ar, this message translates to:
/// **'كم'**
String get km;
/// No description provided for @min.
///
/// In ar, this message translates to:
/// **'د'**
String get min;
/// No description provided for @searchTimeout.
///
/// In ar, this message translates to:
/// **'لم نجد سائقاً متاحاً حالياً. حاول مرة أخرى'**
String get searchTimeout;
/// No description provided for @goOnline.
///
/// In ar, this message translates to:
/// **'الاتصال'**
String get goOnline;
/// No description provided for @goOffline.
///
/// In ar, this message translates to:
/// **'الانقطاع'**
String get goOffline;
/// No description provided for @online.
///
/// In ar, this message translates to:
/// **'مُتصل'**
String get online;
/// No description provided for @offline.
///
/// In ar, this message translates to:
/// **'مُنقطع'**
String get offline;
/// No description provided for @accept.
///
/// In ar, this message translates to:
/// **'قبول'**
String get accept;
/// No description provided for @reject.
///
/// In ar, this message translates to:
/// **'رفض'**
String get reject;
/// No description provided for @offersAvailable.
///
/// In ar, this message translates to:
/// **'عروض متاحة'**
String get offersAvailable;
/// No description provided for @tripAssigned.
///
/// In ar, this message translates to:
/// **'رحلة جديدة مُعيّنة'**
String get tripAssigned;
/// No description provided for @onTheWay.
///
/// In ar, this message translates to:
/// **'في الطريق'**
String get onTheWay;
/// No description provided for @arrivedAtPickup.
///
/// In ar, this message translates to:
/// **'وصلت'**
String get arrivedAtPickup;
/// No description provided for @startTrip.
///
/// In ar, this message translates to:
/// **'بدء الرحلة'**
String get startTrip;
/// No description provided for @completeTrip.
///
/// In ar, this message translates to:
/// **'إتمام الرحلة'**
String get completeTrip;
/// No description provided for @tripInProgress.
///
/// In ar, this message translates to:
/// **'الرحلة جارية'**
String get tripInProgress;
/// No description provided for @tripCompleted.
///
/// In ar, this message translates to:
/// **'أُتمّت الرحلة'**
String get tripCompleted;
/// No description provided for @cancelTrip.
///
/// In ar, this message translates to:
/// **'إلغاء الرحلة'**
String get cancelTrip;
/// No description provided for @cancelTripConfirm.
///
/// In ar, this message translates to:
/// **'هل أنت متأكد من إلغاء هذه الرحلة؟'**
String get cancelTripConfirm;
/// No description provided for @yes.
///
/// In ar, this message translates to:
/// **'نعم'**
String get yes;
/// No description provided for @no.
///
/// In ar, this message translates to:
/// **'لا'**
String get no;
/// No description provided for @callClient.
///
/// In ar, this message translates to:
/// **'اتصال بالعميل'**
String get callClient;
/// No description provided for @chat.
///
/// In ar, this message translates to:
/// **'محادثة'**
String get chat;
/// No description provided for @trip.
///
/// In ar, this message translates to:
/// **'الرحلة'**
String get trip;
/// No description provided for @anonymous.
///
/// In ar, this message translates to:
/// **'السائق'**
String get anonymous;
/// No description provided for @noMessagesYet.
///
/// In ar, this message translates to:
/// **'لا توجد رسائل بعد'**
String get noMessagesYet;
/// No description provided for @typeMessage.
///
/// In ar, this message translates to:
/// **'اكتب رسالة...'**
String get typeMessage;
}
class _AppLocalizationsDelegate
extends LocalizationsDelegate<AppLocalizations> {
const _AppLocalizationsDelegate();
@override
Future<AppLocalizations> load(Locale locale) {
return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
}
@override
bool isSupported(Locale locale) =>
<String>['ar', 'en'].contains(locale.languageCode);
@override
bool shouldReload(_AppLocalizationsDelegate old) => false;
}
AppLocalizations lookupAppLocalizations(Locale locale) {
// Lookup logic when only language code is specified.
switch (locale.languageCode) {
case 'ar':
return AppLocalizationsAr();
case 'en':
return AppLocalizationsEn();
}
throw FlutterError(
'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
'an issue with the localizations generation tool. Please file an issue '
'on GitHub with a reproducible sample app and the gen-l10n configuration '
'that was used.');
}
apps/driver-archive-cubit/lib/core/l10n/app_localizations_ar.dart
+335
View File
@@ -0,0 +1,335 @@
// ignore: unused_import
import 'package:intl/intl.dart' as intl;
import 'app_localizations.dart';
// ignore_for_file: type=lint
/// The translations for Arabic (`ar`).
class AppLocalizationsAr extends AppLocalizations {
AppLocalizationsAr([String locale = 'ar']) : super(locale);
@override
String get appName => 'Tripz';
@override
String get appTagline => 'اسحب، وصل، وصل';
@override
String get phoneTitle => 'أدخل رقم هاتفك للمتابعة';
@override
String get phoneLabel => 'رقم الهاتف';
@override
String get phoneHint => '07XXXXXXXX';
@override
String get sendCode => 'إرسال الرمز';
@override
String get otpTitle => 'أدخل رمز التحقق';
@override
String otpSentTo(String phone) {
return 'أُرسل إلى $phone';
}
@override
String get otpLabel => 'الرمز';
@override
String get confirm => 'تأكيد';
@override
String welcome(String name) {
return 'مرحباً $name';
}
@override
String get welcomeBack => 'مرحباً بعودتك';
@override
String get whereTo => 'إلى أين؟';
@override
String get myTrips => 'رحلاتي';
@override
String get wallet => 'المحفظة';
@override
String get coupons => 'الكوبونات والدعوات';
@override
String get settings => 'الإعدادات';
@override
String get support => 'الدعم';
@override
String get logout => 'تسجيل الخروج';
@override
String get language => 'اللغة';
@override
String get arabic => 'العربية';
@override
String get english => 'English';
@override
String get theme => 'المظهر';
@override
String get lightMode => 'الوضع النهاري';
@override
String get darkMode => 'الوضع الليلي';
@override
String get systemMode => 'تلقائي';
@override
String get errorGeneric => 'حدث خطأ ما';
@override
String get retry => 'أعد المحاولة';
@override
String get emptyGeneric => 'لا توجد عناصر بعد';
@override
String get loading => 'جارٍ التحميل...';
@override
String get cancel => 'إلغاء';
@override
String get save => 'حفظ';
@override
String get close => 'إغلاق';
@override
String get next => 'التالي';
@override
String get back => 'رجوع';
@override
String get search => 'بحث';
@override
String get noResults => 'لا توجد نتائج';
@override
String get connectionError => 'تحقق من اتصالك بالإنترنت';
@override
String get authError => 'تعذّر إرسال الرمز';
@override
String get invalidOtp => 'رمز غير صحيح';
@override
String get phoneEmpty => 'أدخل رقم الهاتف';
@override
String get selectDestination => 'اختر وجهتك';
@override
String get pickupLocation => 'نقطة الانطلاق';
@override
String get dropoffLocation => 'الوجهة';
@override
String get chooseOnMap => 'اختر من الخريطة';
@override
String get favorites => 'المفضلة';
@override
String get home => 'البيت';
@override
String get work => 'العمل';
@override
String get searchPlaces => 'ابحث عن مكان...';
@override
String get rideClasses => 'فئة الرحلة';
@override
String get cash => 'نقدي';
@override
String get walletPayment => 'المحفظة';
@override
String get couponCode => 'كود الخصم';
@override
String get scheduleRide => 'جدولة رحلة';
@override
String get requestRide => 'اطلب رحلة';
@override
String get searchingDriver => 'جارٍ البحث عن سائق...';
@override
String get cancelSearch => 'إلغاء البحث';
@override
String get driverAccepted => 'قبل سائقك الرحلة';
@override
String get driverArriving => 'السائق في طريقه إليك';
@override
String get driverArrived => 'وصل سائقك';
@override
String get rideInProgress => 'الرحلة جارية';
@override
String get rideCompleted => 'انتهت الرحلة';
@override
String get rateDriver => 'قيّم سائقك';
@override
String get tripFare => 'أجرة الرحلة';
@override
String get waitingFee => 'رسوم الانتظار';
@override
String get discount => 'الخصم';
@override
String get paymentMethod => 'طريقة الدفع';
@override
String get total => 'المجموع';
@override
String get submitRating => 'إرسال التقييم';
@override
String get skipRating => 'تخطي';
@override
String get freeWaitMinutes => 'دقائق انتظار مجانية';
@override
String get minutes => 'دقائق';
@override
String get callDriver => 'اتصل بالسائق';
@override
String get chatWithDriver => 'دردشة مع السائق';
@override
String get shareTrip => 'مشاركة الرحلة';
@override
String get emergencySOS => 'طارئ SOS';
@override
String get plateNumber => 'رقم اللوحة';
@override
String get vehicleInfo => 'معلومات المركبة';
@override
String get driverRating => 'تقييم السائق';
@override
String get eta => 'الوصول المتوقع';
@override
String get km => 'كم';
@override
String get min => 'د';
@override
String get searchTimeout => 'لم نجد سائقاً متاحاً حالياً. حاول مرة أخرى';
@override
String get goOnline => 'الاتصال';
@override
String get goOffline => 'الانقطاع';
@override
String get online => 'مُتصل';
@override
String get offline => 'مُنقطع';
@override
String get accept => 'قبول';
@override
String get reject => 'رفض';
@override
String get offersAvailable => 'عروض متاحة';
@override
String get tripAssigned => 'رحلة جديدة مُعيّنة';
@override
String get onTheWay => 'في الطريق';
@override
String get arrivedAtPickup => 'وصلت';
@override
String get startTrip => 'بدء الرحلة';
@override
String get completeTrip => 'إتمام الرحلة';
@override
String get tripInProgress => 'الرحلة جارية';
@override
String get tripCompleted => 'أُتمّت الرحلة';
@override
String get cancelTrip => 'إلغاء الرحلة';
@override
String get cancelTripConfirm => 'هل أنت متأكد من إلغاء هذه الرحلة؟';
@override
String get yes => 'نعم';
@override
String get no => 'لا';
@override
String get callClient => 'اتصال بالعميل';
@override
String get chat => 'محادثة';
@override
String get trip => 'الرحلة';
@override
String get anonymous => 'السائق';
@override
String get noMessagesYet => 'لا توجد رسائل بعد';
@override
String get typeMessage => 'اكتب رسالة...';
}
apps/driver-archive-cubit/lib/core/l10n/app_localizations_en.dart
+336
View File
@@ -0,0 +1,336 @@
// ignore: unused_import
import 'package:intl/intl.dart' as intl;
import 'app_localizations.dart';
// ignore_for_file: type=lint
/// The translations for English (`en`).
class AppLocalizationsEn extends AppLocalizations {
AppLocalizationsEn([String locale = 'en']) : super(locale);
@override
String get appName => 'Tripz';
@override
String get appTagline => 'Tap, ride, arrive';
@override
String get phoneTitle => 'Enter your phone number to continue';
@override
String get phoneLabel => 'Phone number';
@override
String get phoneHint => '07XXXXXXXX';
@override
String get sendCode => 'Send code';
@override
String get otpTitle => 'Enter verification code';
@override
String otpSentTo(String phone) {
return 'Sent to $phone';
}
@override
String get otpLabel => 'Code';
@override
String get confirm => 'Confirm';
@override
String welcome(String name) {
return 'Welcome $name';
}
@override
String get welcomeBack => 'Welcome back';
@override
String get whereTo => 'Where to?';
@override
String get myTrips => 'My trips';
@override
String get wallet => 'Wallet';
@override
String get coupons => 'Coupons & invites';
@override
String get settings => 'Settings';
@override
String get support => 'Support';
@override
String get logout => 'Logout';
@override
String get language => 'Language';
@override
String get arabic => 'العربية';
@override
String get english => 'English';
@override
String get theme => 'Theme';
@override
String get lightMode => 'Light';
@override
String get darkMode => 'Dark';
@override
String get systemMode => 'System';
@override
String get errorGeneric => 'Something went wrong';
@override
String get retry => 'Try again';
@override
String get emptyGeneric => 'Nothing here yet';
@override
String get loading => 'Loading...';
@override
String get cancel => 'Cancel';
@override
String get save => 'Save';
@override
String get close => 'Close';
@override
String get next => 'Next';
@override
String get back => 'Back';
@override
String get search => 'Search';
@override
String get noResults => 'No results found';
@override
String get connectionError => 'Check your internet connection';
@override
String get authError => 'Failed to send code';
@override
String get invalidOtp => 'Invalid code';
@override
String get phoneEmpty => 'Enter your phone number';
@override
String get selectDestination => 'Choose your destination';
@override
String get pickupLocation => 'Pickup location';
@override
String get dropoffLocation => 'Destination';
@override
String get chooseOnMap => 'Choose on map';
@override
String get favorites => 'Favorites';
@override
String get home => 'Home';
@override
String get work => 'Work';
@override
String get searchPlaces => 'Search for a place...';
@override
String get rideClasses => 'Ride class';
@override
String get cash => 'Cash';
@override
String get walletPayment => 'Wallet';
@override
String get couponCode => 'Coupon code';
@override
String get scheduleRide => 'Schedule a ride';
@override
String get requestRide => 'Request a ride';
@override
String get searchingDriver => 'Looking for a driver...';
@override
String get cancelSearch => 'Cancel search';
@override
String get driverAccepted => 'Your driver accepted';
@override
String get driverArriving => 'Driver is on the way';
@override
String get driverArrived => 'Your driver has arrived';
@override
String get rideInProgress => 'Ride in progress';
@override
String get rideCompleted => 'Ride completed';
@override
String get rateDriver => 'Rate your driver';
@override
String get tripFare => 'Trip fare';
@override
String get waitingFee => 'Waiting fee';
@override
String get discount => 'Discount';
@override
String get paymentMethod => 'Payment method';
@override
String get total => 'Total';
@override
String get submitRating => 'Submit rating';
@override
String get skipRating => 'Skip';
@override
String get freeWaitMinutes => 'Free wait minutes';
@override
String get minutes => 'minutes';
@override
String get callDriver => 'Call driver';
@override
String get chatWithDriver => 'Chat with driver';
@override
String get shareTrip => 'Share trip';
@override
String get emergencySOS => 'Emergency SOS';
@override
String get plateNumber => 'Plate number';
@override
String get vehicleInfo => 'Vehicle info';
@override
String get driverRating => 'Driver rating';
@override
String get eta => 'Estimated arrival';
@override
String get km => 'km';
@override
String get min => 'min';
@override
String get searchTimeout =>
'No drivers available right now. Please try again';
@override
String get goOnline => 'Go online';
@override
String get goOffline => 'Go offline';
@override
String get online => 'Online';
@override
String get offline => 'Offline';
@override
String get accept => 'Accept';
@override
String get reject => 'Reject';
@override
String get offersAvailable => 'offers available';
@override
String get tripAssigned => 'New trip assigned';
@override
String get onTheWay => 'On my way';
@override
String get arrivedAtPickup => 'I\'ve arrived';
@override
String get startTrip => 'Start trip';
@override
String get completeTrip => 'Complete trip';
@override
String get tripInProgress => 'Trip in progress';
@override
String get tripCompleted => 'Trip completed';
@override
String get cancelTrip => 'Cancel trip';
@override
String get cancelTripConfirm => 'Are you sure you want to cancel this trip?';
@override
String get yes => 'Yes';
@override
String get no => 'No';
@override
String get callClient => 'Call client';
@override
String get chat => 'Chat';
@override
String get trip => 'Trip';
@override
String get anonymous => 'Driver';
@override
String get noMessagesYet => 'No messages yet';
@override
String get typeMessage => 'Type a message...';
}
apps/driver-archive-cubit/lib/core/router.dart
+64
View File
@@ -0,0 +1,64 @@
import 'dart:async';
import 'package:flutter/widgets.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../features/auth/cubit/auth_cubit.dart';
import '../features/auth/cubit/auth_state.dart';
import '../features/auth/view/phone_screen.dart';
import '../features/auth/view/otp_screen.dart';
import '../features/home/view/home_screen.dart';
import '../features/trip/bloc/driver_trip_bloc.dart';
import '../features/trip/view/driver_trip_screen.dart';
import '../features/trip/view/driver_chat_screen.dart';
import '../core/di.dart';
GoRouter buildRouter(AuthCubit auth) {
return GoRouter(
initialLocation: '/phone',
refreshListenable: _StreamRefresh(auth.stream),
redirect: (context, state) {
final status = auth.state.status;
final loc = state.matchedLocation;
final onAuthPages = loc == '/phone' || loc == '/otp';
if (status == AuthStatus.authenticated) {
return onAuthPages ? '/home' : null;
}
if (status == AuthStatus.codeSent && loc == '/phone') return '/otp';
if (status != AuthStatus.authenticated && !onAuthPages) return '/phone';
return null;
},
routes: [
GoRoute(path: '/phone', builder: (_, __) => const PhoneScreen()),
GoRoute(path: '/otp', builder: (_, __) => const OtpScreen()),
GoRoute(path: '/home', builder: (_, __) => const HomeScreen()),
GoRoute(
path: '/trip',
builder: (_, __) => BlocProvider.value(
value: getIt<DriverTripBloc>(),
child: const DriverTripScreen(),
),
),
GoRoute(
path: '/chat/:tripId',
builder: (context, state) {
final tripId = state.pathParameters['tripId']!;
return DriverChatScreen(tripId: tripId);
},
),
],
);
}
class _StreamRefresh extends ChangeNotifier {
late final StreamSubscription<dynamic> _sub;
_StreamRefresh(Stream<dynamic> stream) {
notifyListeners();
_sub = stream.asBroadcastStream().listen((_) => notifyListeners());
}
@override
void dispose() {
_sub.cancel();
super.dispose();
}
}
apps/driver-archive-cubit/lib/core/storage/token_store.dart
+15
View File
@@ -0,0 +1,15 @@
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
/// تخزين آمن للتوكنات (access + refresh).
class TokenStore {
final FlutterSecureStorage _s = const FlutterSecureStorage();
Future<void> save(String access, String refresh) async {
await _s.write(key: 'access_token', value: access);
await _s.write(key: 'refresh_token', value: refresh);
}
Future<String?> access() => _s.read(key: 'access_token');
Future<String?> refresh() => _s.read(key: 'refresh_token');
Future<void> clear() => _s.deleteAll();
}
apps/driver-archive-cubit/lib/core/ui/empty_view.dart
+39
View File
@@ -0,0 +1,39 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// حالة اللاشيء — رسالة + أيقونة.
/// docs/26 §7
class EmptyView extends StatelessWidget {
const EmptyView({
super.key,
this.icon = Icons.inbox_rounded,
this.message,
});
final IconData icon;
final String? message;
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return Center(
child: Padding(
padding: const EdgeInsets.all(T.s32),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 64, color: cs.onSurfaceVariant.withValues(alpha: 0.4)),
const SizedBox(height: T.s16),
Text(
message ?? 'لا توجد عناصر بعد',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: cs.onSurfaceVariant,
),
textAlign: TextAlign.center,
),
],
),
),
);
}
}
apps/driver-archive-cubit/lib/core/ui/error_view.dart
+48
View File
@@ -0,0 +1,48 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// حالة الخطأ — رسالة بالعربية + زر إعادة المحاولة.
/// docs/26 §7
class ErrorView extends StatelessWidget {
const ErrorView({
super.key,
this.message,
this.onRetry,
});
final String? message;
final VoidCallback? onRetry;
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return Center(
child: Padding(
padding: const EdgeInsets.all(T.s32),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.error_outline_rounded,
size: 64, color: cs.error.withValues(alpha: 0.6)),
const SizedBox(height: T.s16),
Text(
message ?? 'حدث خطأ ما',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: cs.onSurface,
),
textAlign: TextAlign.center,
),
if (onRetry != null) ...[
const SizedBox(height: T.s16),
FilledButton.icon(
onPressed: onRetry,
icon: const Icon(Icons.refresh_rounded, size: 20),
label: const Text('أعد المحاولة'),
),
],
],
),
),
);
}
}
apps/driver-archive-cubit/lib/core/ui/skeleton.dart
+104
View File
@@ -0,0 +1,104 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// هيكل التحميل — تأثير نبض على عناصر مستوحاة من الشاشة الفعلية.
/// docs/26 §7
class Skeleton extends StatelessWidget {
const Skeleton({super.key});
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final baseColor = cs.surfaceContainerHighest;
final highlightColor = cs.surfaceContainerHigh;
return Padding(
padding: const EdgeInsets.all(T.pagePadding),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_PulseBox(width: double.infinity, height: 200, base: baseColor, highlight: highlightColor),
const SizedBox(height: T.s16),
_PulseBox(width: 200, height: 20, base: baseColor, highlight: highlightColor),
const SizedBox(height: T.s12),
_PulseBox(width: 140, height: 16, base: baseColor, highlight: highlightColor),
const SizedBox(height: T.s24),
Row(
children: [
_PulseBox(width: 48, height: 48, base: baseColor, highlight: highlightColor, radius: T.rCircle),
const SizedBox(width: T.s12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_PulseBox(width: double.infinity, height: 16, base: baseColor, highlight: highlightColor),
const SizedBox(height: T.s8),
_PulseBox(width: 120, height: 14, base: baseColor, highlight: highlightColor),
],
),
),
],
),
],
),
);
}
}
class _PulseBox extends StatefulWidget {
const _PulseBox({
required this.width,
required this.height,
required this.base,
required this.highlight,
this.radius = 8,
});
final double width;
final double height;
final Color base;
final Color highlight;
final double radius;
@override
State<_PulseBox> createState() => _PulseBoxState();
}
class _PulseBoxState extends State<_PulseBox>
with SingleTickerProviderStateMixin {
late final AnimationController _ctrl;
late final Animation<double> _anim;
@override
void initState() {
super.initState();
_ctrl = AnimationController(vsync: this, duration: const Duration(milliseconds: 1200))
..repeat();
_anim = Tween<double>(begin: 0, end: 1).animate(
CurvedAnimation(parent: _ctrl, curve: Curves.easeInOut),
);
}
@override
void dispose() {
_ctrl.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return AnimatedBuilder(
animation: _anim,
builder: (_, __) {
return Container(
width: widget.width,
height: widget.height,
decoration: BoxDecoration(
color: Color.lerp(widget.base, widget.highlight, _anim.value),
borderRadius: BorderRadius.circular(widget.radius),
),
);
},
);
}
}
apps/driver-archive-cubit/lib/core/ui/status_banner.dart
+51
View File
@@ -0,0 +1,51 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// شريط حالة الرحلة الحي.
/// docs/26 §7
class StatusBanner extends StatelessWidget {
const StatusBanner({
super.key,
required this.label,
this.color,
this.icon,
});
final String label;
final Color? color;
final IconData? icon;
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final effectiveColor = color ?? cs.primary;
return Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(
horizontal: T.s16,
vertical: T.s12,
),
decoration: BoxDecoration(
color: effectiveColor.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(T.r8),
),
child: Row(
children: [
if (icon != null) ...[
Icon(icon, color: effectiveColor, size: T.iconSm),
const SizedBox(width: T.s8),
],
Expanded(
child: Text(
label,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: effectiveColor,
),
),
),
],
),
);
}
}
apps/driver-archive-cubit/lib/core/ui/tripz_button.dart
+83
View File
@@ -0,0 +1,83 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// زر موحّد: primary (معبّأ) · secondary (محدّد) · text — مع حالة تحميل داخلية.
/// docs/26 §7
enum TripzButtonStyle { primary, secondary, text }
class TripzButton extends StatelessWidget {
const TripzButton({
super.key,
required this.label,
this.onPressed,
this.style = TripzButtonStyle.primary,
this.loading = false,
this.icon,
this.fullWidth = true,
});
final String label;
final VoidCallback? onPressed;
final TripzButtonStyle style;
final bool loading;
final IconData? icon;
final bool fullWidth;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final cs = theme.colorScheme;
final labelStyle = theme.textTheme.labelLarge;
final effectiveOnPressed = loading ? null : onPressed;
switch (style) {
case TripzButtonStyle.primary:
return SizedBox(
width: fullWidth ? double.infinity : null,
height: T.buttonHeight,
child: FilledButton(
onPressed: effectiveOnPressed,
child: _buildChild(cs.primary, labelStyle),
),
);
case TripzButtonStyle.secondary:
return SizedBox(
width: fullWidth ? double.infinity : null,
height: T.buttonHeight,
child: OutlinedButton(
onPressed: effectiveOnPressed,
child: _buildChild(cs.primary, labelStyle),
),
);
case TripzButtonStyle.text:
return TextButton(
onPressed: effectiveOnPressed,
child: _buildChild(cs.primary, labelStyle),
);
}
}
Widget _buildChild(Color color, TextStyle? style) {
if (loading) {
return const SizedBox(
height: 22,
width: 22,
child: CircularProgressIndicator(strokeWidth: 2),
);
}
if (icon != null) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 20),
const SizedBox(width: T.s8),
Text(label, style: style),
],
);
}
return Text(label, style: style);
}
}
apps/driver-archive-cubit/lib/core/ui/tripz_card.dart
+48
View File
@@ -0,0 +1,48 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// بطاقة موحّدة: رحلة / سائق / محفظة — زوايا 12، حشوة 16.
/// docs/26 §7
class TripzCard extends StatelessWidget {
const TripzCard({
super.key,
required this.child,
this.padding,
this.onTap,
this.color,
this.borderColor,
});
final Widget child;
final EdgeInsetsGeometry? padding;
final VoidCallback? onTap;
final Color? color;
final Color? borderColor;
@override
Widget build(BuildContext context) {
final card = Card(
color: color,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(T.r12),
side: borderColor != null
? BorderSide(color: borderColor!)
: BorderSide.none,
),
child: Padding(
padding: padding ?? const EdgeInsets.all(T.pagePadding),
child: child,
),
);
if (onTap != null) {
return InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(T.r12),
child: card,
);
}
return card;
}
}
apps/driver-archive-cubit/lib/core/ui/tripz_scaffold.dart
+103
View File
@@ -0,0 +1,103 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
import 'empty_view.dart';
import 'error_view.dart';
import 'skeleton.dart';
/// السكافولد الموحّد — كل شاشة في التطبيق تُبنى داخله.
/// يحوّل `status` من Cubit/Bloc إلى: skeleton / error / empty / محتوى.
/// docs/26 §6
class TripzScaffold extends StatelessWidget {
const TripzScaffold({
super.key,
this.title,
this.status,
this.onRetry,
this.empty,
this.bottomAction,
this.actions,
this.showBackButton = false,
this.onBack,
this.safeAreaTop = true,
this.safeAreaBottom = true,
this.padding = true,
this.backgroundColor,
required this.child,
});
final String? title;
final Enum? status;
final VoidCallback? onRetry;
final Widget? empty;
final Widget? bottomAction;
final List<Widget>? actions;
final bool showBackButton;
final VoidCallback? onBack;
final bool safeAreaTop;
final bool safeAreaBottom;
final bool padding;
final Color? backgroundColor;
final Widget child;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final cs = theme.colorScheme;
return Scaffold(
backgroundColor: backgroundColor ?? cs.surface,
appBar: title != null
? AppBar(
title: Text(title!),
leading: showBackButton
? IconButton(
icon: const Icon(Icons.arrow_back_ios_new_rounded,
size: 20),
onPressed: onBack ?? () => Navigator.maybePop(context),
)
: null,
actions: actions,
)
: null,
body: SafeArea(
top: safeAreaTop,
bottom: safeAreaBottom,
child: _buildBody(context),
),
bottomNavigationBar: bottomAction != null
? Padding(
padding: EdgeInsets.fromLTRB(
T.pagePadding,
0,
T.pagePadding,
MediaQuery.of(context).viewInsets.bottom > 0
? MediaQuery.of(context).viewInsets.bottom + 8
: T.pagePadding,
),
child: bottomAction,
)
: null,
);
}
Widget _buildBody(BuildContext context) {
if (status != null) {
if (_isError) return ErrorView(onRetry: onRetry);
if (_isLoading) return const Skeleton();
if (_isEmpty) return empty ?? const EmptyView();
}
return padding
? Padding(
padding: const EdgeInsets.all(T.pagePadding),
child: child,
)
: child;
}
bool get _isLoading => status != null && status!.name == 'loading';
bool get _isError => status != null && status!.name == 'error';
bool get _isEmpty => status != null && status!.name == 'empty';
}
apps/driver-archive-cubit/lib/core/ui/tripz_sheet.dart
+74
View File
@@ -0,0 +1,74 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// كل bottom sheet في التطبيق يمرّ من هنا: مقبض علوي، زوايا 24.
/// docs/26 §7
class TripzSheet extends StatelessWidget {
const TripzSheet({
super.key,
this.title,
this.child,
this.bottomAction,
this.isScrollControlled = true,
});
final String? title;
final Widget? child;
final Widget? bottomAction;
final bool isScrollControlled;
/// مساعد للاستدعاء بأمر واحد
static Future<T?> show<T>(
BuildContext context, {
String? title,
Widget? child,
Widget? bottomAction,
bool isScrollControlled = true,
}) {
return showModalBottomSheet<T>(
context: context,
isScrollControlled: isScrollControlled,
useSafeArea: true,
builder: (_) => TripzSheet(
title: title,
child: child,
bottomAction: bottomAction,
),
);
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final bottomPadding = MediaQuery.of(context).viewInsets.bottom;
return Padding(
padding: EdgeInsets.fromLTRB(0, 0, 0, bottomPadding),
child: SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: T.pagePadding),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (title != null) ...[
Text(
title!,
style: theme.textTheme.titleMedium,
textAlign: TextAlign.center,
),
const SizedBox(height: T.s16),
],
if (child != null) child!,
if (bottomAction != null) ...[
const SizedBox(height: T.s16),
bottomAction!,
const SizedBox(height: T.s8),
],
],
),
),
),
);
}
}
apps/driver-archive-cubit/lib/core/ui/tripz_text_field.dart
+86
View File
@@ -0,0 +1,86 @@
import 'package:flutter/material.dart';
import '../design/tokens.dart';
/// حقل إدخال موحّد: هاتف · OTP · بحث — رسالة الخطأ تحته بالعربية.
/// docs/26 §7
class TripzTextField extends StatelessWidget {
const TripzTextField({
super.key,
this.controller,
this.label,
this.hint,
this.prefix,
this.suffix,
this.keyboardType,
this.obscureText = false,
this.errorText,
this.enabled = true,
this.onChanged,
this.onSubmitted,
this.autofocus = false,
this.textAlign,
this.maxLength,
this.contentPadding,
});
final TextEditingController? controller;
final String? label;
final String? hint;
final Widget? prefix;
final Widget? suffix;
final TextInputType? keyboardType;
final bool obscureText;
final String? errorText;
final bool enabled;
final ValueChanged<String>? onChanged;
final ValueChanged<String>? onSubmitted;
final bool autofocus;
final TextAlign? textAlign;
final int? maxLength;
final EdgeInsetsGeometry? contentPadding;
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
SizedBox(
height: T.inputHeight,
child: TextField(
controller: controller,
keyboardType: keyboardType,
obscureText: obscureText,
enabled: enabled,
onChanged: onChanged,
onSubmitted: onSubmitted,
autofocus: autofocus,
textAlign: textAlign ?? TextAlign.start,
maxLength: maxLength,
style: Theme.of(context).textTheme.bodyLarge,
decoration: InputDecoration(
labelText: label,
hintText: hint,
prefixIcon: prefix,
suffixIcon: suffix,
counterText: '',
contentPadding: contentPadding ??
const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
),
),
),
if (errorText != null) ...[
const SizedBox(height: 4),
Text(
errorText!,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: cs.error,
),
),
],
],
);
}
}
apps/driver-archive-cubit/lib/features/auth/cubit/auth_cubit.dart
+46
View File
@@ -0,0 +1,46 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import '../data/auth_repository.dart';
import 'auth_state.dart';
class AuthCubit extends Cubit<AuthState> {
final AuthRepository _repo;
AuthCubit(this._repo) : super(const AuthState());
Future<void> checkAuth() async {
final user = await _repo.me();
emit(state.copyWith(
status: user != null ? AuthStatus.authenticated : AuthStatus.unauthenticated,
user: user,
));
}
Future<void> sendOtp(String phone) async {
if (phone.trim().isEmpty) {
emit(state.copyWith(status: AuthStatus.error, error: 'أدخل رقم الهاتف'));
return;
}
try {
emit(state.copyWith(status: AuthStatus.authenticating, phone: phone.trim()));
await _repo.sendOtp(phone.trim());
emit(state.copyWith(status: AuthStatus.codeSent, phone: phone.trim()));
} catch (_) {
emit(state.copyWith(status: AuthStatus.error, error: 'تعذّر إرسال الرمز'));
}
}
Future<void> verify(String code) async {
try {
emit(state.copyWith(status: AuthStatus.authenticating));
final user = await _repo.verify(state.phone, code.trim());
emit(state.copyWith(status: AuthStatus.authenticated, user: user));
} catch (_) {
emit(state.copyWith(status: AuthStatus.error, error: 'رمز غير صحيح'));
}
}
Future<void> logout() async {
await _repo.logout();
emit(const AuthState(status: AuthStatus.unauthenticated));
}
}
apps/driver-archive-cubit/lib/features/auth/cubit/auth_state.dart
+42
View File
@@ -0,0 +1,42 @@
import 'package:equatable/equatable.dart';
import '../data/auth_repository.dart';
enum AuthStatus {
unknown,
unauthenticated,
codeSent,
authenticating,
authenticated,
error,
}
class AuthState extends Equatable {
final AuthStatus status;
final String phone;
final AppUser? user;
final String? error;
const AuthState({
this.status = AuthStatus.unknown,
this.phone = '',
this.user,
this.error,
});
AuthState copyWith({
AuthStatus? status,
String? phone,
AppUser? user,
String? error,
}) {
return AuthState(
status: status ?? this.status,
phone: phone ?? this.phone,
user: user ?? this.user,
error: error,
);
}
@override
List<Object?> get props => [status, phone, user, error];
}
apps/driver-archive-cubit/lib/features/auth/data/auth_repository.dart
+53
View File
@@ -0,0 +1,53 @@
import 'package:dio/dio.dart';
import '../../../core/api/api_client.dart';
import '../../../core/storage/token_store.dart';
class AppUser {
final String id;
final String phone;
final String? name;
final String role;
AppUser({required this.id, required this.phone, this.name, required this.role});
factory AppUser.fromJson(Map<String, dynamic> j) => AppUser(
id: j['id'] as String,
phone: (j['phone'] ?? '') as String,
name: j['name'] as String?,
role: (j['role'] ?? 'driver') as String,
);
}
class AuthRepository {
final ApiClient _api;
final TokenStore _store;
AuthRepository(this._api, this._store);
Future<void> sendOtp(String phone) async {
await _api.dio.post('/auth/send-otp', data: {'phone': phone});
}
Future<AppUser> verify(String phone, String code) async {
final r = await _api.dio.post(
'/auth/verify-otp',
data: {'phone': phone, 'code': code},
);
await _store.save(
r.data['access_token'] as String,
r.data['refresh_token'] as String,
);
return AppUser.fromJson(Map<String, dynamic>.from(r.data['user'] as Map));
}
Future<AppUser?> me() async {
try {
final r = await _api.dio.get('/users/me');
return AppUser.fromJson(Map<String, dynamic>.from(r.data as Map));
} on DioException {
return null;
}
}
Future<void> logout() => _store.clear();
}
apps/driver-archive-cubit/lib/features/auth/view/otp_screen.dart
+78
View File
@@ -0,0 +1,78 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import '../cubit/auth_cubit.dart';
import '../cubit/auth_state.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_text_field.dart';
class OtpScreen extends StatefulWidget {
const OtpScreen({super.key});
@override
State<OtpScreen> createState() => _OtpScreenState();
}
class _OtpScreenState extends State<OtpScreen> {
final _controller = TextEditingController();
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return TripzScaffold(
showBackButton: true,
onBack: () => context.go('/phone'),
child: BlocConsumer<AuthCubit, AuthState>(
listener: (context, state) {
if (state.status == AuthStatus.error && state.error != null) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(state.error!)),
);
}
},
builder: (context, state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 24),
Text(
l10n.otpTitle,
style: Theme.of(context).textTheme.titleLarge,
),
const SizedBox(height: 8),
Text(
l10n.otpSentTo(state.phone),
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
const SizedBox(height: 28),
TripzTextField(
controller: _controller,
label: l10n.otpLabel,
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
maxLength: 6,
),
const SizedBox(height: 20),
TripzButton(
label: l10n.confirm,
loading: state.status == AuthStatus.authenticating,
onPressed: () =>
context.read<AuthCubit>().verify(_controller.text),
),
],
);
},
),
);
}
}
apps/driver-archive-cubit/lib/features/auth/view/phone_screen.dart
+77
View File
@@ -0,0 +1,77 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import '../cubit/auth_cubit.dart';
import '../cubit/auth_state.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_text_field.dart';
class PhoneScreen extends StatefulWidget {
const PhoneScreen({super.key});
@override
State<PhoneScreen> createState() => _PhoneScreenState();
}
class _PhoneScreenState extends State<PhoneScreen> {
final _controller = TextEditingController();
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return TripzScaffold(
safeAreaTop: true,
padding: true,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Spacer(flex: 2),
Text(
l10n.appName,
style: Theme.of(context).textTheme.headlineLarge,
),
const SizedBox(height: 8),
Text(
l10n.phoneTitle,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
const Spacer(),
TripzTextField(
controller: _controller,
label: l10n.phoneLabel,
hint: l10n.phoneHint,
keyboardType: TextInputType.phone,
),
const SizedBox(height: 20),
BlocConsumer<AuthCubit, AuthState>(
listener: (context, state) {
if (state.status == AuthStatus.error && state.error != null) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(state.error!)),
);
}
},
builder: (context, state) {
return TripzButton(
label: l10n.sendCode,
loading: state.status == AuthStatus.authenticating,
onPressed: () =>
context.read<AuthCubit>().sendOtp(_controller.text),
);
},
),
const Spacer(flex: 2),
],
),
);
}
}
apps/driver-archive-cubit/lib/features/home/cubit/driver_cubit.dart
+118
View File
@@ -0,0 +1,118 @@
import 'dart:async';
import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../data/driver_repository.dart';
import '../data/driver_location_service.dart';
import '../data/models/driver_profile_model.dart';
/// حالة DriverCubit.
class DriverState extends Equatable {
final DriverProfileModel? profile;
final bool loading;
final bool online;
final String? error;
const DriverState({
this.profile,
this.loading = true,
this.online = false,
this.error,
});
DriverState copyWith({
DriverProfileModel? profile,
bool? loading,
bool? online,
String? error,
bool clearError = false,
}) {
return DriverState(
profile: profile ?? this.profile,
loading: loading ?? this.loading,
online: online ?? this.online,
error: clearError ? null : (error ?? this.error),
);
}
@override
List<Object?> get props => [profile, loading, online, error];
}
/// Cubit مُتّصل/مُنقطع — يدير ملف السائق وتبديل الحالة وموقع الخلفية.
///
/// يُقدّم:
/// - جلب الملف عند بدء التشغيل
/// - تبديل الحالة (online/offline)
/// - بدء/إيقاف تتبع الموقع عند التنشيط
class DriverCubit extends Cubit<DriverState> {
final DriverRepository _repo;
DriverLocationService? _locationService;
Timer? _heartbeatTimer;
DriverCubit(this._repo) : super(const DriverState(loading: true));
/// جلب ملف السائق وتحديد الحالة الأولية.
Future<void> loadProfile() async {
try {
final profile = await _repo.getProfile();
if (profile != null) {
emit(state.copyWith(
profile: profile,
online: profile.online,
loading: false,
));
// إذا كان مُتصلاً مسبقاً، أعد بدء التتبع.
if (profile.online) {
_startLocationTracking();
}
} else {
emit(state.copyWith(loading: false));
}
} catch (e) {
emit(state.copyWith(loading: false, error: e.toString()));
}
}
/// تبديل الحالة (مُتصل/مُنقطع).
Future<void> toggleOnline() async {
final newOnline = !state.online;
emit(state.copyWith(online: newOnline));
final result = await _repo.setOnline(newOnline);
if (!result) {
// فشل — أعد الحالة السابقة.
emit(state.copyWith(online: !newOnline));
return;
}
if (newOnline) {
_startLocationTracking();
} else {
_stopLocationTracking();
}
}
/// بدء تتبع الموقع.
void _startLocationTracking() {
if (_locationService?.isActive == true) return;
_locationService = DriverLocationService((lat, lng, {heading, speed}) async {
await _repo.sendLocation(lat: lat, lng: lng, heading: heading, speed: speed);
});
_locationService!.start();
}
/// إيقاف تتبع الموقع.
void _stopLocationTracking() {
_locationService?.stop();
_locationService = null;
_heartbeatTimer?.cancel();
_heartbeatTimer = null;
}
@override
Future<void> close() {
_stopLocationTracking();
return super.close();
}
}
apps/driver-archive-cubit/lib/features/home/data/driver_location_service.dart
+91
View File
@@ -0,0 +1,91 @@
import 'dart:async';
import 'package:geolocator/geolocator.dart';
/// خدمة موقع السائق — تتبع الموقع في الخلفية وإرساله للسيرفر.
///
/// تتبع 3 ثوانٍ عند التنشيط، ثم إرسال كل دقيقتين (docs/23 §10).
/// تراعي حالة البطارية وتتوقف عند انخفاضها.
class DriverLocationService {
final Future<void> Function(double lat, double lng, {double? heading, double? speed})
_onLocationUpdate;
StreamSubscription<Position>? _positionSub;
Timer? _heartbeatTimer;
bool _active = false;
DriverLocationService(this._onLocationUpdate);
bool get isActive => _active;
/// بدء التتبع.
Future<void> start() async {
if (_active) return;
// تحقق من صلاحية الموقع.
var permission = await Geolocator.checkPermission();
if (permission == LocationPermission.denied) {
permission = await Geolocator.requestPermission();
if (permission == LocationPermission.denied ||
permission == LocationPermission.deniedForever) {
return;
}
}
_active = true;
// أرسل الموقع فوراً.
_sendCurrentLocation();
// استمع لتحديثات الموقع كل 3 ثوانٍ.
_positionSub = Geolocator.getPositionStream(
locationSettings: const LocationSettings(
accuracy: LocationAccuracy.high,
distanceFilter: 15, // تحديث عند تغيير 15 متر
),
).listen((pos) {
_onLocationUpdate(
pos.latitude,
pos.longitude,
heading: pos.heading,
speed: pos.speed,
);
});
// دفعة كل دقيقتين كحد أقصى.
_heartbeatTimer = Timer.periodic(const Duration(minutes: 2), (_) {
_sendCurrentLocation();
});
}
/// إيقاف التتبع.
void stop() {
_active = false;
_positionSub?.cancel();
_positionSub = null;
_heartbeatTimer?.cancel();
_heartbeatTimer = null;
}
/// إرسال الموقع الحالي مرة واحدة.
Future<void> _sendCurrentLocation() async {
try {
final pos = await Geolocator.getCurrentPosition(
locationSettings: const LocationSettings(
accuracy: LocationAccuracy.high,
),
);
await _onLocationUpdate(
pos.latitude,
pos.longitude,
heading: pos.heading,
speed: pos.speed,
);
} catch (_) {
// خطأ صامت — سيحاول مرة أخرى مع الدقيقة التالية.
}
}
void dispose() {
stop();
}
}
apps/driver-archive-cubit/lib/features/home/data/driver_repository.dart
+50
View File
@@ -0,0 +1,50 @@
import '../../../core/api/api_client.dart';
import 'models/driver_profile_model.dart';
/// مستودع بيانات السائق — يُستخدم من DriverCubit.
class DriverRepository {
final ApiClient _api;
DriverRepository(this._api);
/// `GET /drivers/me` — جلب ملف السائق.
Future<DriverProfileModel?> getProfile() async {
try {
final r = await _api.dio.get('/drivers/me');
return DriverProfileModel.fromJson(r.data as Map<String, dynamic>);
} catch (_) {
return null;
}
}
/// `PATCH /drivers/status` — تبديل الحالة (مُتصل/مُنقطع).
Future<bool> setOnline(bool online) async {
try {
final r = await _api.dio.patch('/drivers/status', data: {'online': online});
return r.data['online'] as bool? ?? online;
} catch (_) {
return false;
}
}
/// `POST /drivers/location` — إرسال الموقع الحالي.
///
/// يُعيد `true` إذا كان الموقع "مُهماً" (تغيير كبير حسب السيرفر).
Future<bool> sendLocation({
required double lat,
required double lng,
double? heading,
double? speed,
}) async {
try {
final r = await _api.dio.post('/drivers/location', data: {
'lat': lat,
'lng': lng,
if (heading != null) 'heading': heading,
if (speed != null) 'speed': speed,
});
return r.data['significant'] as bool? ?? false;
} catch (_) {
return false;
}
}
}
apps/driver-archive-cubit/lib/features/home/data/models/driver_profile_model.dart
+94
View File
@@ -0,0 +1,94 @@
import 'package:equatable/equatable.dart';
/// نموذج بيانات السائق — من `GET /drivers/me`.
class DriverProfileModel extends Equatable {
final String id;
final String phone;
final String? name;
final bool online;
final double? lat;
final double? lng;
final String? vehicleMake;
final String? vehicleModel;
final int? vehicleYear;
final String? vehicleColor;
final String? plateNumber;
final String? serviceClass;
final double? rating;
final int? totalTrips;
final int? creditBalance;
const DriverProfileModel({
required this.id,
required this.phone,
this.name,
this.online = false,
this.lat,
this.lng,
this.vehicleMake,
this.vehicleModel,
this.vehicleYear,
this.vehicleColor,
this.plateNumber,
this.serviceClass,
this.rating,
this.totalTrips,
this.creditBalance,
});
factory DriverProfileModel.fromJson(Map<String, dynamic> j) =>
DriverProfileModel(
id: j['id'] as String,
phone: (j['phone'] ?? '') as String,
name: j['name'] as String?,
online: j['online'] as bool? ?? false,
lat: (j['lat'] as num?)?.toDouble(),
lng: (j['lng'] as num?)?.toDouble(),
vehicleMake: j['vehicleMake'] as String?,
vehicleModel: j['vehicleModel'] as String?,
vehicleYear: j['vehicleYear'] as int?,
vehicleColor: j['vehicleColor'] as String?,
plateNumber: j['plateNumber'] as String?,
serviceClass: j['serviceClass'] as String?,
rating: (j['rating'] as num?)?.toDouble(),
totalTrips: j['totalTrips'] as int?,
creditBalance: j['creditBalance'] as int?,
);
DriverProfileModel copyWith({
String? name,
bool? online,
double? lat,
double? lng,
String? vehicleMake,
String? vehicleModel,
int? vehicleYear,
String? vehicleColor,
String? plateNumber,
String? serviceClass,
double? rating,
int? totalTrips,
int? creditBalance,
}) {
return DriverProfileModel(
id: id,
phone: phone,
name: name ?? this.name,
online: online ?? this.online,
lat: lat ?? this.lat,
lng: lng ?? this.lng,
vehicleMake: vehicleMake ?? this.vehicleMake,
vehicleModel: vehicleModel ?? this.vehicleModel,
vehicleYear: vehicleYear ?? this.vehicleYear,
vehicleColor: vehicleColor ?? this.vehicleColor,
plateNumber: plateNumber ?? this.plateNumber,
serviceClass: serviceClass ?? this.serviceClass,
rating: rating ?? this.rating,
totalTrips: totalTrips ?? this.totalTrips,
creditBalance: creditBalance ?? this.creditBalance,
);
}
@override
List<Object?> get props => [id, phone, name, online, vehicleMake, vehicleModel, plateNumber];
}
apps/driver-archive-cubit/lib/features/home/data/models/trip_offer_model.dart
+62
View File
@@ -0,0 +1,62 @@
import 'package:equatable/equatable.dart';
/// عرض رحلة وارد — من `trip:offer` عبر WebSocket.
///
/// يحتوي على كل المعلومات التي يحتاجها السائق للقبول/الرفض.
/// المهلة الزمنية (`expiresAt`) تُدار من OffersBloc.
class TripOfferModel extends Equatable {
final String tripId;
final double pickupLat;
final double pickupLng;
final String? pickupAddress;
final double dropoffLat;
final double dropoffLng;
final String? dropoffAddress;
final double distance;
final num fare;
final String currency;
final int etaPickup;
final String vehicleClass;
final DateTime expiresAt;
const TripOfferModel({
required this.tripId,
required this.pickupLat,
required this.pickupLng,
this.pickupAddress,
required this.dropoffLat,
required this.dropoffLng,
this.dropoffAddress,
required this.distance,
required this.fare,
required this.currency,
required this.etaPickup,
required this.vehicleClass,
required this.expiresAt,
});
factory TripOfferModel.fromJson(Map<String, dynamic> j) => TripOfferModel(
tripId: j['tripId'] as String,
pickupLat: (j['pickup']?['lat'] ?? 0).toDouble(),
pickupLng: (j['pickup']?['lng'] ?? 0).toDouble(),
pickupAddress: j['pickup']?['address'] as String?,
dropoffLat: (j['dropoff']?['lat'] ?? 0).toDouble(),
dropoffLng: (j['dropoff']?['lng'] ?? 0).toDouble(),
dropoffAddress: j['dropoff']?['address'] as String?,
distance: (j['distance'] ?? 0).toDouble(),
fare: (j['fare'] ?? 0) as num,
currency: (j['currency'] ?? 'IQD') as String,
etaPickup: (j['etaPickup'] ?? 0) as int,
vehicleClass: (j['vehicleClass'] ?? '') as String,
expiresAt: DateTime.parse(j['expiresAt'] as String),
);
/// المسافة المنسقة (كم مع خانتين عشريتين).
String get formattedDistance => '${distance.toStringAsFixed(1)} km';
/// الأجرة المنسقة.
String get formattedFare => '$fare $currency';
@override
List<Object?> get props => [tripId, pickupLat, pickupLng, fare, expiresAt];
}
apps/driver-archive-cubit/lib/features/home/view/home_screen.dart
+189
View File
@@ -0,0 +1,189 @@
import 'package:flutter/material.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import 'package:driver/core/design/tokens.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:driver/features/home/cubit/driver_cubit.dart';
import 'package:driver/features/offers/bloc/offers_bloc.dart';
import 'widgets/driver_status_indicator.dart';
import 'widgets/trip_offer_card.dart';
import 'dart:async';
/// شاشة السائق الرئيسية — خريطة + مفتاح الاتصال/الانقطاع + overlay العروض.
class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});
@override
State<HomeScreen> createState() => _HomeScreenState();
}
class _HomeScreenState extends State<HomeScreen> {
final Completer<IntaleqMapController> _mapController = Completer();
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final cs = Theme.of(context).colorScheme;
return Scaffold(
body: Stack(
children: [
// ── الخريطة ──
_buildMap(cs),
// ── شريط الحالة العلوي ──
Positioned(
top: MediaQuery.of(context).padding.top + T.s8,
left: T.s16,
right: T.s16,
child: _buildTopBar(context, l10n, cs),
),
// ── مؤشر حالة السائق ──
Positioned(
bottom: T.s24,
left: T.s16,
right: T.s16,
child: const DriverStatusIndicator(),
),
// ── overlay العروض الواردة ──
const _OffersOverlay(),
],
),
);
}
Widget _buildMap(ColorScheme cs) {
return BlocBuilder<DriverCubit, DriverState>(
builder: (context, state) {
final driverLat = state.profile?.lat ?? 33.3128;
final driverLng = state.profile?.lng ?? 44.3615;
return IntaleqMap(
apiKey: '',
initialCameraPosition: CameraPosition(
target: LatLng(driverLat, driverLng),
zoom: 14,
),
myLocationEnabled: true,
myLocationButtonEnabled: false,
zoomControlsEnabled: false,
onMapCreated: (controller) {
if (!_mapController.isCompleted) {
_mapController.complete(controller);
}
},
);
},
);
}
Widget _buildTopBar(BuildContext context, AppLocalizations l10n, ColorScheme cs) {
return SafeArea(
child: Row(
children: [
// زر القائمة
Container(
decoration: BoxDecoration(
color: cs.surface,
borderRadius: BorderRadius.circular(T.rCircle),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.08),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: IconButton(
icon: const Icon(Icons.menu_rounded),
onPressed: () {
// TODO: Q4 drawer
},
),
),
const Spacer(),
// معلومات السائق
Container(
padding: const EdgeInsets.symmetric(
horizontal: T.s12,
vertical: T.s8,
),
decoration: BoxDecoration(
color: cs.surface,
borderRadius: BorderRadius.circular(T.r12),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.08),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Row(
children: [
Icon(Icons.star_rounded, size: 18, color: Colors.amber[600]),
const SizedBox(width: T.s4),
Text(
'${context.read<DriverCubit>().state.profile?.rating?.toStringAsFixed(1) ?? "-"}',
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w600,
),
),
],
),
),
],
),
);
}
}
/// overlay يعرض العروض الواردة كبطاقات في أسفل الشاشة.
class _OffersOverlay extends StatelessWidget {
const _OffersOverlay();
@override
Widget build(BuildContext context) {
return BlocBuilder<OffersBloc, OffersState>(
builder: (context, state) {
if (!state.hasOffers) return const SizedBox.shrink();
return Positioned(
bottom: 100,
left: T.s16,
right: T.s16,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// عدد العروض
if (state.offers.length > 1)
Container(
margin: const EdgeInsets.only(bottom: T.s8),
padding: const EdgeInsets.symmetric(
horizontal: T.s12,
vertical: T.s4,
),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primary,
borderRadius: BorderRadius.circular(T.rCircle),
),
child: Text(
'${state.offers.length} ${AppLocalizations.of(context)!.offersAvailable}',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context).colorScheme.onPrimary,
fontWeight: FontWeight.w600,
),
),
),
// العرض الأحدث
TripOfferCard(offer: state.offers.first),
],
),
);
},
);
}
}
apps/driver-archive-cubit/lib/features/home/view/widgets/driver_status_indicator.dart
+133
View File
@@ -0,0 +1,133 @@
import 'package:flutter/material.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:driver/core/design/tokens.dart';
import 'package:driver/core/design/tripz_colors.dart';
import 'package:driver/features/home/cubit/driver_cubit.dart';
/// مؤشر حالة السائق — يعرض "مُتصل" أو "مُنقطع" مع زر التبديل.
class DriverStatusIndicator extends StatelessWidget {
const DriverStatusIndicator({super.key});
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final cs = Theme.of(context).colorScheme;
return BlocBuilder<DriverCubit, DriverState>(
builder: (context, state) {
final isOnline = state.online;
return Container(
padding: const EdgeInsets.symmetric(
horizontal: T.s16,
vertical: T.s12,
),
decoration: BoxDecoration(
color: cs.surface,
borderRadius: BorderRadius.circular(T.r12),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.1),
blurRadius: 12,
offset: const Offset(0, -4),
),
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// معلومات السائق
if (state.profile != null)
Padding(
padding: const EdgeInsets.only(bottom: T.s8),
child: Row(
children: [
CircleAvatar(
radius: 20,
backgroundColor: cs.primaryContainer,
child: Icon(Icons.person, color: cs.onPrimaryContainer),
),
const SizedBox(width: T.s12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
state.profile!.name ?? l10n.anonymous,
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(
fontWeight: FontWeight.w600,
),
),
if (state.profile!.vehicleMake != null)
Text(
'${state.profile!.vehicleMake} ${state.profile!.vehicleModel ?? ""} · ${state.profile!.plateNumber ?? ""}',
style: Theme.of(context)
.textTheme
.bodySmall
?.copyWith(
color: cs.onSurfaceVariant,
),
),
],
),
),
],
),
),
// زر التبديل
SizedBox(
width: double.infinity,
height: T.buttonHeight,
child: ElevatedButton(
onPressed: state.loading
? null
: () => context.read<DriverCubit>().toggleOnline(),
style: ElevatedButton.styleFrom(
backgroundColor: isOnline
? context.tripzColors.danger
: cs.primary,
foregroundColor: isOnline ? Colors.white : cs.onPrimary,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(T.r12),
),
elevation: 0,
),
child: state.loading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
isOnline
? Icons.stop_rounded
: Icons.play_arrow_rounded,
size: 24,
),
const SizedBox(width: T.s8),
Text(
isOnline ? l10n.goOffline : l10n.goOnline,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
],
),
),
),
],
),
);
},
);
}
}
apps/driver-archive-cubit/lib/features/home/view/widgets/trip_offer_card.dart
+287
View File
@@ -0,0 +1,287 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:driver/core/design/tokens.dart';
import 'package:driver/core/design/tripz_colors.dart';
import 'package:driver/features/home/data/models/trip_offer_model.dart';
import 'package:driver/features/offers/bloc/offers_bloc.dart';
/// بطاقة عرض الرحلة الواردة — تُعرض في overlay.
///
/// تتضمن:
/// - نقاط pickup/dropoff على الخريطة المصغرة
/// - معلومات المسافة والأجرة والوقت
/// - عداد تنازلي للمهلة
/// - أزرار قبول/رفض
class TripOfferCard extends StatefulWidget {
final TripOfferModel offer;
const TripOfferCard({super.key, required this.offer});
@override
State<TripOfferCard> createState() => _TripOfferCardState();
}
class _TripOfferCardState extends State<TripOfferCard> {
Timer? _countdownTimer;
int _remainingSeconds = 0;
@override
void initState() {
super.initState();
_remainingSeconds = widget.offer.expiresAt.difference(DateTime.now()).inSeconds;
_countdownTimer = Timer.periodic(const Duration(seconds: 1), (_) {
if (!mounted) return;
setState(() {
_remainingSeconds = widget.offer.expiresAt.difference(DateTime.now()).inSeconds;
if (_remainingSeconds <= 0) {
_countdownTimer?.cancel();
}
});
});
}
@override
void dispose() {
_countdownTimer?.cancel();
super.dispose();
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final cs = Theme.of(context).colorScheme;
final progress = _remainingSeconds > 0
? (_remainingSeconds / 30.0).clamp(0.0, 1.0)
: 0.0;
return Container(
constraints: const BoxConstraints(maxHeight: 280),
decoration: BoxDecoration(
color: cs.surface,
borderRadius: BorderRadius.circular(T.r12),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.12),
blurRadius: 16,
offset: const Offset(0, 4),
),
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// شريط التقدم (العد التنازلي)
LinearProgressIndicator(
value: progress,
backgroundColor: cs.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
_remainingSeconds > 10 ? cs.primary : context.tripzColors.danger,
),
minHeight: 4,
),
Padding(
padding: const EdgeInsets.all(T.s16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// الأجرة + العداد
Row(
children: [
Text(
widget.offer.formattedFare,
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.bold,
color: cs.primary,
),
),
const Spacer(),
Container(
padding: const EdgeInsets.symmetric(
horizontal: T.s8,
vertical: T.s4,
),
decoration: BoxDecoration(
color: _remainingSeconds > 10
? cs.primaryContainer
: context.tripzColors.danger.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(T.r8),
),
child: Text(
'${_remainingSeconds > 0 ? _remainingSeconds : 0}s',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.w600,
color: _remainingSeconds > 10
? cs.onPrimaryContainer
: context.tripzColors.danger,
),
),
),
],
),
const SizedBox(height: T.s12),
// المسافة والوقت
Row(
children: [
_InfoChip(
icon: Icons.straighten,
label: widget.offer.formattedDistance,
),
const SizedBox(width: T.s8),
_InfoChip(
icon: Icons.access_time,
label: '${widget.offer.etaPickup} ${l10n.min}',
),
const SizedBox(width: T.s8),
_InfoChip(
icon: Icons.local_taxi,
label: widget.offer.vehicleClass,
),
],
),
const SizedBox(height: T.s12),
// نقاط pickup وdropoff
_LocationDot(
color: const Color(0xFF4CAF50),
label: widget.offer.pickupAddress ?? l10n.pickupLocation,
),
Padding(
padding: const EdgeInsets.only(left: 7),
child: Container(
width: 2,
height: T.s16,
color: cs.outlineVariant,
),
),
_LocationDot(
color: const Color(0xFFF44336),
label: widget.offer.dropoffAddress ?? l10n.dropoffLocation,
),
const SizedBox(height: T.s16),
// أزرار القبول/الرفض
Row(
children: [
Expanded(
child: OutlinedButton(
onPressed: () {
context.read<OffersBloc>().add(
OfferRejected(widget.offer.tripId),
);
},
style: OutlinedButton.styleFrom(
foregroundColor: cs.error,
side: BorderSide(color: cs.error),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(T.r12),
),
minimumSize: const Size(0, T.buttonHeight),
),
child: Text(l10n.reject),
),
),
const SizedBox(width: T.s12),
Expanded(
child: ElevatedButton(
onPressed: () {
context.read<OffersBloc>().add(
OfferAccepted(widget.offer.tripId),
);
},
style: ElevatedButton.styleFrom(
backgroundColor: cs.primary,
foregroundColor: cs.onPrimary,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(T.r12),
),
minimumSize: const Size(0, T.buttonHeight),
elevation: 0,
),
child: Text(l10n.accept),
),
),
],
),
],
),
),
],
),
);
}
}
/// رقاقة معلومات صغيرة (مسافة / وقت / فئة).
class _InfoChip extends StatelessWidget {
final IconData icon;
final String label;
const _InfoChip({required this.icon, required this.label});
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return Container(
padding: const EdgeInsets.symmetric(horizontal: T.s8, vertical: T.s4),
decoration: BoxDecoration(
color: cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(T.r8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 14, color: cs.onSurfaceVariant),
const SizedBox(width: 4),
Text(
label,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: cs.onSurfaceVariant,
),
),
],
),
);
}
}
/// نقطة موقع مع لون وعنوان.
class _LocationDot extends StatelessWidget {
final Color color;
final String label;
const _LocationDot({required this.color, required this.label});
@override
Widget build(BuildContext context) {
return Row(
children: [
Container(
width: 12,
height: 12,
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
),
),
const SizedBox(width: T.s8),
Expanded(
child: Text(
label,
style: Theme.of(context).textTheme.bodyMedium,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
);
}
}
apps/driver-archive-cubit/lib/features/offers/bloc/offers_bloc.dart
+235
View File
@@ -0,0 +1,235 @@
import 'dart:async';
import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../data/offers_repository.dart';
import 'package:driver/features/home/data/models/trip_offer_model.dart';
import '../../trip/data/driver_socket_service.dart';
import '../../trip/data/trip_event_merger.dart';
// ─── أحداث ───
sealed class OffersEvent extends Equatable {
const OffersEvent();
@override
List<Object?> get props => [];
}
/// بدء الاستماع للعروض (بعد الاتصال بالـWebSocket).
class OffersStarted extends OffersEvent {
const OffersStarted();
}
/// عرض رحلة وارد (من WebSocket).
class OfferReceived extends OffersEvent {
final TripOfferModel offer;
const OfferReceived(this.offer);
@override
List<Object?> get props => [offer.tripId];
}
/// العرض تم قبوله من سائق آخر.
class OfferTaken extends OffersEvent {
final String tripId;
const OfferTaken(this.tripId);
@override
List<Object?> get props => [tripId];
}
/// العرض انتهت مهلته (من المؤقت).
class OfferExpired extends OffersEvent {
final String tripId;
const OfferExpired(this.tripId);
@override
List<Object?> get props => [tripId];
}
/// قبول العرض.
class OfferAccepted extends OffersEvent {
final String tripId;
const OfferAccepted(this.tripId);
@override
List<Object?> get props => [tripId];
}
/// رفض العرض يدوياً.
class OfferRejected extends OffersEvent {
final String tripId;
const OfferRejected(this.tripId);
@override
List<Object?> get props => [tripId];
}
/// مسح كل العروض (عند بدء رحلة نشطة).
class OffersClear extends OffersEvent {
const OffersClear();
}
// ─── حالة ───
class OffersState extends Equatable {
final List<TripOfferModel> offers;
final String? acceptedTripId;
final bool accepting;
final String? error;
const OffersState({
this.offers = const [],
this.acceptedTripId,
this.accepting = false,
this.error,
});
OffersState copyWith({
List<TripOfferModel>? offers,
String? acceptedTripId,
bool? accepting,
String? error,
bool clearError = false,
bool clearAccepted = false,
}) {
return OffersState(
offers: offers ?? this.offers,
acceptedTripId: clearAccepted ? null : (acceptedTripId ?? this.acceptedTripId),
accepting: accepting ?? this.accepting,
error: clearError ? null : (error ?? this.error),
);
}
/// هل هناك عرض واحد على الأقل؟
bool get hasOffers => offers.isNotEmpty;
@override
List<Object?> get props => [offers, acceptedTripId, accepting, error];
}
// ─── Bloc ───
/// OffersBloc — Bloc الثاني للسائق (docs/03 §14).
///
/// يستقبل عروض من WebSocket ويدير القبول/الرفض والمؤقت.
/// العروض تُعرض كـstack: الأحدث أولاً.
class OffersBloc extends Bloc<OffersEvent, OffersState> {
final OffersRepository _offersRepo;
final DriverSocketService _socket;
final DriverTripEventMerger _merger;
/// مؤقتات المهلة لكل عرض ( tripId → Timer ).
final Map<String, Timer> _expiryTimers = {};
OffersBloc({
required OffersRepository offersRepo,
required DriverSocketService socket,
DriverTripEventMerger? merger,
}) : _offersRepo = offersRepo,
_socket = socket,
_merger = merger ?? DriverTripEventMerger(),
super(const OffersState()) {
on<OffersStarted>(_onStarted);
on<OfferReceived>(_onOfferReceived);
on<OfferTaken>(_onOfferTaken);
on<OfferExpired>(_onOfferExpired);
on<OfferAccepted>(_onOfferAccepted);
on<OfferRejected>(_onOfferRejected);
on<OffersClear>(_onClear);
// استمع لتحديثات Merger.
_merger.offerStream.listen((offer) {
add(OfferReceived(offer));
});
_merger.offerTakenStream.listen((tripId) {
add(OfferTaken(tripId));
});
}
Future<void> _onStarted(OffersStarted event, Emitter<OffersState> emit) async {
_socket.connect();
}
void _onOfferReceived(OfferReceived event, Emitter<OffersState> emit) {
// لا تضف عروضاً مكررة.
final exists = state.offers.any((o) => o.tripId == event.offer.tripId);
if (exists) return;
final updated = [event.offer, ...state.offers];
emit(state.copyWith(offers: updated, clearError: true));
// ابدأ مؤقت المهلة.
_startExpiryTimer(event.offer);
}
void _onOfferTaken(OfferTaken event, Emitter<OffersState> emit) {
final updated = state.offers.where((o) => o.tripId != event.tripId).toList();
_cancelExpiryTimer(event.tripId);
emit(state.copyWith(offers: updated));
}
void _onOfferExpired(OfferExpired event, Emitter<OffersState> emit) {
final updated = state.offers.where((o) => o.tripId != event.tripId).toList();
_cancelExpiryTimer(event.tripId);
emit(state.copyWith(offers: updated));
}
Future<void> _onOfferAccepted(OfferAccepted event, Emitter<OffersState> emit) async {
emit(state.copyWith(accepting: true, clearError: true));
final trip = await _offersRepo.acceptTrip(event.tripId);
if (trip == null) {
emit(state.copyWith(accepting: false, error: 'Failed to accept trip'));
return;
}
// أزل كل العروض المتبقية (تم اختيار سائق).
_cancelAllTimers();
emit(state.copyWith(
offers: [],
accepting: false,
acceptedTripId: event.tripId,
));
}
void _onOfferRejected(OfferRejected event, Emitter<OffersState> emit) {
final updated = state.offers.where((o) => o.tripId != event.tripId).toList();
_cancelExpiryTimer(event.tripId);
emit(state.copyWith(offers: updated));
}
void _onClear(OffersClear event, Emitter<OffersState> emit) {
_cancelAllTimers();
emit(const OffersState());
}
// ─── مساعدات المؤقتات ───
void _startExpiryTimer(TripOfferModel offer) {
final remaining = offer.expiresAt.difference(DateTime.now());
if (remaining.isNegative) {
add(OfferExpired(offer.tripId));
return;
}
_expiryTimers[offer.tripId]?.cancel();
_expiryTimers[offer.tripId] = Timer(remaining, () {
add(OfferExpired(offer.tripId));
});
}
void _cancelExpiryTimer(String tripId) {
_expiryTimers[tripId]?.cancel();
_expiryTimers.remove(tripId);
}
void _cancelAllTimers() {
for (final timer in _expiryTimers.values) {
timer.cancel();
}
_expiryTimers.clear();
}
@override
Future<void> close() {
_cancelAllTimers();
_merger.dispose();
return super.close();
}
}
apps/driver-archive-cubit/lib/features/offers/data/offers_repository.dart
+41
View File
@@ -0,0 +1,41 @@
import 'package:driver/core/api/api_client.dart';
import 'package:driver/features/trip/data/models/driver_trip_model.dart';
/// مستودع عروض ورحلات السائق — يُستخدم من OffersBloc وDriverTripBloc.
class OffersRepository {
final ApiClient _api;
OffersRepository(this._api);
/// `GET /trips/available` — جلب الرحلات المتاحة.
Future<List<DriverTripModel>> getAvailableTrips() async {
try {
final r = await _api.dio.get('/trips/available');
final items = (r.data['items'] ?? r.data) as List;
return items
.map((j) => DriverTripModel.fromJson(j as Map<String, dynamic>))
.toList();
} catch (_) {
return [];
}
}
/// `POST /trips/:id/accept` — قبول عرض الرحلة.
Future<DriverTripModel?> acceptTrip(String tripId) async {
try {
final r = await _api.dio.post('/trips/$tripId/accept');
return DriverTripModel.fromJson(r.data as Map<String, dynamic>);
} catch (_) {
return null;
}
}
/// `POST /trips/:id/cancel` — إلغاء رحلة مقبولة.
Future<DriverTripModel?> cancelTrip(String tripId) async {
try {
final r = await _api.dio.post('/trips/$tripId/cancel');
return DriverTripModel.fromJson(r.data as Map<String, dynamic>);
} catch (_) {
return null;
}
}
}
apps/driver-archive-cubit/lib/features/settings/cubit/settings_cubit.dart
+38
View File
@@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'settings_state.dart';
/// الإعدادات العامة: الثيم + اللغة.
/// يُحفظ محلياً عبر SharedPreferences (ليس سراً — docs/26 §4).
class SettingsCubit extends Cubit<SettingsState> {
static const _kThemeKey = 'settings_theme_mode';
static const _kLocaleKey = 'settings_locale';
SettingsCubit() : super(const SettingsState()) {
_load();
}
Future<void> _load() async {
final prefs = await SharedPreferences.getInstance();
final themeIndex = prefs.getInt(_kThemeKey) ?? 0;
final localeCode = prefs.getString(_kLocaleKey) ?? 'ar';
emit(state.copyWith(
themeMode: ThemeMode.values[themeIndex],
locale: Locale(localeCode),
));
}
Future<void> setThemeMode(ThemeMode mode) async {
emit(state.copyWith(themeMode: mode));
final prefs = await SharedPreferences.getInstance();
await prefs.setInt(_kThemeKey, mode.index);
}
Future<void> setLocale(Locale locale) async {
emit(state.copyWith(locale: locale));
final prefs = await SharedPreferences.getInstance();
await prefs.setString(_kLocaleKey, locale.languageCode);
}
}
apps/driver-archive-cubit/lib/features/settings/cubit/settings_state.dart
+31
View File
@@ -0,0 +1,31 @@
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
enum SettingsStatus { loaded, error }
class SettingsState extends Equatable {
final SettingsStatus status;
final ThemeMode themeMode;
final Locale locale;
const SettingsState({
this.status = SettingsStatus.loaded,
this.themeMode = ThemeMode.system,
this.locale = const Locale('ar'),
});
SettingsState copyWith({
SettingsStatus? status,
ThemeMode? themeMode,
Locale? locale,
}) {
return SettingsState(
status: status ?? this.status,
themeMode: themeMode ?? this.themeMode,
locale: locale ?? this.locale,
);
}
@override
List<Object?> get props => [status, themeMode, locale];
}
apps/driver-archive-cubit/lib/features/trip/bloc/driver_trip_bloc.dart
+285
View File
@@ -0,0 +1,285 @@
import 'dart:async';
import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../data/driver_trip_repository.dart';
import '../data/driver_socket_service.dart';
import '../data/trip_event_merger.dart';
import 'package:driver/features/trip/data/models/driver_trip_model.dart';
// ─── أحداث ───
sealed class DriverTripEvent extends Equatable {
const DriverTripEvent();
@override
List<Object?> get props => [];
}
/// فحص رحلة نشطة عند بدء التشغيل.
class DriverTripCheckActive extends DriverTripEvent {
const DriverTripCheckActive();
}
/// تم قبول رحلة (من OffersBloc).
class DriverTripAccepted extends DriverTripEvent {
final DriverTripModel trip;
const DriverTripAccepted(this.trip);
@override
List<Object?> get props => [trip.id];
}
/// تحديث حالة من WebSocket أو FCM.
class DriverTripUpdateReceived extends DriverTripEvent {
final String tripId;
final String status;
final Map<String, dynamic> extra;
const DriverTripUpdateReceived({
required this.tripId,
required this.status,
this.extra = const {},
});
@override
List<Object?> get props => [tripId, status];
}
/// تغيير الحالة يدوياً (من زر السائق).
class DriverTripStatusChanged extends DriverTripEvent {
final String status;
const DriverTripStatusChanged(this.status);
@override
List<Object?> get props => [status];
}
/// إلغاء الرحلة من السائق.
class DriverTripCancelRequested extends DriverTripEvent {
const DriverTripCancelRequested();
}
/// مسح الرحلة من الذاكرة.
class DriverTripClear extends DriverTripEvent {
const DriverTripClear();
}
// ─── حالة ───
class DriverTripState extends Equatable {
final DriverTripModel? trip;
final bool loading;
final String? error;
final bool cancelled;
const DriverTripState({
this.trip,
this.loading = false,
this.error,
this.cancelled = false,
});
DriverTripState copyWith({
DriverTripModel? trip,
bool? loading,
String? error,
bool? cancelled,
bool clearError = false,
}) {
return DriverTripState(
trip: trip ?? this.trip,
loading: loading ?? this.loading,
error: clearError ? null : (error ?? this.error),
cancelled: cancelled ?? this.cancelled,
);
}
/// هل هناك رحلة نشطة؟
bool get hasActiveTrip {
if (trip == null) return false;
return !['completed', 'paid', 'cancelled', 'expired']
.contains(trip!.status);
}
/// الحالة التالية المتوقعة للسائق.
String? get nextStatus {
if (trip == null) return null;
switch (trip!.status) {
case 'assigned':
return 'driver_arriving';
case 'driver_arriving':
return 'driver_arrived';
case 'driver_arrived':
return 'in_progress';
case 'in_progress':
return 'completed';
default:
return null;
}
}
/// هل يمكن للسائق إلغاء الرحلة حالياً؟
bool get canCancel {
if (trip == null) return false;
return ['assigned', 'driver_arriving'].contains(trip!.status);
}
@override
List<Object?> get props => [trip, loading, error, cancelled];
}
// ─── Bloc ───
/// DriverTripBloc — يدير دورة حياة الرحلة من وجهة نظر السائق.
///
/// الحالات: assigned → driver_arriving → driver_arrived → in_progress → completed
class DriverTripBloc extends Bloc<DriverTripEvent, DriverTripState> {
final DriverTripRepository _tripRepo;
final DriverSocketService _socket;
final DriverTripEventMerger _merger;
Timer? _reconciliationTimer;
DriverTripBloc({
required DriverTripRepository tripRepo,
required DriverSocketService socket,
DriverTripEventMerger? merger,
}) : _tripRepo = tripRepo,
_socket = socket,
_merger = merger ?? DriverTripEventMerger(),
super(const DriverTripState()) {
on<DriverTripCheckActive>(_onCheckActive);
on<DriverTripAccepted>(_onAccepted);
on<DriverTripUpdateReceived>(_onUpdateReceived);
on<DriverTripStatusChanged>(_onStatusChanged);
on<DriverTripCancelRequested>(_onCancel);
on<DriverTripClear>(_onClear);
// استمع لتحديثات Merger.
_merger.updateStream.listen((update) {
add(DriverTripUpdateReceived(
tripId: update.tripId,
status: update.status,
extra: update.extra,
));
});
}
Future<void> _onCheckActive(
DriverTripCheckActive event, Emitter<DriverTripState> emit) async {
emit(state.copyWith(loading: true));
try {
final trip = await _tripRepo.getTrip('me'); // backend يُعيد الرحلة النشطة للسائق
if (trip != null && trip.status != 'completed' && trip.status != 'paid') {
emit(state.copyWith(trip: trip, loading: false));
_joinTripRoom(trip.id);
_startReconciliation(trip.id);
} else {
emit(state.copyWith(loading: false));
}
} catch (_) {
emit(state.copyWith(loading: false));
}
}
void _onAccepted(DriverTripAccepted event, Emitter<DriverTripState> emit) {
emit(state.copyWith(trip: event.trip));
_joinTripRoom(event.trip.id);
_startReconciliation(event.trip.id);
}
void _onUpdateReceived(
DriverTripUpdateReceived event, Emitter<DriverTripState> emit) {
final currentTrip = state.trip;
if (currentTrip == null || currentTrip.id != event.tripId) return;
// تصفية صامتة: تجاهل الحالات القديمة.
if (isTerminalStatus(event.status)) {
emit(state.copyWith(
trip: currentTrip.copyWith(status: event.status),
));
_stopReconciliation();
_socket.leaveTrip(event.tripId);
return;
}
emit(state.copyWith(
trip: currentTrip.copyWith(status: event.status),
clearError: true,
));
}
Future<void> _onStatusChanged(
DriverTripStatusChanged event, Emitter<DriverTripState> emit) async {
if (state.trip == null) return;
emit(state.copyWith(loading: true, clearError: true));
final trip = await _tripRepo.updateStatus(state.trip!.id, event.status);
if (trip == null) {
emit(state.copyWith(loading: false, error: 'Failed to update status'));
return;
}
emit(state.copyWith(trip: trip, loading: false));
if (isTerminalStatus(trip.status)) {
_stopReconciliation();
_socket.leaveTrip(trip.id);
}
}
Future<void> _onCancel(
DriverTripCancelRequested event, Emitter<DriverTripState> emit) async {
if (state.trip == null) return;
emit(state.copyWith(loading: true, clearError: true));
final trip = await _tripRepo.cancelTrip(state.trip!.id);
if (trip == null) {
emit(state.copyWith(loading: false, error: 'Failed to cancel trip'));
return;
}
emit(state.copyWith(trip: trip, cancelled: true, loading: false));
_stopReconciliation();
_socket.leaveTrip(trip.id);
}
void _onClear(DriverTripClear event, Emitter<DriverTripState> emit) {
_stopReconciliation();
emit(const DriverTripState());
}
// ─── مساعدات ───
void _joinTripRoom(String tripId) {
_socket.joinTrip(tripId);
}
void _startReconciliation(String tripId) {
_stopReconciliation();
_reconciliationTimer = Timer.periodic(const Duration(seconds: 25), (_) async {
try {
final trip = await _tripRepo.getTrip(tripId);
if (trip != null) {
add(DriverTripUpdateReceived(
tripId: trip.id,
status: trip.status,
));
}
} catch (_) {}
});
}
void _stopReconciliation() {
_reconciliationTimer?.cancel();
_reconciliationTimer = null;
}
@override
Future<void> close() {
_stopReconciliation();
_merger.dispose();
return super.close();
}
}
/// هل هذه الحالة نهائية؟
bool isTerminalStatus(String status) {
return status == 'cancelled' || status == 'expired' || status == 'paid' || status == 'completed';
}
apps/driver-archive-cubit/lib/features/trip/data/driver_socket_service.dart
+117
View File
@@ -0,0 +1,117 @@
import 'dart:async';
import 'package:socket_io_client/socket_io_client.dart' as io;
import '../../../core/config.dart';
import '../../../core/storage/token_store.dart';
import '../../home/data/models/trip_offer_model.dart';
import 'trip_event_merger.dart';
/// خدمة WebSocket للسائق — تتصل بالسيرفر وتستقبل:
/// - `trip:offer` — عرض رحلة وارد
/// - `trip:offer_taken` — تم قبول العرض (من سائق آخر)
/// - `trip:update` — تحديث حالة الرحلة النشطة
/// - `trip:new` — رحلة جديدة متاحة
class DriverSocketService {
final TokenStore _tokenStore;
final DriverTripEventMerger _merger;
io.Socket? _socket;
bool _connected = false;
String? _currentTripId;
DriverSocketService(this._tokenStore, this._merger);
/// الاتصال بالخادم.
Future<void> connect() async {
if (_connected) return;
final token = await _tokenStore.access();
if (token == null || token.isEmpty) return;
_socket = io.io(
AppConfig.baseUrl.replaceAll('/api', ''),
io.OptionBuilder()
.setTransports(['websocket'])
.enableAutoConnect()
.enableReconnection()
.setReconnectionDelay(2000)
.setReconnectionAttempts(10)
.setAuth({'token': token})
.build(),
);
_socket!.onConnect((_) {
_connected = true;
});
_socket!.onDisconnect((_) {
_connected = false;
});
_socket!.onReconnect((_) {
if (_currentTripId != null) {
joinTrip(_currentTripId!);
}
});
// استقبال عروض الرحلات الواردة.
_socket!.on('trip:offer', (data) {
if (data is! Map) return;
final map = Map<String, dynamic>.from(data);
_merger.addOffer(TripOfferModel.fromJson(map));
});
// العرض تم قبوله من سائق آخر.
_socket!.on('trip:offer_taken', (data) {
if (data is! Map) return;
final map = Map<String, dynamic>.from(data);
final tripId = map['tripId'] as String?;
if (tripId != null) {
_merger.addOfferTaken(tripId);
}
});
// تحديث حالة الرحلة النشطة.
_socket!.on('trip:update', (data) {
if (data is! Map) return;
final map = Map<String, dynamic>.from(data);
_merger.addUpdate(DriverTripUpdate(
tripId: map['tripId'] as String? ?? '',
status: map['status'] as String? ?? '',
extra: map..remove('tripId')..remove('status'),
));
});
// رحلة جديدة متاحة (إشعار عام).
_socket!.on('trip:new', (data) {
if (data is! Map) return;
final map = Map<String, dynamic>.from(data);
final tripId = map['tripId'] as String?;
if (tripId != null) {
_merger.addNewTrip(tripId);
}
});
_socket!.connect();
}
/// الانضمام لغرفة الرحلة.
void joinTrip(String tripId) {
_currentTripId = tripId;
_socket?.emit('trip:join', {'tripId': tripId});
}
/// مغادرة غرفة الرحلة.
void leaveTrip(String tripId) {
_currentTripId = null;
}
/// قطع الاتصال.
void disconnect() {
_socket?.disconnect();
_socket?.dispose();
_socket = null;
_connected = false;
}
bool get isConnected => _connected;
}
apps/driver-archive-cubit/lib/features/trip/data/driver_trip_repository.dart
+75
View File
@@ -0,0 +1,75 @@
import '../../../core/api/api_client.dart';
import 'models/driver_trip_model.dart';
import 'models/chat_message_model.dart';
/// مستودع رحلة السائق — يُستخدم من DriverTripBloc.
///
/// يشمل تغييرات الحالة ودردشة الرحلة.
class DriverTripRepository {
final ApiClient _api;
DriverTripRepository(this._api);
/// `GET /trips/:id` — جلب رحلة محددة.
Future<DriverTripModel?> getTrip(String tripId) async {
try {
final r = await _api.dio.get('/trips/$tripId');
return DriverTripModel.fromJson(r.data as Map<String, dynamic>);
} catch (_) {
return null;
}
}
/// `PATCH /trips/:id/status` — تغيير حالة الرحلة (status machine).
///
/// الحالات المسموحة للسائق: `driver_arriving`, `driver_arrived`, `in_progress`, `completed`.
Future<DriverTripModel?> updateStatus(String tripId, String status) async {
try {
final r = await _api.dio.patch('/trips/$tripId/status', data: {
'status': status,
});
return DriverTripModel.fromJson(r.data as Map<String, dynamic>);
} catch (_) {
return null;
}
}
/// `POST /trips/:id/cancel` — إلغاء الرحلة من السائق.
Future<DriverTripModel?> cancelTrip(String tripId) async {
try {
final r = await _api.dio.post('/trips/$tripId/cancel');
return DriverTripModel.fromJson(r.data as Map<String, dynamic>);
} catch (_) {
return null;
}
}
/// `GET /chat/:tripId/messages` — جلب سجل الرسائل.
Future<List<ChatMessageModel>> getMessages(String tripId, {String? currentUserId}) async {
try {
final r = await _api.dio.get('/chat/$tripId/messages');
final items = (r.data['items'] ?? r.data) as List;
return items
.map((j) => ChatMessageModel.fromJson(
j as Map<String, dynamic>,
currentUserId: currentUserId,
))
.toList();
} catch (_) {
return [];
}
}
/// `POST /chat/:tripId/send` — إرسال رسالة.
Future<ChatMessageModel?> sendMessage(String tripId, String text,
{String? currentUserId}) async {
try {
final r = await _api.dio.post('/chat/$tripId/send', data: {'text': text});
return ChatMessageModel.fromJson(
r.data as Map<String, dynamic>,
currentUserId: currentUserId,
);
} catch (_) {
return null;
}
}
}
apps/driver-archive-cubit/lib/features/trip/data/fcm_service.dart
+89
View File
@@ -0,0 +1,89 @@
import 'dart:async';
import 'dart:io' show Platform;
import 'package:firebase_messaging/firebase_messaging.dart';
import '../../../core/api/api_client.dart';
import '../../../core/di.dart';
import 'trip_event_merger.dart';
/// القناة الثانية للزمن الحقيقي — FCM data-message (docs/23 §15).
///
/// للسائق: يستقبل عروض الرحلات (trip:offer) وتحديثات الحالة
/// عبر FCM كطبقة احتياطية للسوكت. أيّهما يسبق يفوز —
/// الـ merger يتكفّل بالتصفية الصامتة.
class DriverFcmService {
final DriverTripEventMerger _merger;
StreamSubscription<RemoteMessage>? _onMessageSub;
StreamSubscription<RemoteMessage>? _onOpenSub;
DriverFcmService(this._merger);
Future<void> init() async {
final messaging = FirebaseMessaging.instance;
await messaging.requestPermission(
alert: false,
badge: false,
sound: false,
provisional: false,
);
final token = await messaging.getToken();
if (token != null) {
_registerToken(token);
}
messaging.onTokenRefresh.listen(_registerToken);
_onMessageSub = FirebaseMessaging.onMessage.listen(_handleMessage);
_onOpenSub = FirebaseMessaging.onMessageOpenedApp.listen(_handleMessage);
}
void dispose() {
_onMessageSub?.cancel();
_onOpenSub?.cancel();
}
void _handleMessage(RemoteMessage message) {
final data = message.data;
final type = data['type'] as String?;
final tripId = data['tripId'] as String?;
if (type == null || tripId == null || tripId.isEmpty) return;
switch (type) {
case 'trip_offer':
// عرض رحلة وارد — سيُعالج عبر OffersBloc.
_merger.addNewTrip(tripId);
break;
case 'trip_offer_taken':
// العرض تم قبوله من سائق آخر.
_merger.addOfferTaken(tripId);
break;
default:
// تحديث حالة رحلة نشطة.
final status = type.startsWith('trip_') ? type.substring(5) : null;
if (status == null) return;
final extra = Map<String, dynamic>.from(data)
..remove('type')
..remove('tripId')
..remove('title')
..remove('body');
_merger.addUpdate(DriverTripUpdate(
tripId: tripId,
status: status,
extra: extra,
));
}
}
static Future<void> _registerToken(String token) async {
try {
final api = getIt<ApiClient>();
await api.dio.post('/notifications/token', data: {
'token': token,
'platform': Platform.isIOS ? 'ios' : 'android',
});
} catch (_) {}
}
}
apps/driver-archive-cubit/lib/features/trip/data/models/chat_message_model.dart
+33
View File
@@ -0,0 +1,33 @@
import 'package:equatable/equatable.dart';
/// نموذج رسالة الدردشة — من `GET /chat/:tripId/messages` و`POST /chat/:tripId/send`.
class ChatMessageModel extends Equatable {
final String id;
final String tripId;
final String senderId;
final String text;
final DateTime createdAt;
final bool isMe;
const ChatMessageModel({
required this.id,
required this.tripId,
required this.senderId,
required this.text,
required this.createdAt,
required this.isMe,
});
factory ChatMessageModel.fromJson(Map<String, dynamic> j, {String? currentUserId}) =>
ChatMessageModel(
id: j['id'] as String,
tripId: (j['tripId'] ?? '') as String,
senderId: j['senderId'] as String,
text: j['text'] as String,
createdAt: DateTime.parse(j['createdAt'] as String),
isMe: j['senderId'] == currentUserId,
);
@override
List<Object?> get props => [id, tripId, senderId, text, createdAt];
}
apps/driver-archive-cubit/lib/features/trip/data/models/driver_trip_model.dart
+93
View File
@@ -0,0 +1,93 @@
import 'package:equatable/equatable.dart';
/// نموذج الرحلة من وجهة نظر السائق — من `GET /trips/available` وتحديثات WebSocket.
class DriverTripModel extends Equatable {
final String id;
final String status;
final String? clientId;
final String? clientName;
final String? clientPhone;
final double pickupLat;
final double pickupLng;
final String? pickupAddress;
final double dropoffLat;
final double dropoffLng;
final String? dropoffAddress;
final String vehicleClass;
final num? fare;
final String? currency;
final String? paymentMethod;
final DateTime? createdAt;
final DateTime? updatedAt;
const DriverTripModel({
required this.id,
required this.status,
this.clientId,
this.clientName,
this.clientPhone,
required this.pickupLat,
required this.pickupLng,
this.pickupAddress,
required this.dropoffLat,
required this.dropoffLng,
this.dropoffAddress,
required this.vehicleClass,
this.fare,
this.currency,
this.paymentMethod,
this.createdAt,
this.updatedAt,
});
factory DriverTripModel.fromJson(Map<String, dynamic> j) => DriverTripModel(
id: j['id'] as String,
status: j['status'] as String,
clientId: j['clientId'] as String?,
clientName: j['clientName'] as String?,
clientPhone: j['clientPhone'] as String?,
pickupLat: (j['pickup']?['lat'] ?? j['pickupLat'] ?? 0).toDouble(),
pickupLng: (j['pickup']?['lng'] ?? j['pickupLng'] ?? 0).toDouble(),
pickupAddress: (j['pickup']?['address'] ?? j['pickupAddress']) as String?,
dropoffLat: (j['dropoff']?['lat'] ?? j['dropoffLat'] ?? 0).toDouble(),
dropoffLng: (j['dropoff']?['lng'] ?? j['dropoffLng'] ?? 0).toDouble(),
dropoffAddress: (j['dropoff']?['address'] ?? j['dropoffAddress']) as String?,
vehicleClass: (j['vehicleClass'] ?? '') as String,
fare: (j['fare'] as num?),
currency: j['currency'] as String?,
paymentMethod: j['paymentMethod'] as String?,
createdAt: j['createdAt'] != null ? DateTime.tryParse(j['createdAt'] as String) : null,
updatedAt: j['updatedAt'] != null ? DateTime.tryParse(j['updatedAt'] as String) : null,
);
DriverTripModel copyWith({
String? status,
String? clientName,
String? clientPhone,
num? fare,
String? currency,
}) {
return DriverTripModel(
id: id,
status: status ?? this.status,
clientId: clientId,
clientName: clientName ?? this.clientName,
clientPhone: clientPhone ?? this.clientPhone,
pickupLat: pickupLat,
pickupLng: pickupLng,
pickupAddress: pickupAddress,
dropoffLat: dropoffLat,
dropoffLng: dropoffLng,
dropoffAddress: dropoffAddress,
vehicleClass: vehicleClass,
fare: fare ?? this.fare,
currency: currency ?? this.currency,
paymentMethod: paymentMethod,
createdAt: createdAt,
updatedAt: DateTime.now(),
);
}
@override
List<Object?> get props => [id, status, clientId, vehicleClass, fare];
}
apps/driver-archive-cubit/lib/features/trip/data/trip_event_merger.dart
+92
View File
@@ -0,0 +1,92 @@
import 'dart:async';
import '../../home/data/models/trip_offer_model.dart';
/// تحديث حالة رحلة من WebSocket (للسائق).
class DriverTripUpdate {
final String tripId;
final String status;
final Map<String, dynamic> extra;
const DriverTripUpdate({
required this.tripId,
required this.status,
this.extra = const {},
});
}
/// محول أحداث WebSocket للسائق — يدعم:
/// - عروض الرحلات (`trip:offer`)
/// - إلغاء العروض (`trip:offer_taken`)
/// - تحديثات الحالة (`trip:update`)
/// - رحلات جديدة (`trip:new`)
///
/// التصفية الصامتة تتم بترتيب الحالات (docs/23 §15).
int _statusOrder(String s) {
switch (s) {
case 'assigned':
return 0;
case 'driver_arriving':
return 1;
case 'driver_arrived':
return 2;
case 'in_progress':
return 3;
case 'completed':
return 4;
case 'paid':
return 5;
default:
return -1; // cancelled, expired
}
}
class DriverTripEventMerger {
final _offerController = StreamController<TripOfferModel>.broadcast();
final _offerTakenController = StreamController<String>.broadcast();
final _updateController = StreamController<DriverTripUpdate>.broadcast();
final _newTripController = StreamController<String>.broadcast();
/// الحالة المعروضة حالياً لكل رحلة.
final Map<String, int> _currentOrder = {};
Stream<TripOfferModel> get offerStream => _offerController.stream;
Stream<String> get offerTakenStream => _offerTakenController.stream;
Stream<DriverTripUpdate> get updateStream => _updateController.stream;
Stream<String> get newTripStream => _newTripController.stream;
/// استقبال عرض رحلة وارد.
void addOffer(TripOfferModel offer) {
_offerController.add(offer);
}
/// العرض تم قبوله من سائق آخر.
void addOfferTaken(String tripId) {
_offerTakenController.add(tripId);
}
/// تحديث حالة رحلة نشطة.
void addUpdate(DriverTripUpdate update) {
final newOrder = _statusOrder(update.status);
final currentOrder = _currentOrder[update.tripId] ?? -1;
if (newOrder >= 0 && newOrder <= currentOrder) return;
if (newOrder >= 0) {
_currentOrder[update.tripId] = newOrder;
}
_updateController.add(update);
}
/// إشعار برحلة جديدة متاحة.
void addNewTrip(String tripId) {
_newTripController.add(tripId);
}
void dispose() {
_offerController.close();
_offerTakenController.close();
_updateController.close();
_newTripController.close();
}
}
apps/driver-archive-cubit/lib/features/trip/view/driver_chat_screen.dart
+212
View File
@@ -0,0 +1,212 @@
import 'package:flutter/material.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import '../../../core/design/tokens.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../../trip/data/driver_trip_repository.dart';
import '../../trip/data/models/chat_message_model.dart';
import '../../../core/storage/token_store.dart';
import '../../../core/di.dart';
/// شاشة دردشة السائق مع العميل داخل الرحلة.
///
/// تُستخدم من شاشة تنفيذ الرحلة (Q4).
class DriverChatScreen extends StatefulWidget {
final String tripId;
const DriverChatScreen({super.key, required this.tripId});
@override
State<DriverChatScreen> createState() => _DriverChatScreenState();
}
class _DriverChatScreenState extends State<DriverChatScreen> {
final TextEditingController _controller = TextEditingController();
final ScrollController _scrollController = ScrollController();
late final DriverTripRepository _repo;
List<ChatMessageModel> _messages = [];
bool _loading = true;
bool _sending = false;
@override
void initState() {
super.initState();
_repo = DriverTripRepository(getIt());
_loadMessages();
}
Future<void> _loadMessages() async {
final userId = await getIt<TokenStore>().access();
final messages = await _repo.getMessages(widget.tripId, currentUserId: userId);
if (mounted) {
setState(() {
_messages = messages;
_loading = false;
});
_scrollToBottom();
}
}
Future<void> _sendMessage() async {
final text = _controller.text.trim();
if (text.isEmpty || _sending) return;
setState(() => _sending = true);
_controller.clear();
final userId = await getIt<TokenStore>().access();
final msg = await _repo.sendMessage(widget.tripId, text, currentUserId: userId);
if (msg != null && mounted) {
setState(() => _messages.add(msg));
_scrollToBottom();
}
if (mounted) setState(() => _sending = false);
}
void _scrollToBottom() {
Future.delayed(const Duration(milliseconds: 100), () {
if (_scrollController.hasClients) {
_scrollController.animateTo(
_scrollController.position.maxScrollExtent,
duration: const Duration(milliseconds: 200),
curve: Curves.easeOut,
);
}
});
}
@override
void dispose() {
_controller.dispose();
_scrollController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final cs = Theme.of(context).colorScheme;
return Scaffold(
appBar: AppBar(
title: Text(l10n.chat),
),
body: Column(
children: [
// الرسائل
Expanded(
child: _loading
? const Center(child: CircularProgressIndicator())
: _messages.isEmpty
? Center(
child: Text(
l10n.noMessagesYet,
style: TextStyle(color: cs.onSurfaceVariant),
),
)
: ListView.builder(
controller: _scrollController,
padding: const EdgeInsets.all(T.s16),
itemCount: _messages.length,
itemBuilder: (context, index) {
final msg = _messages[index];
return _MessageBubble(message: msg);
},
),
),
// حقل الإرسال
Container(
padding: const EdgeInsets.all(T.s12),
decoration: BoxDecoration(
color: cs.surface,
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.05),
blurRadius: 8,
offset: const Offset(0, -2),
),
],
),
child: SafeArea(
child: Row(
children: [
Expanded(
child: TripzTextField(
controller: _controller,
hint: l10n.typeMessage,
onSubmitted: (_) => _sendMessage(),
),
),
const SizedBox(width: T.s8),
IconButton(
onPressed: _sending ? null : _sendMessage,
icon: _sending
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: Icon(Icons.send, color: cs.primary),
),
],
),
),
),
],
),
);
}
}
class _MessageBubble extends StatelessWidget {
final ChatMessageModel message;
const _MessageBubble({required this.message});
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return Align(
alignment: message.isMe ? Alignment.centerRight : Alignment.centerLeft,
child: Container(
margin: const EdgeInsets.only(bottom: T.s8),
padding: const EdgeInsets.symmetric(
horizontal: T.s12,
vertical: T.s8,
),
constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width * 0.75,
),
decoration: BoxDecoration(
color: message.isMe ? cs.primary : cs.surfaceContainerHighest,
borderRadius: BorderRadius.circular(T.r12).copyWith(
bottomRight: message.isMe ? const Radius.circular(4) : null,
bottomLeft: !message.isMe ? const Radius.circular(4) : null,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
message.text,
style: TextStyle(
color: message.isMe ? cs.onPrimary : cs.onSurface,
),
),
const SizedBox(height: 2),
Text(
'${message.createdAt.hour.toString().padLeft(2, '0')}:${message.createdAt.minute.toString().padLeft(2, '0')}',
style: TextStyle(
fontSize: 10,
color: message.isMe
? cs.onPrimary.withValues(alpha: 0.7)
: cs.onSurfaceVariant,
),
),
],
),
),
);
}
}
apps/driver-archive-cubit/lib/features/trip/view/driver_trip_screen.dart
+260
View File
@@ -0,0 +1,260 @@
import 'package:flutter/material.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:intaleq_maps/intaleq_maps.dart';
import '../../../core/design/tokens.dart';
import '../../trip/bloc/driver_trip_bloc.dart';
import 'widgets/trip_action_button.dart';
/// شاشة تنفيذ الرحلة — تتبع السائق أثناء تنفيذ الرحلة.
///
/// الحالات:
/// - `assigned`: عرض pickup + زر "في الطريق"
/// - `driver_arriving`: تتبع المسار إلى العميل
/// - `driver_arrived`: انتظار العميل + زر "بدء الرحلة"
/// - `in_progress`: تتبع المسار إلى dropoff + زر "إتمام"
class DriverTripScreen extends StatelessWidget {
const DriverTripScreen({super.key});
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final cs = Theme.of(context).colorScheme;
return BlocBuilder<DriverTripBloc, DriverTripState>(
builder: (context, state) {
if (state.trip == null) {
return const Scaffold(
body: Center(child: CircularProgressIndicator()),
);
}
final trip = state.trip!;
final statusLabel = _statusLabel(l10n, trip.status);
return Scaffold(
appBar: AppBar(
title: Text(statusLabel),
centerTitle: true,
automaticallyImplyLeading: false,
actions: [
if (state.canCancel)
TextButton(
onPressed: () => _showCancelDialog(context, l10n),
child: Text(
l10n.cancel,
style: TextStyle(color: cs.error),
),
),
],
),
body: Column(
children: [
// ── الخريطة ──
Expanded(
flex: 3,
child: _buildMap(context, trip),
),
// ── معلومات + زر ──
Expanded(
flex: 2,
child: Container(
padding: const EdgeInsets.all(T.s16),
decoration: BoxDecoration(
color: cs.surface,
borderRadius: const BorderRadius.vertical(
top: Radius.circular(T.r24),
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.08),
blurRadius: 12,
offset: const Offset(0, -4),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// معلومات العميل
if (trip.clientName != null)
Row(
children: [
CircleAvatar(
radius: 20,
backgroundColor: cs.primaryContainer,
child: Icon(Icons.person, color: cs.onPrimaryContainer),
),
const SizedBox(width: T.s12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
trip.clientName!,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.w600,
),
),
if (trip.clientPhone != null)
Text(
trip.clientPhone!,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: cs.onSurfaceVariant,
),
),
],
),
),
],
),
const SizedBox(height: T.s12),
// نقاط pickup/dropoff
_InfoRow(
dotColor: const Color(0xFF4CAF50),
label: trip.pickupAddress ?? l10n.pickupLocation,
),
const SizedBox(height: T.s4),
_InfoRow(
dotColor: const Color(0xFFF44336),
label: trip.dropoffAddress ?? l10n.dropoffLocation,
),
if (trip.fare != null) ...[
const SizedBox(height: T.s8),
Text(
'${l10n.tripFare}: ${trip.fare} ${trip.currency ?? ""}',
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w600,
color: cs.primary,
),
),
],
const Spacer(),
// زر الإجراء التالي
TripActionButton(trip: trip),
if (state.error != null) ...[
const SizedBox(height: T.s8),
Text(
state.error!,
style: TextStyle(color: cs.error, fontSize: 12),
textAlign: TextAlign.center,
),
],
],
),
),
),
],
),
);
},
);
}
Widget _buildMap(BuildContext context, dynamic trip) {
return IntaleqMap(
apiKey: '',
initialCameraPosition: CameraPosition(
target: LatLng(trip.pickupLat, trip.pickupLng),
zoom: 14,
),
myLocationEnabled: true,
myLocationButtonEnabled: false,
zoomControlsEnabled: false,
markers: {
Marker(
markerId: const MarkerId('pickup'),
position: LatLng(trip.pickupLat, trip.pickupLng),
infoWindow: InfoWindow(title: AppLocalizations.of(context)!.pickupLocation),
),
if (trip.dropoffLat != 0 && trip.dropoffLng != 0)
Marker(
markerId: const MarkerId('dropoff'),
position: LatLng(trip.dropoffLat, trip.dropoffLng),
infoWindow: InfoWindow(title: AppLocalizations.of(context)!.dropoffLocation),
),
},
);
}
String _statusLabel(AppLocalizations l10n, String status) {
switch (status) {
case 'assigned':
return l10n.tripAssigned;
case 'driver_arriving':
return l10n.onTheWay;
case 'driver_arrived':
return l10n.arrivedAtPickup;
case 'in_progress':
return l10n.tripInProgress;
case 'completed':
return l10n.tripCompleted;
default:
return l10n.trip;
}
}
void _showCancelDialog(BuildContext context, AppLocalizations l10n) {
final cs = Theme.of(context).colorScheme;
showDialog(
context: context,
builder: (ctx) => AlertDialog(
title: Text(l10n.cancelTrip),
content: Text(l10n.cancelTripConfirm),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx),
child: Text(l10n.no),
),
TextButton(
onPressed: () {
Navigator.pop(ctx);
context.read<DriverTripBloc>().add(const DriverTripCancelRequested());
},
style: TextButton.styleFrom(foregroundColor: cs.error),
child: Text(l10n.yes),
),
],
),
);
}
}
class _InfoRow extends StatelessWidget {
final Color dotColor;
final String label;
const _InfoRow({required this.dotColor, required this.label});
@override
Widget build(BuildContext context) {
return Row(
children: [
Container(
width: 10,
height: 10,
decoration: BoxDecoration(
color: dotColor,
shape: BoxShape.circle,
),
),
const SizedBox(width: T.s8),
Expanded(
child: Text(
label,
style: Theme.of(context).textTheme.bodyMedium,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
);
}
}
apps/driver-archive-cubit/lib/features/trip/view/widgets/trip_action_button.dart
+161
View File
@@ -0,0 +1,161 @@
import 'package:flutter/material.dart';
import 'package:driver/core/l10n/app_localizations.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:driver/core/design/tokens.dart';
import 'package:driver/core/design/tripz_colors.dart';
import 'package:driver/features/trip/bloc/driver_trip_bloc.dart';
/// زر الإجراء التالي في شاشة تنفيذ الرحلة.
///
/// الحالة → الزر:
/// - assigned → "في الطريق" (driver_arriving)
/// - driver_arriving → "وصلت" (driver_arrived)
/// - driver_arrived → "بدء الرحلة" (in_progress)
/// - in_progress → "إتمام" (completed)
class TripActionButton extends StatelessWidget {
final dynamic trip;
const TripActionButton({super.key, required this.trip});
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final cs = Theme.of(context).colorScheme;
final bloc = context.watch<DriverTripBloc>();
final state = bloc.state;
final nextStatus = state.nextStatus;
if (nextStatus == null) return const SizedBox.shrink();
final label = _buttonLabel(l10n, nextStatus);
final color = nextStatus == 'completed'
? context.tripzColors.success
: cs.primary;
return Column(
mainAxisSize: MainAxisSize.min,
children: [
// أزرار ثانوية
Row(
children: [
if (trip.clientPhone != null) ...[
Expanded(
child: _SecondaryButton(
icon: Icons.phone,
label: l10n.callClient,
onTap: () => _launchPhone(trip.clientPhone!),
),
),
const SizedBox(width: T.s8),
],
Expanded(
child: _SecondaryButton(
icon: Icons.chat_bubble_outline,
label: l10n.chat,
onTap: () {
// TODO: Q4 chat screen
},
),
),
],
),
const SizedBox(height: T.s12),
// زر الإجراء الرئيسي
SizedBox(
width: double.infinity,
height: T.buttonHeight,
child: ElevatedButton(
onPressed: state.loading
? null
: () {
bloc.add(DriverTripStatusChanged(nextStatus));
},
style: ElevatedButton.styleFrom(
backgroundColor: color,
foregroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(T.r12),
),
elevation: 0,
),
child: state.loading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: Text(
label,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
),
),
],
);
}
String _buttonLabel(AppLocalizations l10n, String status) {
switch (status) {
case 'driver_arriving':
return l10n.onTheWay;
case 'driver_arrived':
return l10n.arrivedAtPickup;
case 'in_progress':
return l10n.startTrip;
case 'completed':
return l10n.completeTrip;
default:
return status;
}
}
void _launchPhone(String phone) async {
final uri = Uri(scheme: 'tel', path: phone);
if (await canLaunchUrl(uri)) {
await launchUrl(uri);
}
}
}
/// زر ثانوي صغير.
class _SecondaryButton extends StatelessWidget {
final IconData icon;
final String label;
final VoidCallback onTap;
const _SecondaryButton({
required this.icon,
required this.label,
required this.onTap,
});
@override
Widget build(BuildContext context) {
return OutlinedButton(
onPressed: onTap,
style: OutlinedButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(T.r12),
),
minimumSize: const Size(0, T.buttonHeight),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(icon, size: 18),
const SizedBox(width: T.s4),
Text(label),
],
),
);
}
}
apps/driver-archive-cubit/lib/firebase_options.dart
+90
View File
@@ -0,0 +1,90 @@
// File generated by FlutterFire CLI.
// ignore_for_file: type=lint
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
show defaultTargetPlatform, kIsWeb, TargetPlatform;
/// Default [FirebaseOptions] for use with your Firebase apps.
///
/// Example:
/// ```dart
/// import 'firebase_options.dart';
/// // ...
/// await Firebase.initializeApp(
/// options: DefaultFirebaseOptions.currentPlatform,
/// );
/// ```
class DefaultFirebaseOptions {
static FirebaseOptions get currentPlatform {
if (kIsWeb) {
return web;
}
switch (defaultTargetPlatform) {
case TargetPlatform.android:
return android;
case TargetPlatform.iOS:
return ios;
case TargetPlatform.macOS:
return macos;
case TargetPlatform.windows:
return windows;
case TargetPlatform.linux:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for linux - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
default:
throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.',
);
}
}
static const FirebaseOptions android = FirebaseOptions(
apiKey: 'AIzaSyCPew9iGolLyI8f-uZUD7QhG4IE0hl20LU',
appId: '1:139325012385:android:a272f0c9aea4e03d9fb3e0',
messagingSenderId: '139325012385',
projectId: 'tripz-7883a',
storageBucket: 'tripz-7883a.firebasestorage.app',
);
static const FirebaseOptions ios = FirebaseOptions(
apiKey: 'AIzaSyB6chzJf14YXUM9wWXIGNLlHfmNg5Jrw6E',
appId: '1:139325012385:ios:a8221368551c6ef59fb3e0',
messagingSenderId: '139325012385',
projectId: 'tripz-7883a',
storageBucket: 'tripz-7883a.firebasestorage.app',
iosBundleId: 'com.sefer.driver',
);
static const FirebaseOptions web = FirebaseOptions(
apiKey: 'AIzaSyAVtyV7YVMeLbwA1UlNPxV9FhCzT0kjeAE',
appId: '1:594687661098:web:62d8388476ec91ec595f53',
messagingSenderId: '594687661098',
projectId: 'ride-b1bd8',
authDomain: 'ride-b1bd8.firebaseapp.com',
storageBucket: 'ride-b1bd8.appspot.com',
measurementId: 'G-Y3HFEC6F4N',
);
static const FirebaseOptions macos = FirebaseOptions(
apiKey: 'AIzaSyCf2mW2h0HD8ZYjwh4VOa2ladw6MJkCDTM',
appId: '1:594687661098:ios:6f69eee1449be943595f53',
messagingSenderId: '594687661098',
projectId: 'ride-b1bd8',
storageBucket: 'ride-b1bd8.appspot.com',
androidClientId:
'594687661098-2dhoogl7be9phobfbu8bbg1sj567iv88.apps.googleusercontent.com',
iosClientId:
'594687661098-8e26699cris2k3nj5msj1osi59it9kpf.apps.googleusercontent.com',
iosBundleId: 'com.mobileapp.store.ride',
);
static const FirebaseOptions windows = FirebaseOptions(
apiKey: 'AIzaSyAVtyV7YVMeLbwA1UlNPxV9FhCzT0kjeAE',
appId: '1:594687661098:web:d9f43a2091395d87595f53',
messagingSenderId: '594687661098',
projectId: 'ride-b1bd8',
authDomain: 'ride-b1bd8.firebaseapp.com',
storageBucket: 'ride-b1bd8.appspot.com',
measurementId: 'G-C3DWQ8Z062',
);
}
apps/driver-archive-cubit/lib/main.dart
+16
View File
@@ -0,0 +1,16 @@
import 'package:flutter/material.dart';
import 'package:firebase_core/firebase_core.dart';
import 'firebase_options.dart';
import 'core/di.dart';
import 'app.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
try {
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
} catch (_) {
// لا نُسقط الإقلاع لو تعذّر Firebase
}
await setupDi();
runApp(const TripzDriverApp());
}