Xeewy/TravelMate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor user and theme management to use BLoC pattern; remove provider classes and integrate new services for user and group functionalities

Browse Source
This commit is contained in:
Dayron
2025-10-14 12:10:42 +02:00
parent c4588a65c0
commit 72ddb58a11
27 changed files with 1864 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

610
lib/components/home/create_trip_content.dart
View File

@@ -1,11 +1,14 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:travel_mate/data/models/trip.dart';
import 'package:travel_mate/providers/user_provider.dart';
import 'package:travel_mate/services/trip_service.dart';
import 'package:travel_mate/services/group_service.dart';
import 'package:travel_mate/data/models/group.dart';
import '../../blocs/user/user_bloc.dart';
import '../../blocs/user/user_state.dart' as user_state;
import '../../blocs/trip/trip_bloc.dart';
import '../../blocs/trip/trip_event.dart';
import '../../blocs/group/group_bloc.dart';
import '../../blocs/group/group_event.dart';
import '../../data/models/group.dart';
import '../../services/user_service.dart';
class CreateTripContent extends StatefulWidget {
const CreateTripContent({super.key});
@@ -20,12 +23,12 @@ class _CreateTripContentState extends State<CreateTripContent> {
final _descriptionController = TextEditingController();
final _locationController = TextEditingController();
final _budgetController = TextEditingController();
final _userService = UserService();
DateTime? _startDate;
DateTime? _endDate;
bool _isLoading = false;
// Liste des participants (emails)
final List<String> _participants = [];
final _participantController = TextEditingController();
@@ -41,233 +44,235 @@ class _CreateTripContentState extends State<CreateTripContent> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Créer un voyage'),
backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Colors.white,
),
body: SingleChildScrollView(
padding: EdgeInsets.all(16),
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Titre du voyage
_buildSectionTitle('Informations générales'),
SizedBox(height: 16),
return BlocBuilder<UserBloc, user_state.UserState>(
builder: (context, userState) {
if (userState is! user_state.UserLoaded) {
return Scaffold(
appBar: AppBar(title: Text('Créer un voyage')),
body: Center(child: Text('Veuillez vous connecter')),
);
}
TextFormField(
controller: _titleController,
validator: (value) {
if (value == null || value.trim().isEmpty) {
return 'Titre requis';
}
return null;
},
decoration: InputDecoration(
labelText: 'Titre du voyage *',
hintText: 'ex: Voyage à Paris',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.travel_explore),
),
),
SizedBox(height: 16),
// Description
TextFormField(
controller: _descriptionController,
maxLines: 3,
decoration: InputDecoration(
labelText: 'Description',
hintText: 'Décrivez votre voyage...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.description),
),
),
SizedBox(height: 16),
// Destination
TextFormField(
controller: _locationController,
validator: (value) {
if (value == null || value.trim().isEmpty) {
return 'Destination requise';
}
return null;
},
decoration: InputDecoration(
labelText: 'Destination *',
hintText: 'ex: Paris, France',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.location_on),
),
),
SizedBox(height: 24),
// Dates
_buildSectionTitle('Dates du voyage'),
SizedBox(height: 16),
Row(
return Scaffold(
appBar: AppBar(
title: Text('Créer un voyage'),
backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Colors.white,
),
body: SingleChildScrollView(
padding: EdgeInsets.all(16),
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: _buildDateField(
label: 'Date de début *',
date: _startDate,
onTap: () => _selectStartDate(context),
),
),
SizedBox(width: 16),
Expanded(
child: _buildDateField(
label: 'Date de fin *',
date: _endDate,
onTap: () => _selectEndDate(context),
),
),
],
),
_buildSectionTitle('Informations générales'),
SizedBox(height: 16),
SizedBox(height: 24),
// Budget
_buildSectionTitle('Budget'),
SizedBox(height: 16),
TextFormField(
controller: _budgetController,
keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration(
labelText: 'Budget estimé',
hintText: 'ex: 1200.50',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.euro),
suffixText: '€',
),
),
SizedBox(height: 24),
// Participants
_buildSectionTitle('Participants'),
SizedBox(height: 8),
Text(
'Ajoutez les emails des personnes que vous souhaitez inviter',
style: TextStyle(color: Colors.grey[600], fontSize: 14),
),
SizedBox(height: 16),
// Champ d'ajout de participant
Row(
children: [
Expanded(
child: TextFormField(
controller: _participantController,
keyboardType: TextInputType.emailAddress,
decoration: InputDecoration(
labelText: 'Email du participant',
hintText: 'ex: ami@email.com',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.person_add),
),
),
),
SizedBox(width: 8),
ElevatedButton(
onPressed: _addParticipant,
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(
TextFormField(
controller: _titleController,
validator: (value) {
if (value == null || value.trim().isEmpty) {
return 'Titre requis';
}
return null;
},
decoration: InputDecoration(
labelText: 'Titre du voyage *',
hintText: 'ex: Voyage à Paris',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
padding: EdgeInsets.all(16),
),
child: Icon(Icons.add),
),
],
),
SizedBox(height: 16),
// Liste des participants ajoutés
if (_participants.isNotEmpty) ...[
Text(
'Participants ajoutés (${_participants.length})',
style: TextStyle(fontWeight: FontWeight.w500),
),
SizedBox(height: 8),
Container(
width: double.infinity,
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey[300]!),
borderRadius: BorderRadius.circular(12),
),
child: Wrap(
spacing: 8,
runSpacing: 8,
children: _participants
.map(
(email) => Chip(
label: Text(email, style: TextStyle(fontSize: 12)),
deleteIcon: Icon(Icons.close, size: 18),
onDeleted: () => _removeParticipant(email),
backgroundColor: Theme.of(
context,
).colorScheme.primary.withAlpha(25),
),
)
.toList(),
),
),
],
SizedBox(height: 32),
// Bouton de création
SizedBox(
width: double.infinity,
height: 50,
child: ElevatedButton(
onPressed: _isLoading ? null : _saveTrip,
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
prefixIcon: Icon(Icons.travel_explore),
),
),
child: _isLoading
? CircularProgressIndicator(color: Colors.white)
: Text(
'Créer le voyage',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
SizedBox(height: 16),
TextFormField(
controller: _descriptionController,
maxLines: 3,
decoration: InputDecoration(
labelText: 'Description',
hintText: 'Décrivez votre voyage...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.description),
),
),
SizedBox(height: 16),
TextFormField(
controller: _locationController,
validator: (value) {
if (value == null || value.trim().isEmpty) {
return 'Destination requise';
}
return null;
},
decoration: InputDecoration(
labelText: 'Destination *',
hintText: 'ex: Paris, France',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.location_on),
),
),
SizedBox(height: 24),
_buildSectionTitle('Dates du voyage'),
SizedBox(height: 16),
Row(
children: [
Expanded(
child: _buildDateField(
label: 'Date de début *',
date: _startDate,
onTap: () => _selectStartDate(context),
),
),
SizedBox(width: 16),
Expanded(
child: _buildDateField(
label: 'Date de fin *',
date: _endDate,
onTap: () => _selectEndDate(context),
),
),
],
),
SizedBox(height: 24),
_buildSectionTitle('Budget'),
SizedBox(height: 16),
TextFormField(
controller: _budgetController,
keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: InputDecoration(
labelText: 'Budget estimé',
hintText: 'ex: 1200.50',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.euro),
suffixText: '€',
),
),
SizedBox(height: 24),
_buildSectionTitle('Participants'),
SizedBox(height: 8),
Text(
'Ajoutez les emails des personnes que vous souhaitez inviter',
style: TextStyle(color: Colors.grey[600], fontSize: 14),
),
SizedBox(height: 16),
Row(
children: [
Expanded(
child: TextFormField(
controller: _participantController,
keyboardType: TextInputType.emailAddress,
decoration: InputDecoration(
labelText: 'Email du participant',
hintText: 'ex: ami@email.com',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
prefixIcon: Icon(Icons.person_add),
),
),
),
),
),
SizedBox(width: 8),
ElevatedButton(
onPressed: _addParticipant,
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
padding: EdgeInsets.all(16),
),
child: Icon(Icons.add),
),
],
),
SizedBox(height: 20),
],
SizedBox(height: 16),
if (_participants.isNotEmpty) ...[
Text(
'Participants ajoutés (${_participants.length})',
style: TextStyle(fontWeight: FontWeight.w500),
),
SizedBox(height: 8),
Container(
width: double.infinity,
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey[300]!),
borderRadius: BorderRadius.circular(12),
),
child: Wrap(
spacing: 8,
runSpacing: 8,
children: _participants
.map(
(email) => Chip(
label: Text(email, style: TextStyle(fontSize: 12)),
deleteIcon: Icon(Icons.close, size: 18),
onDeleted: () => _removeParticipant(email),
backgroundColor: Theme.of(
context,
).colorScheme.primary.withAlpha(25),
),
)
.toList(),
),
),
],
SizedBox(height: 32),
SizedBox(
width: double.infinity,
height: 50,
child: ElevatedButton(
onPressed: _isLoading ? null : () => _saveTrip(userState.user),
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
child: _isLoading
? CircularProgressIndicator(color: Colors.white)
: Text(
'Créer le voyage',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
),
),
SizedBox(height: 20),
],
),
),
),
),
),
);
},
);
}
@@ -287,7 +292,6 @@ class _CreateTripContentState extends State<CreateTripContent> {
required DateTime? date,
required VoidCallback onTap,
}) {
// Détecter le thème actuel
final isDarkMode = Theme.of(context).brightness == Brightness.dark;
final textColor = isDarkMode ? Colors.white : Colors.black;
final labelColor = isDarkMode ? Colors.white70 : Colors.grey[600];
@@ -305,10 +309,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: TextStyle(fontSize: 12, color: labelColor),
),
Text(label, style: TextStyle(fontSize: 12, color: labelColor)),
SizedBox(height: 8),
Row(
children: [
@@ -352,9 +353,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
if (_startDate == null) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Veuillez d\'abord sélectionner la date de début'),
),
SnackBar(content: Text('Veuillez d\'abord sélectionner la date de début')),
);
}
return;
@@ -377,7 +376,6 @@ class _CreateTripContentState extends State<CreateTripContent> {
final email = _participantController.text.trim();
if (email.isEmpty) return;
// Validation email simple
final emailRegex = RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
if (!emailRegex.hasMatch(email)) {
if (mounted) {
@@ -388,7 +386,6 @@ class _CreateTripContentState extends State<CreateTripContent> {
return;
}
// Vérifier si l'email existe déjà
if (_participants.contains(email)) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
@@ -410,66 +407,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
});
}
Future<bool> _saveGroup(String currentUserId) async {
if (!_formKey.currentState!.validate()) {
return false;
}
// Convertir les emails en IDs
final participantIds = await _changeUserEmailById(_participants);
// Créer la liste des membres incluant le créateur
List<String> allMembers = [currentUserId];
// Ajouter tous les participants (éviter les doublons)
for (String participantId in participantIds) {
if (!allMembers.contains(participantId)) {
allMembers.add(participantId);
}
}
print('Membres du groupe: $allMembers');
final group = Group(
id: '',
name: _titleController.text.trim(),
members: allMembers, // Contient le créateur + tous les participants
);
final groupService = GroupService();
bool success = await groupService.createGroup(group);
print('Groupe créé avec succès: $success');
return success;
}
Future<List<String>> _changeUserEmailById(List<String> participants) async {
final userProvider = Provider.of<UserProvider>(context, listen: false);
List<String> ids = [];
for (String email in participants) {
try {
final id = await userProvider.getUserIdByEmail(email);
if (id != null) {
ids.add(id);
} else {
print('Utilisateur non trouvé pour l\'ID: $email');
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Utilisateur non trouvé pour l\'email: $email'),
backgroundColor: Colors.orange,
duration: Duration(seconds: 2),
),
);
}
} catch (e) {
print('Erreur lors de la récupération de l\'utilisateur $email: $e');
}
}
return ids;
}
Future<void> _saveTrip() async {
Future<void> _saveTrip(user_state.UserModel currentUser) async {
if (!_formKey.currentState!.validate()) {
return;
}
@@ -488,68 +426,48 @@ class _CreateTripContentState extends State<CreateTripContent> {
});
try {
final userProvider = Provider.of<UserProvider>(context, listen: false);
final currentUser = userProvider.currentUser;
if (currentUser == null || currentUser.id == null) {
throw Exception('Utilisateur non connecté');
}
print('Création du voyage par: ${currentUser.id} (${currentUser.email})');
// Convertir les emails en IDs utilisateur
// Convertir les emails en IDs
List<String> participantIds = await _changeUserEmailById(_participants);
// Ajouter le créateur aux participants s'il n'y est pas déjà
if (!participantIds.contains(currentUser.id!)) {
participantIds.insert(0, currentUser.id!);
// Ajouter le créateur
if (!participantIds.contains(currentUser.id)) {
participantIds.insert(0, currentUser.id);
}
print('Participants IDs (avec créateur): $participantIds');
// Créer l'objet Trip avec les IDs des participants
// Créer le voyage
final trip = Trip(
id: '', // Sera généré par Firebase
id: '',
title: _titleController.text.trim(),
description: _descriptionController.text.trim(),
location: _locationController.text.trim(),
startDate: _startDate!,
endDate: _endDate!,
budget: double.tryParse(_budgetController.text) ?? 0.0,
createdBy: currentUser.id!,
participants: participantIds, // Contient le créateur + tous les participants
createdBy: currentUser.id,
participants: participantIds,
createdAt: DateTime.now(),
updatedAt: DateTime.now(),
);
print('Données du voyage: ${trip.toMap()}');
// Créer le groupe
final group = Group(
id: '',
name: _titleController.text.trim(),
members: participantIds,
);
// Sauvegarder le voyage
final tripService = TripService();
final success = await tripService.addTrip(trip);
// Utiliser les BLoCs pour créer
context.read<TripBloc>().add(TripCreateRequested(trip: trip));
context.read<GroupBloc>().add(GroupCreateRequested(group: group));
// Créer le groupe associé au voyage avec le créateur inclus
final successGroup = await _saveGroup(currentUser.id!);
if (success && successGroup && mounted) {
print('Voyage et groupe créés avec succès !');
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Voyage créé avec succès !'),
backgroundColor: Colors.green,
),
);
Navigator.pop(context, true); // Retourner true pour indiquer le succès
} else {
throw Exception('Erreur lors de la sauvegarde');
if (mounted) {
Navigator.pop(context, true);
}
} catch (e) {
print('Erreur lors de la création: $e');
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Erreur lors de la création: $e'),
content: Text('Erreur: $e'),
backgroundColor: Colors.red,
),
);
@@ -562,4 +480,30 @@ class _CreateTripContentState extends State<CreateTripContent> {
}
}
}
Future<List<String>> _changeUserEmailById(List<String> participants) async {
List<String> ids = [];
for (String email in participants) {
try {
final id = await _userService.getUserIdByEmail(email);
if (id != null) {
ids.add(id);
} else {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Utilisateur non trouvé: $email'),
backgroundColor: Colors.orange,
),
);
}
}
} catch (e) {
print('Erreur: $e');
}
}
return ids;
}
}