feat: Propagate user profile updates to group member details and remove trip code sharing UI.

android/app/src/main/AndroidManifest.xml

@@ -62,7 +62,7 @@
             android:value="2" />
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCAtz1_d5K0ANwxAA_T84iq7Ac_gsUs_oM"/>
+            android:value="AIzaSyAON_ol0Jr34tKbETvdDK9JCQdKNawxBeQ"/>
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="high_importance_channel" />

lib/blocs/user/user_bloc.dart

@@ -1,6 +1,8 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
+
+import 'package:travel_mate/repositories/group_repository.dart';
 import 'package:travel_mate/services/notification_service.dart';
 import 'package:travel_mate/services/logger_service.dart';
 import 'package:travel_mate/services/error_service.dart';
@@ -19,6 +21,8 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
   /// Firestore instance for user data operations.
   final FirebaseFirestore _firestore = FirebaseFirestore.instance;
 
+  final GroupRepository _groupRepository = GroupRepository();
+
   final _errorService = ErrorService();
 
   /// Creates a new [UserBloc] with initial state.
@@ -164,6 +168,16 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
         });
 
         emit(state.UserLoaded(updatedUser));
+
+        // Propager les changements aux groupes
+        await _groupRepository.updateMemberDetails(
+          userId: currentUser.id,
+          firstName: event
+              .userData['prenom'], // 'prenom' dans Firestore map map to firstName usually? Wait, UserModel has prenom/nom.
+          lastName: event.userData['nom'],
+          profilePictureUrl: event
+              .userData['profilePictureUrl'], // Key was 'profilePictureUrl' in ProfileContent
+        );
       } catch (e, stackTrace) {
         _errorService.logError(
           'UserBloc',

lib/components/account/add_expense_dialog.dart

@@ -85,6 +85,18 @@ class AddExpenseDialog extends StatefulWidget {
   /// The expense to edit (null for new expense).
   final Expense? expenseToEdit;
 
+  /// Optional initial category for a new expense.
+  final ExpenseCategory? initialCategory;
+
+  /// Optional initial amount for a new expense.
+  final double? initialAmount;
+
+  /// Optional initial splits (userId -> amount) for a new expense.
+  final Map<String, double>? initialSplits;
+
+  /// Optional initial description for a new expense.
+  final String? initialDescription;
+
   /// Creates an AddExpenseDialog.
   ///
   /// [group] is the group for the expense.
@@ -95,6 +107,10 @@ class AddExpenseDialog extends StatefulWidget {
     required this.group,
     required this.currentUser,
     this.expenseToEdit,
+    this.initialCategory,
+    this.initialAmount,
+    this.initialSplits,
+    this.initialDescription,
   });
 
   @override
@@ -146,7 +162,10 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
     super.initState();
     // Initialize form fields and splits based on whether editing or creating
     _selectedDate = widget.expenseToEdit?.date ?? DateTime.now();
-    _selectedCategory = widget.expenseToEdit?.category ?? ExpenseCategory.other;
+    _selectedCategory =
+        widget.expenseToEdit?.category ??
+        widget.initialCategory ??
+        ExpenseCategory.other;
     _selectedCurrency = widget.expenseToEdit?.currency ?? ExpenseCurrency.eur;
     _paidById = widget.expenseToEdit?.paidById ?? widget.currentUser.id;
 
@@ -159,12 +178,35 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
       }
       _splitEqually = false;
     } else {
-      // Creating: initialize splits for all group members
+      // Creating: initialize splits
+      if (widget.initialDescription != null) {
+        _descriptionController.text = widget.initialDescription!;
+      }
+
+      if (widget.initialAmount != null) {
+        _amountController.text = widget.initialAmount.toString();
+      }
+
+      if (widget.initialSplits != null) {
+        _splits.addAll(widget.initialSplits!);
+        // Fill remaining members with 0 if not in initialSplits
+        for (final member in widget.group.members) {
+          if (!_splits.containsKey(member.userId)) {
+            _splits[member.userId] = 0;
+          } else {
+            // If we have specific splits, we probably aren't splitting equally by default logic
+            // unless we want to force it. For reimbursement, we likely set exact amounts.
+            _splitEqually = false;
+          }
+        }
+      } else {
+        // Default behavior: initialize splits for all group members
         for (final member in widget.group.members) {
           _splits[member.userId] = 0;
         }
       }
     }
+  }
 
   @override
   void dispose() {

lib/components/account/balances_tab.dart

@@ -6,7 +6,13 @@
 library;
 
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../../blocs/user/user_bloc.dart';
+import '../../blocs/user/user_state.dart' as user_state;
+import '../../models/expense.dart';
+import '../../models/group.dart';
 import '../../models/user_balance.dart';
+import 'add_expense_dialog.dart';
 
 /// A stateless widget that displays a list of user balances in a group.
 ///
@@ -18,21 +24,19 @@ class BalancesTab extends StatelessWidget {
   /// The list of user balances to display.
   final List<UserBalance> balances;
 
+  /// The group associated with these balances.
+  final Group group;
+
   /// Creates a `BalancesTab` widget.
   ///
   /// The [balances] parameter must not be null.
-  const BalancesTab({
-    super.key,
-    required this.balances,
-  });
+  const BalancesTab({super.key, required this.balances, required this.group});
 
   @override
   Widget build(BuildContext context) {
     // Check if the balances list is empty and display a placeholder message if true.
     if (balances.isEmpty) {
-      return const Center(
-        child: Text('Aucune balance à afficher'),
-      );
+      return const Center(child: Text('Aucune balance à afficher'));
     }
 
     // Render the list of balances as a scrollable list.
@@ -79,7 +83,9 @@ class BalancesTab extends StatelessWidget {
       margin: const EdgeInsets.only(bottom: 12),
       child: Padding(
         padding: const EdgeInsets.all(16),
-        child: Row(
+        child: Column(
+          children: [
+            Row(
               children: [
                 // Display the user's initial in a circular avatar.
                 CircleAvatar(
@@ -144,15 +150,81 @@ class BalancesTab extends StatelessWidget {
                     // Text indicating the balance status (e.g., "À recevoir").
                     Text(
                       balanceText,
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: balanceColor,
-                  ),
+                      style: TextStyle(fontSize: 12, color: balanceColor),
                     ),
                   ],
                 ),
               ],
             ),
+            // "Rembourser" button (Only show if this user is owed money and current user is looking at list?
+            // Wait, this list shows balances of everyone.
+            // Requirement: "Il faut un bouton dans la page qui permet de régler l'argent qu'on doit à une certaine personne"
+            // So if I look at "Alice", and Alice "shouldReceive" (is green), it implies the group owes Alice.
+            // But does it mean *I* owe Alice?
+            // The BalancesTab shows the *Group's* balances.
+            // However, usually settlement is 1-on-1. The requirement says: "régler l'argent qu'on doit à une certaine personne".
+            // If the user displayed here 'shouldReceive' money, it means they are owed money.
+            // If I click 'Rembourser', it implies *I* am paying them.
+            // This button should probably be available if the user on the card is POSITIVE (shouldReceive)
+            // AND I am not that user.
+            if (balance.shouldReceive) ...[
+              const SizedBox(height: 12),
+              SizedBox(
+                width: double.infinity,
+                child: OutlinedButton.icon(
+                  onPressed: () => _showReimbursementDialog(context, balance),
+                  icon: const Icon(Icons.monetization_on_outlined),
+                  label: Text('Rembourser ${balance.userName}'),
+                  style: OutlinedButton.styleFrom(
+                    foregroundColor: Colors.green,
+                    side: const BorderSide(color: Colors.green),
+                  ),
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _showReimbursementDialog(
+    BuildContext context,
+    UserBalance payeeBalance,
+  ) {
+    final userState = context.read<UserBloc>().state;
+
+    if (userState is! user_state.UserLoaded) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Erreur: utilisateur non connecté')),
+      );
+      return;
+    }
+
+    final currentUser = userState.user;
+
+    // Prevent reimbursing yourself
+    if (payeeBalance.userId == currentUser.id) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Vous ne pouvez pas vous rembourser vous-même'),
+        ),
+      );
+      return;
+    }
+
+    showDialog(
+      context: context,
+      builder: (context) => AddExpenseDialog(
+        group: group,
+        currentUser: currentUser,
+        initialCategory: ExpenseCategory.reimbursement,
+        initialDescription: 'Remboursement',
+        initialAmount: payeeBalance.absoluteBalance,
+        initialSplits: {
+          payeeBalance.userId: payeeBalance
+              .absoluteBalance, // The payee receives the full amount (as split)
+        },
       ),
     );
   }

lib/components/account/expenses_tab.dart

@@ -194,6 +194,8 @@ class ExpensesTab extends StatelessWidget {
         return Colors.teal;
       case ExpenseCategory.other:
         return Colors.grey;
+      case ExpenseCategory.reimbursement:
+        return Colors.green;
     }
   }
 

lib/components/account/group_expenses_page.dart

@@ -80,14 +80,7 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
           icon: const Icon(Icons.arrow_back),
           onPressed: () => Navigator.pop(context),
         ),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.filter_list),
-            onPressed: () {
-              _showFilterDialog();
-            },
-          ),
-        ],
+        actions: [],
       ),
       body: MultiBlocListener(
         listeners: [
@@ -193,7 +186,10 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
                       if (state is BalanceLoading) {
                         return const Center(child: CircularProgressIndicator());
                       } else if (state is GroupBalancesLoaded) {
-                        return BalancesTab(balances: state.balances);
+                        return BalancesTab(
+                          balances: state.balances,
+                          group: widget.group,
+                        );
                       } else if (state is BalanceError) {
                         return _buildErrorState('Erreur: ${state.message}');
                       }
@@ -390,96 +386,4 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
       ErrorService().showError(message: 'Erreur: utilisateur non connecté');
     }
   }
-
-  void _showFilterDialog() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return StatefulBuilder(
-          builder: (context, setState) {
-            return AlertDialog(
-              title: const Text('Filtrer les dépenses'),
-              content: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  DropdownButtonFormField<ExpenseCategory>(
-                    // ignore: deprecated_member_use
-                    value: _selectedCategory,
-                    decoration: const InputDecoration(
-                      labelText: 'Catégorie',
-                      border: OutlineInputBorder(),
-                    ),
-                    items: [
-                      const DropdownMenuItem<ExpenseCategory>(
-                        value: null,
-                        child: Text('Toutes'),
-                      ),
-                      ...ExpenseCategory.values.map((category) {
-                        return DropdownMenuItem(
-                          value: category,
-                          child: Text(category.displayName),
-                        );
-                      }),
-                    ],
-                    onChanged: (value) {
-                      setState(() => _selectedCategory = value);
-                    },
-                  ),
-                  const SizedBox(height: 16),
-                  DropdownButtonFormField<String>(
-                    // ignore: deprecated_member_use
-                    value: _selectedPayerId,
-                    decoration: const InputDecoration(
-                      labelText: 'Payé par',
-                      border: OutlineInputBorder(),
-                    ),
-                    items: [
-                      const DropdownMenuItem<String>(
-                        value: null,
-                        child: Text('Tous'),
-                      ),
-                      ...widget.group.members.map((member) {
-                        return DropdownMenuItem(
-                          value: member.userId,
-                          child: Text(member.firstName),
-                        );
-                      }),
-                    ],
-                    onChanged: (value) {
-                      setState(() => _selectedPayerId = value);
-                    },
-                  ),
-                ],
-              ),
-              actions: [
-                TextButton(
-                  onPressed: () {
-                    setState(() {
-                      _selectedCategory = null;
-                      _selectedPayerId = null;
-                    });
-                    // Also update parent state
-                    this.setState(() {
-                      _selectedCategory = null;
-                      _selectedPayerId = null;
-                    });
-                    Navigator.pop(context);
-                  },
-                  child: const Text('Réinitialiser'),
-                ),
-                ElevatedButton(
-                  onPressed: () {
-                    // Update parent state
-                    this.setState(() {});
-                    Navigator.pop(context);
-                  },
-                  child: const Text('Appliquer'),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
 }

lib/components/home/create_trip_content.dart

@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -84,7 +85,18 @@ class _CreateTripContentState extends State<CreateTripContent> {
   String? _selectedImageUrl;
 
   /// Google Maps API key for location services
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  static String get _apiKey {
+    if (Platform.isAndroid) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_ANDROID'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    } else if (Platform.isIOS) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_IOS'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    }
+    return dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  }
 
   /// Participant management
   final List<String> _participants = [];

lib/components/home/show_trip_details_content.dart

@@ -26,6 +26,8 @@ import 'package:travel_mate/blocs/activity/activity_state.dart';
 import 'package:travel_mate/blocs/balance/balance_bloc.dart';
 import 'package:travel_mate/blocs/balance/balance_event.dart';
 import 'package:travel_mate/blocs/balance/balance_state.dart';
+import 'package:travel_mate/blocs/group/group_bloc.dart';
+import 'package:travel_mate/blocs/group/group_event.dart';
 
 import 'package:travel_mate/blocs/user/user_bloc.dart';
 import 'package:travel_mate/blocs/user/user_state.dart' as user_state;
@@ -641,36 +643,18 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                     ),
                     const Divider(),
                   ],
+                  if (!isCreator)
                     ListTile(
-                    leading: Icon(
-                      Icons.share,
-                      color: theme.colorScheme.onSurface,
-                    ),
+                      leading: Icon(Icons.exit_to_app, color: Colors.red[400]),
                       title: Text(
-                      'Partager le code',
+                        'Quitter le voyage',
                         style: theme.textTheme.bodyLarge?.copyWith(
-                        color: theme.colorScheme.onSurface,
+                          color: Colors.red[400],
                         ),
                       ),
                       onTap: () {
                         Navigator.pop(context);
-                      // Implement share functionality
-                      if (_group != null) {
-                        // Use share_plus package to share the code
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            content: Text('ID du groupe : ${_group!.id}'),
-                            action: SnackBarAction(
-                              label: 'Copier',
-                              onPressed: () {
-                                Clipboard.setData(
-                                  ClipboardData(text: _group!.id),
-                                );
-                              },
-                            ),
-                          ),
-                        );
-                      }
+                        _handleLeaveTrip(currentUser);
                       },
                     ),
                 ],
@@ -682,6 +666,91 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
     );
   }
 
+  void _handleLeaveTrip(user_state.UserModel? currentUser) {
+    if (currentUser == null || _group == null) return;
+
+    // Vérifier les dettes
+    final balanceState = context.read<BalanceBloc>().state;
+    if (balanceState is GroupBalancesLoaded) {
+      final myBalance = balanceState.balances.firstWhere(
+        (b) => b.userId == currentUser.id,
+        orElse: () => const UserBalance(
+          userId: '',
+          userName: '',
+          totalPaid: 0,
+          totalOwed: 0,
+          balance: 0,
+        ),
+      );
+
+      // Tolérance pour les arrondis (0.01€)
+      if (myBalance.balance.abs() > 0.01) {
+        _errorService.showError(
+          message:
+              'Vous devez régler vos dettes (ou récupérer votre argent) avant de quitter le voyage. Solde: ${myBalance.formattedBalance}',
+        );
+        return;
+      }
+
+      _confirmLeaveTrip(currentUser.id);
+    } else {
+      // Si les balances ne sont pas chargées, on essaie de les charger et on demande de rééssayer
+      context.read<BalanceBloc>().add(LoadGroupBalances(_group!.id));
+      _errorService.showError(
+        message:
+            'Impossible de vérifier votre solde. Veuillez réessayer dans un instant.',
+      );
+    }
+  }
+
+  void _confirmLeaveTrip(String userId) {
+    final theme = Theme.of(context);
+
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        backgroundColor:
+            theme.dialogTheme.backgroundColor ?? theme.colorScheme.surface,
+        title: Text(
+          'Quitter le voyage',
+          style: theme.textTheme.titleLarge?.copyWith(
+            color: theme.colorScheme.onSurface,
+          ),
+        ),
+        content: Text(
+          'Êtes-vous sûr de vouloir quitter ce voyage ? Vous ne pourrez plus voir les détails ni les dépenses.',
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: theme.colorScheme.onSurface,
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(
+              'Annuler',
+              style: TextStyle(color: theme.colorScheme.primary),
+            ),
+          ),
+          TextButton(
+            onPressed: () {
+              Navigator.pop(context); // Fermer le dialog
+
+              if (_group != null) {
+                context.read<GroupBloc>().add(
+                  RemoveMemberFromGroup(_group!.id, userId),
+                );
+
+                // Retourner à l'écran d'accueil
+                Navigator.pop(context);
+              }
+            },
+            child: const Text('Quitter', style: TextStyle(color: Colors.red)),
+          ),
+        ],
+      ),
+    );
+  }
+
   void _confirmDeleteTrip() {
     final theme = Theme.of(context);
 

lib/components/map/map_content.dart

@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:geolocator/geolocator.dart';
@@ -31,7 +32,18 @@ class _MapContentState extends State<MapContent> {
 
   List<PlaceSuggestion> _suggestions = [];
 
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  static String get _apiKey {
+    if (Platform.isAndroid) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_ANDROID'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    } else if (Platform.isIOS) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_IOS'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    }
+    return dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  }
 
   @override
   void initState() {
@@ -313,14 +325,14 @@ class _MapContentState extends State<MapContent> {
   Future<BitmapDescriptor> _createCustomMarkerIcon() async {
     final pictureRecorder = ui.PictureRecorder();
     final canvas = Canvas(pictureRecorder);
-    const size = 120.0;
+    const size = 80.0;
 
     // Dessiner l'icône person_pin_circle en bleu
     final iconPainter = TextPainter(textDirection: TextDirection.ltr);
     iconPainter.text = TextSpan(
       text: String.fromCharCode(Icons.person_pin_circle.codePoint),
       style: TextStyle(
-        fontSize: 100,
+        fontSize: 70,
         fontFamily: Icons.person_pin_circle.fontFamily,
         color: Colors.blue[700],
       ),

lib/components/settings/policies/policies_content.dart

@@ -11,6 +11,13 @@ class PoliciesContent extends StatelessWidget {
     }
   }
 
+  Future<void> _launchCustomPrivacyPolicy() async {
+    final Uri url = Uri.parse('https://xeewy.be/travelmate/policies');
+    if (!await launchUrl(url)) {
+      throw Exception('Could not launch $url');
+    }
+  }
+
   Future<void> _onBackPressed(BuildContext context) async {
     if (Navigator.canPop(context)) {
       Navigator.pop(context);
@@ -44,108 +51,8 @@ class PoliciesContent extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // Section Collecte d'informations
-            Text(
-              'Collecte d\'informations',
-              style: theme.textTheme.titleLarge?.copyWith(
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white : Colors.black,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              'Nous collectons des informations que vous nous fournissez directement, comme votre nom, adresse e-mail et préférences de voyage.',
-              style: theme.textTheme.bodyLarge?.copyWith(
-                color: isDark ? Colors.grey[300] : Colors.grey[800],
-              ),
-            ),
+            // Keep only the buttons
             const SizedBox(height: 20),
-
-            // Section Utilisation des données
-            Text(
-              'Utilisation des données',
-              style: theme.textTheme.titleLarge?.copyWith(
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white : Colors.black,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              'Vos données sont utilisées pour améliorer votre expérience utilisateur et vous proposer des recommandations personnalisées.',
-              style: theme.textTheme.bodyLarge?.copyWith(
-                color: isDark ? Colors.grey[300] : Colors.grey[800],
-              ),
-            ),
-            const SizedBox(height: 20),
-
-            // Section Protection des données
-            Text(
-              'Protection des données',
-              style: theme.textTheme.titleLarge?.copyWith(
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white : Colors.black,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              'Nous mettons en place des mesures de sécurité appropriées pour protéger vos informations personnelles.',
-              style: theme.textTheme.bodyLarge?.copyWith(
-                color: isDark ? Colors.grey[300] : Colors.grey[800],
-              ),
-            ),
-            const SizedBox(height: 20),
-
-            // Section Partage des données
-            Text(
-              'Partage des données',
-              style: theme.textTheme.titleLarge?.copyWith(
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white : Colors.black,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              'Nous ne partageons pas vos informations personnelles avec des tiers sans votre consentement explicite.',
-              style: theme.textTheme.bodyLarge?.copyWith(
-                color: isDark ? Colors.grey[300] : Colors.grey[800],
-              ),
-            ),
-            const SizedBox(height: 20),
-
-            // Section Droits de l'utilisateur
-            Text(
-              'Vos droits',
-              style: theme.textTheme.titleLarge?.copyWith(
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white : Colors.black,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              'Vous avez le droit d\'accéder, de corriger ou de supprimer vos données personnelles à tout moment. Veuillez nous contacter pour toute demande.',
-              style: theme.textTheme.bodyLarge?.copyWith(
-                color: isDark ? Colors.grey[300] : Colors.grey[800],
-              ),
-            ),
-            const SizedBox(height: 20),
-
-            // Section Contact
-            Text(
-              'Nous contacter',
-              style: theme.textTheme.titleLarge?.copyWith(
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white : Colors.black,
-              ),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              'Pour toute question concernant cette politique de confidentialité, veuillez nous contacter à support@travelmate.com',
-              style: theme.textTheme.bodyLarge?.copyWith(
-                color: isDark ? Colors.grey[300] : Colors.grey[800],
-              ),
-            ),
-            const SizedBox(height: 20),
-
             // Bouton Google Privacy Policy
             SizedBox(
               width: double.infinity,
@@ -163,6 +70,24 @@ class PoliciesContent extends StatelessWidget {
                 ),
               ),
             ),
+            const SizedBox(height: 12),
+            // Bouton Nos politiques de confidentialité
+            SizedBox(
+              width: double.infinity,
+              child: ElevatedButton.icon(
+                onPressed: _launchCustomPrivacyPolicy,
+                icon: const Icon(Icons.policy),
+                label: const Text('Nos politiques de confidentialités'),
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: theme.primaryColor,
+                  foregroundColor: Colors.white,
+                  padding: const EdgeInsets.symmetric(vertical: 12),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                ),
+              ),
+            ),
             const SizedBox(height: 32),
           ],
         ),

lib/components/settings/settings_content.dart

@@ -3,9 +3,33 @@ import 'package:travel_mate/components/settings/policies/policies_content.dart';
 import 'theme/settings_theme_content.dart';
 import 'profile/profile_content.dart';
 
-class SettingsContent extends StatelessWidget {
+import 'package:package_info_plus/package_info_plus.dart';
+
+class SettingsContent extends StatefulWidget {
   const SettingsContent({super.key});
 
+  @override
+  State<SettingsContent> createState() => _SettingsContentState();
+}
+
+class _SettingsContentState extends State<SettingsContent> {
+  String _version = '...';
+
+  @override
+  void initState() {
+    super.initState();
+    _loadVersion();
+  }
+
+  Future<void> _loadVersion() async {
+    final packageInfo = await PackageInfo.fromPlatform();
+    if (mounted) {
+      setState(() {
+        _version = packageInfo.version;
+      });
+    }
+  }
+
   Future<void> changePage(BuildContext context, Widget page) async {
     Navigator.push(context, MaterialPageRoute(builder: (context) => page));
   }
@@ -46,13 +70,6 @@ class SettingsContent extends StatelessWidget {
           },
         ),
 
-        ListTile(
-          leading: const Icon(Icons.notifications),
-          title: const Text('Notifications'),
-          trailing: const Icon(Icons.arrow_forward_ios),
-          onTap: () {},
-        ),
-
         ListTile(
           leading: const Icon(Icons.privacy_tip),
           title: const Text('Confidentialité'),
@@ -77,7 +94,7 @@ class SettingsContent extends StatelessWidget {
               ),
               const SizedBox(height: 4),
               Text(
-                '1.0.0',
+                _version,
                 style: TextStyle(fontSize: 14, color: Colors.grey[500]),
               ),
             ],

lib/main.dart

@@ -3,6 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:travel_mate/blocs/balance/balance_bloc.dart';
 import 'package:travel_mate/blocs/expense/expense_bloc.dart';
+import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
+import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 import 'package:travel_mate/blocs/message/message_bloc.dart';
 import 'package:travel_mate/blocs/activity/activity_bloc.dart';
 import 'package:travel_mate/firebase_options.dart';
@@ -54,6 +56,13 @@ void main() async {
 
   await NotificationService().initialize();
 
+  // Requirements for Google Maps on Android (Hybrid Composition)
+  final GoogleMapsFlutterPlatform mapsImplementation =
+      GoogleMapsFlutterPlatform.instance;
+  if (mapsImplementation is GoogleMapsFlutterAndroid) {
+    mapsImplementation.useAndroidViewSurface = true;
+  }
+
   runApp(const MyApp());
 }
 

lib/models/expense.dart

@@ -45,7 +45,10 @@ enum ExpenseCategory {
   shopping('Shopping', Icons.shopping_bag),
 
   /// Other miscellaneous expenses
-  other('Other', Icons.category);
+  other('Other', Icons.category),
+
+  /// Reimbursement for settling debts
+  reimbursement('Remboursement', Icons.monetization_on);
 
   const ExpenseCategory(this.displayName, this.icon);
 

lib/repositories/group_repository.dart

@@ -286,4 +286,42 @@ class GroupRepository {
           .toList(),
     );
   }
+
+  Future<void> updateMemberDetails({
+    required String userId,
+    String? firstName,
+    String? lastName,
+    String? profilePictureUrl,
+  }) async {
+    try {
+      // 1. Trouver tous les groupes où l'utilisateur est membre
+      final groupsSnapshot = await _groupsCollection
+          .where('memberIds', arrayContains: userId)
+          .get();
+
+      // 2. Mettre à jour les infos du membre dans chaque groupe
+      for (final groupDoc in groupsSnapshot.docs) {
+        final memberRef = _membersCollection(groupDoc.id).doc(userId);
+
+        final updates = <String, dynamic>{};
+        if (firstName != null) updates['firstName'] = firstName;
+        if (lastName != null) updates['lastName'] = lastName;
+        if (profilePictureUrl != null) {
+          updates['profilePictureUrl'] = profilePictureUrl;
+        }
+
+        if (updates.isNotEmpty) {
+          await memberRef.update(updates);
+        }
+      }
+    } catch (e, stackTrace) {
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur update member details: $e',
+        stackTrace,
+      );
+      // On ne throw pas d'exception ici pour ne pas bloquer l'update user principal
+      // C'est une opération "best effort"
+    }
+  }
 }

lib/services/activity_places_service.dart

@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -13,7 +14,19 @@ class ActivityPlacesService {
   ActivityPlacesService._internal();
 
   final ErrorService _errorService = ErrorService();
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+
+  static String get _apiKey {
+    if (Platform.isAndroid) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_ANDROID'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    } else if (Platform.isIOS) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_IOS'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    }
+    return dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  }
 
   /// Recherche des activités près d'une destination
   Future<List<Activity>> searchActivities({

lib/services/place_image_service.dart

@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -5,7 +6,19 @@ import 'package:firebase_storage/firebase_storage.dart';
 import 'package:travel_mate/services/error_service.dart';
 
 class PlaceImageService {
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  static String get _apiKey {
+    if (Platform.isAndroid) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_ANDROID'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    } else if (Platform.isIOS) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_IOS'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    }
+    return dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  }
+
   final FirebaseStorage _storage = FirebaseStorage.instance;
   final ErrorService _errorService = ErrorService();
 

lib/services/trip_geocoding_service.dart

@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -13,7 +14,18 @@ class TripGeocodingService {
   TripGeocodingService._internal();
 
   final ErrorService _errorService = ErrorService();
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  static String get _apiKey {
+    if (Platform.isAndroid) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_ANDROID'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    } else if (Platform.isIOS) {
+      return dotenv.env['GOOGLE_MAPS_API_KEY_IOS'] ??
+          dotenv.env['GOOGLE_MAPS_API_KEY'] ??
+          '';
+    }
+    return dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  }
 
   /// Géocode la destination d'un voyage et retourne un Trip mis à jour
   Future<Trip> geocodeTrip(Trip trip) async {

pubspec.lock

@@ -1089,7 +1089,7 @@ packages:
     source: hosted
     version: "2.2.0"
   package_info_plus:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: package_info_plus
       sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 1.0.2+3
 
 environment:
   sdk: ^3.9.2
@@ -63,6 +63,7 @@ dependencies:
   image: ^4.5.4
   firebase_messaging: ^16.0.4
   flutter_local_notifications: ^19.5.0
+  package_info_plus: ^8.3.1
 
 dev_dependencies:
   flutter_launcher_icons: ^0.13.1