pennellato git da rosso ad arancio e verde

lib/features/onboarding/ui/onboarding_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/utils/validators.dart';
 import 'package:flux/features/company/models/company_model.dart';
 import 'package:flux/features/master_data/store/models/store_model.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
@@ -9,6 +10,7 @@ import 'package:flux/features/onboarding/blocs/onboarding_cubit.dart';
 // Sostituisci con il percorso corretto della tua FluxTextField
 import 'package:flux/core/widgets/flux_text_field.dart';
 import 'package:flux/features/onboarding/blocs/onboarding_state.dart';
+import 'package:flux/features/onboarding/ui/company_onboarding_form.dart';
 
 class OnboardingScreen extends StatefulWidget {
   const OnboardingScreen({super.key});
@@ -21,14 +23,10 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
   late PageController _pageController;
 
   // --- CHIAVI DEI FORM (Per la validazione indipendente di ogni step) ---
-  final _companyFormKey = GlobalKey<FormState>();
+
   final _storeFormKey = GlobalKey<FormState>();
   final _staffFormKey = GlobalKey<FormState>();
 
-  // --- CONTROLLERS: STEP 1 (Company) ---
-  final _companyNameCtrl = TextEditingController();
-  final _companyVatCtrl = TextEditingController();
-
   // --- CONTROLLERS: STEP 2 (Store) ---
   final _storeNameCtrl = TextEditingController();
   final _storeAddressCtrl = TextEditingController();
@@ -49,8 +47,6 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
   @override
   void dispose() {
     _pageController.dispose();
-    _companyNameCtrl.dispose();
-    _companyVatCtrl.dispose();
     _storeNameCtrl.dispose();
     _storeAddressCtrl.dispose();
     _staffFirstNameCtrl.dispose();
@@ -72,14 +68,6 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
     }
   }
 
-  // Validatore generico riutilizzabile
-  String? _requireValidator(String? value) {
-    if (value == null || value.trim().isEmpty) {
-      return 'Campo obbligatorio';
-    }
-    return null;
-  }
-
   @override
   Widget build(BuildContext context) {
     return BlocConsumer<OnboardingCubit, OnboardingState>(
@@ -129,7 +117,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
                   physics:
                       const NeverScrollableScrollPhysics(), // Vietato lo swipe manuale!
                   children: [
-                    _buildCompanyForm(context, state),
+                    CompanyOnboardingForm(state: state), // Step 1: Company
                     _buildStoreForm(context, state),
                     _buildStaffForm(context, state),
                   ],
@@ -149,73 +137,6 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
     );
   }
 
-  // =========================================================================
-  // SCHERMATE DEI SINGOLI STEP
-  // =========================================================================
-
-  Widget _buildCompanyForm(BuildContext context, OnboardingState state) {
-    return Padding(
-      padding: const EdgeInsets.all(32.0),
-      child: Form(
-        key: _companyFormKey,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            const Text(
-              "Iniziamo! 🏢",
-              style: TextStyle(fontSize: 32, fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 8),
-            const Text(
-              "Inserisci i dati della tua attività per configurare il tuo ambiente FLUX.",
-              style: TextStyle(fontSize: 16, color: Colors.grey),
-            ),
-            const SizedBox(height: 48),
-
-            FluxTextField(
-              label: 'Ragione Sociale / Nome Azienda',
-              controller: _companyNameCtrl,
-              validator: _requireValidator,
-            ),
-            const SizedBox(height: 16),
-            FluxTextField(
-              label: 'Partita IVA',
-              controller: _companyVatCtrl,
-              validator: _requireValidator,
-            ),
-
-            const Spacer(),
-            ElevatedButton(
-              style: ElevatedButton.styleFrom(
-                padding: const EdgeInsets.symmetric(vertical: 16),
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(12),
-                ),
-              ),
-              onPressed: () {
-                if (_companyFormKey.currentState!.validate()) {
-                  // MOCK DI ESEMPIO: Sostituisci con il tuo vero CompanyModel
-                  final newCompany = CompanyModel(
-                    ownerId: '', // Questo lo gestirà o ignorerà il Cubit
-                    name: _companyNameCtrl.text.trim(),
-                    vatNumber: _companyVatCtrl.text.trim(),
-                  );
-                  context.read<OnboardingCubit>().saveCompany(newCompany);
-                }
-              },
-              child: const Text(
-                "Salva e Prosegui",
-                style: TextStyle(fontSize: 16),
-              ),
-            ),
-            const SizedBox(height: 16),
-          ],
-        ),
-      ),
-    );
-  }
-
   Widget _buildStoreForm(BuildContext context, OnboardingState state) {
     return Padding(
       padding: const EdgeInsets.all(32.0),
@@ -239,13 +160,13 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
             FluxTextField(
               label: 'Nome Negozio (es. Sede Centrale)',
               controller: _storeNameCtrl,
-              validator: _requireValidator,
+              validator: notEmptyValidator,
             ),
             const SizedBox(height: 16),
             FluxTextField(
               label: 'Indirizzo completo',
               controller: _storeAddressCtrl,
-              validator: _requireValidator,
+              validator: notEmptyValidator,
             ),
 
             const Spacer(),
@@ -258,11 +179,9 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
               ),
               onPressed: () {
                 if (_storeFormKey.currentState!.validate()) {
-                  final newStore = StoreModel(
-                    companyId: '', // Iniettato dal Cubit
-                    name: _storeNameCtrl.text.trim(),
-                    address: _storeAddressCtrl.text.trim(),
-                    isActive: true,
+                  final newStore = StoreModel.empty().copyWith(
+                    nome: _storeNameCtrl.text.trim(),
+                    indirizzo: _storeAddressCtrl.text.trim(),
                   );
                   context.read<OnboardingCubit>().saveStore(newStore);
                 }
@@ -302,13 +221,13 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
             FluxTextField(
               label: 'Nome',
               controller: _staffFirstNameCtrl,
-              validator: _requireValidator,
+              validator: notEmptyValidator,
             ),
             const SizedBox(height: 16),
             FluxTextField(
               label: 'Cognome',
               controller: _staffLastNameCtrl,
-              validator: _requireValidator,
+              validator: notEmptyValidator,
             ),
             const SizedBox(height: 16),
             FluxTextField(
@@ -329,14 +248,9 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
               ),
               onPressed: () {
                 if (_staffFormKey.currentState!.validate()) {
-                  final newStaff = StaffMemberModel(
-                    companyId: '', // Iniettato dal Cubit
-                    storeId: '', // Iniettato dal Cubit
-                    userId: '', // Iniettato dal Cubit
+                  final newStaff = StaffMemberModel.empty().copyWith(
                     name: _staffFirstNameCtrl.text.trim(),
-                    surname: _staffLastNameCtrl.text.trim(),
                     jobTitle: _staffJobTitleCtrl.text.trim(),
-                    // systemRole non viene passato qui: la Paranoia Mode del Cubit forzerà "admin"
                   );
                   context.read<OnboardingCubit>().saveStaff(newStaff);
                 }