feat: Enhance trip management features and improve UI responsiveness
- Implemented AutomaticKeepAliveClientMixin in HomeContent to maintain state during navigation. - Modified trip loading logic to trigger after the first frame for better performance. - Updated trip loading events to use LoadTripsByUserId for consistency. - Added temporary success messages for trip creation and operations. - Improved UI elements for better user experience, including updated text styles and spacing. - Refactored trip model to support Firestore timestamps and improved error handling during parsing. - Streamlined trip repository methods for better clarity and performance. - Enhanced trip service methods to ensure correct mapping from Firestore documents. - Removed unnecessary trip reset logic on logout.
This commit is contained in:
Dayron
@@ -6,14 +6,20 @@ 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/trip/trip_state.dart';
|
||||
import '../../blocs/group/group_bloc.dart';
|
||||
import '../../blocs/group/group_event.dart';
|
||||
import '../../data/models/group.dart';
|
||||
import '../../data/models/group_member.dart';
|
||||
import '../../services/user_service.dart';
|
||||
import '../../repositories/group_repository.dart';
|
||||
|
||||
class CreateTripContent extends StatefulWidget {
|
||||
const CreateTripContent({super.key});
|
||||
final Trip? tripToEdit;
|
||||
const CreateTripContent({
|
||||
super.key,
|
||||
this.tripToEdit,
|
||||
});
|
||||
|
||||
@override
|
||||
State<CreateTripContent> createState() => _CreateTripContentState();
|
||||
@@ -27,6 +33,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
final _locationController = TextEditingController();
|
||||
final _budgetController = TextEditingController();
|
||||
final _userService = UserService();
|
||||
final _groupRepository = GroupRepository();
|
||||
|
||||
DateTime? _startDate;
|
||||
DateTime? _endDate;
|
||||
@@ -35,6 +42,58 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
final List<String> _participants = [];
|
||||
final _participantController = TextEditingController();
|
||||
|
||||
bool get isEditing => widget.tripToEdit != null;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_initializeFormWithTrip();
|
||||
}
|
||||
|
||||
Future<void> _initializeFormWithTrip() async {
|
||||
if (widget.tripToEdit != null) {
|
||||
final trip = widget.tripToEdit!;
|
||||
|
||||
setState(() {
|
||||
_titleController.text = trip.title;
|
||||
_descriptionController.text = trip.description;
|
||||
_locationController.text = trip.location;
|
||||
_budgetController.text = trip.budget?.toString() ?? '';
|
||||
_startDate = trip.startDate;
|
||||
_endDate = trip.endDate;
|
||||
});
|
||||
|
||||
await _loadParticipantEmails(trip.participants);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadParticipantEmails(List<String> participantIds) async {
|
||||
final userState = context.read<UserBloc>().state;
|
||||
String? currentUserId;
|
||||
|
||||
if (userState is user_state.UserLoaded) {
|
||||
currentUserId = userState.user.id;
|
||||
}
|
||||
|
||||
for (String userId in participantIds) {
|
||||
if (userId == currentUserId) continue;
|
||||
|
||||
try {
|
||||
final userDoc = await _userService.getUserById(userId);
|
||||
if (userDoc != null && userDoc.email.isNotEmpty) {
|
||||
setState(() {
|
||||
_participants.add(userDoc.email);
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_errorService.logError(
|
||||
'create_trip_content.dart',
|
||||
'Erreur chargement participant $userId: $e',
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_titleController.dispose();
|
||||
@@ -47,235 +106,271 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
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')),
|
||||
);
|
||||
return BlocListener<TripBloc, TripState>(
|
||||
listener: (context, tripState) {
|
||||
// Écouter l'état TripCreated pour récupérer l'ID du voyage
|
||||
if (tripState is TripCreated) {
|
||||
_createGroupForTrip(tripState.tripId);
|
||||
} else if (tripState is TripOperationSuccess) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(tripState.message),
|
||||
backgroundColor: Colors.green,
|
||||
),
|
||||
);
|
||||
Navigator.pop(context);
|
||||
if (isEditing) {
|
||||
Navigator.pop(context); // Retour supplémentaire en mode édition
|
||||
}
|
||||
}
|
||||
} else if (tripState is TripError) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(tripState.message),
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
child: BlocBuilder<UserBloc, user_state.UserState>(
|
||||
builder: (context, userState) {
|
||||
if (userState is! user_state.UserLoaded) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(isEditing ? 'Modifier le voyage' : 'Créer un voyage'),
|
||||
),
|
||||
body: Center(child: Text('Veuillez vous connecter')),
|
||||
);
|
||||
}
|
||||
|
||||
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: [
|
||||
_buildSectionTitle('Informations générales'),
|
||||
SizedBox(height: 16),
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(isEditing ? 'Modifier le voyage' : '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: [
|
||||
_buildSectionTitle('Informations générales'),
|
||||
SizedBox(height: 16),
|
||||
|
||||
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),
|
||||
|
||||
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),
|
||||
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(width: 16),
|
||||
Expanded(
|
||||
child: _buildDateField(
|
||||
label: 'Date de fin *',
|
||||
date: _endDate,
|
||||
onTap: () => _selectEndDate(context),
|
||||
),
|
||||
|
||||
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: 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
|
||||
.withValues(alpha: 0.1),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
SizedBox(height: 24),
|
||||
SizedBox(height: 32),
|
||||
|
||||
_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,
|
||||
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),
|
||||
),
|
||||
padding: EdgeInsets.all(16),
|
||||
),
|
||||
child: Icon(Icons.add),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
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),
|
||||
child: _isLoading
|
||||
? CircularProgressIndicator(color: Colors.white)
|
||||
: Text(
|
||||
isEditing ? 'Mettre à jour le voyage' : 'Créer le voyage',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
),
|
||||
|
||||
SizedBox(height: 20),
|
||||
],
|
||||
|
||||
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),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -300,7 +395,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
final labelColor = isDarkMode ? Colors.white70 : Colors.grey[600];
|
||||
final iconColor = isDarkMode ? Colors.white70 : Colors.grey[600];
|
||||
final placeholderColor = isDarkMode ? Colors.white38 : Colors.grey[500];
|
||||
|
||||
|
||||
return InkWell(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
@@ -319,9 +414,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
Icon(Icons.calendar_today, size: 16, color: iconColor),
|
||||
SizedBox(width: 8),
|
||||
Text(
|
||||
date != null
|
||||
? '${date.day}/${date.month}/${date.year}'
|
||||
: 'Sélectionner',
|
||||
date != null ? '${date.day}/${date.month}/${date.year}' : 'Sélectionner',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: date != null ? textColor : placeholderColor,
|
||||
@@ -382,18 +475,15 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
final emailRegex = RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
|
||||
if (!emailRegex.hasMatch(email)) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Email invalide'))
|
||||
);
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Email invalide')));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (_participants.contains(email)) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Ce participant est déjà ajouté'))
|
||||
);
|
||||
ScaffoldMessenger.of(context)
|
||||
.showSnackBar(SnackBar(content: Text('Ce participant est déjà ajouté')));
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -410,6 +500,128 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
});
|
||||
}
|
||||
|
||||
// Mettre à jour le groupe avec les nouveaux membres
|
||||
Future<void> _updateGroupMembers(
|
||||
String tripId,
|
||||
user_state.UserModel currentUser,
|
||||
List<Map<String, String>> participantsData,
|
||||
) async {
|
||||
try {
|
||||
final group = await _groupRepository.getGroupByTripId(tripId);
|
||||
|
||||
if (group == null) {
|
||||
_errorService.logError(
|
||||
'create_trip_content.dart',
|
||||
'Groupe non trouvé pour le voyage $tripId',
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
final newMembers = <GroupMember>[
|
||||
GroupMember(
|
||||
userId: currentUser.id,
|
||||
firstName: currentUser.prenom,
|
||||
pseudo: currentUser.prenom,
|
||||
role: 'admin',
|
||||
),
|
||||
...participantsData.map((p) => GroupMember(
|
||||
userId: p['id'] as String,
|
||||
firstName: p['firstName'] as String,
|
||||
pseudo: p['firstName'] as String,
|
||||
role: 'member',
|
||||
)),
|
||||
];
|
||||
|
||||
final currentMembers = await _groupRepository.getGroupMembers(group.id);
|
||||
final currentMemberIds = currentMembers.map((m) => m.userId).toSet();
|
||||
final newMemberIds = newMembers.map((m) => m.userId).toSet();
|
||||
|
||||
final membersToAdd = newMembers.where((m) => !currentMemberIds.contains(m.userId)).toList();
|
||||
|
||||
final membersToRemove = currentMembers
|
||||
.where((m) => !newMemberIds.contains(m.userId) && m.role != 'admin')
|
||||
.toList();
|
||||
|
||||
for (final member in membersToAdd) {
|
||||
context.read<GroupBloc>().add(AddMemberToGroup(group.id, member));
|
||||
}
|
||||
|
||||
for (final member in membersToRemove) {
|
||||
context.read<GroupBloc>().add(RemoveMemberFromGroup(group.id, member.userId));
|
||||
}
|
||||
} catch (e) {
|
||||
_errorService.logError(
|
||||
'create_trip_content.dart',
|
||||
'Erreur lors de la mise à jour du groupe: $e',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// NOUVELLE MÉTHODE : Créer le groupe après la création du voyage
|
||||
Future<void> _createGroupForTrip(String tripId) async {
|
||||
try {
|
||||
final userState = context.read<UserBloc>().state;
|
||||
if (userState is! user_state.UserLoaded) return;
|
||||
|
||||
final currentUser = userState.user;
|
||||
final participantsData = await _getParticipantsData(_participants);
|
||||
|
||||
// Créer le groupe avec le tripId récupéré
|
||||
final group = Group(
|
||||
id: '', // Sera généré par Firestore
|
||||
name: _titleController.text.trim(),
|
||||
tripId: tripId, // ✅ ID du voyage récupéré
|
||||
createdBy: currentUser.id,
|
||||
);
|
||||
|
||||
final groupMembers = <GroupMember>[
|
||||
GroupMember(
|
||||
userId: currentUser.id,
|
||||
firstName: currentUser.prenom,
|
||||
pseudo: currentUser.prenom,
|
||||
role: 'admin',
|
||||
),
|
||||
...participantsData.map((p) => GroupMember(
|
||||
userId: p['id'] as String,
|
||||
firstName: p['firstName'] as String,
|
||||
pseudo: p['firstName'] as String,
|
||||
role: 'member',
|
||||
)),
|
||||
];
|
||||
|
||||
context.read<GroupBloc>().add(CreateGroupWithMembers(
|
||||
group: group,
|
||||
members: groupMembers,
|
||||
));
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text('Voyage et groupe créés avec succès !'),
|
||||
backgroundColor: Colors.green,
|
||||
),
|
||||
);
|
||||
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
});
|
||||
|
||||
Navigator.pop(context);
|
||||
}
|
||||
} catch (e) {
|
||||
_errorService.logError(
|
||||
'create_trip_content.dart',
|
||||
'Erreur lors de la création du groupe: $e',
|
||||
);
|
||||
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _saveTrip(user_state.UserModel currentUser) async {
|
||||
if (!_formKey.currentState!.validate()) {
|
||||
return;
|
||||
@@ -431,14 +643,13 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
try {
|
||||
final participantsData = await _getParticipantsData(_participants);
|
||||
List<String> participantIds = participantsData.map((p) => p['id'] as String).toList();
|
||||
|
||||
|
||||
if (!participantIds.contains(currentUser.id)) {
|
||||
participantIds.insert(0, currentUser.id);
|
||||
}
|
||||
|
||||
// Créer le voyage
|
||||
final trip = Trip(
|
||||
id: '',
|
||||
id: isEditing ? widget.tripToEdit!.id : '',
|
||||
title: _titleController.text.trim(),
|
||||
description: _descriptionController.text.trim(),
|
||||
location: _locationController.text.trim(),
|
||||
@@ -447,42 +658,23 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
budget: double.tryParse(_budgetController.text) ?? 0.0,
|
||||
createdBy: currentUser.id,
|
||||
participants: participantIds,
|
||||
createdAt: DateTime.now(),
|
||||
createdAt: isEditing ? widget.tripToEdit!.createdAt : DateTime.now(),
|
||||
updatedAt: DateTime.now(),
|
||||
);
|
||||
|
||||
context.read<TripBloc>().add(TripCreateRequested(trip: trip));
|
||||
if (isEditing) {
|
||||
// Mode mise à jour
|
||||
context.read<TripBloc>().add(TripUpdateRequested(trip: trip));
|
||||
|
||||
// Attendre que le trip soit créé (simplifié)
|
||||
await Future.delayed(Duration(milliseconds: 500));
|
||||
|
||||
final group = Group(
|
||||
id: '',
|
||||
name: _titleController.text.trim(),
|
||||
tripId: '',
|
||||
createdBy: currentUser.id,
|
||||
);
|
||||
|
||||
final groupMembers = <GroupMember>[
|
||||
GroupMember(
|
||||
userId: currentUser.id,
|
||||
firstName: currentUser.prenom,
|
||||
pseudo: currentUser.prenom, // Par défaut = prénom
|
||||
role: 'admin',
|
||||
),
|
||||
...participantsData.map((p) => GroupMember(
|
||||
userId: p['id'] as String,
|
||||
firstName: p['firstName'] as String,
|
||||
pseudo: p['firstName'] as String, // Par défaut = prénom
|
||||
role: 'member',
|
||||
)),
|
||||
];
|
||||
|
||||
|
||||
context.read<GroupBloc>().add(CreateGroupWithMembers(
|
||||
group: group,
|
||||
members: groupMembers,
|
||||
));
|
||||
await _updateGroupMembers(
|
||||
widget.tripToEdit!.id!,
|
||||
currentUser,
|
||||
participantsData,
|
||||
);
|
||||
} else {
|
||||
// Mode création - Le groupe sera créé dans le listener TripCreated
|
||||
context.read<TripBloc>().add(TripCreateRequested(trip: trip));
|
||||
}
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
@@ -491,9 +683,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
}
|
||||
} finally {
|
||||
if (mounted) {
|
||||
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
});
|
||||
@@ -501,9 +691,6 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
}
|
||||
}
|
||||
|
||||
// ...existing code...
|
||||
|
||||
// Récupérer les IDs et prénoms des participants
|
||||
Future<List<Map<String, String>>> _getParticipantsData(List<String> emails) async {
|
||||
List<Map<String, String>> participantsData = [];
|
||||
|
||||
@@ -511,10 +698,9 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
try {
|
||||
final userId = await _userService.getUserIdByEmail(email);
|
||||
if (userId != null) {
|
||||
// Récupérer le prénom de l'utilisateur
|
||||
final userDoc = await _userService.getUserById(userId);
|
||||
final firstName = userDoc?.prenom ?? 'Utilisateur';
|
||||
|
||||
|
||||
participantsData.add({
|
||||
'id': userId,
|
||||
'firstName': firstName,
|
||||
@@ -530,7 +716,10 @@ class _CreateTripContentState extends State<CreateTripContent> {
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
_errorService.logError('Erreur lors de la récupération de l\'utilisateur $email: $e', StackTrace.current);
|
||||
_errorService.logError(
|
||||
'create_trip_content.dart',
|
||||
'Erreur lors de la récupération de l\'utilisateur $email: $e',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,23 +16,31 @@ class HomeContent extends StatefulWidget {
|
||||
State<HomeContent> createState() => _HomeContentState();
|
||||
}
|
||||
|
||||
class _HomeContentState extends State<HomeContent> {
|
||||
class _HomeContentState extends State<HomeContent> with AutomaticKeepAliveClientMixin {
|
||||
@override
|
||||
bool get wantKeepAlive => true;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Charger les trips quand le widget est initialisé
|
||||
_loadTripsIfUserLoaded();
|
||||
// MODIFIÉ : Attendre un frame avant de charger
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_loadTripsIfUserLoaded();
|
||||
});
|
||||
}
|
||||
|
||||
void _loadTripsIfUserLoaded() {
|
||||
final userState = context.read<UserBloc>().state;
|
||||
if (userState is UserLoaded) {
|
||||
context.read<TripBloc>().add(TripLoadRequested(userId: userState.user.id));
|
||||
print('🚀 Chargement initial des trips pour ${userState.user.id}');
|
||||
context.read<TripBloc>().add(LoadTripsByUserId(userId: userState.user.id));
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
super.build(context); // Important pour AutomaticKeepAliveClientMixin
|
||||
|
||||
return BlocBuilder<UserBloc, UserState>(
|
||||
builder: (context, userState) {
|
||||
if (userState is UserLoading) {
|
||||
@@ -42,7 +50,7 @@ class _HomeContentState extends State<HomeContent> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
if (userState is UserError) {
|
||||
return Scaffold(
|
||||
body: Center(
|
||||
@@ -57,7 +65,7 @@ class _HomeContentState extends State<HomeContent> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
if (userState is! UserLoaded) {
|
||||
return Scaffold(
|
||||
body: Center(
|
||||
@@ -65,14 +73,9 @@ class _HomeContentState extends State<HomeContent> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
final user = userState.user;
|
||||
|
||||
// Charger les trips si ce n'est pas déjà fait
|
||||
if (context.read<TripBloc>().state is TripInitial) {
|
||||
context.read<TripBloc>().add(TripLoadRequested(userId: user.id));
|
||||
}
|
||||
|
||||
|
||||
return BlocConsumer<TripBloc, TripState>(
|
||||
listener: (context, tripState) {
|
||||
if (tripState is TripOperationSuccess) {
|
||||
@@ -82,8 +85,6 @@ class _HomeContentState extends State<HomeContent> {
|
||||
backgroundColor: Colors.green,
|
||||
),
|
||||
);
|
||||
// Recharger les trips après une opération réussie
|
||||
context.read<TripBloc>().add(TripLoadRequested(userId: user.id));
|
||||
} else if (tripState is TripError) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
@@ -91,62 +92,70 @@ class _HomeContentState extends State<HomeContent> {
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
} else if (tripState is TripCreated) {
|
||||
// Afficher un message de succès temporaire
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text('Voyage en cours de création...'),
|
||||
backgroundColor: Colors.blue,
|
||||
duration: Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
builder: (context, tripState) {
|
||||
return Scaffold(
|
||||
body: RefreshIndicator(
|
||||
onRefresh: () async {
|
||||
context.read<TripBloc>().add(TripLoadRequested(userId: user.id));
|
||||
print('🔄 Pull to refresh');
|
||||
context.read<TripBloc>().add(LoadTripsByUserId(userId: user.id));
|
||||
// Attendre que le chargement soit terminé
|
||||
await Future.delayed(Duration(milliseconds: 500));
|
||||
},
|
||||
child: SingleChildScrollView(
|
||||
physics: AlwaysScrollableScrollPhysics(),
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Header de bienvenue
|
||||
Text(
|
||||
'Bonjour ${user.prenom} !',
|
||||
style: TextStyle(fontSize: 28, fontWeight: FontWeight.bold),
|
||||
style: const TextStyle(fontSize: 28, fontWeight: FontWeight.bold),
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Vos voyages',
|
||||
style: TextStyle(fontSize: 16, color: Colors.grey[600]),
|
||||
),
|
||||
SizedBox(height: 20),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// Contenu principal basé sur l'état du TripBloc
|
||||
if (tripState is TripLoading)
|
||||
if (tripState is TripLoading || tripState is TripCreated)
|
||||
_buildLoadingState()
|
||||
else if (tripState is TripError)
|
||||
_buildErrorState(tripState.message, user.id)
|
||||
else if (tripState is TripLoaded)
|
||||
tripState.trips.isEmpty
|
||||
? _buildEmptyState()
|
||||
: _buildTripsList(tripState.trips)
|
||||
tripState.trips.isEmpty
|
||||
? _buildEmptyState()
|
||||
: _buildTripsList(tripState.trips)
|
||||
else
|
||||
_buildEmptyState(),
|
||||
|
||||
// Espacement en bas pour éviter que le FAB cache le contenu
|
||||
const SizedBox(height: 80),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// FloatingActionButton
|
||||
floatingActionButton: FloatingActionButton(
|
||||
onPressed: () async {
|
||||
final result = await Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (context) => CreateTripContent()),
|
||||
MaterialPageRoute(builder: (context) => const CreateTripContent()),
|
||||
);
|
||||
|
||||
if (result == true) {
|
||||
// Recharger les trips
|
||||
context.read<TripBloc>().add(TripLoadRequested(userId: user.id));
|
||||
|
||||
// AJOUTÉ : Recharger manuellement après retour
|
||||
if (result == true && mounted) {
|
||||
print('🔄 Retour de création, rechargement...');
|
||||
context.read<TripBloc>().add(LoadTripsByUserId(userId: user.id));
|
||||
}
|
||||
},
|
||||
backgroundColor: Theme.of(context).colorScheme.primary,
|
||||
@@ -189,7 +198,7 @@ class _HomeContentState extends State<HomeContent> {
|
||||
SizedBox(height: 16),
|
||||
ElevatedButton(
|
||||
onPressed: () {
|
||||
context.read<TripBloc>().add(TripLoadRequested(userId: userId));
|
||||
context.read<TripBloc>().add(LoadTripsByUserId(userId: userId));
|
||||
},
|
||||
child: Text('Réessayer'),
|
||||
),
|
||||
@@ -205,28 +214,17 @@ class _HomeContentState extends State<HomeContent> {
|
||||
padding: EdgeInsets.all(32),
|
||||
child: Column(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.travel_explore,
|
||||
size: 64,
|
||||
color: Colors.grey[400],
|
||||
),
|
||||
Icon(Icons.travel_explore, size: 80, color: Colors.grey[400]),
|
||||
SizedBox(height: 16),
|
||||
Text(
|
||||
'Aucun voyage pour le moment',
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.grey[600],
|
||||
),
|
||||
'Aucun voyage',
|
||||
style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
Text(
|
||||
'Créez votre premier voyage en appuyant sur le bouton +',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Colors.grey[500],
|
||||
),
|
||||
style: TextStyle(fontSize: 14, color: Colors.grey[600]),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -236,205 +234,127 @@ class _HomeContentState extends State<HomeContent> {
|
||||
|
||||
Widget _buildTripsList(List<Trip> trips) {
|
||||
return Column(
|
||||
children: trips.map((trip) => _buildTravelCard(trip)).toList(),
|
||||
children: trips.map((trip) => _buildTripCard(trip)).toList(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTravelCard(Trip trip) {
|
||||
final colors = [Colors.blue, Colors.orange, Colors.green, Colors.purple, Colors.red];
|
||||
final color = colors[trip.title.hashCode.abs() % colors.length];
|
||||
|
||||
Widget _buildTripCard(Trip trip) {
|
||||
final isDarkMode = Theme.of(context).brightness == Brightness.dark;
|
||||
final secondaryTextColor = isDarkMode ? Colors.white70 : Colors.grey[700];
|
||||
final iconColor = isDarkMode ? Colors.white70 : Colors.grey[600];
|
||||
final textColor = isDarkMode ? Colors.white : Colors.black;
|
||||
final subtextColor = isDarkMode ? Colors.white70 : Colors.grey[600];
|
||||
|
||||
return Card(
|
||||
elevation: 4,
|
||||
margin: const EdgeInsets.only(bottom: 16),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
|
||||
margin: EdgeInsets.only(bottom: 12),
|
||||
elevation: 2,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: InkWell(
|
||||
onTap: () {
|
||||
Navigator.push(
|
||||
onTap: () async {
|
||||
// AJOUTÉ : Recharger après retour des détails
|
||||
final result = await Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (context) => ShowTripDetailsContent(trip: trip)),
|
||||
MaterialPageRoute(
|
||||
builder: (context) => ShowTripDetailsContent(trip: trip),
|
||||
),
|
||||
);
|
||||
|
||||
if (result == true && mounted) {
|
||||
final userState = context.read<UserBloc>().state;
|
||||
if (userState is UserLoaded) {
|
||||
print('🔄 Retour des détails, rechargement...');
|
||||
context.read<TripBloc>().add(LoadTripsByUserId(userId: userState.user.id));
|
||||
}
|
||||
}
|
||||
},
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Image d'en-tête avec titre overlay
|
||||
Container(
|
||||
height: 150,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
color.withValues(alpha: 0.7),
|
||||
color.withValues(alpha: 0.9),
|
||||
],
|
||||
),
|
||||
),
|
||||
child: Stack(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.vertical(
|
||||
top: Radius.circular(12),
|
||||
),
|
||||
color: color.withValues(alpha: 0.3),
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
bottom: 16,
|
||||
left: 16,
|
||||
right: 16,
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
trip.title,
|
||||
style: const TextStyle(
|
||||
fontSize: 20,
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white,
|
||||
color: textColor,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
SizedBox(height: 4),
|
||||
Row(
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.location_on,
|
||||
color: Colors.white,
|
||||
size: 16,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Expanded(
|
||||
child: Text(
|
||||
trip.location,
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
color: Colors.white,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
Icon(Icons.location_on, size: 16, color: subtextColor),
|
||||
SizedBox(width: 4),
|
||||
Text(
|
||||
trip.location,
|
||||
style: TextStyle(color: subtextColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
// Contenu de la carte
|
||||
Padding(
|
||||
padding: EdgeInsets.all(16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Description
|
||||
if (trip.description.isNotEmpty) ...[
|
||||
Text(
|
||||
trip.description,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: secondaryTextColor,
|
||||
),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||
decoration: BoxDecoration(
|
||||
color: _getStatusColor(trip).withOpacity(0.2),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
SizedBox(height: 12),
|
||||
],
|
||||
|
||||
// Dates
|
||||
Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.calendar_today,
|
||||
size: 16,
|
||||
color: iconColor,
|
||||
child: Text(
|
||||
_getStatusText(trip),
|
||||
style: TextStyle(
|
||||
color: _getStatusColor(trip),
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 12,
|
||||
),
|
||||
SizedBox(width: 8),
|
||||
Text(
|
||||
'${trip.startDate.day}/${trip.startDate.month}/${trip.startDate.year} - ${trip.endDate.day}/${trip.endDate.month}/${trip.endDate.year}',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: iconColor,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
SizedBox(height: 12),
|
||||
|
||||
// Participants
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.group, size: 16, color: iconColor),
|
||||
SizedBox(width: 8),
|
||||
Text(
|
||||
'${trip.participants.length} participant${trip.participants.length > 1 ? 's' : ''}',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: iconColor,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
SizedBox(height: 12),
|
||||
|
||||
// Budget et statut
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
if (trip.budget! > 0)
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.euro, size: 16, color: iconColor),
|
||||
SizedBox(width: 8),
|
||||
Text(
|
||||
'Budget: ${trip.budget!.toStringAsFixed(2)}€',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: iconColor,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
Container(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 4,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: _getStatusColor(trip).withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Text(
|
||||
_getStatusText(trip),
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: _getStatusColor(trip),
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
SizedBox(height: 12),
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.calendar_today, size: 16, color: subtextColor),
|
||||
SizedBox(width: 4),
|
||||
Text(
|
||||
'${_formatDate(trip.startDate)} - ${_formatDate(trip.endDate)}',
|
||||
style: TextStyle(fontSize: 14, color: subtextColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (trip.budget != null) ...[
|
||||
SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.euro, size: 16, color: subtextColor),
|
||||
SizedBox(width: 4),
|
||||
Text(
|
||||
'${trip.budget!.toStringAsFixed(2)} €',
|
||||
style: TextStyle(fontSize: 14, color: subtextColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.people, size: 16, color: subtextColor),
|
||||
SizedBox(width: 4),
|
||||
Text(
|
||||
'${trip.participants.length} participant${trip.participants.length > 1 ? 's' : ''}',
|
||||
style: TextStyle(fontSize: 14, color: subtextColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -442,23 +362,27 @@ class _HomeContentState extends State<HomeContent> {
|
||||
|
||||
Color _getStatusColor(Trip trip) {
|
||||
final now = DateTime.now();
|
||||
if (trip.endDate.isBefore(now)) {
|
||||
return Colors.grey;
|
||||
} else if (trip.startDate.isBefore(now) && trip.endDate.isAfter(now)) {
|
||||
return Colors.green;
|
||||
} else {
|
||||
if (now.isBefore(trip.startDate)) {
|
||||
return Colors.blue;
|
||||
} else if (now.isAfter(trip.endDate)) {
|
||||
return Colors.grey;
|
||||
} else {
|
||||
return Colors.green;
|
||||
}
|
||||
}
|
||||
|
||||
String _getStatusText(Trip trip) {
|
||||
final now = DateTime.now();
|
||||
if (trip.endDate.isBefore(now)) {
|
||||
return 'Terminé';
|
||||
} else if (trip.startDate.isBefore(now) && trip.endDate.isAfter(now)) {
|
||||
return 'En cours';
|
||||
} else {
|
||||
if (now.isBefore(trip.startDate)) {
|
||||
return 'À venir';
|
||||
} else if (now.isAfter(trip.endDate)) {
|
||||
return 'Terminé';
|
||||
} else {
|
||||
return 'En cours';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String _formatDate(DateTime date) {
|
||||
return '${date.day}/${date.month}/${date.year}';
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:travel_mate/components/home/create_trip_content.dart';
|
||||
import 'package:travel_mate/data/models/trip.dart';
|
||||
|
||||
class ShowTripDetailsContent extends StatefulWidget {
|
||||
@@ -12,7 +13,7 @@ class ShowTripDetailsContent extends StatefulWidget {
|
||||
class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Détecter le thème actuel
|
||||
|
||||
final isDarkMode = Theme.of(context).brightness == Brightness.dark;
|
||||
final textColor = isDarkMode ? Colors.white : Colors.black;
|
||||
final secondaryTextColor = isDarkMode ? Colors.white70 : Colors.grey[600];
|
||||
@@ -85,8 +86,20 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
|
||||
width: double.infinity,
|
||||
height: 50,
|
||||
child: ElevatedButton(
|
||||
onPressed: () {
|
||||
// Handle button press
|
||||
onPressed: () async {
|
||||
final result = await Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => CreateTripContent(
|
||||
tripToEdit: widget.trip,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
if (result == true && mounted) {
|
||||
Navigator.pop(context, true); // Retour avec flag
|
||||
}
|
||||
},
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Color.fromARGB(255, 0, 123, 255),
|
||||
|
||||
Reference in New Issue
Block a user