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

feat(apps): ثيم سيرو ومفتاح الدولة والعراق

Browse Source 
## الثيم مقرَّب من سيرو (قرار المالك 2026-08-05)
- البذرة صارت كحليّ سيرو #1A2340 بدل الأزرق العام، والثانوي #8C9CF8
- fromSeed وحدها تنتج من بذرة داكنة أسطحاً باهتة، فثُبّت الأساسي والثانوي
  والأسطح صراحةً وتُرك الباقي للمشتقّ — شكل سيرو مع تباين M3
- الأدوار الدلالية بأرقام سيرو الميدانية: نجاح #22C55E · تحذير #F59E0B ·
  خطأ #EF4444، وبطاقة الليلي #2C2C2E

## مفتاح الدولة عاد
core/ui/phone_field.dart — النمط المجرَّب في سيرو، لكن بلا intl_phone_field:
تلك الحزمة تحمل 240 دولة ونحتاج أربعاً. CountryCode صريح ومقصور على أسواقنا.
- الاختيار من ورقة سفلية لا قائمة منسدلة: أهداف لمس أكبر وأربع دول لا مئتان
- الترتيب يبدأ بحزمة دولة المستأجر — الأردنيّ يرى الأردن أولاً بلا بحث
- الرقم يُرسل كاملاً بالمفتاح بلا + (962790000001) كما يقبله الخادم
- التحقّق صار بطول الدولة لا برقم ثابت: jo/sy تسع خانات، eg/iq عشر

## العراق
- CountryCode.iraq (+964) في قائمة الهاتف
- قنوات دفعه: زين كاش · كي كارد · نقد
⚠️ الباك إند لا يعرف حزمة `iq`: default-tariffs.ts فيه jo/sy/eg فقط، فمستأجر
عراقي يُزوَّد بلا أي تعرفة. موثَّق في الكود — وهو شغل خادم يسبق أي إطلاق عراقي.

flutter analyze نظيف في التطبيقين.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
2026-08-05 01:08:18 +03:00
co-authored by Claude Opus 5
parent 3a8caf7b27
commit e22cc5c7e4
128 changed files with 684 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/rider_new/lib/features/auth/cubit/login_cubit.dart
+14 -11
View File
@@ -1,22 +1,16 @@
import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:geolocator/geolocator.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../../core/api/api_exception.dart';
import '../../../core/api/api_failure.dart';
import '../../../core/config.dart';
import '../../../core/payments/country_codes.dart';
import '../data/auth_repository.dart';
import 'login_state.dart';
import 'phone_error.dart';
/// تدفّق الدخول كاملاً: الشروط ← إذن الموقع ← الهاتف ← الرمز.
@@ -121,6 +115,15 @@ class LoginCubit extends Cubit<LoginState> {
// ── الهاتف ─────────────────────────────────────────────────────────────
/// يُنادى عند الإقلاع بحزمة دولة المستأجر — فيرى الأردنيُّ الأردن أولاً.
void applyTenantCountry(String countryPack) {
if (state.phone.isNotEmpty) return; // لا نغيّر اختياراً واعياً للمستخدم
emit(state.copyWith(country: CountryCode.fromPack(countryPack)));
}
void countryChanged(CountryCode country) =>
emit(state.copyWith(country: country, clearPhoneError: true));
void phoneChanged(String value) {
emit(state.copyWith(
phone: value,
@@ -130,14 +133,14 @@ class LoginCubit extends Cubit<LoginState> {
}
Future<void> submitPhone() async {
final error = validatePhone(state.phone);
final error = validatePhone(state.phone, state.country);
if (error != null) {
emit(state.copyWith(phoneError: error));
return;
}
emit(state.copyWith(status: LoginStatus.submitting, clearFailure: true));
try {
await _repo.sendOtp(state.phone.trim());
await _repo.sendOtp(state.e164);
emit(state.copyWith(status: LoginStatus.idle, step: LoginStep.otp));
_startResendCountdown();
} on ApiException catch (e) {
@@ -164,7 +167,7 @@ class LoginCubit extends Cubit<LoginState> {
if (!state.canResend) return;
emit(state.copyWith(status: LoginStatus.submitting, clearFailure: true));
try {
await _repo.sendOtp(state.phone.trim());
await _repo.sendOtp(state.e164);
emit(state.copyWith(status: LoginStatus.idle));
_startResendCountdown();
} on ApiException catch (e) {
@@ -182,7 +185,7 @@ class LoginCubit extends Cubit<LoginState> {
if (code.length != AppConfig.otpLength) return;
emit(state.copyWith(status: LoginStatus.submitting, clearFailure: true));
try {
final user = await _repo.verifyOtp(phone: state.phone.trim(), code: code);
final user = await _repo.verifyOtp(phone: state.e164, code: code);
_resendTimer?.cancel();
emit(state.copyWith(
status: LoginStatus.success,
apps/rider_new/lib/features/auth/cubit/login_state.dart
+12 -2
View File
@@ -1,9 +1,8 @@
import 'package:equatable/equatable.dart';
import '../../../core/api/api_failure.dart';
import '../../../core/payments/country_codes.dart';
import '../../../core/session/app_user.dart';
import 'phone_error.dart';
/// خطوات الدخول بالترتيب الميداني المثبت في سيرو (docs/39 §2): بوابتان
@@ -17,6 +16,7 @@ class LoginState extends Equatable {
this.step = LoginStep.agreement,
this.status = LoginStatus.idle,
this.phone = '',
this.country = CountryCode.jordan,
this.agreed = false,
this.failure,
this.phoneError,
@@ -31,6 +31,13 @@ class LoginState extends Equatable {
/// الرقم كما أدخله المستخدم — الخادم يطبّعه، فلا نطبّعه نحن (docs/38 §2).
final String phone;
/// الدولة المختارة — تحدّد المفتاح الدولي وطول التحقّق. تُبدأ من
/// `countryPack` المستأجر لا من لغة الجهاز.
final CountryCode country;
/// ما يُرسل للخادم: المفتاح + الرقم بلا `+` (`962790000001`).
String get e164 => '${country.dial}${phone.trim()}';
final bool agreed;
final ApiFailure? failure;
final PhoneError? phoneError;
@@ -51,6 +58,7 @@ class LoginState extends Equatable {
LoginStep? step,
LoginStatus? status,
String? phone,
CountryCode? country,
bool? agreed,
ApiFailure? failure,
PhoneError? phoneError,
@@ -64,6 +72,7 @@ class LoginState extends Equatable {
step: step ?? this.step,
status: status ?? this.status,
phone: phone ?? this.phone,
country: country ?? this.country,
agreed: agreed ?? this.agreed,
failure: clearFailure ? null : (failure ?? this.failure),
phoneError: clearPhoneError ? null : (phoneError ?? this.phoneError),
@@ -79,6 +88,7 @@ class LoginState extends Equatable {
step,
status,
phone,
country,
agreed,
failure,
phoneError,
apps/rider_new/lib/features/auth/cubit/phone_error.dart
+6 -2
View File
@@ -1,11 +1,15 @@
import '../../../core/payments/country_codes.dart';
/// أخطاء تحقّق **محليّة** لرقم الهاتف — تُكتشف قبل أي نداء شبكة.
/// الشروط الثلاثة منقولة من التحقّق المطبَّق ميدانياً في سيرو (docs/39 §2).
enum PhoneError { empty, leadingZero, tooShort }
PhoneError? validatePhone(String raw) {
/// الطول المتوقّع من **الدولة المختارة** لا رقماً ثابتاً: الأردن وسوريا 9
/// خانات، ومصر والعراق 10.
PhoneError? validatePhone(String raw, CountryCode country) {
final v = raw.trim();
if (v.isEmpty) return PhoneError.empty;
if (v.startsWith('0')) return PhoneError.leadingZero;
if (v.length < 9) return PhoneError.tooShort;
if (v.length < country.nationalLength) return PhoneError.tooShort;
return null;
}
apps/rider_new/lib/features/auth/data/auth_repository.dart
-3
View File
@@ -1,9 +1,6 @@
import '../../../core/api/api_client.dart';
import '../../../core/session/app_user.dart';
import '../../../core/session/session_source.dart';
import '../../../core/storage/token_store.dart';
/// كل نداءات المصادقة (docs/38 §2). الـCubit لا ينادي Dio مباشرة أبداً
apps/rider_new/lib/features/auth/view/agreement_view.dart
+4 -12
View File
@@ -1,22 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
import '../../../core/ui/form_header.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
/// البوابة الأولى: شاشة كاملة لا حوار، وزر متابعة **معطّل حتى يُؤشَّر**
/// (docs/39 §2). تُحفظ الموافقة فلا تتكرر.
apps/rider_new/lib/features/auth/view/login_page.dart
-8
View File
@@ -1,21 +1,13 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/di.dart';
import '../../../core/session/session_cubit.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
import 'agreement_view.dart';
import 'otp_view.dart';
import 'permission_view.dart';
import 'phone_view.dart';
/// مضيف تدفّق الدخول: خطوة واحدة معروضة في كل لحظة، والانتقال بينها من
apps/rider_new/lib/features/auth/view/otp_view.dart
+5 -15
View File
@@ -1,26 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/failure_text.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_otp_field.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
import '../../../core/ui/form_header.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_otp_field.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
class OtpView extends StatefulWidget {
const OtpView({super.key});
apps/rider_new/lib/features/auth/view/permission_view.dart
+5 -13
View File
@@ -1,22 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/status_banner.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
import '../../../core/ui/form_header.dart';
import '../../../core/ui/status_banner.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
/// البوابة الثانية: إذن الموقع. عند الرفض النهائي لا يبقى إلا فتح إعدادات
/// النظام — والعودة منها يلتقطها `LoginPage` بمراقبة دورة الحياة.
apps/rider_new/lib/features/auth/view/phone_view.dart
+37 -14
View File
@@ -1,28 +1,48 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/tenant/tenant_cubit.dart';
import '../../../core/ui/failure_text.dart';
import '../../../core/ui/form_header.dart';
import '../../../core/ui/phone_field.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../cubit/login_cubit.dart';
import '../cubit/login_state.dart';
import '../../../core/ui/form_header.dart';
class PhoneView extends StatelessWidget {
class PhoneView extends StatefulWidget {
const PhoneView({super.key});
@override
State<PhoneView> createState() => _PhoneViewState();
}
class _PhoneViewState extends State<PhoneView> {
final _phone = TextEditingController();
@override
void initState() {
super.initState();
_phone.addListener(
() => context.read<LoginCubit>().phoneChanged(_phone.text),
);
// الدولة الافتراضية من المستأجر — يُطبَّق بعد أول إطار كي يتوفّر السياق.
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
context
.read<LoginCubit>()
.applyTenantCountry(context.read<TenantCubit>().state.countryPack);
});
}
@override
void dispose() {
_phone.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final l10n = context.l10n;
@@ -30,6 +50,7 @@ class PhoneView extends StatelessWidget {
buildWhen: (p, n) =>
p.status != n.status ||
p.phoneError != n.phoneError ||
p.country != n.country ||
p.failure != n.failure,
builder: (context, state) {
final cubit = context.read<LoginCubit>();
@@ -49,11 +70,13 @@ class PhoneView extends StatelessWidget {
lead: l10n.phoneLead,
),
const SizedBox(height: Space.lg),
TripzTextField.phone(
PhoneField(
controller: _phone,
country: state.country,
onCountryChanged: cubit.countryChanged,
label: l10n.phoneLabel,
hint: l10n.phoneHint,
enabled: !state.isSubmitting,
onChanged: cubit.phoneChanged,
onSubmitted: (_) => cubit.submitPhone(),
errorText: state.phoneError == null
? null
apps/rider_new/lib/features/profile/cubit/profile_cubit.dart
-4
View File
@@ -1,13 +1,9 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/api/api_exception.dart';
import '../../../core/api/api_failure.dart';
import '../../../core/session/app_user.dart';
import '../../../core/ui/view_status.dart';
import '../data/profile_repository.dart';
class ProfileState {
apps/rider_new/lib/features/profile/view/profile_edit_page.dart
-9
View File
@@ -1,23 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/di.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/session/session_cubit.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../cubit/profile_cubit.dart';
/// تعديل الاسم. **الرقم لا يُعدَّل**: هو هوية الحساب على الخادم، وتغييره
apps/rider_new/lib/features/profile/view/profile_setup_page.dart
+3 -13
View File
@@ -1,25 +1,15 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/di.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/session/session_cubit.dart';
import '../../../core/ui/failure_text.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../../../core/ui/form_header.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../cubit/profile_cubit.dart';
class ProfileSetupPage extends StatefulWidget {
apps/rider_new/lib/features/rating/cubit/rating_cubit.dart
-2
View File
@@ -1,9 +1,7 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/api/api_exception.dart';
import '../data/rating_repository.dart';
import 'rating_state.dart';
class RatingCubit extends Cubit<RatingState> {
apps/rider_new/lib/features/rating/view/rating_page.dart
-11
View File
@@ -1,27 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/di.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../cubit/rating_cubit.dart';
import '../cubit/rating_state.dart';
import '../data/rating_repository.dart';
import 'star_row.dart';
/// شاشة التقييم — **تُفرض عند فتح التطبيق** إن كانت هناك رحلة معلّقة
apps/rider_new/lib/features/rating/view/star_row.dart
-1
View File
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
/// خمس نجوم — أهداف لمس ≥ 48 لأن الشاشة تُستعمل عادةً والمستخدم مستعجل.
apps/rider_new/lib/features/settings/cubit/settings_cubit.dart
-2
View File
@@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'settings_state.dart';
apps/rider_new/lib/features/settings/cubit/settings_state.dart
-1
View File
@@ -1,5 +1,4 @@
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
/// المظهر واللغة (docs/26 §4) — محفوظان محلياً، وليسا سرّاً فيذهبان إلى
apps/rider_new/lib/features/settings/view/settings_page.dart
-6
View File
@@ -1,17 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/settings_cubit.dart';
import '../cubit/settings_state.dart';
/// المظهر واللغة. تبديل اللغة **يقلب الاتجاه كاملاً** بلا إعادة تشغيل —
apps/rider_new/lib/features/splash/view/splash_page.dart
-7
View File
@@ -1,19 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/build_config.dart';
import '../../../core/config.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/session/session_cubit.dart';
import '../../../core/tenant/tenant_cubit.dart';
/// شاشة الإقلاع: تستعيد الجلسة ثم يتولّى الراوتر التوجيه. لا تنقّل من هنا —
apps/rider_new/lib/features/support/view/support_page.dart
-5
View File
@@ -1,15 +1,10 @@
import 'package:flutter/material.dart';
import '../../../core/build_config.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/tripz_card.dart';
import '../../../core/ui/tripz_scaffold.dart';
/// المساعدة و«عن التطبيق». محتوى محلّي عمداً: الخادم لا يوفّر نقطة أسئلة
apps/rider_new/lib/features/trip/cubit/history_cubit.dart
-3
View File
@@ -1,11 +1,8 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/api/api_exception.dart';
import '../../../core/ui/view_status.dart';
import '../data/history_repository.dart';
import '../data/models/trip.dart';
class HistoryState {
apps/rider_new/lib/features/trip/cubit/ride_cubit.dart
+1 -11
View File
@@ -3,26 +3,16 @@ import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/api/api_exception.dart';
import '../../../core/config.dart';
import '../../../core/location/location_service.dart';
import '../../../core/realtime/realtime_service.dart';
import '../data/maps_repository.dart';
import '../data/models/geo_point.dart';
import '../data/models/fare_quote.dart';
import '../data/models/geo_point.dart';
import '../data/models/place.dart';
import '../data/models/ride_type.dart';
import '../data/models/trip.dart';
import '../data/trip_repository.dart';
import 'ride_state.dart';
/// شاشة الراكب كاملة: التخطيط ← التسعيرة ← الطلب ← البحث ← الرحلة الجارية.
apps/rider_new/lib/features/trip/cubit/ride_state.dart
-5
View File
@@ -1,15 +1,10 @@
import 'package:equatable/equatable.dart';
import '../data/models/fare_quote.dart';
import '../data/models/geo_point.dart';
import '../data/models/place.dart';
import '../data/models/ride_type.dart';
import '../data/models/route_info.dart';
import '../data/models/trip.dart';
/// مراحل شاشة الراكب. المرحلة تحدّد ما يُعرض على الخريطة وما في الورقة
apps/rider_new/lib/features/trip/data/history_repository.dart
-1
View File
@@ -1,5 +1,4 @@
import '../../../core/api/api_client.dart';
import 'models/trip.dart';
/// سجلّ الرحلات. لا يستورد ميزة الرحلة كمنطق — يعيد استعمال نموذجها فقط،
apps/rider_new/lib/features/trip/data/maps_repository.dart
-3
View File
@@ -1,9 +1,6 @@
import '../../../core/api/antlaq_api.dart';
import 'models/geo_point.dart';
import 'models/place.dart';
import 'models/route_info.dart';
/// كل الخرائط من map-saas مباشرة (قرار 2026-07-20). نقاط `/maps/*` في باك إند
apps/rider_new/lib/features/trip/data/trip_repository.dart
-4
View File
@@ -1,11 +1,7 @@
import '../../../core/api/api_client.dart';
import 'models/fare_quote.dart';
import 'models/geo_point.dart';
import 'models/ride_type.dart';
import 'models/trip.dart';
class TripRepository {
apps/rider_new/lib/features/trip/view/history_page.dart
-11
View File
@@ -1,27 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/design/typography.dart';
import '../../../core/di.dart';
import '../../../core/format/money.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/empty_view.dart';
import '../../../core/ui/tripz_card.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../cubit/history_cubit.dart';
import '../data/models/trip.dart';
class HistoryPage extends StatefulWidget {
apps/rider_new/lib/features/trip/view/ride_page.dart
-15
View File
@@ -1,36 +1,21 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/di.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/app_drawer.dart';
import '../../../core/ui/status_banner.dart';
import '../../../core/ui/tripz_button.dart';
import '../cubit/ride_cubit.dart';
import '../cubit/ride_state.dart';
import '../data/models/geo_point.dart';
import 'widgets/active_trip_sheet.dart';
import 'widgets/center_pin.dart';
import 'widgets/confirm_sheet.dart';
import 'widgets/planner_sheet.dart';
import 'widgets/ride_map.dart';
import 'widgets/searching_sheet.dart';
/// شاشة الراكب: خريطة ثابتة + ورقة سفلية تتبدّل بالمرحلة (docs/39 §3).
apps/rider_new/lib/features/trip/view/widgets/active_trip_sheet.dart
+2 -11
View File
@@ -1,27 +1,18 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/build_config.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/router.dart';
import '../../../../core/tenant/feature_gate.dart';
import '../../../../core/ui/tripz_button.dart';
import '../../cubit/ride_cubit.dart';
import '../../data/models/trip.dart';
import 'cancel_sheet.dart';
import 'driver_badge.dart';
import 'fare_summary.dart';
/// بطاقة الرحلة الجارية: حالة واضحة ثم بيانات السائق ثم فعل واحد.
apps/rider_new/lib/features/trip/view/widgets/cancel_sheet.dart
-3
View File
@@ -1,11 +1,8 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/ui/tripz_button.dart';
import '../../../../core/ui/tripz_sheet.dart';
/// الإلغاء لا يقع بضغطة واحدة: تأكيدٌ صريح مع سبب.
apps/rider_new/lib/features/trip/view/widgets/center_pin.dart
-1
View File
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
/// دبّوس ثابت في منتصف الشاشة أثناء الاختيار من الخريطة.
apps/rider_new/lib/features/trip/view/widgets/confirm_sheet.dart
+5 -15
View File
@@ -1,28 +1,18 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/design/typography.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/ui/status_banner.dart';
import '../../../../core/build_config.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/design/typography.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/tenant/feature_gate.dart';
import '../../../../core/ui/status_banner.dart';
import '../../../../core/ui/tripz_button.dart';
import '../../../../core/ui/tripz_text_field.dart';
import '../../cubit/ride_cubit.dart';
import '../../cubit/ride_state.dart';
import 'ride_type_picker.dart';
import 'route_timeline.dart';
/// التأكيد: نوع الرحلة والأجرة والمسافة والمدة — ثم زر واحد.
apps/rider_new/lib/features/trip/view/widgets/driver_badge.dart
-3
View File
@@ -1,11 +1,8 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/design/typography.dart';
import '../../data/models/trip.dart';
/// بطاقة السائق ولوحة المركبة — أهم ما يبحث عنه الراكب في الشارع، فيأخذ
apps/rider_new/lib/features/trip/view/widgets/fare_summary.dart
-5
View File
@@ -1,15 +1,10 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/design/typography.dart';
import '../../../../core/format/money.dart';
import '../../../../core/l10n/l10n.dart';
import '../../data/models/trip.dart';
/// ملخّص الأجرة عند الإنهاء.
apps/rider_new/lib/features/trip/view/widgets/planner_sheet.dart
-7
View File
@@ -1,19 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/ui/tripz_button.dart';
import '../../../../core/ui/tripz_text_field.dart';
import '../../cubit/ride_cubit.dart';
import '../../cubit/ride_state.dart';
import 'route_timeline.dart';
/// المخطّط الموسّع بترتيبه المثبت ميدانياً (docs/39 §3):
apps/rider_new/lib/features/trip/view/widgets/route_timeline.dart
-2
View File
@@ -1,9 +1,7 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/l10n/l10n.dart';
/// الخط الزمني للمسار: المصدر ← المحطات ← الوجهة، بنقاط ملوّنة تطابق
apps/rider_new/lib/features/trip/view/widgets/searching_sheet.dart
-5
View File
@@ -1,15 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/l10n/l10n.dart';
import '../../../../core/ui/tripz_button.dart';
import '../../cubit/ride_cubit.dart';
/// نافذة البحث عن سائق.
apps/rider_new/lib/features/wallet/cubit/wallet_cubit.dart
-3
View File
@@ -1,11 +1,8 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/api/api_exception.dart';
import '../../../core/ui/view_status.dart';
import '../data/wallet_repository.dart';
import 'wallet_state.dart';
class WalletCubit extends Cubit<WalletState> {
apps/rider_new/lib/features/wallet/cubit/wallet_state.dart
-2
View File
@@ -1,9 +1,7 @@
import 'package:equatable/equatable.dart';
import '../../../core/ui/view_status.dart';
import '../data/models/wallet.dart';
import '../data/models/wallet_txn.dart';
enum WalletAction { none, toppingUp, topupFailed, topupDone }
apps/rider_new/lib/features/wallet/data/wallet_repository.dart
-2
View File
@@ -1,7 +1,5 @@
import '../../../core/api/api_client.dart';
import 'models/wallet.dart';
import 'models/wallet_txn.dart';
class WalletRepository {
apps/rider_new/lib/features/wallet/view/wallet_page.dart
+3 -16
View File
@@ -1,35 +1,22 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../core/design/tokens.dart';
import '../../../core/design/tripz_colors.dart';
import '../../../core/di.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/payments/payment_channels.dart';
import '../../../core/tenant/tenant_cubit.dart';
import '../../../core/ui/channel_picker.dart';
import '../../../core/ui/status_banner.dart';
import '../../../core/di.dart';
import '../../../core/l10n/l10n.dart';
import '../../../core/ui/empty_view.dart';
import '../../../core/ui/status_banner.dart';
import '../../../core/ui/tripz_button.dart';
import '../../../core/ui/tripz_scaffold.dart';
import '../../../core/ui/tripz_sheet.dart';
import '../../../core/ui/tripz_text_field.dart';
import '../cubit/wallet_cubit.dart';
import '../cubit/wallet_state.dart';
import 'widgets/balance_card.dart';
import 'widgets/txn_tile.dart';
/// محفظة الراكب — **رصيدٌ دفعه ولم يستهلكه**، أي التزامٌ على المنصّة.
apps/rider_new/lib/features/wallet/view/widgets/balance_card.dart
-3
View File
@@ -1,11 +1,8 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/design/typography.dart';
import '../../../../core/format/money.dart';
/// بطاقة الرصيد — الرقم هو بطل الشاشة، فيأخذ أكبر حجم وأعلى تباين.
apps/rider_new/lib/features/wallet/view/widgets/txn_tile.dart
-4
View File
@@ -1,13 +1,9 @@
import 'package:flutter/material.dart';
import '../../../../core/design/tokens.dart';
import '../../../../core/design/tripz_colors.dart';
import '../../../../core/design/typography.dart';
import '../../../../core/format/money.dart';
import '../../data/models/wallet_txn.dart';
class TxnTile extends StatelessWidget {