feat(apps): نظام التصميم والمصادقة الكاملة — المرحلتان 2 و3
## تصحيح بنيوي أولاً
بنية المرحلة 1 كانت تخالف docs/23 §1 المُلزِم. أُعيدت للشجرة المفروضة
حرفياً: app.dart في الجذر · core/{config,build_config,di,router}.dart ·
core/{design,ui,l10n,api,storage,session}/ · features/<f>/{cubit,data,view}/
## المرحلة 2 — نظام التصميم (docs/26)
- core/design: tokens (مسافات/زوايا/حركة/أحجام — الشاشة لا تخترع رقماً) ·
typography (IBM Plex Sans Arabic + Inter محليّان، بأرقام tabular للأسعار
والعدّادات) · TripzColors كـThemeExtension للأدوار الدلالية ·
buildTheme(brightness, locale) بمدخلين لا ثالث لهما
- core/ui: 11 مكوّناً. TripzScaffold يحوّل status الـCubit وحده إلى
skeleton/خطأ/فراغ/محتوى — فلا تكتب أي شاشة if (loading)
- core/l10n: ARB عربي/إنجليزي + gen_l10n. لا نص مرئي داخل widget
- SettingsCubit: المظهر واللغة. الاتجاه يتبع اللغة آلياً بلا Directionality
مفروضة، وسقف تكبير النص 1.3
## المرحلة 3 — المصادقة
- طبقة الشبكة: تجديد استباقي بطلقة واحدة (عمر التوكن 15 دقيقة) ·
x-app-role · x-device-id من device_info_plus — يُرسَل الآن كي يُفعَّل علم
الخادم لاحقاً بلا تعديل التطبيق
- SessionCubit في core/session خلف واجهة SessionSource: الجلسة حالة على
مستوى التطبيق لا ميزة، و core لا يستورد من features
- LoginCubit بخطواته الخمس، ProfileCubit، وست شاشات:
الشروط ← إذن الموقع ← الهاتف ← الرمز ← إكمال الملف ← هيكل الرئيسية
من سيرو نُقل السلوك لا الكود: بوابتان قبل أي حقل إدخال · إعادة فحص الإذن عند
العودة من إعدادات النظام · تحقّق الهاتف الثلاثي. وأُضيف ما ينقصه: عدّاد إعادة
إرسال الرمز — بدونه تُحظر ثلاث ضغطات المستخدمَ خمس دقائق (docs/38 §2).
قراران موثّقان في docs/37: لا packages/tripz_ui (الوثيقتان المُلزِمتان تفرضان
core/design و core/ui داخل التطبيق)، والـCubit يُصدر رمز فشل لا نصّاً
(يجمع بين docs/23 §3 و docs/26 §4).
flutter analyze نظيف في التطبيقين · 48 ملف و3,140 سطر لكل تطبيق · الفرق
بينهما أربعة ملفات فقط: build_config · config · ملفّا ARB.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
co-authored by
Claude Opus 5
Claude Opus 5
parent
0de8573d27
commit
c52338f3bb
@@ -0,0 +1,38 @@
|
||||
import '../../../core/api/api_exception.dart';
|
||||
|
||||
/// سبب الفشل كـ**رمز** لا كنصّ.
|
||||
///
|
||||
/// docs/23 §3 يقول إن الـCubit يحوّل خطأ الشبكة إلى رسالة عربية؛ وdocs/26 §4
|
||||
/// (الأحدث، وهو الذي «يفعّل قاعدة docs/23 §2 التي كانت بلا أداة») يوجب مرور
|
||||
/// كل نص مرئي بطبقة الترجمة. والـCubit لا يعرف `BuildContext` (docs/23 §3).
|
||||
/// الجمع بينها: الـCubit يُصدر الرمز، والواجهة تترجمه سطراً واحداً — فتبقى
|
||||
/// الشاشة بلا منطق، والنص بلغتين.
|
||||
enum AuthFailure {
|
||||
/// رمز خاطئ أو منتهي الصلاحية.
|
||||
invalidCode,
|
||||
|
||||
/// تجاوز عدد المحاولات — الخادم يُبطل الرمز فوراً (docs/38 §2).
|
||||
tooManyAttempts,
|
||||
|
||||
/// تجاوز حدّ طلب الرمز: ثلاثة كل خمس دقائق.
|
||||
rateLimited,
|
||||
|
||||
network,
|
||||
timeout,
|
||||
server,
|
||||
}
|
||||
|
||||
extension AuthFailureX on ApiException {
|
||||
AuthFailure toAuthFailure() {
|
||||
if (isRateLimited) return AuthFailure.rateLimited;
|
||||
if (kind == ApiErrorKind.network) return AuthFailure.network;
|
||||
if (kind == ApiErrorKind.timeout) return AuthFailure.timeout;
|
||||
if (isUnauthorized) {
|
||||
// الخادم يفرّق بين «رمز خاطئ» و«محاولات كثيرة» بالنصّ وحده.
|
||||
return message.contains('Too many')
|
||||
? AuthFailure.tooManyAttempts
|
||||
: AuthFailure.invalidCode;
|
||||
}
|
||||
return AuthFailure.server;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,169 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../../../core/api/api_exception.dart';
|
||||
import '../../../core/config.dart';
|
||||
import '../data/auth_repository.dart';
|
||||
import 'auth_failure.dart';
|
||||
import 'login_state.dart';
|
||||
import 'phone_error.dart';
|
||||
|
||||
/// تدفّق الدخول كاملاً: الشروط ← إذن الموقع ← الهاتف ← الرمز.
|
||||
///
|
||||
/// الـCubit لا يعرف Flutter: لا `BuildContext` ولا تنقّل ولا `SnackBar`
|
||||
/// (docs/23 §3). يُصدر حالة، والواجهة تتصرّف.
|
||||
class LoginCubit extends Cubit<LoginState> {
|
||||
LoginCubit(this._repo, this._prefs) : super(const LoginState()) {
|
||||
_resolveInitialStep();
|
||||
}
|
||||
|
||||
final AuthRepository _repo;
|
||||
final SharedPreferences _prefs;
|
||||
|
||||
static const _kAgreed = 'auth.agreed_terms';
|
||||
|
||||
Timer? _resendTimer;
|
||||
|
||||
@override
|
||||
Future<void> close() {
|
||||
_resendTimer?.cancel();
|
||||
return super.close();
|
||||
}
|
||||
|
||||
// ── البوابتان ──────────────────────────────────────────────────────────
|
||||
|
||||
void _resolveInitialStep() {
|
||||
if (_prefs.getBool(_kAgreed) != true) {
|
||||
emit(state.copyWith(step: LoginStep.agreement));
|
||||
return;
|
||||
}
|
||||
emit(state.copyWith(step: LoginStep.permission, agreed: true));
|
||||
unawaited(checkLocationPermission());
|
||||
}
|
||||
|
||||
void toggleAgreement(bool value) => emit(state.copyWith(agreed: value));
|
||||
|
||||
Future<void> acceptAgreement() async {
|
||||
if (!state.agreed) return;
|
||||
await _prefs.setBool(_kAgreed, true);
|
||||
emit(state.copyWith(step: LoginStep.permission));
|
||||
await checkLocationPermission();
|
||||
}
|
||||
|
||||
/// تُستدعى أيضاً عند **العودة من إعدادات النظام**: بلا إعادة الفحص تبقى
|
||||
/// الشاشة عالقة بعد أن يمنح المستخدم الإذن يدوياً (حالة حافة من docs/39 §2).
|
||||
Future<void> checkLocationPermission() async {
|
||||
final status = await Permission.locationWhenInUse.status;
|
||||
if (status.isGranted || status.isLimited) {
|
||||
emit(state.copyWith(step: LoginStep.phone));
|
||||
return;
|
||||
}
|
||||
emit(state.copyWith(
|
||||
permissionPermanentlyDenied: status.isPermanentlyDenied,
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> requestLocationPermission() async {
|
||||
final status = await Permission.locationWhenInUse.request();
|
||||
if (status.isGranted || status.isLimited) {
|
||||
emit(state.copyWith(step: LoginStep.phone));
|
||||
return;
|
||||
}
|
||||
emit(state.copyWith(
|
||||
permissionPermanentlyDenied: status.isPermanentlyDenied,
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> openSystemSettings() => openAppSettings();
|
||||
|
||||
// ── الهاتف ─────────────────────────────────────────────────────────────
|
||||
|
||||
void phoneChanged(String value) {
|
||||
emit(state.copyWith(
|
||||
phone: value,
|
||||
clearPhoneError: true,
|
||||
clearFailure: true,
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> submitPhone() async {
|
||||
final error = validatePhone(state.phone);
|
||||
if (error != null) {
|
||||
emit(state.copyWith(phoneError: error));
|
||||
return;
|
||||
}
|
||||
emit(state.copyWith(status: LoginStatus.submitting, clearFailure: true));
|
||||
try {
|
||||
await _repo.sendOtp(state.phone.trim());
|
||||
emit(state.copyWith(status: LoginStatus.idle, step: LoginStep.otp));
|
||||
_startResendCountdown();
|
||||
} on ApiException catch (e) {
|
||||
emit(state.copyWith(
|
||||
status: LoginStatus.failure,
|
||||
failure: e.toAuthFailure(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
void editPhone() {
|
||||
_resendTimer?.cancel();
|
||||
emit(state.copyWith(
|
||||
step: LoginStep.phone,
|
||||
status: LoginStatus.idle,
|
||||
resendIn: 0,
|
||||
clearFailure: true,
|
||||
));
|
||||
}
|
||||
|
||||
// ── الرمز ──────────────────────────────────────────────────────────────
|
||||
|
||||
Future<void> resendOtp() async {
|
||||
if (!state.canResend) return;
|
||||
emit(state.copyWith(status: LoginStatus.submitting, clearFailure: true));
|
||||
try {
|
||||
await _repo.sendOtp(state.phone.trim());
|
||||
emit(state.copyWith(status: LoginStatus.idle));
|
||||
_startResendCountdown();
|
||||
} on ApiException catch (e) {
|
||||
emit(state.copyWith(
|
||||
status: LoginStatus.failure,
|
||||
failure: e.toAuthFailure(),
|
||||
));
|
||||
// حتى عند الرفض بحدّ المعدّل نبدأ العدّاد — وإلا ضغط المستخدم مجدداً
|
||||
// فوراً وعمّق الحظر.
|
||||
_startResendCountdown();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> submitOtp(String code) async {
|
||||
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);
|
||||
_resendTimer?.cancel();
|
||||
emit(state.copyWith(
|
||||
status: LoginStatus.success,
|
||||
step: LoginStep.done,
|
||||
user: user,
|
||||
));
|
||||
} on ApiException catch (e) {
|
||||
emit(state.copyWith(
|
||||
status: LoginStatus.failure,
|
||||
failure: e.toAuthFailure(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
void _startResendCountdown() {
|
||||
_resendTimer?.cancel();
|
||||
emit(state.copyWith(resendIn: AppConfig.otpResendCooldown.inSeconds));
|
||||
_resendTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
|
||||
final next = state.resendIn - 1;
|
||||
if (next <= 0) timer.cancel();
|
||||
emit(state.copyWith(resendIn: next < 0 ? 0 : next));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
import '../../../core/session/app_user.dart';
|
||||
import 'auth_failure.dart';
|
||||
import 'phone_error.dart';
|
||||
|
||||
/// خطوات الدخول بالترتيب الميداني المثبت في سيرو (docs/39 §2): بوابتان
|
||||
/// كاملتان **قبل** أي حقل إدخال، ثم الهاتف فالرمز.
|
||||
enum LoginStep { agreement, permission, phone, otp, done }
|
||||
|
||||
enum LoginStatus { idle, submitting, failure, success }
|
||||
|
||||
class LoginState extends Equatable {
|
||||
const LoginState({
|
||||
this.step = LoginStep.agreement,
|
||||
this.status = LoginStatus.idle,
|
||||
this.phone = '',
|
||||
this.agreed = false,
|
||||
this.failure,
|
||||
this.phoneError,
|
||||
this.resendIn = 0,
|
||||
this.permissionPermanentlyDenied = false,
|
||||
this.user,
|
||||
});
|
||||
|
||||
final LoginStep step;
|
||||
final LoginStatus status;
|
||||
|
||||
/// الرقم كما أدخله المستخدم — الخادم يطبّعه، فلا نطبّعه نحن (docs/38 §2).
|
||||
final String phone;
|
||||
|
||||
final bool agreed;
|
||||
final AuthFailure? failure;
|
||||
final PhoneError? phoneError;
|
||||
|
||||
/// ثوانٍ متبقّية قبل السماح بإعادة الإرسال. الخادم يحدّ بثلاثة طلبات كل
|
||||
/// خمس دقائق، فالعدّاد ليس تجميلاً (docs/39 §2).
|
||||
final int resendIn;
|
||||
|
||||
/// رُفض الإذن نهائياً — الحل الوحيد فتح إعدادات النظام.
|
||||
final bool permissionPermanentlyDenied;
|
||||
|
||||
final AppUser? user;
|
||||
|
||||
bool get isSubmitting => status == LoginStatus.submitting;
|
||||
bool get canResend => resendIn == 0 && !isSubmitting;
|
||||
|
||||
LoginState copyWith({
|
||||
LoginStep? step,
|
||||
LoginStatus? status,
|
||||
String? phone,
|
||||
bool? agreed,
|
||||
AuthFailure? failure,
|
||||
PhoneError? phoneError,
|
||||
int? resendIn,
|
||||
bool? permissionPermanentlyDenied,
|
||||
AppUser? user,
|
||||
bool clearFailure = false,
|
||||
bool clearPhoneError = false,
|
||||
}) {
|
||||
return LoginState(
|
||||
step: step ?? this.step,
|
||||
status: status ?? this.status,
|
||||
phone: phone ?? this.phone,
|
||||
agreed: agreed ?? this.agreed,
|
||||
failure: clearFailure ? null : (failure ?? this.failure),
|
||||
phoneError: clearPhoneError ? null : (phoneError ?? this.phoneError),
|
||||
resendIn: resendIn ?? this.resendIn,
|
||||
permissionPermanentlyDenied:
|
||||
permissionPermanentlyDenied ?? this.permissionPermanentlyDenied,
|
||||
user: user ?? this.user,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
step,
|
||||
status,
|
||||
phone,
|
||||
agreed,
|
||||
failure,
|
||||
phoneError,
|
||||
resendIn,
|
||||
permissionPermanentlyDenied,
|
||||
user,
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
/// أخطاء تحقّق **محليّة** لرقم الهاتف — تُكتشف قبل أي نداء شبكة.
|
||||
/// الشروط الثلاثة منقولة من التحقّق المطبَّق ميدانياً في سيرو (docs/39 §2).
|
||||
enum PhoneError { empty, leadingZero, tooShort }
|
||||
|
||||
PhoneError? validatePhone(String raw) {
|
||||
final v = raw.trim();
|
||||
if (v.isEmpty) return PhoneError.empty;
|
||||
if (v.startsWith('0')) return PhoneError.leadingZero;
|
||||
if (v.length < 9) return PhoneError.tooShort;
|
||||
return null;
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../core/api/api_exception.dart';
|
||||
import '../../../core/ui/view_status.dart';
|
||||
import '../data/auth_repository.dart';
|
||||
import '../../../core/session/app_user.dart';
|
||||
import 'auth_failure.dart';
|
||||
|
||||
class ProfileState {
|
||||
const ProfileState({
|
||||
this.status = ViewStatus.success,
|
||||
this.saving = false,
|
||||
this.failure,
|
||||
this.user,
|
||||
});
|
||||
|
||||
final ViewStatus status;
|
||||
final bool saving;
|
||||
final AuthFailure? failure;
|
||||
final AppUser? user;
|
||||
|
||||
ProfileState copyWith({
|
||||
ViewStatus? status,
|
||||
bool? saving,
|
||||
AuthFailure? failure,
|
||||
AppUser? user,
|
||||
bool clearFailure = false,
|
||||
}) {
|
||||
return ProfileState(
|
||||
status: status ?? this.status,
|
||||
saving: saving ?? this.saving,
|
||||
failure: clearFailure ? null : (failure ?? this.failure),
|
||||
user: user ?? this.user,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// إكمال الملف بعد أول دخول. عقد الخادم يقبل `{ name, language }` فقط
|
||||
/// (docs/38 §3) — لا اسم أول/أخير ولا بريد كما في سيرو (docs/39 §2).
|
||||
class ProfileCubit extends Cubit<ProfileState> {
|
||||
ProfileCubit(this._repo) : super(const ProfileState());
|
||||
|
||||
final AuthRepository _repo;
|
||||
|
||||
Future<AppUser?> save(String name) async {
|
||||
emit(state.copyWith(saving: true, clearFailure: true));
|
||||
try {
|
||||
final user = await _repo.updateProfile(name: name.trim());
|
||||
emit(state.copyWith(saving: false, user: user));
|
||||
return user;
|
||||
} on ApiException catch (e) {
|
||||
emit(state.copyWith(saving: false, failure: e.toAuthFailure()));
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import '../../../core/api/api_client.dart';
|
||||
import '../../../core/storage/token_store.dart';
|
||||
import '../../../core/session/app_user.dart';
|
||||
import '../../../core/session/session_source.dart';
|
||||
|
||||
/// كل نداءات المصادقة (docs/38 §2). الـCubit لا ينادي Dio مباشرة أبداً
|
||||
/// (docs/23 §3).
|
||||
class AuthRepository implements SessionSource {
|
||||
AuthRepository(this._api, this._tokens);
|
||||
|
||||
final ApiClient _api;
|
||||
final TokenStore _tokens;
|
||||
|
||||
/// حدّ الخادم: ثلاثة طلبات كل خمس دقائق — الواجهة تمنع الضغط المتكرر
|
||||
/// بعدّاد تنازلي (docs/39 §2).
|
||||
Future<void> sendOtp(String phone) async {
|
||||
await _api.post<Map<String, dynamic>>(
|
||||
'/auth/send-otp',
|
||||
body: {'phone': phone},
|
||||
);
|
||||
}
|
||||
|
||||
/// عند النجاح تُحفظ الرموز **قبل** أن يعود المستخدم — أي نداء تالٍ يجدها.
|
||||
Future<AppUser> verifyOtp({
|
||||
required String phone,
|
||||
required String code,
|
||||
String? referralCode,
|
||||
}) async {
|
||||
final res = await _api.post<Map<String, dynamic>>(
|
||||
'/auth/verify-otp',
|
||||
body: {
|
||||
'phone': phone,
|
||||
'code': code,
|
||||
if (referralCode != null && referralCode.isNotEmpty)
|
||||
'referral_code': referralCode,
|
||||
},
|
||||
);
|
||||
|
||||
await _tokens.save(
|
||||
accessToken: res['access_token'] as String,
|
||||
refreshToken: res['refresh_token'] as String,
|
||||
// مفتاح توقيع الطلبات المالية (docs/38 §8) — يُخزَّن الآن ويُستهلك لاحقاً.
|
||||
signingKey: res['signing_key'] as String?,
|
||||
);
|
||||
|
||||
return AppUser.fromJson(res['user'] as Map<String, dynamic>);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<AppUser> me() async {
|
||||
final res = await _api.get<Map<String, dynamic>>('/users/me');
|
||||
return AppUser.fromJson(res);
|
||||
}
|
||||
|
||||
Future<AppUser> updateProfile({String? name, String? language}) async {
|
||||
final res = await _api.patch<Map<String, dynamic>>(
|
||||
'/users/me',
|
||||
body: {
|
||||
'name': ?name,
|
||||
'language': ?language,
|
||||
},
|
||||
);
|
||||
return AppUser.fromJson(res);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> logout() => _tokens.clear();
|
||||
|
||||
@override
|
||||
bool get hasSession => _tokens.isLoggedIn;
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
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 'widgets/auth_header.dart';
|
||||
|
||||
/// البوابة الأولى: شاشة كاملة لا حوار، وزر متابعة **معطّل حتى يُؤشَّر**
|
||||
/// (docs/39 §2). تُحفظ الموافقة فلا تتكرر.
|
||||
class AgreementView extends StatelessWidget {
|
||||
const AgreementView({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return BlocBuilder<LoginCubit, LoginState>(
|
||||
buildWhen: (p, n) => p.agreed != n.agreed,
|
||||
builder: (context, state) {
|
||||
final cubit = context.read<LoginCubit>();
|
||||
return TripzScaffold(
|
||||
showAppBar: false,
|
||||
bottomAction: TripzButton.primary(
|
||||
label: l10n.agreementAccept,
|
||||
onPressed: state.agreed ? cubit.acceptAgreement : null,
|
||||
),
|
||||
child: ListView(
|
||||
children: [
|
||||
const SizedBox(height: Space.xl),
|
||||
AuthHeader(
|
||||
icon: Icons.policy_outlined,
|
||||
title: l10n.agreementTitle,
|
||||
lead: l10n.agreementLead,
|
||||
),
|
||||
const SizedBox(height: Space.lg),
|
||||
CheckboxListTile(
|
||||
value: state.agreed,
|
||||
onChanged: (v) => cubit.toggleAgreement(v ?? false),
|
||||
contentPadding: EdgeInsets.zero,
|
||||
controlAffinity: ListTileControlAffinity.leading,
|
||||
title: Text(
|
||||
l10n.agreementCheckbox,
|
||||
style: context.texts.bodyMedium,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
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';
|
||||
|
||||
/// مضيف تدفّق الدخول: خطوة واحدة معروضة في كل لحظة، والانتقال بينها من
|
||||
/// الـCubit لا من التنقّل — فلا يستطيع المستخدم الرجوع لخطوة تخطّاها.
|
||||
class LoginPage extends StatefulWidget {
|
||||
const LoginPage({super.key});
|
||||
|
||||
@override
|
||||
State<LoginPage> createState() => _LoginPageState();
|
||||
}
|
||||
|
||||
class _LoginPageState extends State<LoginPage> with WidgetsBindingObserver {
|
||||
late final LoginCubit _cubit = sl<LoginCubit>();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
_cubit.close();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState lifecycle) {
|
||||
// العودة من إعدادات النظام بعد منح الإذن يدوياً — بلا هذا الفحص تبقى
|
||||
// شاشة الإذن عالقة (حالة حافة مثبتة ميدانياً، docs/39 §2).
|
||||
if (lifecycle == AppLifecycleState.resumed &&
|
||||
_cubit.state.step == LoginStep.permission) {
|
||||
_cubit.checkLocationPermission();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocProvider.value(
|
||||
value: _cubit,
|
||||
child: BlocListener<LoginCubit, LoginState>(
|
||||
listenWhen: (prev, next) => next.step == LoginStep.done,
|
||||
listener: (context, state) {
|
||||
final user = state.user;
|
||||
if (user != null) context.read<SessionCubit>().onLoggedIn(user);
|
||||
},
|
||||
child: BlocBuilder<LoginCubit, LoginState>(
|
||||
buildWhen: (prev, next) => prev.step != next.step,
|
||||
builder: (context, state) => switch (state.step) {
|
||||
LoginStep.agreement => const AgreementView(),
|
||||
LoginStep.permission => const PermissionView(),
|
||||
LoginStep.phone => const PhoneView(),
|
||||
LoginStep.otp || LoginStep.done => const OtpView(),
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
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_otp_field.dart';
|
||||
import '../../../core/ui/tripz_scaffold.dart';
|
||||
import '../cubit/login_cubit.dart';
|
||||
import '../cubit/login_state.dart';
|
||||
import 'widgets/auth_failure_text.dart';
|
||||
import 'widgets/auth_header.dart';
|
||||
|
||||
class OtpView extends StatefulWidget {
|
||||
const OtpView({super.key});
|
||||
|
||||
@override
|
||||
State<OtpView> createState() => _OtpViewState();
|
||||
}
|
||||
|
||||
class _OtpViewState extends State<OtpView> {
|
||||
final _code = TextEditingController();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_code.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return BlocBuilder<LoginCubit, LoginState>(
|
||||
builder: (context, state) {
|
||||
final cubit = context.read<LoginCubit>();
|
||||
return TripzScaffold(
|
||||
showAppBar: false,
|
||||
bottomAction: TripzButton.primary(
|
||||
label: l10n.otpVerify,
|
||||
loading: state.isSubmitting,
|
||||
onPressed: () => cubit.submitOtp(_code.text),
|
||||
),
|
||||
child: ListView(
|
||||
children: [
|
||||
const SizedBox(height: Space.xl),
|
||||
AuthHeader(
|
||||
icon: Icons.mark_email_read_outlined,
|
||||
title: l10n.otpTitle,
|
||||
lead: l10n.otpLead(state.phone),
|
||||
),
|
||||
const SizedBox(height: Space.lg),
|
||||
TripzOtpField(
|
||||
controller: _code,
|
||||
enabled: !state.isSubmitting,
|
||||
hasError: state.failure != null,
|
||||
onCompleted: cubit.submitOtp,
|
||||
),
|
||||
if (state.failure != null)
|
||||
AuthFailureText(failure: state.failure!),
|
||||
const SizedBox(height: Space.md),
|
||||
// العدّاد التنازلي ليس تجميلاً: بلا حارس تُحظر ثلاث ضغطات
|
||||
// المستخدمَ خمس دقائق (docs/38 §2).
|
||||
Center(
|
||||
child: state.canResend
|
||||
? TripzButton.text(
|
||||
label: l10n.otpResend,
|
||||
onPressed: cubit.resendOtp,
|
||||
)
|
||||
: Text(
|
||||
l10n.otpResendIn(state.resendIn),
|
||||
style: context.texts.bodySmall?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
Center(
|
||||
child: TripzButton.text(
|
||||
label: l10n.otpChangeNumber,
|
||||
onPressed: cubit.editPhone,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
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 'widgets/auth_header.dart';
|
||||
|
||||
/// البوابة الثانية: إذن الموقع. عند الرفض النهائي لا يبقى إلا فتح إعدادات
|
||||
/// النظام — والعودة منها يلتقطها `LoginPage` بمراقبة دورة الحياة.
|
||||
class PermissionView extends StatelessWidget {
|
||||
const PermissionView({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return BlocBuilder<LoginCubit, LoginState>(
|
||||
buildWhen: (p, n) =>
|
||||
p.permissionPermanentlyDenied != n.permissionPermanentlyDenied,
|
||||
builder: (context, state) {
|
||||
final cubit = context.read<LoginCubit>();
|
||||
final denied = state.permissionPermanentlyDenied;
|
||||
return TripzScaffold(
|
||||
showAppBar: false,
|
||||
bottomAction: TripzButton.primary(
|
||||
label: denied ? l10n.actionOpenSettings : l10n.permissionAllow,
|
||||
onPressed: denied
|
||||
? cubit.openSystemSettings
|
||||
: cubit.requestLocationPermission,
|
||||
),
|
||||
child: ListView(
|
||||
children: [
|
||||
const SizedBox(height: Space.xl),
|
||||
AuthHeader(
|
||||
icon: Icons.my_location_rounded,
|
||||
title: l10n.permissionTitle,
|
||||
lead: l10n.permissionLead,
|
||||
),
|
||||
if (denied) ...[
|
||||
const SizedBox(height: Space.lg),
|
||||
StatusBanner(
|
||||
message: l10n.permissionDeniedForever,
|
||||
tone: BannerTone.warning,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
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_scaffold.dart';
|
||||
import '../../../core/ui/tripz_text_field.dart';
|
||||
import '../cubit/login_cubit.dart';
|
||||
import '../cubit/login_state.dart';
|
||||
import 'widgets/auth_failure_text.dart';
|
||||
import 'widgets/auth_header.dart';
|
||||
|
||||
class PhoneView extends StatelessWidget {
|
||||
const PhoneView({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return BlocBuilder<LoginCubit, LoginState>(
|
||||
buildWhen: (p, n) =>
|
||||
p.status != n.status ||
|
||||
p.phoneError != n.phoneError ||
|
||||
p.failure != n.failure,
|
||||
builder: (context, state) {
|
||||
final cubit = context.read<LoginCubit>();
|
||||
return TripzScaffold(
|
||||
showAppBar: false,
|
||||
bottomAction: TripzButton.primary(
|
||||
label: l10n.phoneSend,
|
||||
loading: state.isSubmitting,
|
||||
onPressed: cubit.submitPhone,
|
||||
),
|
||||
child: ListView(
|
||||
children: [
|
||||
const SizedBox(height: Space.xl),
|
||||
AuthHeader(
|
||||
icon: Icons.phone_outlined,
|
||||
title: l10n.phoneTitle,
|
||||
lead: l10n.phoneLead,
|
||||
),
|
||||
const SizedBox(height: Space.lg),
|
||||
TripzTextField.phone(
|
||||
label: l10n.phoneLabel,
|
||||
hint: l10n.phoneHint,
|
||||
enabled: !state.isSubmitting,
|
||||
onChanged: cubit.phoneChanged,
|
||||
onSubmitted: (_) => cubit.submitPhone(),
|
||||
errorText: state.phoneError == null
|
||||
? null
|
||||
: AuthFailureText.phoneMessageOf(context, state.phoneError!),
|
||||
),
|
||||
if (state.failure != null)
|
||||
AuthFailureText(failure: state.failure!),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
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/ui/tripz_button.dart';
|
||||
import '../../../core/ui/tripz_scaffold.dart';
|
||||
import '../../../core/ui/tripz_text_field.dart';
|
||||
import '../cubit/profile_cubit.dart';
|
||||
import '../../../core/session/session_cubit.dart';
|
||||
import 'widgets/auth_failure_text.dart';
|
||||
import 'widgets/auth_header.dart';
|
||||
|
||||
class ProfilePage extends StatefulWidget {
|
||||
const ProfilePage({super.key});
|
||||
|
||||
@override
|
||||
State<ProfilePage> createState() => _ProfilePageState();
|
||||
}
|
||||
|
||||
class _ProfilePageState extends State<ProfilePage> {
|
||||
final _name = TextEditingController();
|
||||
String? _error;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_name.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final l10n = context.l10n;
|
||||
return BlocProvider(
|
||||
create: (_) => ProfileCubit(sl()),
|
||||
child: BlocBuilder<ProfileCubit, ProfileState>(
|
||||
builder: (context, state) {
|
||||
return TripzScaffold(
|
||||
showAppBar: false,
|
||||
bottomAction: TripzButton.primary(
|
||||
label: l10n.actionSave,
|
||||
loading: state.saving,
|
||||
onPressed: () => _submit(context),
|
||||
),
|
||||
child: ListView(
|
||||
children: [
|
||||
const SizedBox(height: Space.xl),
|
||||
AuthHeader(
|
||||
icon: Icons.person_outline_rounded,
|
||||
title: l10n.profileTitle,
|
||||
lead: l10n.profileLead,
|
||||
),
|
||||
const SizedBox(height: Space.lg),
|
||||
TripzTextField(
|
||||
controller: _name,
|
||||
label: l10n.profileNameLabel,
|
||||
autofocus: true,
|
||||
enabled: !state.saving,
|
||||
errorText: _error,
|
||||
textInputAction: TextInputAction.done,
|
||||
autofillHints: const [AutofillHints.name],
|
||||
onChanged: (_) => setState(() => _error = null),
|
||||
onSubmitted: (_) => _submit(context),
|
||||
),
|
||||
if (state.failure != null)
|
||||
AuthFailureText(failure: state.failure!),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _submit(BuildContext context) async {
|
||||
if (_name.text.trim().isEmpty) {
|
||||
setState(() => _error = context.l10n.profileNameErrEmpty);
|
||||
return;
|
||||
}
|
||||
final session = context.read<SessionCubit>();
|
||||
final user = await context.read<ProfileCubit>().save(_name.text);
|
||||
if (user != null) session.onProfileCompleted(user);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
import '../../../../core/l10n/l10n.dart';
|
||||
import '../../cubit/auth_failure.dart';
|
||||
import '../../cubit/phone_error.dart';
|
||||
|
||||
/// النقطة **الوحيدة** التي تُترجَم فيها رموز الفشل إلى نصّ.
|
||||
/// الشاشات لا تكتب رسائل خطأ، والـCubit لا يعرف اللغة (راجع `auth_failure.dart`).
|
||||
class AuthFailureText extends StatelessWidget {
|
||||
const AuthFailureText({super.key, required this.failure});
|
||||
|
||||
final AuthFailure failure;
|
||||
|
||||
static String messageOf(BuildContext context, AuthFailure failure) {
|
||||
final l10n = context.l10n;
|
||||
return switch (failure) {
|
||||
AuthFailure.invalidCode => l10n.otpErrInvalid,
|
||||
AuthFailure.tooManyAttempts => l10n.otpErrTooManyAttempts,
|
||||
AuthFailure.rateLimited => l10n.otpErrRateLimited,
|
||||
AuthFailure.network => l10n.errorNetwork,
|
||||
AuthFailure.timeout => l10n.errorTimeout,
|
||||
AuthFailure.server => l10n.errorGeneric,
|
||||
};
|
||||
}
|
||||
|
||||
static String phoneMessageOf(BuildContext context, PhoneError error) {
|
||||
final l10n = context.l10n;
|
||||
return switch (error) {
|
||||
PhoneError.empty => l10n.phoneErrEmpty,
|
||||
PhoneError.leadingZero => l10n.phoneErrLeadingZero,
|
||||
PhoneError.tooShort => l10n.phoneErrShort,
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(top: Space.sm),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.error_outline_rounded,
|
||||
size: Sizes.iconSm,
|
||||
color: context.tripzColors.danger,
|
||||
),
|
||||
const SizedBox(width: Space.xs),
|
||||
Expanded(
|
||||
child: Text(
|
||||
messageOf(context, failure),
|
||||
style: context.texts.bodySmall?.copyWith(
|
||||
color: context.tripzColors.danger,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../core/design/tokens.dart';
|
||||
import '../../../../core/design/tripz_colors.dart';
|
||||
|
||||
/// ترويسة موحّدة لشاشات الدخول: أيقونة ثم عنوان ثم سطر شارح.
|
||||
/// «الشاشة مهمة واحدة» — سؤال واحد وزر أساسي واحد أسفلها (docs/26 §8.1).
|
||||
class AuthHeader extends StatelessWidget {
|
||||
const AuthHeader({
|
||||
super.key,
|
||||
required this.icon,
|
||||
required this.title,
|
||||
required this.lead,
|
||||
});
|
||||
|
||||
final IconData icon;
|
||||
final String title;
|
||||
final String lead;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.all(Space.sm),
|
||||
decoration: BoxDecoration(
|
||||
color: context.colors.primaryContainer,
|
||||
borderRadius: Radii.card_,
|
||||
),
|
||||
child: Icon(
|
||||
icon,
|
||||
size: Sizes.icon,
|
||||
color: context.colors.onPrimaryContainer,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: Space.md),
|
||||
Text(title, style: context.texts.headlineSmall),
|
||||
const SizedBox(height: Space.xs),
|
||||
Text(
|
||||
lead,
|
||||
style: context.texts.bodyMedium?.copyWith(
|
||||
color: context.colors.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user