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

feat(apps): نظام التصميم والمصادقة الكاملة — المرحلتان 2 و3

Browse Source 
## تصحيح بنيوي أولاً
بنية المرحلة 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
2026-08-04 21:42:19 +03:00
co-authored by Claude Opus 5
parent 0de8573d27
commit c52338f3bb
117 changed files with 6061 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/driver_new/lib/features/auth/view/agreement_view.dart
+56
View File
@@ -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,
),
),
],
),
);
},
);
}
}
apps/driver_new/lib/features/auth/view/login_page.dart
+70
View File
@@ -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(),
},
),
),
);
}
}
apps/driver_new/lib/features/auth/view/otp_view.dart
+89
View File
@@ -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,
),
),
],
),
);
},
);
}
}
apps/driver_new/lib/features/auth/view/permission_view.dart
+56
View File
@@ -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,
),
],
],
),
);
},
);
}
}
apps/driver_new/lib/features/auth/view/phone_view.dart
+61
View File
@@ -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!),
],
),
);
},
);
}
}
apps/driver_new/lib/features/auth/view/profile_page.dart
+85
View File
@@ -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);
}
}
apps/driver_new/lib/features/auth/view/widgets/auth_failure_text.dart
+61
View File
@@ -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,
),
),
),
],
),
);
}
}
apps/driver_new/lib/features/auth/view/widgets/auth_header.dart
+49
View File
@@ -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,
),
),
],
);
}
}