feat(activities): add autocomplete & what's new popup

Features:
- Add autocomplete support for Activity search with Google Places API.
- Add "What's New" popup system to showcase new features on app update.
- Implement logic to detect fresh installs vs updates.

Fixes:
- Switch API key handling to use Firebase config for Release mode support.
- Refactor map pins to be consistent (red pins).
- UI fixes on Create Trip page (overflow issues).

Refactor:
- Make WhatsNewDialog reusable by accepting features list as parameter.

.VSCodeCounter/2025-10-14_11-10-48/details.md

@@ -1,82 +0,0 @@
-# Details
-
-Date : 2025-10-14 11:10:48
-
-Directory c:\\Users\\dayro\\Documents\\coding\\travel_mate
-
-Total : 67 files,  5159 codes, 328 comments, 739 blanks, all 6226 lines
-
-[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md)
-
-## Files
-| filename | language | code | comment | blank | total |
-| :--- | :--- | ---: | ---: | ---: | ---: |
-| [README.md](/README.md) | Markdown | 45 | 0 | 16 | 61 |
-| [analysis\_options.yaml](/analysis_options.yaml) | YAML | 3 | 22 | 4 | 29 |
-| [android/app/google-services.json](/android/app/google-services.json) | JSON | 54 | 0 | 0 | 54 |
-| [android/app/src/debug/AndroidManifest.xml](/android/app/src/debug/AndroidManifest.xml) | XML | 3 | 4 | 1 | 8 |
-| [android/app/src/main/AndroidManifest.xml](/android/app/src/main/AndroidManifest.xml) | XML | 40 | 11 | 1 | 52 |
-| [android/app/src/main/res/drawable-v21/launch\_background.xml](/android/app/src/main/res/drawable-v21/launch_background.xml) | XML | 4 | 7 | 2 | 13 |
-| [android/app/src/main/res/drawable/launch\_background.xml](/android/app/src/main/res/drawable/launch_background.xml) | XML | 4 | 7 | 2 | 13 |
-| [android/app/src/main/res/values-night/styles.xml](/android/app/src/main/res/values-night/styles.xml) | XML | 9 | 9 | 1 | 19 |
-| [android/app/src/main/res/values/styles.xml](/android/app/src/main/res/values/styles.xml) | XML | 9 | 9 | 1 | 19 |
-| [android/app/src/profile/AndroidManifest.xml](/android/app/src/profile/AndroidManifest.xml) | XML | 3 | 4 | 1 | 8 |
-| [android/build/reports/problems/problems-report.html](/android/build/reports/problems/problems-report.html) | HTML | 548 | 2 | 114 | 664 |
-| [android/gradle.properties](/android/gradle.properties) | Properties | 3 | 0 | 1 | 4 |
-| [android/gradle/wrapper/gradle-wrapper.properties](/android/gradle/wrapper/gradle-wrapper.properties) | Properties | 5 | 0 | 1 | 6 |
-| [firebase.json](/firebase.json) | JSON | 1 | 0 | 0 | 1 |
-| [ios/Podfile](/ios/Podfile) | Ruby | 32 | 2 | 10 | 44 |
-| [ios/RunnerTests/RunnerTests.swift](/ios/RunnerTests/RunnerTests.swift) | Swift | 7 | 2 | 4 | 13 |
-| [ios/Runner/AppDelegate.swift](/ios/Runner/AppDelegate.swift) | Swift | 14 | 0 | 2 | 16 |
-| [ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json](/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json) | JSON | 122 | 0 | 1 | 123 |
-| [ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json](/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json) | JSON | 23 | 0 | 1 | 24 |
-| [ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md](/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md) | Markdown | 3 | 0 | 2 | 5 |
-| [ios/Runner/Base.lproj/LaunchScreen.storyboard](/ios/Runner/Base.lproj/LaunchScreen.storyboard) | XML | 36 | 1 | 1 | 38 |
-| [ios/Runner/Base.lproj/Main.storyboard](/ios/Runner/Base.lproj/Main.storyboard) | XML | 25 | 1 | 1 | 27 |
-| [ios/Runner/Runner-Bridging-Header.h](/ios/Runner/Runner-Bridging-Header.h) | C++ | 1 | 0 | 1 | 2 |
-| [lib/blocs/auth/auth\_bloc.dart](/lib/blocs/auth/auth_bloc.dart) | Dart | 129 | 1 | 20 | 150 |
-| [lib/blocs/auth/auth\_event.dart](/lib/blocs/auth/auth_event.dart) | Dart | 40 | 0 | 15 | 55 |
-| [lib/blocs/auth/auth\_state.dart](/lib/blocs/auth/auth_state.dart) | Dart | 28 | 0 | 14 | 42 |
-| [lib/blocs/theme/theme\_bloc.dart](/lib/blocs/theme/theme_bloc.dart) | Dart | 40 | 1 | 5 | 46 |
-| [lib/blocs/theme/theme\_event.dart](/lib/blocs/theme/theme_event.dart) | Dart | 14 | 0 | 6 | 20 |
-| [lib/blocs/theme/theme\_state.dart](/lib/blocs/theme/theme_state.dart) | Dart | 16 | 0 | 5 | 21 |
-| [lib/blocs/trip/trip\_bloc.dart](/lib/blocs/trip/trip_bloc.dart) | Dart | 103 | 1 | 14 | 118 |
-| [lib/blocs/trip/trip\_event.dart](/lib/blocs/trip/trip_event.dart) | Dart | 51 | 0 | 20 | 71 |
-| [lib/blocs/trip/trip\_state.dart](/lib/blocs/trip/trip_state.dart) | Dart | 27 | 0 | 13 | 40 |
-| [lib/blocs/user/user\_bloc.dart](/lib/blocs/user/user_bloc.dart) | Dart | 0 | 0 | 1 | 1 |
-| [lib/blocs/user/user\_event.dart](/lib/blocs/user/user_event.dart) | Dart | 0 | 0 | 1 | 1 |
-| [lib/blocs/user/user\_state.dart](/lib/blocs/user/user_state.dart) | Dart | 0 | 0 | 1 | 1 |
-| [lib/components/count/count\_content.dart](/lib/components/count/count_content.dart) | Dart | 25 | 0 | 3 | 28 |
-| [lib/components/group/group\_content.dart](/lib/components/group/group_content.dart) | Dart | 115 | 2 | 12 | 129 |
-| [lib/components/home/create\_trip\_content.dart](/lib/components/home/create_trip_content.dart) | Dart | 481 | 21 | 63 | 565 |
-| [lib/components/home/home\_content.dart](/lib/components/home/home_content.dart) | Dart | 366 | 12 | 30 | 408 |
-| [lib/components/home/show\_trip\_details\_content.dart](/lib/components/home/show_trip_details_content.dart) | Dart | 106 | 2 | 4 | 112 |
-| [lib/components/map/map\_content.dart](/lib/components/map/map_content.dart) | Dart | 100 | 4 | 11 | 115 |
-| [lib/components/profile/profile\_content.dart](/lib/components/profile/profile_content.dart) | Dart | 328 | 6 | 29 | 363 |
-| [lib/components/settings/settings\_content.dart](/lib/components/settings/settings_content.dart) | Dart | 60 | 2 | 10 | 72 |
-| [lib/components/settings/settings\_theme\_content.dart](/lib/components/settings/settings_theme_content.dart) | Dart | 123 | 4 | 10 | 137 |
-| [lib/data/data\_sources/firestore\_data\_source.dart](/lib/data/data_sources/firestore_data_source.dart) | Dart | 0 | 0 | 1 | 1 |
-| [lib/data/data\_sources/local\_data\_source.dart](/lib/data/data_sources/local_data_source.dart) | Dart | 0 | 0 | 1 | 1 |
-| [lib/data/models/group.dart](/lib/data/models/group.dart) | Dart | 23 | 0 | 3 | 26 |
-| [lib/data/models/message.dart](/lib/data/models/message.dart) | Dart | 14 | 0 | 1 | 15 |
-| [lib/data/models/trip.dart](/lib/data/models/trip.dart) | Dart | 176 | 16 | 24 | 216 |
-| [lib/data/models/user.dart](/lib/data/models/user.dart) | Dart | 61 | 6 | 13 | 80 |
-| [lib/firebase\_options.dart](/lib/firebase_options.dart) | Dart | 60 | 12 | 5 | 77 |
-| [lib/main.dart](/lib/main.dart) | Dart | 89 | 0 | 5 | 94 |
-| [lib/pages/home.dart](/lib/pages/home.dart) | Dart | 147 | 6 | 13 | 166 |
-| [lib/pages/login.dart](/lib/pages/login.dart) | Dart | 285 | 9 | 28 | 322 |
-| [lib/pages/resetpswd.dart](/lib/pages/resetpswd.dart) | Dart | 92 | 2 | 13 | 107 |
-| [lib/pages/signup.dart](/lib/pages/signup.dart) | Dart | 256 | 7 | 20 | 283 |
-| [lib/providers/theme\_provider.dart](/lib/providers/theme_provider.dart) | Dart | 41 | 1 | 9 | 51 |
-| [lib/providers/user\_provider.dart](/lib/providers/user_provider.dart) | Dart | 94 | 9 | 18 | 121 |
-| [lib/repositories/auth\_repository.dart](/lib/repositories/auth_repository.dart) | Dart | 115 | 11 | 22 | 148 |
-| [lib/repositories/trip\_repository.dart](/lib/repositories/trip_repository.dart) | Dart | 92 | 9 | 12 | 113 |
-| [lib/repositories/user\_repository.dart](/lib/repositories/user_repository.dart) | Dart | 77 | 7 | 11 | 95 |
-| [lib/services/auth\_service.dart](/lib/services/auth_service.dart) | Dart | 84 | 6 | 18 | 108 |
-| [lib/services/group\_service.dart](/lib/services/group_service.dart) | Dart | 53 | 1 | 6 | 60 |
-| [lib/services/message\_service.dart](/lib/services/message_service.dart) | Dart | 0 | 0 | 1 | 1 |
-| [lib/services/trip\_service.dart](/lib/services/trip_service.dart) | Dart | 209 | 21 | 39 | 269 |
-| [pubspec.yaml](/pubspec.yaml) | YAML | 31 | 58 | 14 | 103 |
-| [test/widget\_test.dart](/test/widget_test.dart) | Dart | 14 | 10 | 7 | 31 |
-
-[Summary](results.md) / Details / [Diff Summary](diff.md) / [Diff Details](diff-details.md)

.VSCodeCounter/2025-10-14_11-10-48/diff-details.md

@@ -1,15 +0,0 @@
-# Diff Details
-
-Date : 2025-10-14 11:10:48
-
-Directory c:\\Users\\dayro\\Documents\\coding\\travel_mate
-
-Total : 0 files,  0 codes, 0 comments, 0 blanks, all 0 lines
-
-[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details
-
-## Files
-| filename | language | code | comment | blank | total |
-| :--- | :--- | ---: | ---: | ---: | ---: |
-
-[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details

.VSCodeCounter/2025-10-14_11-10-48/diff.csv

@@ -1,2 +0,0 @@
-"filename", "language", "", "comment", "blank", "total"
-"Total", "-", , 0, 0, 0

.VSCodeCounter/2025-10-14_11-10-48/diff.md

@@ -1,19 +0,0 @@
-# Diff Summary
-
-Date : 2025-10-14 11:10:48
-
-Directory c:\\Users\\dayro\\Documents\\coding\\travel_mate
-
-Total : 0 files,  0 codes, 0 comments, 0 blanks, all 0 lines
-
-[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md)
-
-## Languages
-| language | files | code | comment | blank | total |
-| :--- | ---: | ---: | ---: | ---: | ---: |
-
-## Directories
-| path | files | code | comment | blank | total |
-| :--- | ---: | ---: | ---: | ---: | ---: |
-
-[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md)

.VSCodeCounter/2025-10-14_11-10-48/diff.txt

@@ -1,22 +0,0 @@
-Date : 2025-10-14 11:10:48
-Directory : c:\Users\dayro\Documents\coding\travel_mate
-Total : 0 files,  0 codes, 0 comments, 0 blanks, all 0 lines
-
-Languages
-+----------+------------+------------+------------+------------+------------+
-| language | files      | code       | comment    | blank      | total      |
-+----------+------------+------------+------------+------------+------------+
-+----------+------------+------------+------------+------------+------------+
-
-Directories
-+------+------------+------------+------------+------------+------------+
-| path | files      | code       | comment    | blank      | total      |
-+------+------------+------------+------------+------------+------------+
-+------+------------+------------+------------+------------+------------+
-
-Files
-+----------+----------+------------+------------+------------+------------+
-| filename | language | code       | comment    | blank      | total      |
-+----------+----------+------------+------------+------------+------------+
-| Total    |          |          0 |          0 |          0 |          0 |
-+----------+----------+------------+------------+------------+------------+

.VSCodeCounter/2025-10-14_11-10-48/results.csv

@@ -1,69 +0,0 @@
-"filename", "language", "YAML", "Markdown", "Dart", "JSON", "Swift", "C++", "XML", "Ruby", "Properties", "HTML", "comment", "blank", "total"
-"c:\Users\dayro\Documents\coding\travel_mate\README.md", "Markdown", 0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 61
-"c:\Users\dayro\Documents\coding\travel_mate\analysis_options.yaml", "YAML", 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 4, 29
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\google-services.json", "JSON", 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 54
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\debug\AndroidManifest.xml", "XML", 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 1, 8
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\AndroidManifest.xml", "XML", 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 11, 1, 52
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\drawable-v21\launch_background.xml", "XML", 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 7, 2, 13
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\drawable\launch_background.xml", "XML", 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 7, 2, 13
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\values-night\styles.xml", "XML", 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 9, 1, 19
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\values\styles.xml", "XML", 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 9, 1, 19
-"c:\Users\dayro\Documents\coding\travel_mate\android\app\src\profile\AndroidManifest.xml", "XML", 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 1, 8
-"c:\Users\dayro\Documents\coding\travel_mate\android\build\reports\problems\problems-report.html", "HTML", 0, 0, 0, 0, 0, 0, 0, 0, 0, 548, 2, 114, 664
-"c:\Users\dayro\Documents\coding\travel_mate\android\gradle.properties", "Properties", 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 1, 4
-"c:\Users\dayro\Documents\coding\travel_mate\android\gradle\wrapper\gradle-wrapper.properties", "Properties", 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 1, 6
-"c:\Users\dayro\Documents\coding\travel_mate\firebase.json", "JSON", 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Podfile", "Ruby", 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 2, 10, 44
-"c:\Users\dayro\Documents\coding\travel_mate\ios\RunnerTests\RunnerTests.swift", "Swift", 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 2, 4, 13
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\AppDelegate.swift", "Swift", 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 2, 16
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Assets.xcassets\AppIcon.appiconset\Contents.json", "JSON", 0, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 1, 123
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Assets.xcassets\LaunchImage.imageset\Contents.json", "JSON", 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 1, 24
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Assets.xcassets\LaunchImage.imageset\README.md", "Markdown", 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 5
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Base.lproj\LaunchScreen.storyboard", "XML", 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 1, 1, 38
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Base.lproj\Main.storyboard", "XML", 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 1, 1, 27
-"c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Runner-Bridging-Header.h", "C++", 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 2
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\auth\auth_bloc.dart", "Dart", 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, 1, 20, 150
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\auth\auth_event.dart", "Dart", 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 15, 55
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\auth\auth_state.dart", "Dart", 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 14, 42
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\theme\theme_bloc.dart", "Dart", 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 1, 5, 46
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\theme\theme_event.dart", "Dart", 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 6, 20
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\theme\theme_state.dart", "Dart", 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 5, 21
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\trip\trip_bloc.dart", "Dart", 0, 0, 103, 0, 0, 0, 0, 0, 0, 0, 1, 14, 118
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\trip\trip_event.dart", "Dart", 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, 0, 20, 71
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\trip\trip_state.dart", "Dart", 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 13, 40
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\user\user_bloc.dart", "Dart", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\user\user_event.dart", "Dart", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-"c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\user\user_state.dart", "Dart", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\count\count_content.dart", "Dart", 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 3, 28
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\group\group_content.dart", "Dart", 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, 2, 12, 129
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\home\create_trip_content.dart", "Dart", 0, 0, 481, 0, 0, 0, 0, 0, 0, 0, 21, 63, 565
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\home\home_content.dart", "Dart", 0, 0, 366, 0, 0, 0, 0, 0, 0, 0, 12, 30, 408
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\home\show_trip_details_content.dart", "Dart", 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 2, 4, 112
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\map\map_content.dart", "Dart", 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 4, 11, 115
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\profile\profile_content.dart", "Dart", 0, 0, 328, 0, 0, 0, 0, 0, 0, 0, 6, 29, 363
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\settings\settings_content.dart", "Dart", 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 2, 10, 72
-"c:\Users\dayro\Documents\coding\travel_mate\lib\components\settings\settings_theme_content.dart", "Dart", 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 4, 10, 137
-"c:\Users\dayro\Documents\coding\travel_mate\lib\data\data_sources\firestore_data_source.dart", "Dart", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-"c:\Users\dayro\Documents\coding\travel_mate\lib\data\data_sources\local_data_source.dart", "Dart", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-"c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\group.dart", "Dart", 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 3, 26
-"c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\message.dart", "Dart", 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15
-"c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\trip.dart", "Dart", 0, 0, 176, 0, 0, 0, 0, 0, 0, 0, 16, 24, 216
-"c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\user.dart", "Dart", 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 6, 13, 80
-"c:\Users\dayro\Documents\coding\travel_mate\lib\firebase_options.dart", "Dart", 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 12, 5, 77
-"c:\Users\dayro\Documents\coding\travel_mate\lib\main.dart", "Dart", 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 5, 94
-"c:\Users\dayro\Documents\coding\travel_mate\lib\pages\home.dart", "Dart", 0, 0, 147, 0, 0, 0, 0, 0, 0, 0, 6, 13, 166
-"c:\Users\dayro\Documents\coding\travel_mate\lib\pages\login.dart", "Dart", 0, 0, 285, 0, 0, 0, 0, 0, 0, 0, 9, 28, 322
-"c:\Users\dayro\Documents\coding\travel_mate\lib\pages\resetpswd.dart", "Dart", 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 2, 13, 107
-"c:\Users\dayro\Documents\coding\travel_mate\lib\pages\signup.dart", "Dart", 0, 0, 256, 0, 0, 0, 0, 0, 0, 0, 7, 20, 283
-"c:\Users\dayro\Documents\coding\travel_mate\lib\providers\theme_provider.dart", "Dart", 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 1, 9, 51
-"c:\Users\dayro\Documents\coding\travel_mate\lib\providers\user_provider.dart", "Dart", 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, 9, 18, 121
-"c:\Users\dayro\Documents\coding\travel_mate\lib\repositories\auth_repository.dart", "Dart", 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, 11, 22, 148
-"c:\Users\dayro\Documents\coding\travel_mate\lib\repositories\trip_repository.dart", "Dart", 0, 0, 92, 0, 0, 0, 0, 0, 0, 0, 9, 12, 113
-"c:\Users\dayro\Documents\coding\travel_mate\lib\repositories\user_repository.dart", "Dart", 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 7, 11, 95
-"c:\Users\dayro\Documents\coding\travel_mate\lib\services\auth_service.dart", "Dart", 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 6, 18, 108
-"c:\Users\dayro\Documents\coding\travel_mate\lib\services\group_service.dart", "Dart", 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 1, 6, 60
-"c:\Users\dayro\Documents\coding\travel_mate\lib\services\message_service.dart", "Dart", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-"c:\Users\dayro\Documents\coding\travel_mate\lib\services\trip_service.dart", "Dart", 0, 0, 209, 0, 0, 0, 0, 0, 0, 0, 21, 39, 269
-"c:\Users\dayro\Documents\coding\travel_mate\pubspec.yaml", "YAML", 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 14, 103
-"c:\Users\dayro\Documents\coding\travel_mate\test\widget_test.dart", "Dart", 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 10, 7, 31
-"Total", "-", 34, 48, 4134, 200, 21, 1, 133, 32, 8, 548, 328, 739, 6226

.VSCodeCounter/2025-10-14_11-10-48/results.md

@@ -1,81 +0,0 @@
-# Summary
-
-Date : 2025-10-14 11:10:48
-
-Directory c:\\Users\\dayro\\Documents\\coding\\travel_mate
-
-Total : 67 files,  5159 codes, 328 comments, 739 blanks, all 6226 lines
-
-Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md)
-
-## Languages
-| language | files | code | comment | blank | total |
-| :--- | ---: | ---: | ---: | ---: | ---: |
-| Dart | 43 | 4,134 | 189 | 557 | 4,880 |
-| HTML | 1 | 548 | 2 | 114 | 664 |
-| JSON | 4 | 200 | 0 | 2 | 202 |
-| XML | 9 | 133 | 53 | 11 | 197 |
-| Markdown | 2 | 48 | 0 | 18 | 66 |
-| YAML | 2 | 34 | 80 | 18 | 132 |
-| Ruby | 1 | 32 | 2 | 10 | 44 |
-| Swift | 2 | 21 | 2 | 6 | 29 |
-| Properties | 2 | 8 | 0 | 2 | 10 |
-| C++ | 1 | 1 | 0 | 1 | 2 |
-
-## Directories
-| path | files | code | comment | blank | total |
-| :--- | ---: | ---: | ---: | ---: | ---: |
-| . | 67 | 5,159 | 328 | 739 | 6,226 |
-| . (Files) | 4 | 80 | 80 | 34 | 194 |
-| android | 11 | 682 | 53 | 125 | 860 |
-| android (Files) | 1 | 3 | 0 | 1 | 4 |
-| android\\app | 8 | 126 | 51 | 9 | 186 |
-| android\\app (Files) | 1 | 54 | 0 | 0 | 54 |
-| android\\app\\src | 7 | 72 | 51 | 9 | 132 |
-| android\\app\\src\\debug | 1 | 3 | 4 | 1 | 8 |
-| android\\app\\src\\main | 5 | 66 | 43 | 7 | 116 |
-| android\\app\\src\\main (Files) | 1 | 40 | 11 | 1 | 52 |
-| android\\app\\src\\main\\res | 4 | 26 | 32 | 6 | 64 |
-| android\\app\\src\\main\\res\\drawable | 1 | 4 | 7 | 2 | 13 |
-| android\\app\\src\\main\\res\\drawable-v21 | 1 | 4 | 7 | 2 | 13 |
-| android\\app\\src\\main\\res\\values | 1 | 9 | 9 | 1 | 19 |
-| android\\app\\src\\main\\res\\values-night | 1 | 9 | 9 | 1 | 19 |
-| android\\app\\src\\profile | 1 | 3 | 4 | 1 | 8 |
-| android\\build | 1 | 548 | 2 | 114 | 664 |
-| android\\build\\reports | 1 | 548 | 2 | 114 | 664 |
-| android\\build\\reports\\problems | 1 | 548 | 2 | 114 | 664 |
-| android\\gradle | 1 | 5 | 0 | 1 | 6 |
-| android\\gradle\\wrapper | 1 | 5 | 0 | 1 | 6 |
-| ios | 9 | 263 | 6 | 23 | 292 |
-| ios (Files) | 1 | 32 | 2 | 10 | 44 |
-| ios\\Runner | 7 | 224 | 2 | 9 | 235 |
-| ios\\Runner (Files) | 2 | 15 | 0 | 3 | 18 |
-| ios\\RunnerTests | 1 | 7 | 2 | 4 | 13 |
-| ios\\Runner\\Assets.xcassets | 3 | 148 | 0 | 4 | 152 |
-| ios\\Runner\\Assets.xcassets\\AppIcon.appiconset | 1 | 122 | 0 | 1 | 123 |
-| ios\\Runner\\Assets.xcassets\\LaunchImage.imageset | 2 | 26 | 0 | 3 | 29 |
-| ios\\Runner\\Base.lproj | 2 | 61 | 2 | 2 | 65 |
-| lib | 42 | 4,120 | 179 | 550 | 4,849 |
-| lib (Files) | 2 | 149 | 12 | 10 | 171 |
-| lib\\blocs | 12 | 448 | 3 | 115 | 566 |
-| lib\\blocs\\auth | 3 | 197 | 1 | 49 | 247 |
-| lib\\blocs\\theme | 3 | 70 | 1 | 16 | 87 |
-| lib\\blocs\\trip | 3 | 181 | 1 | 47 | 229 |
-| lib\\blocs\\user | 3 | 0 | 0 | 3 | 3 |
-| lib\\components | 9 | 1,704 | 53 | 172 | 1,929 |
-| lib\\components\\count | 1 | 25 | 0 | 3 | 28 |
-| lib\\components\\group | 1 | 115 | 2 | 12 | 129 |
-| lib\\components\\home | 3 | 953 | 35 | 97 | 1,085 |
-| lib\\components\\map | 1 | 100 | 4 | 11 | 115 |
-| lib\\components\\profile | 1 | 328 | 6 | 29 | 363 |
-| lib\\components\\settings | 2 | 183 | 6 | 20 | 209 |
-| lib\\data | 6 | 274 | 22 | 43 | 339 |
-| lib\\data\\data_sources | 2 | 0 | 0 | 2 | 2 |
-| lib\\data\\models | 4 | 274 | 22 | 41 | 337 |
-| lib\\pages | 4 | 780 | 24 | 74 | 878 |
-| lib\\providers | 2 | 135 | 10 | 27 | 172 |
-| lib\\repositories | 3 | 284 | 27 | 45 | 356 |
-| lib\\services | 4 | 346 | 28 | 64 | 438 |
-| test | 1 | 14 | 10 | 7 | 31 |
-
-Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md)

.VSCodeCounter/2025-10-14_11-10-48/results.txt

@@ -1,151 +0,0 @@
-Date : 2025-10-14 11:10:48
-Directory : c:\Users\dayro\Documents\coding\travel_mate
-Total : 67 files,  5159 codes, 328 comments, 739 blanks, all 6226 lines
-
-Languages
-+------------+------------+------------+------------+------------+------------+
-| language   | files      | code       | comment    | blank      | total      |
-+------------+------------+------------+------------+------------+------------+
-| Dart       |         43 |      4,134 |        189 |        557 |      4,880 |
-| HTML       |          1 |        548 |          2 |        114 |        664 |
-| JSON       |          4 |        200 |          0 |          2 |        202 |
-| XML        |          9 |        133 |         53 |         11 |        197 |
-| Markdown   |          2 |         48 |          0 |         18 |         66 |
-| YAML       |          2 |         34 |         80 |         18 |        132 |
-| Ruby       |          1 |         32 |          2 |         10 |         44 |
-| Swift      |          2 |         21 |          2 |          6 |         29 |
-| Properties |          2 |          8 |          0 |          2 |         10 |
-| C++        |          1 |          1 |          0 |          1 |          2 |
-+------------+------------+------------+------------+------------+------------+
-
-Directories
-+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
-| path                                                                                                      | files      | code       | comment    | blank      | total      |
-+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
-| .                                                                                                         |         67 |      5,159 |        328 |        739 |      6,226 |
-| . (Files)                                                                                                 |          4 |         80 |         80 |         34 |        194 |
-| android                                                                                                   |         11 |        682 |         53 |        125 |        860 |
-| android (Files)                                                                                           |          1 |          3 |          0 |          1 |          4 |
-| android\app                                                                                               |          8 |        126 |         51 |          9 |        186 |
-| android\app (Files)                                                                                       |          1 |         54 |          0 |          0 |         54 |
-| android\app\src                                                                                           |          7 |         72 |         51 |          9 |        132 |
-| android\app\src\debug                                                                                     |          1 |          3 |          4 |          1 |          8 |
-| android\app\src\main                                                                                      |          5 |         66 |         43 |          7 |        116 |
-| android\app\src\main (Files)                                                                              |          1 |         40 |         11 |          1 |         52 |
-| android\app\src\main\res                                                                                  |          4 |         26 |         32 |          6 |         64 |
-| android\app\src\main\res\drawable                                                                         |          1 |          4 |          7 |          2 |         13 |
-| android\app\src\main\res\drawable-v21                                                                     |          1 |          4 |          7 |          2 |         13 |
-| android\app\src\main\res\values                                                                           |          1 |          9 |          9 |          1 |         19 |
-| android\app\src\main\res\values-night                                                                     |          1 |          9 |          9 |          1 |         19 |
-| android\app\src\profile                                                                                   |          1 |          3 |          4 |          1 |          8 |
-| android\build                                                                                             |          1 |        548 |          2 |        114 |        664 |
-| android\build\reports                                                                                     |          1 |        548 |          2 |        114 |        664 |
-| android\build\reports\problems                                                                            |          1 |        548 |          2 |        114 |        664 |
-| android\gradle                                                                                            |          1 |          5 |          0 |          1 |          6 |
-| android\gradle\wrapper                                                                                    |          1 |          5 |          0 |          1 |          6 |
-| ios                                                                                                       |          9 |        263 |          6 |         23 |        292 |
-| ios (Files)                                                                                               |          1 |         32 |          2 |         10 |         44 |
-| ios\Runner                                                                                                |          7 |        224 |          2 |          9 |        235 |
-| ios\Runner (Files)                                                                                        |          2 |         15 |          0 |          3 |         18 |
-| ios\RunnerTests                                                                                           |          1 |          7 |          2 |          4 |         13 |
-| ios\Runner\Assets.xcassets                                                                                |          3 |        148 |          0 |          4 |        152 |
-| ios\Runner\Assets.xcassets\AppIcon.appiconset                                                             |          1 |        122 |          0 |          1 |        123 |
-| ios\Runner\Assets.xcassets\LaunchImage.imageset                                                           |          2 |         26 |          0 |          3 |         29 |
-| ios\Runner\Base.lproj                                                                                     |          2 |         61 |          2 |          2 |         65 |
-| lib                                                                                                       |         42 |      4,120 |        179 |        550 |      4,849 |
-| lib (Files)                                                                                               |          2 |        149 |         12 |         10 |        171 |
-| lib\blocs                                                                                                 |         12 |        448 |          3 |        115 |        566 |
-| lib\blocs\auth                                                                                            |          3 |        197 |          1 |         49 |        247 |
-| lib\blocs\theme                                                                                           |          3 |         70 |          1 |         16 |         87 |
-| lib\blocs\trip                                                                                            |          3 |        181 |          1 |         47 |        229 |
-| lib\blocs\user                                                                                            |          3 |          0 |          0 |          3 |          3 |
-| lib\components                                                                                            |          9 |      1,704 |         53 |        172 |      1,929 |
-| lib\components\count                                                                                      |          1 |         25 |          0 |          3 |         28 |
-| lib\components\group                                                                                      |          1 |        115 |          2 |         12 |        129 |
-| lib\components\home                                                                                       |          3 |        953 |         35 |         97 |      1,085 |
-| lib\components\map                                                                                        |          1 |        100 |          4 |         11 |        115 |
-| lib\components\profile                                                                                    |          1 |        328 |          6 |         29 |        363 |
-| lib\components\settings                                                                                   |          2 |        183 |          6 |         20 |        209 |
-| lib\data                                                                                                  |          6 |        274 |         22 |         43 |        339 |
-| lib\data\data_sources                                                                                     |          2 |          0 |          0 |          2 |          2 |
-| lib\data\models                                                                                           |          4 |        274 |         22 |         41 |        337 |
-| lib\pages                                                                                                 |          4 |        780 |         24 |         74 |        878 |
-| lib\providers                                                                                             |          2 |        135 |         10 |         27 |        172 |
-| lib\repositories                                                                                          |          3 |        284 |         27 |         45 |        356 |
-| lib\services                                                                                              |          4 |        346 |         28 |         64 |        438 |
-| test                                                                                                      |          1 |         14 |         10 |          7 |         31 |
-+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
-
-Files
-+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
-| filename                                                                                                  | language   | code       | comment    | blank      | total      |
-+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+
-| c:\Users\dayro\Documents\coding\travel_mate\README.md                                                     | Markdown   |         45 |          0 |         16 |         61 |
-| c:\Users\dayro\Documents\coding\travel_mate\analysis_options.yaml                                         | YAML       |          3 |         22 |          4 |         29 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\google-services.json                              | JSON       |         54 |          0 |          0 |         54 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\debug\AndroidManifest.xml                     | XML        |          3 |          4 |          1 |          8 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\AndroidManifest.xml                      | XML        |         40 |         11 |          1 |         52 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\drawable-v21\launch_background.xml   | XML        |          4 |          7 |          2 |         13 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\drawable\launch_background.xml       | XML        |          4 |          7 |          2 |         13 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\values-night\styles.xml              | XML        |          9 |          9 |          1 |         19 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\main\res\values\styles.xml                    | XML        |          9 |          9 |          1 |         19 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\app\src\profile\AndroidManifest.xml                   | XML        |          3 |          4 |          1 |          8 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\build\reports\problems\problems-report.html           | HTML       |        548 |          2 |        114 |        664 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\gradle.properties                                     | Properties |          3 |          0 |          1 |          4 |
-| c:\Users\dayro\Documents\coding\travel_mate\android\gradle\wrapper\gradle-wrapper.properties              | Properties |          5 |          0 |          1 |          6 |
-| c:\Users\dayro\Documents\coding\travel_mate\firebase.json                                                 | JSON       |          1 |          0 |          0 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Podfile                                                   | Ruby       |         32 |          2 |         10 |         44 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\RunnerTests\RunnerTests.swift                             | Swift      |          7 |          2 |          4 |         13 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\AppDelegate.swift                                  | Swift      |         14 |          0 |          2 |         16 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Assets.xcassets\AppIcon.appiconset\Contents.json   | JSON       |        122 |          0 |          1 |        123 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Assets.xcassets\LaunchImage.imageset\Contents.json | JSON       |         23 |          0 |          1 |         24 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Assets.xcassets\LaunchImage.imageset\README.md     | Markdown   |          3 |          0 |          2 |          5 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Base.lproj\LaunchScreen.storyboard                 | XML        |         36 |          1 |          1 |         38 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Base.lproj\Main.storyboard                         | XML        |         25 |          1 |          1 |         27 |
-| c:\Users\dayro\Documents\coding\travel_mate\ios\Runner\Runner-Bridging-Header.h                           | C++        |          1 |          0 |          1 |          2 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\auth\auth_bloc.dart                                 | Dart       |        129 |          1 |         20 |        150 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\auth\auth_event.dart                                | Dart       |         40 |          0 |         15 |         55 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\auth\auth_state.dart                                | Dart       |         28 |          0 |         14 |         42 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\theme\theme_bloc.dart                               | Dart       |         40 |          1 |          5 |         46 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\theme\theme_event.dart                              | Dart       |         14 |          0 |          6 |         20 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\theme\theme_state.dart                              | Dart       |         16 |          0 |          5 |         21 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\trip\trip_bloc.dart                                 | Dart       |        103 |          1 |         14 |        118 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\trip\trip_event.dart                                | Dart       |         51 |          0 |         20 |         71 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\trip\trip_state.dart                                | Dart       |         27 |          0 |         13 |         40 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\user\user_bloc.dart                                 | Dart       |          0 |          0 |          1 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\user\user_event.dart                                | Dart       |          0 |          0 |          1 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\blocs\user\user_state.dart                                | Dart       |          0 |          0 |          1 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\count\count_content.dart                       | Dart       |         25 |          0 |          3 |         28 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\group\group_content.dart                       | Dart       |        115 |          2 |         12 |        129 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\home\create_trip_content.dart                  | Dart       |        481 |         21 |         63 |        565 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\home\home_content.dart                         | Dart       |        366 |         12 |         30 |        408 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\home\show_trip_details_content.dart            | Dart       |        106 |          2 |          4 |        112 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\map\map_content.dart                           | Dart       |        100 |          4 |         11 |        115 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\profile\profile_content.dart                   | Dart       |        328 |          6 |         29 |        363 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\settings\settings_content.dart                 | Dart       |         60 |          2 |         10 |         72 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\components\settings\settings_theme_content.dart           | Dart       |        123 |          4 |         10 |        137 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\data\data_sources\firestore_data_source.dart              | Dart       |          0 |          0 |          1 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\data\data_sources\local_data_source.dart                  | Dart       |          0 |          0 |          1 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\group.dart                                    | Dart       |         23 |          0 |          3 |         26 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\message.dart                                  | Dart       |         14 |          0 |          1 |         15 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\trip.dart                                     | Dart       |        176 |         16 |         24 |        216 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\data\models\user.dart                                     | Dart       |         61 |          6 |         13 |         80 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\firebase_options.dart                                     | Dart       |         60 |         12 |          5 |         77 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\main.dart                                                 | Dart       |         89 |          0 |          5 |         94 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\pages\home.dart                                           | Dart       |        147 |          6 |         13 |        166 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\pages\login.dart                                          | Dart       |        285 |          9 |         28 |        322 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\pages\resetpswd.dart                                      | Dart       |         92 |          2 |         13 |        107 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\pages\signup.dart                                         | Dart       |        256 |          7 |         20 |        283 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\providers\theme_provider.dart                             | Dart       |         41 |          1 |          9 |         51 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\providers\user_provider.dart                              | Dart       |         94 |          9 |         18 |        121 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\repositories\auth_repository.dart                         | Dart       |        115 |         11 |         22 |        148 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\repositories\trip_repository.dart                         | Dart       |         92 |          9 |         12 |        113 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\repositories\user_repository.dart                         | Dart       |         77 |          7 |         11 |         95 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\services\auth_service.dart                                | Dart       |         84 |          6 |         18 |        108 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\services\group_service.dart                               | Dart       |         53 |          1 |          6 |         60 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\services\message_service.dart                             | Dart       |          0 |          0 |          1 |          1 |
-| c:\Users\dayro\Documents\coding\travel_mate\lib\services\trip_service.dart                                | Dart       |        209 |         21 |         39 |        269 |
-| c:\Users\dayro\Documents\coding\travel_mate\pubspec.yaml                                                  | YAML       |         31 |         58 |         14 |        103 |
-| c:\Users\dayro\Documents\coding\travel_mate\test\widget_test.dart                                         | Dart       |         14 |         10 |          7 |         31 |
-| Total                                                                                                     |            |      5,159 |        328 |        739 |      6,226 |
-+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "travelmate-a47f5"
+  }
+}

.gitea/workflows/deploy.yaml

@@ -0,0 +1,226 @@
+name: Deploy TravelMate (Full Mobile)
+on:
+  push:
+    branches:
+      - release
+
+jobs:
+  # --- JOB 1 : ANDROID (Génération APK) ---
+  deploy-android:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Configuration Flutter & Secrets
+        run: |
+          flutter pub get
+          echo "${{ secrets.ENV_FILE }}" > .env
+          printf '%s' '${{ secrets.FIREBASE_CREDENTIALS }}' > ./android/firebase_credentials.json
+
+      - name: Build & Deploy Android
+        working-directory: ./android
+        env:
+          ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          RAW_PROPERTIES: ${{ secrets.ANDROID_KEY_PROPERTIES }}
+          FIREBASE_ANDROID_APP_ID: ${{ secrets.FIREBASE_ANDROID_APP_ID }}
+        run: |
+          # 1. Keystore
+          echo "$ANDROID_KEYSTORE_BASE64" | base64 -D > keystore.jks
+          echo "$RAW_PROPERTIES" > temp_props.txt
+          echo "storePassword=$(grep 'storePassword' temp_props.txt | cut -d'=' -f2 | tr -d '\r')" > key.properties
+          echo "keyPassword=$(grep 'keyPassword' temp_props.txt | cut -d'=' -f2 | tr -d '\r')" >> key.properties
+          echo "keyAlias=$(grep 'keyAlias' temp_props.txt | cut -d'=' -f2 | tr -d '\r')" >> key.properties
+          echo "storeFile=$(pwd)/keystore.jks" >> key.properties
+
+          # 2. Gemfile (Correctifs Ruby 3.4 inclus)
+          echo "source 'https://rubygems.org'" > Gemfile
+          echo "gem 'fastlane', '>= 2.230.0'" >> Gemfile
+          echo "gem 'fastlane-plugin-firebase_app_distribution'" >> Gemfile
+          for g in abbrev ostruct mutex_m base64 csv bigdecimal drb nkf reline logger; do echo "gem '$g'" >> Gemfile; done
+          
+          gem install bundler -v 2.7.2 --no-document
+          bundle _2.7.2_ update
+
+          # 3. Build & Envoi
+          cd .. && flutter build apk --release && cd android
+          bundle _2.7.2_ exec fastlane run firebase_app_distribution \
+            app:"$FIREBASE_ANDROID_APP_ID" \
+            android_artifact_path:"../build/app/outputs/flutter-apk/app-release.apk" \
+            service_credentials_file:"firebase_credentials.json"
+
+  # --- JOB 2 : IOS (Génération IPA) ---
+  deploy-ios:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Dépendances iOS & Secrets
+        run: |
+          flutter pub get
+          echo "${{ secrets.ENV_FILE }}" > .env
+          printf '%s' '${{ secrets.FIREBASE_CREDENTIALS }}' > ./ios/firebase_credentials.json
+          cd ios && (pod install --repo-update || pod update)
+
+      - name: Préparer le Code Signing
+        env:
+          P12_BASE: ${{ secrets.IOS_P12_BASE64 }}
+          P12_PASS: ${{ secrets.IOS_P12_PASSWORD }}
+          PROV_BASE: ${{ secrets.IOS_PROVISION_BASE64 }}
+          TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
+        run: |
+          # Créer et configurer le keychain
+          security delete-keychain build.keychain || true
+          security create-keychain -p "" build.keychain
+          security unlock-keychain -p "" build.keychain
+          security list-keychains -d user -s build.keychain $(security list-keychains -d user | xargs)
+          security set-keychain-settings -lut 21600 build.keychain
+          
+          # Importer le certificat
+          echo "$P12_BASE" | base64 -D -o cert.p12
+          security import cert.p12 -k build.keychain -P "$P12_PASS" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain
+          
+          # Installer le profil de provisioning
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          PROFILE_PATH=~/Library/MobileDevice/Provisioning\ Profiles/distribution.mobileprovision
+          echo "$PROV_BASE" | base64 -D -o "$PROFILE_PATH"
+          
+          # Extraire l'UUID du profil
+          PROFILE_UUID=$(/usr/libexec/PlistBuddy -c "Print UUID" /dev/stdin <<< $(/usr/bin/security cms -D -i "$PROFILE_PATH"))
+          echo "Profile UUID: $PROFILE_UUID"
+          
+          # Copier avec l'UUID correct
+          cp "$PROFILE_PATH" ~/Library/MobileDevice/Provisioning\ Profiles/$PROFILE_UUID.mobileprovision
+
+      - name: Configurer le projet Xcode
+        env:
+          TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
+          BUNDLE_ID: ${{ secrets.IOS_BUNDLE_ID }}
+        run: |
+          cd ios
+          
+          # Extraire le nom du profil de provisioning
+          PROV_NAME=$(/usr/libexec/PlistBuddy -c "Print Name" /dev/stdin <<< $(/usr/bin/security cms -D -i ~/Library/MobileDevice/Provisioning\ Profiles/distribution.mobileprovision))
+          echo "📝 Provisioning Profile Name: $PROV_NAME"
+          
+          # Obtenir l'UUID du profil
+          PROFILE_UUID=$(/usr/libexec/PlistBuddy -c "Print UUID" /dev/stdin <<< $(/usr/bin/security cms -D -i ~/Library/MobileDevice/Provisioning\ Profiles/distribution.mobileprovision))
+          echo "🔑 Profile UUID: $PROFILE_UUID"
+          
+          # Sauvegarder les variables pour la prochaine étape
+          echo "$PROV_NAME" > /tmp/prov_name.txt
+          echo "$TEAM_ID" > /tmp/team_id.txt
+          echo "$BUNDLE_ID" > /tmp/bundle_id.txt
+          
+          echo "✅ Configuration des paramètres de signing prête"
+
+      - name: Créer exportOptions.plist
+        env:
+          TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
+          BUNDLE_ID: ${{ secrets.IOS_BUNDLE_ID }}
+        run: |
+          # Extraire le nom du profil
+          PROV_NAME=$(/usr/libexec/PlistBuddy -c "Print Name" /dev/stdin <<< $(/usr/bin/security cms -D -i ~/Library/MobileDevice/Provisioning\ Profiles/distribution.mobileprovision))
+          
+          cat > ios/exportOptions.plist <<EOF
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+            <key>method</key>
+            <string>ad-hoc</string>
+            <key>teamID</key>
+            <string>$TEAM_ID</string>
+            <key>signingStyle</key>
+            <string>manual</string>
+            <key>provisioningProfiles</key>
+            <dict>
+              <key>$BUNDLE_ID</key>
+              <string>$PROV_NAME</string>
+            </dict>
+          </dict>
+          </plist>
+          EOF
+
+      - name: Build IPA avec Flutter
+        run: |
+          # Récupérer les variables sauvegardées
+          PROV_NAME=$(cat /tmp/prov_name.txt)
+          TEAM_ID=$(cat /tmp/team_id.txt)
+          BUNDLE_ID=$(cat /tmp/bundle_id.txt)
+          
+          echo "📝 Provisioning Profile: $PROV_NAME"
+          echo "🔑 Team ID: $TEAM_ID"
+          echo "📦 Bundle ID: $BUNDLE_ID"
+          
+          # Clean
+          flutter clean
+          flutter pub get
+          
+          echo "🔨 Build de l'IPA avec Flutter..."
+          
+          # Flutter build ipa gère automatiquement le signing des Pods
+          # On utilise SEULEMENT --export-options-plist (pas --export-method)
+          flutter build ipa \
+            --release \
+            --export-options-plist=ios/exportOptions.plist
+          
+          echo "✅ Build terminé"
+          echo "📂 Recherche de l'IPA..."
+          
+          # L'IPA devrait être dans build/ios/ipa/
+          find build/ios -name "*.ipa" -type f
+          
+          IPA_FILE=$(find build/ios/ipa -name "*.ipa" | head -n 1)
+          
+          if [ -z "$IPA_FILE" ]; then
+            echo "❌ ERREUR: Aucun fichier IPA trouvé !"
+            echo "📂 Contenu de build/ios/ :"
+            ls -R build/ios/
+            exit 1
+          fi
+          
+          echo "✅ IPA trouvée : $IPA_FILE"
+          echo "📊 Taille : $(du -h "$IPA_FILE" | cut -f1)"
+
+      - name: Vérification et Upload Firebase
+        env:
+          FIREBASE_IOS_APP_ID: ${{ secrets.FIREBASE_IOS_APP_ID }}
+        run: |
+          cd ios
+          
+          # Configuration Fastlane
+          echo "source 'https://rubygems.org'" > Gemfile
+          echo "gem 'fastlane', '>= 2.230.0'" >> Gemfile
+          echo "gem 'fastlane-plugin-firebase_app_distribution'" >> Gemfile
+          for g in abbrev ostruct mutex_m base64 csv bigdecimal drb nkf reline logger; do echo "gem '$g'" >> Gemfile; done
+          
+          gem install bundler -v 2.7.2 --no-document
+          bundle _2.7.2_ update
+          
+          # Recherche de l'IPA
+          IPA_FILE=$(find ../build/ios/ipa -name "*.ipa" | head -n 1)
+          
+          if [ -z "$IPA_FILE" ]; then
+            echo "❌ ERREUR : Aucun fichier IPA trouvé !"
+            echo "📂 Structure complète du dossier build :"
+            ls -R ../build/
+            exit 1
+          fi
+          
+          echo "✅ IPA trouvée : $IPA_FILE"
+          echo "📊 Taille : $(du -h "$IPA_FILE" | cut -f1)"
+          
+          # Upload vers Firebase
+          bundle _2.7.2_ exec fastlane run firebase_app_distribution \
+            app:"$FIREBASE_IOS_APP_ID" \
+            ipa_path:"$IPA_FILE" \
+            service_credentials_file:"firebase_credentials.json"
+
+      - name: Nettoyage Final
+        if: always()
+        run: |
+          security list-keychains -d user -s login.keychain
+          security delete-keychain build.keychain || true

.github/workflows/deploy-playstore.yml

@@ -1,55 +0,0 @@
-name: Deploy to Play Store
-
-on:
-  push:
-    branches:
-      - release  # L'action se déclenche uniquement sur la branche 'release'
-
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      # 1. Récupérer le code
-      - uses: actions/checkout@v4
-
-      # 2. Installer Java (requis pour Android build)
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      # 3. Installer Flutter
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-
-      # 4. Gérer les dépendances
-      - run: flutter pub get
-
-      # 5. Créer le Keystore depuis le secret (Décodage)
-      - name: Decode Keystore
-        run: |
-          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > android/app/upload-keystore.jks
-
-      # 6. Créer le fichier key.properties pour que Gradle trouve la clé
-      - name: Create key.properties
-        run: |
-          echo "storePassword=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" > android/key.properties
-          echo "keyPassword=${{ secrets.ANDROID_KEY_PASSWORD }}" >> android/key.properties
-          echo "keyAlias=${{ secrets.ANDROID_KEY_ALIAS }}" >> android/key.properties
-          echo "storeFile=upload-keystore.jks" >> android/key.properties
-
-      # 7. Construire l'AppBundle (.aab)
-      - name: Build AppBundle
-        run: flutter build appbundle --release
-
-      # 8. Uploader sur le Play Store (Track: alpha = Test fermé)
-      - name: Upload to Play Store
-        uses: r0adkll/upload-google-play@v1
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
-          packageName: be.devdayronvl.travel_mate
-          releaseFiles: build/app/outputs/bundle/release/app-release.aab
-          track: alpha # 'alpha' correspond souvent au Test Fermé. Sinon 'internal' ou 'beta'.
-          status: completed

.gitignore

@@ -51,3 +51,8 @@ app.*.map.json
 firestore.rules
 storage.rules
 /functions/node_modules
+
+.idea 
+.vscode
+.VSCodeCounter 
+ 

README.md

@@ -56,3 +56,7 @@ Travel Mate est une application mobile conçue pour simplifier l'organisation de
 - **Google Places API** - Recherche de lieux et points d'intérêt
 - **Google Maps API** - Cartes et navigation
 - **Google Directions API** - Calcul d'itinéraires
+
+## 🚀 CI/CD & Déploiement
+
+Les versions de test interne Android et IOS sont automatiquement distribuées via **Firebase App Distribution**.

android/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

android/app/build.gradle.kts

@@ -22,6 +22,7 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
 
     kotlinOptions {
@@ -29,10 +30,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "be.devdayronvl.travel_mate"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
@@ -44,21 +42,27 @@ android {
             keyAlias = keystoreProperties["keyAlias"] as String?
             keyPassword = keystoreProperties["keyPassword"] as String?
             storeFile = if (keystoreProperties["storeFile"] != null) {
-                file(keystoreProperties["storeFile"] as String)
+                rootProject.file(keystoreProperties["storeFile"] as String)
             } else {
                 null
             }
+            
             storePassword = keystoreProperties["storePassword"] as String?
         }
     }
 
     buildTypes {
         release {
+            // Applique la configuration de signature définie au-dessus
             signingConfig = signingConfigs.getByName("release")
         }
     }
 }
 
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+}
+
 flutter {
     source = "../.."
 }

android/app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     
     <!-- Permissions pour écrire dans le stockage -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
         android:label="Travel Mate"
@@ -20,6 +21,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:screenOrientation="portrait"
             android:exported="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
@@ -40,6 +42,20 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        
+        <!-- Apple Sign In Callback Activity -->
+        <activity
+            android:name="com.aboutyou.dart_packages.sign_in_with_apple.SignInWithAppleCallback"
+            android:exported="true"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="signinwithapple" />
+                <data android:path="/" />
+            </intent-filter>
+        </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -47,7 +63,10 @@
             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" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
@@ -59,5 +78,23 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <!-- Waze -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="waze" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" android:host="www.waze.com" />
+        </intent>
+        <!-- Google Maps -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="google.navigation" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" android:host="www.google.com" />
+        </intent>
     </queries>
 </manifest>

android/fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("'/Users/dayronvanleemput/Documents/Coding/clé/travelmate-a47f5-1e4759031f2d.json'") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("be.devdayronvl.travel_mate") # e.g. com.krausefx.app

android/fastlane/Fastfile

@@ -0,0 +1,28 @@
+default_platform(:android)
+
+platform :android do
+  desc "Deploy to Firebase from Mac"
+  lane :deploy_firebase do
+    
+    # 1. Création du Keystore depuis le secret Gitea 
+    if ENV['ANDROID_KEYSTORE_BASE64']
+      File.open("upload-keystore.jks", "wb") do |f|
+        f.write(Base64.decode64(ENV['ANDROID_KEYSTORE_BASE64']))
+      end
+    else
+        UI.error("Secret Keystore manquant !")
+    end
+
+    # 2. Build de l'App Bundle (AAB)
+    sh("flutter build appbundle --release")
+
+    # 3. Envoi vers Firebase App Distribution
+    firebase_app_distribution(
+      app: ENV["FIREBASE_ANDROID_APP_ID"],
+      service_credentials_file: "firebase_credentials.json",
+      groups: "testers",
+      android_artifact_path: "../build/app/outputs/bundle/release/app-release.aab",
+      release_notes: "Build depuis Mac M1/M2. Commit: #{ENV['GITHUB_SHA']}"
+    )
+  end
+end

android/fastlane/Pluginfile

@@ -0,0 +1,5 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-firebase_app_distribution'

firebase.json

@@ -1 +1,37 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"travelmate-a47f5","appId":"1:521527250907:android:be3db7fc84f053ec7da1fe","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"travelmate-a47f5","configurations":{"android":"1:521527250907:android:be3db7fc84f053ec7da1fe","ios":"1:521527250907:ios:64b41be39c54db1c7da1fe","windows":"1:521527250907:web:53ff98bcdb8c218f7da1fe"}}}}}}
+{
+  "flutter": {
+    "platforms": {
+      "android": {
+        "default": {
+          "projectId": "travelmate-a47f5",
+          "appId": "1:521527250907:android:be3db7fc84f053ec7da1fe",
+          "fileOutput": "android/app/google-services.json"
+        }
+      },
+      "dart": {
+        "lib/firebase_options.dart": {
+          "projectId": "travelmate-a47f5",
+          "configurations": {
+            "android": "1:521527250907:android:be3db7fc84f053ec7da1fe",
+            "ios": "1:521527250907:ios:64b41be39c54db1c7da1fe",
+            "windows": "1:521527250907:web:53ff98bcdb8c218f7da1fe"
+          }
+        }
+      }
+    }
+  },
+  "functions": [
+    {
+      "source": "functions",
+      "codebase": "default",
+      "disallowLegacyRuntimeConfig": true,
+      "ignore": [
+        "node_modules",
+        ".git",
+        "firebase-debug.log",
+        "firebase-debug.*.log",
+        "*.local"
+      ]
+    }
+  ]
+}

functions/.gitignore

@@ -0,0 +1,2 @@
+node_modules/
+*.local

functions/index.js

@@ -1,11 +1,84 @@
-const functions = require("firebase-functions");
+const functions = require("firebase-functions/v1");
 const admin = require("firebase-admin");
 
 admin.initializeApp();
 
-// Helper function to send notifications
+// Helper function to send notifications to a list of users
-async function sendNotificationToTripParticipants(tripId, title, body, excludeUserId) {
+async function sendNotificationToUsers(userIds, title, body, excludeUserId, data = {}) {
+    console.log(`Starting sendNotificationToUsers. Total users: ${userIds.length}, Exclude: ${excludeUserId}`);
     try {
+        const tokens = [];
+
+        for (const userId of userIds) {
+            if (userId === excludeUserId) {
+                console.log(`Skipping user ${userId} (sender)`);
+                continue;
+            }
+
+            const userDoc = await admin.firestore().collection("users").doc(userId).get();
+            if (userDoc.exists) {
+                const userData = userDoc.data();
+                if (userData.fcmToken) {
+                    console.log(`Found token for user ${userId}`);
+                    tokens.push(userData.fcmToken);
+                } else {
+                    console.log(`No FCM token found for user ${userId}`);
+                }
+            } else {
+                console.log(`User document not found for ${userId}`);
+            }
+        }
+
+        // De-duplicate tokens
+        const uniqueTokens = [...new Set(tokens)];
+        console.log(`Total unique tokens to send: ${uniqueTokens.length} (from ${tokens.length} found)`);
+
+        if (uniqueTokens.length > 0) {
+            const message = {
+                notification: {
+                    title: title,
+                    body: body,
+                },
+                tokens: uniqueTokens,
+                data: {
+                    click_action: "FLUTTER_NOTIFICATION_CLICK",
+                    ...data
+                },
+                android: {
+                    priority: "high",
+                    notification: {
+                        channelId: "high_importance_channel",
+                    }
+                }
+            };
+
+            const response = await admin.messaging().sendEachForMulticast(message);
+            console.log(`${response.successCount} messages were sent successfully`);
+            if (response.failureCount > 0) {
+                console.log('Failed notifications:', response.responses.filter(r => !r.success));
+            }
+        } else {
+            console.log("No tokens found, skipping notification send.");
+        }
+    } catch (error) {
+        console.error("Error sending notification:", error);
+    }
+}
+
+exports.onActivityCreated = functions.firestore
+    .document("activities/{activityId}")
+    .onCreate(async (snapshot, context) => {
+        console.log(`onActivityCreated triggered for ${context.params.activityId}`);
+        const activity = snapshot.data();
+        const tripId = activity.tripId;
+        const createdBy = activity.createdBy || "Unknown";
+
+        if (!tripId) {
+            console.log("No tripId found in activity");
+            return;
+        }
+
+        // Fetch trip to get participants
         const tripDoc = await admin.firestore().collection("trips").doc(tripId).get();
         if (!tripDoc.exists) {
             console.log(`Trip ${tripId} not found`);
@@ -14,54 +87,13 @@ async function sendNotificationToTripParticipants(tripId, title, body, excludeUs
 
         const trip = tripDoc.data();
         const participants = trip.participants || [];
-        // Add creator if not in participants list (though usually they are)
         if (trip.createdBy && !participants.includes(trip.createdBy)) {
             participants.push(trip.createdBy);
         }
 
-        const tokens = [];
+        console.log(`Found trip participants: ${JSON.stringify(participants)}`);
 
-        for (const userId of participants) {
+        // Fetch creator name
-            if (userId === excludeUserId) continue;
-
-            const userDoc = await admin.firestore().collection("users").doc(userId).get();
-            if (userDoc.exists) {
-                const userData = userDoc.data();
-                if (userData.fcmToken) {
-                    tokens.push(userData.fcmToken);
-                }
-            }
-        }
-
-        if (tokens.length > 0) {
-            const message = {
-                notification: {
-                    title: title,
-                    body: body,
-                },
-                tokens: tokens,
-                data: {
-                    tripId: tripId,
-                    click_action: "FLUTTER_NOTIFICATION_CLICK",
-                },
-            };
-
-            const response = await admin.messaging().sendMulticast(message);
-            console.log(`${response.successCount} messages were sent successfully`);
-        }
-    } catch (error) {
-        console.error("Error sending notification:", error);
-    }
-}
-
-exports.onActivityCreated = functions.firestore
-    .document("trips/{tripId}/activities/{activityId}")
-    .onCreate(async (snapshot, context) => {
-        const activity = snapshot.data();
-        const tripId = context.params.tripId;
-        const createdBy = activity.createdBy || "Unknown"; // Assuming createdBy field exists
-
-        // Fetch creator name if possible, otherwise use generic message
         let creatorName = "Quelqu'un";
         if (createdBy !== "Unknown") {
             const userDoc = await admin.firestore().collection("users").doc(createdBy).get();
@@ -70,56 +102,95 @@ exports.onActivityCreated = functions.firestore
             }
         }
 
-        await sendNotificationToTripParticipants(
+        await sendNotificationToUsers(
-            tripId,
+            participants,
             "Nouvelle activité !",
-            `${creatorName} a ajouté une nouvelle activité : ${activity.title}`,
+            `${creatorName} a ajouté une nouvelle activité : ${activity.name || activity.title}`,
-            createdBy
+            createdBy,
+            { tripId: tripId }
         );
     });
 
 exports.onMessageCreated = functions.firestore
-    .document("trips/{tripId}/messages/{messageId}")
+    .document("groups/{groupId}/messages/{messageId}")
     .onCreate(async (snapshot, context) => {
+        console.log(`onMessageCreated triggered for ${context.params.messageId} in group ${context.params.groupId}`);
         const message = snapshot.data();
-        const tripId = context.params.tripId;
+        const groupId = context.params.groupId;
         const senderId = message.senderId;
 
-        let senderName = "Quelqu'un";
+        // Fetch group to get members
-        if (senderId) {
+        const groupDoc = await admin.firestore().collection("groups").doc(groupId).get();
-            const userDoc = await admin.firestore().collection("users").doc(senderId).get();
+        if (!groupDoc.exists) {
-            if (userDoc.exists) {
+            console.log(`Group ${groupId} not found`);
-                senderName = userDoc.data().prenom || "Quelqu'un";
+            return;
-            }
         }
 
-        await sendNotificationToTripParticipants(
+        const group = groupDoc.data();
-            tripId,
+        const memberIds = group.memberIds || [];
+        console.log(`Found group members: ${JSON.stringify(memberIds)}`);
+
+        let senderName = message.senderName || "Quelqu'un";
+
+        await sendNotificationToUsers(
+            memberIds,
             "Nouveau message",
-            `${senderName} : ${message.content}`,
+            `${senderName} : ${message.text}`,
-            senderId
+            senderId,
+            { groupId: groupId }
         );
     });
 
 exports.onExpenseCreated = functions.firestore
-    .document("trips/{tripId}/expenses/{expenseId}")
+    .document("expenses/{expenseId}")
     .onCreate(async (snapshot, context) => {
+        console.log(`onExpenseCreated triggered for ${context.params.expenseId}`);
         const expense = snapshot.data();
-        const tripId = context.params.tripId;
+        const groupId = expense.groupId;
-        const paidBy = expense.paidBy;
+        const paidBy = expense.paidById || expense.paidBy;
 
-        let payerName = "Quelqu'un";
+        if (!groupId) {
-        if (paidBy) {
+            console.log("No groupId found in expense");
-            const userDoc = await admin.firestore().collection("users").doc(paidBy).get();
+            return;
-            if (userDoc.exists) {
-                payerName = userDoc.data().prenom || "Quelqu'un";
-            }
         }
 
-        await sendNotificationToTripParticipants(
+        // Fetch group to get members
-            tripId,
+        const groupDoc = await admin.firestore().collection("groups").doc(groupId).get();
+        if (!groupDoc.exists) {
+            console.log(`Group ${groupId} not found`);
+            return;
+        }
+
+        const group = groupDoc.data();
+        const memberIds = group.memberIds || [];
+        console.log(`Found group members: ${JSON.stringify(memberIds)}`);
+
+        let payerName = expense.paidByName || "Quelqu'un";
+
+        await sendNotificationToUsers(
+            memberIds,
             "Nouvelle dépense",
             `${payerName} a ajouté une dépense : ${expense.amount} ${expense.currency || '€'}`,
-            paidBy
+            paidBy,
+            { groupId: groupId }
         );
     });
+
+exports.callbacks_signInWithApple = functions.https.onRequest((req, res) => {
+    const code = req.body.code;
+    const state = req.body.state;
+    const id_token = req.body.id_token;
+    const user = req.body.user;
+
+    const params = new URLSearchParams();
+    if (code) params.append('code', code);
+    if (state) params.append('state', state);
+    if (id_token) params.append('id_token', id_token);
+    if (user) params.append('user', user);
+
+    const qs = params.toString();
+    const packageName = 'be.devdayronvl.travel_mate';
+    const redirectUrl = `intent://callback?${qs}#Intent;package=${packageName};scheme=signinwithapple;end`;
+
+    res.redirect(302, redirectUrl);
+});

functions/package.json

@@ -1,8 +1,7 @@
 {
   "name": "functions",
-    "description": "Cloud Functions for Travel Mate",
+  "description": "Cloud Functions for Firebase",
   "scripts": {
-        "lint": "eslint .",
     "serve": "firebase emulators:start --only functions",
     "shell": "firebase functions:shell",
     "start": "npm run shell",
@@ -10,16 +9,15 @@
     "logs": "firebase functions:log"
   },
   "engines": {
-        "node": "18"
+    "node": "20"
   },
   "main": "index.js",
   "dependencies": {
-        "firebase-admin": "^11.8.0",
+    "firebase-admin": "^13.6.0",
-        "firebase-functions": "^4.3.1"
+    "firebase-functions": "^7.0.0"
   },
   "devDependencies": {
-        "eslint": "^8.15.0",
+    "firebase-functions-test": "^3.4.1"
-        "eslint-config-google": "^0.14.0"
   },
   "private": true
 }

ios/Podfile.lock

@@ -1205,56 +1205,85 @@ PODS:
     - BoringSSL-GRPC/Interface (= 0.0.37)
   - BoringSSL-GRPC/Interface (0.0.37)
   - cloud_firestore (6.0.3):
-    - Firebase/Firestore (= 12.4.0)
+    - Firebase/Firestore (= 12.6.0)
     - firebase_core
     - Flutter
-  - Firebase/Auth (12.4.0):
+  - Firebase/Auth (12.6.0):
     - Firebase/CoreOnly
-    - FirebaseAuth (~> 12.4.0)
+    - FirebaseAuth (~> 12.6.0)
-  - Firebase/CoreOnly (12.4.0):
+  - Firebase/CoreOnly (12.6.0):
-    - FirebaseCore (~> 12.4.0)
+    - FirebaseCore (~> 12.6.0)
-  - Firebase/Firestore (12.4.0):
+  - Firebase/Firestore (12.6.0):
     - Firebase/CoreOnly
-    - FirebaseFirestore (~> 12.4.0)
+    - FirebaseFirestore (~> 12.6.0)
-  - Firebase/Storage (12.4.0):
+  - Firebase/Messaging (12.6.0):
     - Firebase/CoreOnly
-    - FirebaseStorage (~> 12.4.0)
+    - FirebaseMessaging (~> 12.6.0)
+  - Firebase/Storage (12.6.0):
+    - Firebase/CoreOnly
+    - FirebaseStorage (~> 12.6.0)
+  - firebase_analytics (12.1.0):
+    - firebase_core
+    - FirebaseAnalytics (= 12.6.0)
+    - Flutter
   - firebase_auth (6.1.1):
-    - Firebase/Auth (= 12.4.0)
+    - Firebase/Auth (= 12.6.0)
     - firebase_core
     - Flutter
-  - firebase_core (4.2.0):
+  - firebase_core (4.3.0):
-    - Firebase/CoreOnly (= 12.4.0)
+    - Firebase/CoreOnly (= 12.6.0)
+    - Flutter
+  - firebase_messaging (16.0.4):
+    - Firebase/Messaging (= 12.6.0)
+    - firebase_core
     - Flutter
   - firebase_storage (13.0.3):
-    - Firebase/Storage (= 12.4.0)
+    - Firebase/Storage (= 12.6.0)
     - firebase_core
     - Flutter
-  - FirebaseAppCheckInterop (12.4.0)
+  - FirebaseAnalytics (12.6.0):
-  - FirebaseAuth (12.4.0):
+    - FirebaseAnalytics/Default (= 12.6.0)
-    - FirebaseAppCheckInterop (~> 12.4.0)
+    - FirebaseCore (~> 12.6.0)
-    - FirebaseAuthInterop (~> 12.4.0)
+    - FirebaseInstallations (~> 12.6.0)
-    - FirebaseCore (~> 12.4.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - FirebaseCoreExtension (~> 12.4.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/Default (12.6.0):
+    - FirebaseCore (~> 12.6.0)
+    - FirebaseInstallations (~> 12.6.0)
+    - GoogleAppMeasurement/Default (= 12.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAppCheckInterop (12.6.0)
+  - FirebaseAuth (12.6.0):
+    - FirebaseAppCheckInterop (~> 12.6.0)
+    - FirebaseAuthInterop (~> 12.6.0)
+    - FirebaseCore (~> 12.6.0)
+    - FirebaseCoreExtension (~> 12.6.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
     - GoogleUtilities/Environment (~> 8.1)
     - GTMSessionFetcher/Core (< 6.0, >= 3.4)
     - RecaptchaInterop (~> 101.0)
-  - FirebaseAuthInterop (12.4.0)
+  - FirebaseAuthInterop (12.6.0)
-  - FirebaseCore (12.4.0):
+  - FirebaseCore (12.6.0):
-    - FirebaseCoreInternal (~> 12.4.0)
+    - FirebaseCoreInternal (~> 12.6.0)
     - GoogleUtilities/Environment (~> 8.1)
     - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreExtension (12.4.0):
+  - FirebaseCoreExtension (12.6.0):
-    - FirebaseCore (~> 12.4.0)
+    - FirebaseCore (~> 12.6.0)
-  - FirebaseCoreInternal (12.4.0):
+  - FirebaseCoreInternal (12.6.0):
     - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseFirestore (12.4.0):
+  - FirebaseFirestore (12.6.0):
-    - FirebaseCore (~> 12.4.0)
+    - FirebaseCore (~> 12.6.0)
-    - FirebaseCoreExtension (~> 12.4.0)
+    - FirebaseCoreExtension (~> 12.6.0)
-    - FirebaseFirestoreInternal (~> 12.4.0)
+    - FirebaseFirestoreInternal (~> 12.6.0)
-    - FirebaseSharedSwift (~> 12.4.0)
+    - FirebaseSharedSwift (~> 12.6.0)
-  - FirebaseFirestoreInternal (12.4.0):
+  - FirebaseFirestoreInternal (12.6.0):
     - abseil/algorithm (~> 1.20240722.0)
     - abseil/base (~> 1.20240722.0)
     - abseil/container/flat_hash_map (~> 1.20240722.0)
@@ -1263,21 +1292,37 @@ PODS:
     - abseil/strings/strings (~> 1.20240722.0)
     - abseil/time (~> 1.20240722.0)
     - abseil/types (~> 1.20240722.0)
-    - FirebaseAppCheckInterop (~> 12.4.0)
+    - FirebaseAppCheckInterop (~> 12.6.0)
-    - FirebaseCore (~> 12.4.0)
+    - FirebaseCore (~> 12.6.0)
     - "gRPC-C++ (~> 1.69.0)"
     - gRPC-Core (~> 1.69.0)
     - leveldb-library (~> 1.22)
     - nanopb (~> 3.30910.0)
-  - FirebaseSharedSwift (12.4.0)
+  - FirebaseInstallations (12.6.0):
-  - FirebaseStorage (12.4.0):
+    - FirebaseCore (~> 12.6.0)
-    - FirebaseAppCheckInterop (~> 12.4.0)
+    - GoogleUtilities/Environment (~> 8.1)
-    - FirebaseAuthInterop (~> 12.4.0)
+    - GoogleUtilities/UserDefaults (~> 8.1)
-    - FirebaseCore (~> 12.4.0)
+    - PromisesObjC (~> 2.4)
-    - FirebaseCoreExtension (~> 12.4.0)
+  - FirebaseMessaging (12.6.0):
+    - FirebaseCore (~> 12.6.0)
+    - FirebaseInstallations (~> 12.6.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Reachability (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+  - FirebaseSharedSwift (12.6.0)
+  - FirebaseStorage (12.6.0):
+    - FirebaseAppCheckInterop (~> 12.6.0)
+    - FirebaseAuthInterop (~> 12.6.0)
+    - FirebaseCore (~> 12.6.0)
+    - FirebaseCoreExtension (~> 12.6.0)
     - GoogleUtilities/Environment (~> 8.1)
     - GTMSessionFetcher/Core (< 6.0, >= 3.4)
   - Flutter (1.0.0)
+  - flutter_local_notifications (0.0.1):
+    - Flutter
   - geolocator_apple (1.2.0):
     - Flutter
     - FlutterMacOS
@@ -1292,10 +1337,40 @@ PODS:
     - FlutterMacOS
     - GoogleSignIn (~> 9.0)
     - GTMSessionFetcher (>= 3.4.0)
+  - GoogleAdsOnDeviceConversion (3.2.0):
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Logger (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Core (12.6.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Default (12.6.0):
+    - GoogleAdsOnDeviceConversion (~> 3.2.0)
+    - GoogleAppMeasurement/Core (= 12.6.0)
+    - GoogleAppMeasurement/IdentitySupport (= 12.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/IdentitySupport (12.6.0):
+    - GoogleAppMeasurement/Core (= 12.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - GoogleMaps (9.4.0):
     - GoogleMaps/Maps (= 9.4.0)
   - GoogleMaps/Maps (9.4.0)
-  - GoogleSignIn (9.0.0):
+  - GoogleSignIn (9.1.0):
     - AppAuth (~> 2.0)
     - AppCheckCore (~> 11.0)
     - GTMAppAuth (~> 5.0)
@@ -1310,6 +1385,9 @@ PODS:
   - GoogleUtilities/Logger (8.1.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - GoogleUtilities/Network (8.1.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
@@ -1454,10 +1532,13 @@ PODS:
 
 DEPENDENCIES:
   - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
+  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
   - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
   - Flutter (from `Flutter`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
   - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
@@ -1477,6 +1558,7 @@ SPEC REPOS:
     - AppCheckCore
     - BoringSSL-GRPC
     - Firebase
+    - FirebaseAnalytics
     - FirebaseAppCheckInterop
     - FirebaseAuth
     - FirebaseAuthInterop
@@ -1485,9 +1567,14 @@ SPEC REPOS:
     - FirebaseCoreInternal
     - FirebaseFirestore
     - FirebaseFirestoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
     - FirebaseSharedSwift
     - FirebaseStorage
     - Google-Maps-iOS-Utils
+    - GoogleAdsOnDeviceConversion
+    - GoogleAppMeasurement
+    - GoogleDataTransport
     - GoogleMaps
     - GoogleSignIn
     - GoogleUtilities
@@ -1503,14 +1590,20 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   cloud_firestore:
     :path: ".symlinks/plugins/cloud_firestore/ios"
+  firebase_analytics:
+    :path: ".symlinks/plugins/firebase_analytics/ios"
   firebase_auth:
     :path: ".symlinks/plugins/firebase_auth/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_messaging:
+    :path: ".symlinks/plugins/firebase_messaging/ios"
   firebase_storage:
     :path: ".symlinks/plugins/firebase_storage/ios"
   Flutter:
     :path: Flutter
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/darwin"
   google_maps_flutter_ios:
@@ -1539,28 +1632,37 @@ SPEC CHECKSUMS:
   AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063
   AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
   BoringSSL-GRPC: dded2a44897e45f28f08ae87a55ee4bcd19bc508
-  cloud_firestore: 79014bb3b303d451717ed5fe69fded8a2b2e8dc2
+  cloud_firestore: d7598ff2b1b2064e810f839dbdde2765c0f2052a
-  Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
+  Firebase: a451a7b61536298fd5cbfe3a746fd40443a50679
-  firebase_auth: c2b8be95d602d4e8a9148fae72333ef78e69cc20
+  firebase_analytics: 4f9cca09e65f6c2944a862c6dc86f6bed9fb769c
-  firebase_core: 744984dbbed8b3036abf34f0b98d80f130a7e464
+  firebase_auth: cfb7237c0d01e87360cb3bf61e02a417c36e19e8
-  firebase_storage: 0ba617a05b24aec050395e4d5d3773c0d7518a15
+  firebase_core: ba00a168e719694f38960502ceb560285603d073
-  FirebaseAppCheckInterop: f734c802f21fe1da0837708f0f9a27218c8a4ed0
+  firebase_messaging: 752f1df5294ead9d72091d4974362d00d4aec201
-  FirebaseAuth: 4a2aed737c84114a9d9b33d11ae1b147d6b94889
+  firebase_storage: 5716627614e95c75e243134f65c1b0d6f66a4315
-  FirebaseAuthInterop: 858e6b754966e70740a4370dd1503dfffe6dbb49
+  FirebaseAnalytics: d0a97a0db6425e5a5d966340b87f92ca7b13a557
-  FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
+  FirebaseAppCheckInterop: e2178171b4145013c7c1a3cc464d1d446d3a1896
-  FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018
+  FirebaseAuth: 613c463cb43545a7fd2cd99ade09b78ac472c544
-  FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
+  FirebaseAuthInterop: db06756ef028006d034b6004dc0c37c24f7828d4
-  FirebaseFirestore: 2a6183381cf7679b1bb000eb76a8e3178e25dee2
+  FirebaseCore: 0e38ad5d62d980a47a64b8e9301ffa311457be04
-  FirebaseFirestoreInternal: 6577a27cd5dc3722b900042527f86d4ea1626134
+  FirebaseCoreExtension: 032fd6f8509e591fda8cb76f6651f20d926b121f
-  FirebaseSharedSwift: 93426a1de92f19e1199fac5295a4f8df16458daa
+  FirebaseCoreInternal: 69bf1306a05b8ac43004f6cc1f804bb7b05b229e
-  FirebaseStorage: 20d6b56fb8a40ebaa03d6a2889fe33dac64adb73
+  FirebaseFirestore: 51ce079b9ddcaa481644164eda649d362c2a6396
+  FirebaseFirestoreInternal: 8b1d2b0a1b859b2ddbd63f448c416c5be7367405
+  FirebaseInstallations: 631b38da2e11a83daa4bfb482f79d286a5dfa7ad
+  FirebaseMessaging: a61bc42dcab3f7a346d94bbb54dab2c9435b18b2
+  FirebaseSharedSwift: 79f27fff0addd15c3de19b87fba426f3cc2c964f
+  FirebaseStorage: 550349b1e8f7315834ea08308696e9469d77135d
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
   google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
   google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
+  GoogleAdsOnDeviceConversion: d68c69dd9581a0f5da02617b6f377e5be483970f
+  GoogleAppMeasurement: 3bf40aff49a601af5da1c3345702fcb4991d35ee
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
-  GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77
+  GoogleSignIn: fcee2257188d5eda57a5e2b6a715550ffff9206d
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
   "gRPC-C++": cc207623316fb041a7a3e774c252cf68a058b9e8
   gRPC-Core: 860978b7db482de8b4f5e10677216309b5ff6330

ios/Runner.xcodeproj/project.pbxproj

@@ -490,7 +490,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 456VVYXDFN;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -499,6 +503,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = be.devdayronvl.TravelMate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = myiphone;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -673,7 +679,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 456VVYXDFN;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -682,6 +692,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = be.devdayronvl.TravelMate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = myiphone;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -696,7 +708,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 456VVYXDFN;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -705,6 +721,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = be.devdayronvl.TravelMate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = myiphone;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner/Info.plist

@@ -32,6 +32,14 @@
 				<string>com.googleusercontent.apps.521527250907-3i1qe2656eojs8k9hjdi573j09i9p41m</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Apple Sign-In</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
@@ -39,6 +47,11 @@
 	<string>521527250907-3i1qe2656eojs8k9hjdi573j09i9p41m.apps.googleusercontent.com</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+		<string>remote-notification</string>
+	</array>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Cette application a besoin de votre position pour afficher votre localisation sur la carte</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
@@ -52,26 +65,17 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CFBundleURLTypes</key>
+
+    <key>LSApplicationQueriesSchemes</key>
     <array>
-		<dict>
+        <string>comgooglemaps</string>
-			<key>CFBundleURLName</key>
+        <string>waze</string>
-			<string>Apple Sign-In</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-			</array>
-		</dict>
     </array>
 	<!-- Permission Caméra -->
     <key>NSCameraUsageDescription</key>

ios/Runner/Runner.entitlements

@@ -6,5 +6,7 @@
 	<array>
 		<string>Default</string>
 	</array>
+	<key>aps-environment</key>
+	<string>development</string>
 </dict>
 </plist>

lib/blocs/account/account_bloc.dart

@@ -22,6 +22,7 @@
 /// accountBloc.close();
 /// ```
 library;
+
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:travel_mate/services/error_service.dart';
@@ -51,7 +52,9 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
     try {
       emit(AccountLoading());
       await _accountsSubscription?.cancel();
-      _accountsSubscription = _repository.getAccountByUserId(event.userId).listen(
+      _accountsSubscription = _repository
+          .getAccountByUserId(event.userId)
+          .listen(
             (accounts) {
               add(_AccountsUpdated(accounts));
             },
@@ -60,8 +63,12 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
             },
           );
     } catch (e, stackTrace) {
-      _errorService.logError(e.toString(), stackTrace);
+      _errorService.logError(
-      emit(AccountError(e.toString()));
+        'AccountBloc',
+        'Error loading accounts: $e',
+        stackTrace,
+      );
+      emit(const AccountError('Impossible de charger les comptes'));
     }
   }
 
@@ -89,8 +96,12 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
       );
       emit(AccountOperationSuccess('Compte créé avec succès. ID: $accountId'));
     } catch (e, stackTrace) {
-      _errorService.logError(e.toString(), stackTrace);
+      _errorService.logError(
-      emit(AccountError('Erreur lors de la création du compte: ${e.toString()}'));
+        'AccountBloc',
+        'Error creating account: $e',
+        stackTrace,
+      );
+      emit(const AccountError('Impossible de créer le compte'));
     }
   }
 
@@ -98,7 +109,7 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
     CreateAccountWithMembers event,
     Emitter<AccountState> emit,
   ) async {
-    try{
+    try {
       emit(AccountLoading());
       final accountId = await _repository.createAccountWithMembers(
         account: event.account,
@@ -106,8 +117,12 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
       );
       emit(AccountOperationSuccess('Compte créé avec succès. ID: $accountId'));
     } catch (e, stackTrace) {
-      _errorService.logError(e.toString(), stackTrace);
+      _errorService.logError(
-      emit(AccountError('Erreur lors de la création du compte: ${e.toString()}'));
+        'AccountBloc',
+        'Error creating account with members: $e',
+        stackTrace,
+      );
+      emit(const AccountError('Impossible de créer le compte'));
     }
   }
 
@@ -120,8 +135,12 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
       await _repository.addMemberToAccount(event.accountId, event.member);
       emit(AccountOperationSuccess('Membre ajouté avec succès'));
     } catch (e, stackTrace) {
-      _errorService.logError(e.toString(), stackTrace);
+      _errorService.logError(
-      emit(AccountError('Erreur lors de l\'ajout du membre: ${e.toString()}'));
+        'AccountBloc',
+        'Error adding member: $e',
+        stackTrace,
+      );
+      emit(const AccountError('Impossible d\'ajouter le membre'));
     }
   }
 
@@ -131,11 +150,18 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
   ) async {
     try {
       emit(AccountLoading());
-      await _repository.removeMemberFromAccount(event.accountId, event.memberId);
+      await _repository.removeMemberFromAccount(
+        event.accountId,
+        event.memberId,
+      );
       emit(AccountOperationSuccess('Membre supprimé avec succès'));
     } catch (e, stackTrace) {
-      _errorService.logError(e.toString(), stackTrace);
+      _errorService.logError(
-      emit(AccountError('Erreur lors de la suppression du membre: ${e.toString()}'));
+        'AccountBloc',
+        'Error removing member: $e',
+        stackTrace,
+      );
+      emit(const AccountError('Impossible de supprimer le membre'));
     }
   }
 

lib/blocs/activity/activity_bloc.dart

@@ -56,10 +56,11 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       emit(
         ActivityLoaded(activities: activities, filteredActivities: activities),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'activity_bloc',
         'Erreur chargement activités: $e',
+        stackTrace,
       );
       emit(const ActivityError('Impossible de charger les activités'));
     }
@@ -83,10 +84,11 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       emit(
         ActivityLoaded(activities: activities, filteredActivities: activities),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'activity_bloc',
         'Erreur chargement activités: $e',
+        stackTrace,
       );
       emit(const ActivityError('Impossible de charger les activités'));
     }
@@ -112,8 +114,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
         // Recharger les activités pour mettre à jour l'UI
         add(LoadActivities(event.tripId));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur mise à jour date: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur mise à jour date: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible de mettre à jour la date'));
     }
   }
@@ -162,9 +168,17 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
           isLoading: false,
         ),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur recherche activités: $e');
+      _errorService.logError(
-      emit(const ActivityError('Impossible de rechercher les activités'));
+        'activity_bloc',
+        'Erreur recherche activités: $e',
+        stackTrace,
+      );
+      // Extraire le message d'erreur si disponible
+      final errorMessage = e.toString().replaceAll('Exception: ', '');
+      emit(
+        ActivityError('Impossible de rechercher les activités: $errorMessage'),
+      );
     }
   }
 
@@ -211,10 +225,11 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
           isLoading: false,
         ),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'activity_bloc',
         'Erreur recherche activités avec coordonnées: $e',
+        stackTrace,
       );
       emit(const ActivityError('Impossible de rechercher les activités'));
     }
@@ -240,8 +255,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       emit(
         ActivitySearchResults(searchResults: searchResults, query: event.query),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur recherche textuelle: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur recherche textuelle: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible de rechercher les activités'));
     }
   }
@@ -292,8 +311,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       } else {
         emit(const ActivityError('Impossible d\'ajouter l\'activité'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur ajout activité: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur ajout activité: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible d\'ajouter l\'activité'));
     }
   }
@@ -350,8 +373,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       } else {
         emit(const ActivityError('Impossible d\'ajouter l\'activité'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur ajout activité: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur ajout activité: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible d\'ajouter l\'activité'));
     }
   }
@@ -418,8 +445,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       } else {
         emit(const ActivityError('Impossible d\'ajouter les activités'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur ajout en lot: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur ajout en lot: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible d\'ajouter les activités'));
     }
   }
@@ -479,8 +510,8 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       } else {
         emit(const ActivityError('Impossible d\'enregistrer le vote'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur vote: $e');
+      _errorService.logError('activity_bloc', 'Erreur vote: $e', stackTrace);
       emit(const ActivityError('Impossible d\'enregistrer le vote'));
     }
   }
@@ -511,8 +542,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       } else {
         emit(const ActivityError('Impossible de supprimer l\'activité'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur suppression: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur suppression: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible de supprimer l\'activité'));
     }
   }
@@ -593,8 +628,12 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
       } else {
         emit(const ActivityError('Impossible de mettre à jour l\'activité'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur mise à jour: $e');
+      _errorService.logError(
+        'activity_bloc',
+        'Erreur mise à jour: $e',
+        stackTrace,
+      );
       emit(const ActivityError('Impossible de mettre à jour l\'activité'));
     }
   }
@@ -614,8 +653,8 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
           vote: 1,
         ),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('activity_bloc', 'Erreur favori: $e');
+      _errorService.logError('activity_bloc', 'Erreur favori: $e', stackTrace);
       emit(const ActivityError('Impossible de modifier les favoris'));
     }
   }

lib/blocs/auth/auth_bloc.dart

@@ -25,18 +25,27 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../repositories/auth_repository.dart';
 import 'auth_event.dart';
 import 'auth_state.dart';
+import '../../services/notification_service.dart';
+import '../../services/analytics_service.dart';
 
 /// BLoC for managing authentication state and operations.
 class AuthBloc extends Bloc<AuthEvent, AuthState> {
   /// Repository for authentication operations.
   final AuthRepository _authRepository;
+  final NotificationService _notificationService;
+  final AnalyticsService _analyticsService;
 
   /// Creates an [AuthBloc] with the provided [authRepository].
   ///
   /// The bloc starts in the [AuthInitial] state and registers event handlers
   /// for all supported authentication events.
-  AuthBloc({required AuthRepository authRepository})
+  AuthBloc({
-    : _authRepository = authRepository,
+    required AuthRepository authRepository,
+    NotificationService? notificationService,
+    AnalyticsService? analyticsService,
+  }) : _authRepository = authRepository,
+       _notificationService = notificationService ?? NotificationService(),
+       _analyticsService = analyticsService ?? AnalyticsService(),
        super(AuthInitial()) {
     on<AuthCheckRequested>(_onAuthCheckRequested);
     on<AuthSignInRequested>(_onSignInRequested);
@@ -69,6 +78,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         );
 
         if (user != null) {
+          // Save FCM Token on auto-login
+          await _notificationService.saveTokenToFirestore(user.id!);
+          await _analyticsService.setUserId(user.id);
           emit(AuthAuthenticated(user: user));
         } else {
           emit(AuthUnauthenticated());
@@ -77,7 +89,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         emit(AuthUnauthenticated());
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -98,12 +110,19 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       );
 
       if (user != null) {
+        // Save FCM Token
+        await NotificationService().saveTokenToFirestore(user.id!);
+        await _analyticsService.setUserId(user.id);
+        await _analyticsService.logEvent(
+          name: 'login',
+          parameters: {'method': 'email'},
+        );
         emit(AuthAuthenticated(user: user));
       } else {
         emit(const AuthError(message: 'Invalid email or password'));
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -127,12 +146,19 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       );
 
       if (user != null) {
+        // Save FCM Token
+        await NotificationService().saveTokenToFirestore(user.id!);
+        await _analyticsService.setUserId(user.id);
+        await _analyticsService.logEvent(
+          name: 'sign_up',
+          parameters: {'method': 'email'},
+        );
         emit(AuthAuthenticated(user: user));
       } else {
         emit(const AuthError(message: 'Failed to create account'));
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -150,6 +176,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       final user = await _authRepository.signInWithGoogle();
 
       if (user != null) {
+        // Save FCM Token
+        await NotificationService().saveTokenToFirestore(user.id!);
+        await _analyticsService.setUserId(user.id);
+        await _analyticsService.logEvent(
+          name: 'login',
+          parameters: {'method': 'google'},
+        );
         emit(AuthAuthenticated(user: user));
       } else {
         emit(
@@ -160,7 +193,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         );
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -178,12 +211,17 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       );
 
       if (user != null) {
+        await _analyticsService.setUserId(user.id);
+        await _analyticsService.logEvent(
+          name: 'sign_up',
+          parameters: {'method': 'google'},
+        );
         emit(AuthAuthenticated(user: user));
       } else {
         emit(const AuthError(message: 'Failed to create account with Google'));
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -201,12 +239,17 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       );
 
       if (user != null) {
+        await _analyticsService.setUserId(user.id);
+        await _analyticsService.logEvent(
+          name: 'sign_up',
+          parameters: {'method': 'apple'},
+        );
         emit(AuthAuthenticated(user: user));
       } else {
         emit(const AuthError(message: 'Failed to create account with Apple'));
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -224,6 +267,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       final user = await _authRepository.signInWithApple();
 
       if (user != null) {
+        // Save FCM Token
+        await NotificationService().saveTokenToFirestore(user.id!);
+        await _analyticsService.setUserId(user.id);
+        await _analyticsService.logEvent(
+          name: 'login',
+          parameters: {'method': 'apple'},
+        );
         emit(AuthAuthenticated(user: user));
       } else {
         emit(
@@ -234,7 +284,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         );
       }
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 
@@ -246,6 +296,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     Emitter<AuthState> emit,
   ) async {
     await _authRepository.signOut();
+    await _analyticsService.setUserId(null); // Clear user ID
     emit(AuthUnauthenticated());
   }
 
@@ -261,7 +312,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       await _authRepository.resetPassword(event.email);
       emit(AuthPasswordResetSent(email: event.email));
     } catch (e) {
-      emit(AuthError(message: e.toString()));
+      emit(AuthError(message: e.toString().replaceAll('Exception: ', '')));
     }
   }
 }

lib/blocs/balance/balance_bloc.dart

@@ -105,9 +105,13 @@ class BalanceBloc extends Bloc<BalanceEvent, BalanceState> {
       emit(
         GroupBalancesLoaded(balances: userBalances, settlements: settlements),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('BalanceBloc', 'Error loading balance: $e');
+      _errorService.logError(
-      emit(BalanceError(e.toString()));
+        'BalanceBloc',
+        'Error loading balance: $e',
+        stackTrace,
+      );
+      emit(const BalanceError('Impossible de charger la balance'));
     }
   }
 
@@ -143,9 +147,13 @@ class BalanceBloc extends Bloc<BalanceEvent, BalanceState> {
       emit(
         GroupBalancesLoaded(balances: userBalances, settlements: settlements),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('BalanceBloc', 'Error refreshing balance: $e');
+      _errorService.logError(
-      emit(BalanceError(e.toString()));
+        'BalanceBloc',
+        'Error refreshing balance: $e',
+        stackTrace,
+      );
+      emit(const BalanceError('Impossible de rafraîchir la balance'));
     }
   }
 
@@ -174,9 +182,15 @@ class BalanceBloc extends Bloc<BalanceEvent, BalanceState> {
 
       // Reload balance after settlement
       add(RefreshBalance(event.groupId));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('BalanceBloc', 'Error marking settlement: $e');
+      _errorService.logError(
-      emit(BalanceError(e.toString()));
+        'BalanceBloc',
+        'Error marking settlement: $e',
+        stackTrace,
+      );
+      emit(
+        const BalanceError('Impossible de marquer le règlement comme terminé'),
+      );
     }
   }
 }

lib/blocs/expense/expense_bloc.dart

@@ -72,7 +72,7 @@ class ExpenseBloc extends Bloc<ExpenseEvent, ExpenseState> {
           );
     } catch (e) {
       _errorService.logError('ExpenseBloc', 'Error loading expenses: $e');
-      emit(ExpenseError(e.toString()));
+      emit(const ExpenseError('Impossible de charger les dépenses'));
     }
   }
 
@@ -116,7 +116,7 @@ class ExpenseBloc extends Bloc<ExpenseEvent, ExpenseState> {
       emit(const ExpenseOperationSuccess('Expense created successfully'));
     } catch (e) {
       _errorService.logError('ExpenseBloc', 'Error creating expense: $e');
-      emit(ExpenseError(e.toString()));
+      emit(const ExpenseError('Impossible de créer la dépense'));
     }
   }
 
@@ -141,7 +141,7 @@ class ExpenseBloc extends Bloc<ExpenseEvent, ExpenseState> {
       emit(const ExpenseOperationSuccess('Expense updated successfully'));
     } catch (e) {
       _errorService.logError('ExpenseBloc', 'Error updating expense: $e');
-      emit(ExpenseError(e.toString()));
+      emit(const ExpenseError('Impossible de mettre à jour la dépense'));
     }
   }
 
@@ -162,7 +162,7 @@ class ExpenseBloc extends Bloc<ExpenseEvent, ExpenseState> {
       emit(const ExpenseOperationSuccess('Expense deleted successfully'));
     } catch (e) {
       _errorService.logError('ExpenseBloc', 'Error deleting expense: $e');
-      emit(ExpenseError(e.toString()));
+      emit(const ExpenseError('Impossible de supprimer la dépense'));
     }
   }
 
@@ -184,7 +184,7 @@ class ExpenseBloc extends Bloc<ExpenseEvent, ExpenseState> {
       emit(const ExpenseOperationSuccess('Payment marked as completed'));
     } catch (e) {
       _errorService.logError('ExpenseBloc', 'Error marking split as paid: $e');
-      emit(ExpenseError(e.toString()));
+      emit(const ExpenseError('Impossible de marquer comme payé'));
     }
   }
 
@@ -206,7 +206,7 @@ class ExpenseBloc extends Bloc<ExpenseEvent, ExpenseState> {
       emit(const ExpenseOperationSuccess('Expense archived successfully'));
     } catch (e) {
       _errorService.logError('ExpenseBloc', 'Error archiving expense: $e');
-      emit(ExpenseError(e.toString()));
+      emit(const ExpenseError('Impossible d\'archiver la dépense'));
     }
   }
 

lib/blocs/group/group_bloc.dart

@@ -32,6 +32,7 @@
 /// ));
 /// ```
 library;
+
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:travel_mate/services/error_service.dart';
@@ -85,7 +86,9 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
     try {
       emit(GroupLoading());
       await _groupsSubscription?.cancel();
-      _groupsSubscription = _repository.getGroupsByUserId(event.userId).listen(
+      _groupsSubscription = _repository
+          .getGroupsByUserId(event.userId)
+          .listen(
             (groups) {
               add(_GroupsUpdated(groups));
             },
@@ -94,8 +97,12 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
             },
           );
     } catch (e, stackTrace) {
-      _errorService.logError(e.toString(), stackTrace);
+      _errorService.logError(
-      emit(GroupError(e.toString()));
+        'GroupBloc',
+        'Error loading groups: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de charger les groupes'));
     }
   }
 
@@ -139,8 +146,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
       } else {
         emit(const GroupsLoaded([]));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError(e.toString()));
+      _errorService.logError(
+        'GroupBloc',
+        'Error loading group by trip: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de charger le groupe du voyage'));
     }
   }
 
@@ -164,8 +176,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
       );
       emit(GroupCreated(groupId: groupId));
       emit(const GroupOperationSuccess('Group created successfully'));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError('Error during creation: $e'));
+      _errorService.logError(
+        'GroupBloc',
+        'Error creating group: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de créer le groupe'));
     }
   }
 
@@ -189,8 +206,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
         members: event.members,
       );
       emit(GroupCreated(groupId: groupId));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError('Error during creation: $e'));
+      _errorService.logError(
+        'GroupBloc',
+        'Error creating group with members: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de créer le groupe'));
     }
   }
 
@@ -209,8 +231,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
     try {
       await _repository.addMember(event.groupId, event.member);
       emit(const GroupOperationSuccess('Member added'));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError('Error during addition: $e'));
+      _errorService.logError(
+        'GroupBloc',
+        'Error adding member: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible d\'ajouter le membre'));
     }
   }
 
@@ -229,8 +256,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
     try {
       await _repository.removeMember(event.groupId, event.userId);
       emit(const GroupOperationSuccess('Member removed'));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError('Error during removal: $e'));
+      _errorService.logError(
+        'GroupBloc',
+        'Error removing member: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de supprimer le membre'));
     }
   }
 
@@ -249,8 +281,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
     try {
       await _repository.updateGroup(event.groupId, event.group);
       emit(const GroupOperationSuccess('Group updated'));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError('Error during update: $e'));
+      _errorService.logError(
+        'GroupBloc',
+        'Error updating group: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de mettre à jour le groupe'));
     }
   }
 
@@ -269,8 +306,13 @@ class GroupBloc extends Bloc<GroupEvent, GroupState> {
     try {
       await _repository.deleteGroup(event.tripId);
       emit(const GroupOperationSuccess('Group deleted'));
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(GroupError('Error during deletion: $e'));
+      _errorService.logError(
+        'GroupBloc',
+        'Error deleting group: $e',
+        stackTrace,
+      );
+      emit(const GroupError('Impossible de supprimer le groupe'));
     }
   }
 

lib/blocs/message/message_bloc.dart

@@ -40,6 +40,7 @@
 /// ));
 /// ```
 library;
+
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../models/message.dart';
@@ -65,9 +66,9 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
   /// Args:
   ///   [messageService]: Optional service for message operations (auto-created if null)
   MessageBloc({MessageService? messageService})
-      : _messageService = messageService ?? MessageService(
+    : _messageService =
-          messageRepository: MessageRepository(),
+          messageService ??
-        ),
+          MessageService(messageRepository: MessageRepository()),
       super(MessageInitial()) {
     on<LoadMessages>(_onLoadMessages);
     on<SendMessage>(_onSendMessage);
@@ -101,7 +102,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
             add(_MessagesUpdated(messages: messages, groupId: event.groupId));
           },
           onError: (error) {
-            add(_MessagesError('Error loading messages: $error'));
+            add(const _MessagesError('Impossible de charger les messages'));
           },
         );
   }
@@ -114,10 +115,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
   /// Args:
   ///   [event]: The _MessagesUpdated event containing messages and group ID
   ///   [emit]: State emitter function
-  void _onMessagesUpdated(
+  void _onMessagesUpdated(_MessagesUpdated event, Emitter<MessageState> emit) {
-    _MessagesUpdated event,
-    Emitter<MessageState> emit,
-  ) {
     emit(MessagesLoaded(messages: event.messages, groupId: event.groupId));
   }
 
@@ -142,7 +140,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
         senderName: event.senderName,
       );
     } catch (e) {
-      emit(MessageError('Error sending message: $e'));
+      emit(const MessageError('Impossible d\'envoyer le message'));
     }
   }
 
@@ -166,7 +164,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
         messageId: event.messageId,
       );
     } catch (e) {
-      emit(MessageError('Error deleting message: $e'));
+      emit(const MessageError('Impossible de supprimer le message'));
     }
   }
 
@@ -191,7 +189,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
         newText: event.newText,
       );
     } catch (e) {
-      emit(MessageError('Error updating message: $e'));
+      emit(const MessageError('Impossible de modifier le message'));
     }
   }
 
@@ -217,7 +215,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
         reaction: event.reaction,
       );
     } catch (e) {
-      emit(MessageError('Error adding reaction: $e'));
+      emit(const MessageError('Impossible d\'ajouter la réaction'));
     }
   }
 
@@ -242,7 +240,7 @@ class MessageBloc extends Bloc<MessageEvent, MessageState> {
         userId: event.userId,
       );
     } catch (e) {
-      emit(MessageError('Error removing reaction: $e'));
+      emit(const MessageError('Impossible de supprimer la réaction'));
     }
   }
 
@@ -273,10 +271,7 @@ class _MessagesUpdated extends MessageEvent {
   /// Args:
   ///   [messages]: List of messages from the stream update
   ///   [groupId]: ID of the group these messages belong to
-  const _MessagesUpdated({
+  const _MessagesUpdated({required this.messages, required this.groupId});
-    required this.messages,
-    required this.groupId,
-  });
 
   @override
   List<Object?> get props => [messages, groupId];

lib/blocs/trip/trip_bloc.dart

@@ -36,17 +36,20 @@
 /// tripBloc.add(TripDeleteRequested(tripId: 'tripId456'));
 /// ```
 library;
+
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:travel_mate/models/trip.dart';
 import 'trip_event.dart';
 import 'trip_state.dart';
 import '../../repositories/trip_repository.dart';
+import '../../services/error_service.dart';
 
 /// BLoC that manages trip-related operations and state.
 class TripBloc extends Bloc<TripEvent, TripState> {
   /// Repository for trip data operations
   final TripRepository _repository;
+  final _errorService = ErrorService();
 
   /// Subscription to trip stream for real-time updates
   StreamSubscription? _tripsSubscription;
@@ -88,12 +91,24 @@ class TripBloc extends Bloc<TripEvent, TripState> {
     _currentUserId = event.userId;
     await _tripsSubscription?.cancel();
 
-    _tripsSubscription = _repository.getTripsByUserId(event.userId).listen(
+    _tripsSubscription = _repository
+        .getTripsByUserId(event.userId)
+        .listen(
           (trips) {
             add(_TripsUpdated(trips));
           },
-      onError: (error) {
+          onError: (error, stackTrace) {
-        emit(TripError(error.toString()));
+            _errorService.logError(
+              'TripBloc',
+              'Error loading trips: $error',
+              stackTrace,
+            );
+            add(
+              const _TripsUpdated(
+                [],
+                error: 'Impossible de charger les voyages',
+              ),
+            );
           },
         );
   }
@@ -106,12 +121,13 @@ class TripBloc extends Bloc<TripEvent, TripState> {
   /// Args:
   ///   [event]: The _TripsUpdated event containing the updated trip list
   ///   [emit]: State emitter function
-  void _onTripsUpdated(
+  void _onTripsUpdated(_TripsUpdated event, Emitter<TripState> emit) {
-    _TripsUpdated event,
+    if (event.error != null) {
-    Emitter<TripState> emit,
+      emit(TripError(event.error!));
-  ) {
+    } else {
       emit(TripLoaded(event.trips));
     }
+  }
 
   /// Handles [TripCreateRequested] events.
   ///
@@ -137,9 +153,9 @@ class TripBloc extends Bloc<TripEvent, TripState> {
       if (_currentUserId != null) {
         add(LoadTripsByUserId(userId: _currentUserId!));
       }
-      
+    } catch (e, stackTrace) {
-    } catch (e) {
+      _errorService.logError('TripBloc', 'Error creating trip: $e', stackTrace);
-      emit(TripError('Error during creation: $e'));
+      emit(const TripError('Impossible de créer le voyage'));
     }
   }
 
@@ -163,9 +179,9 @@ class TripBloc extends Bloc<TripEvent, TripState> {
       if (_currentUserId != null) {
         add(LoadTripsByUserId(userId: _currentUserId!));
       }
-      
+    } catch (e, stackTrace) {
-    } catch (e) {
+      _errorService.logError('TripBloc', 'Error updating trip: $e', stackTrace);
-      emit(TripError('Error during update: $e'));
+      emit(const TripError('Impossible de mettre à jour le voyage'));
     }
   }
 
@@ -191,9 +207,9 @@ class TripBloc extends Bloc<TripEvent, TripState> {
       if (_currentUserId != null) {
         add(LoadTripsByUserId(userId: _currentUserId!));
       }
-      
+    } catch (e, stackTrace) {
-    } catch (e) {
+      _errorService.logError('TripBloc', 'Error deleting trip: $e', stackTrace);
-      emit(TripError('Error during deletion: $e'));
+      emit(const TripError('Impossible de supprimer le voyage'));
     }
   }
 
@@ -206,10 +222,7 @@ class TripBloc extends Bloc<TripEvent, TripState> {
   /// Args:
   ///   [event]: The ResetTrips event
   ///   [emit]: State emitter function
-  Future<void> _onResetTrips(
+  Future<void> _onResetTrips(ResetTrips event, Emitter<TripState> emit) async {
-    ResetTrips event,
-    Emitter<TripState> emit,
-  ) async {
     await _tripsSubscription?.cancel();
     _currentUserId = null;
     emit(TripInitial());
@@ -230,16 +243,11 @@ class TripBloc extends Bloc<TripEvent, TripState> {
 ///
 /// This internal event is used to process updates from the trip stream
 /// subscription and emit appropriate states based on the received data.
+/// internal event
 class _TripsUpdated extends TripEvent {
-  /// List of trips received from the stream
   final List<Trip> trips;
-
+  final String? error;
-  /// Creates a _TripsUpdated event.
+  const _TripsUpdated(this.trips, {this.error});
-  /// 
-  /// Args:
-  ///   [trips]: List of trips from the stream update
-  const _TripsUpdated(this.trips);
-
   @override
-  List<Object?> get props => [trips];
+  List<Object?> get props => [trips, error];
 }

lib/blocs/user/user_bloc.dart

@@ -1,6 +1,11 @@
 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';
 import 'user_event.dart' as event;
 import 'user_state.dart' as state;
 
@@ -16,6 +21,10 @@ 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.
   ///
   /// Registers event handlers for all user-related events.
@@ -45,6 +54,12 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
         return;
       }
 
+      // Initialize notifications and update token
+      final notificationService = NotificationService();
+      await notificationService.initialize();
+      final fcmToken = await notificationService.getFCMToken();
+      LoggerService.info('UserBloc - FCM Token retrieved: $fcmToken');
+
       // Fetch user data from Firestore
       final userDoc = await _firestore
           .collection('users')
@@ -57,6 +72,7 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
           id: currentUser.uid,
           email: currentUser.email ?? '',
           prenom: currentUser.displayName ?? 'Voyageur',
+          fcmToken: fcmToken,
         );
 
         await _firestore
@@ -70,10 +86,25 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
           'id': currentUser.uid,
           ...userDoc.data()!,
         });
+
+        // Update FCM token if it changed
+        if (fcmToken != null && user.fcmToken != fcmToken) {
+          LoggerService.info('UserBloc - Updating FCM token in Firestore');
+          await _firestore.collection('users').doc(currentUser.uid).set({
+            'fcmToken': fcmToken,
+          }, SetOptions(merge: true));
+          LoggerService.info('UserBloc - FCM token updated');
+        } else {
+          LoggerService.info(
+            'UserBloc - FCM token not updated. Local: $fcmToken, Firestore: ${user.fcmToken}',
+          );
+        }
+
         emit(state.UserLoaded(user));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(state.UserError('Error loading user: $e'));
+      _errorService.logError('UserBloc', 'Error loading user: $e', stackTrace);
+      emit(state.UserError('Impossible de charger l\'utilisateur'));
     }
   }
 
@@ -102,8 +133,9 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
       } else {
         emit(state.UserError('User not found'));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      emit(state.UserError('Error loading user: $e'));
+      _errorService.logError('UserBloc', 'Error loading user: $e', stackTrace);
+      emit(state.UserError('Impossible de charger l\'utilisateur'));
     }
   }
 
@@ -136,8 +168,23 @@ class UserBloc extends Bloc<event.UserEvent, state.UserState> {
         });
 
         emit(state.UserLoaded(updatedUser));
-      } catch (e) {
+
-        emit(state.UserError('Error updating user: $e'));
+        // 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',
+          'Error updating user: $e',
+          stackTrace,
+        );
+        emit(state.UserError('Impossible de mettre à jour l\'utilisateur'));
       }
     }
   }

lib/blocs/user/user_state.dart

@@ -81,6 +81,9 @@ class UserModel {
   /// User's profile picture URL (optional).
   final String? profilePictureUrl;
 
+  /// Firebase Cloud Messaging token for push notifications.
+  final String? fcmToken;
+
   /// Creates a new [UserModel] instance.
   ///
   /// [id], [email], and [prenom] are required fields.
@@ -93,6 +96,7 @@ class UserModel {
     this.authMethod,
     this.phoneNumber,
     this.profilePictureUrl,
+    this.fcmToken,
   });
 
   /// Creates a [UserModel] instance from a JSON map.
@@ -108,6 +112,7 @@ class UserModel {
       authMethod: json['authMethod'] ?? json['platform'],
       phoneNumber: json['phoneNumber'],
       profilePictureUrl: json['profilePictureUrl'],
+      fcmToken: json['fcmToken'],
     );
   }
 
@@ -123,6 +128,7 @@ class UserModel {
       'authMethod': authMethod,
       'phoneNumber': phoneNumber,
       'profilePictureUrl': profilePictureUrl,
+      'fcmToken': fcmToken,
     };
   }
 }

lib/components/account/account_content.dart

@@ -18,8 +18,11 @@
 ///
 /// The component automatically loads account data when initialized and
 /// provides a clean interface for managing group-based expenses.
+/// 
 library;
+
 import 'package:flutter/material.dart';
+import '../../services/error_service.dart';
 import 'package:travel_mate/blocs/user/user_bloc.dart';
 import '../../models/account.dart';
 import '../../blocs/account/account_bloc.dart';
@@ -70,10 +73,7 @@ class _AccountContentState extends State<AccountContent> {
         throw Exception('User not connected');
       }
     } catch (e) {
-      ErrorContent(
+      ErrorContent(message: 'Error loading accounts: $e', onRetry: () {});
-        message: 'Error loading accounts: $e',
-        onRetry: () {},
-      );
     }
   }
 
@@ -94,30 +94,18 @@ class _AccountContentState extends State<AccountContent> {
         Navigator.push(
           context,
           MaterialPageRoute(
-            builder: (context) => GroupExpensesPage(
+            builder: (context) =>
-              account: account,
+                GroupExpensesPage(account: account, group: group),
-              group: group,
-            ),
           ),
         );
       } else {
         if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
+          ErrorService().showError(message: 'Group not found for this account');
-            const SnackBar(
-              content: Text('Group not found for this account'),
-              backgroundColor: Colors.red,
-            ),
-          );
         }
       }
     } catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        ErrorService().showError(message: 'Error loading group: $e');
-          SnackBar(
-            content: Text('Error loading group: $e'),
-            backgroundColor: Colors.red,
-          ),
-        );
       }
     }
   }
@@ -139,9 +127,12 @@ class _AccountContentState extends State<AccountContent> {
           listener: (context, accountState) {
             if (accountState is AccountError) {
               ErrorContent(
-                message: 'Erreur de chargement des comptes : ${accountState.message}',
+                message:
+                    'Erreur de chargement des comptes : ${accountState.message}',
                 onRetry: () {
-                  context.read<AccountBloc>().add(LoadAccountsByUserId(user.id));
+                  context.read<AccountBloc>().add(
+                    LoadAccountsByUserId(user.id),
+                  );
                 },
               );
             }
@@ -156,10 +147,7 @@ class _AccountContentState extends State<AccountContent> {
       loadingWidget: const Scaffold(
         body: Center(child: CircularProgressIndicator()),
       ),
-      errorWidget: ErrorContent(
+      errorWidget: ErrorContent(message: 'User error', onRetry: () {}),
-        message: 'User error',
-        onRetry: () {},
-      ),
       noUserWidget: const Scaffold(
         body: Center(child: Text('Utilisateur non connecté')),
       ),
@@ -241,7 +229,11 @@ class _AccountContentState extends State<AccountContent> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            const Icon(Icons.account_balance_wallet, size: 80, color: Colors.grey),
+            const Icon(
+              Icons.account_balance_wallet,
+              size: 80,
+              color: Colors.grey,
+            ),
             const SizedBox(height: 16),
             const Text(
               'No accounts found',
@@ -285,9 +277,9 @@ class _AccountContentState extends State<AccountContent> {
               padding: const EdgeInsets.only(bottom: 12),
               child: _buildSimpleAccountCard(account),
             );
-          })
+          }),
         ],
-      )
+      ),
     );
   }
 
@@ -309,9 +301,10 @@ class _AccountContentState extends State<AccountContent> {
       final colors = [Colors.blue, Colors.purple, Colors.green, Colors.orange];
       final color = colors[account.name.hashCode.abs() % colors.length];
 
-      String memberInfo = '${account.members.length} member${account.members.length > 1 ? 's' : ''}';
+      String memberInfo =
+          '${account.members.length} member${account.members.length > 1 ? 's' : ''}';
 
-      if(account.members.isNotEmpty){
+      if (account.members.isNotEmpty) {
         final names = account.members
             .take(2)
             .map((m) => m.pseudo.isNotEmpty ? m.pseudo : m.firstName)
@@ -324,7 +317,10 @@ class _AccountContentState extends State<AccountContent> {
         child: ListTile(
           leading: CircleAvatar(
             backgroundColor: color,
-            child: const Icon(Icons.account_balance_wallet, color: Colors.white),
+            child: const Icon(
+              Icons.account_balance_wallet,
+              color: Colors.white,
+            ),
           ),
           title: Text(
             account.name,
@@ -332,7 +328,8 @@ class _AccountContentState extends State<AccountContent> {
           ),
           subtitle: Text(memberInfo),
           trailing: const Icon(Icons.chevron_right),
-          onTap: () => _navigateToGroupExpenses(account), // Navigate to group expenses
+          onTap: () =>
+              _navigateToGroupExpenses(account), // Navigate to group expenses
         ),
       );
     } catch (e) {
@@ -341,7 +338,7 @@ class _AccountContentState extends State<AccountContent> {
         child: const ListTile(
           leading: Icon(Icons.error, color: Colors.red),
           title: Text('Display error'),
-        )
+        ),
       );
     }
   }

lib/components/account/add_expense_dialog.dart

@@ -63,6 +63,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:intl/intl.dart';
 import 'package:travel_mate/models/expense_split.dart';
+import '../../services/error_service.dart';
 import '../../blocs/expense/expense_bloc.dart';
 import '../../blocs/expense/expense_event.dart';
 import '../../blocs/expense/expense_state.dart';
@@ -84,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.
@@ -94,6 +107,10 @@ class AddExpenseDialog extends StatefulWidget {
     required this.group,
     required this.currentUser,
     this.expenseToEdit,
+    this.initialCategory,
+    this.initialAmount,
+    this.initialSplits,
+    this.initialDescription,
   });
 
   @override
@@ -145,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;
 
@@ -158,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() {
@@ -191,11 +234,8 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
 
       if (fileSize > 5 * 1024 * 1024) {
         if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
+          ErrorService().showError(
-            const SnackBar(
+            message: 'L\'image ne doit pas dépasser 5 Mo',
-              content: Text('L\'image ne doit pas dépasser 5 Mo'),
-              backgroundColor: Colors.red,
-            ),
           );
         }
         return;
@@ -247,11 +287,8 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
     }).toList();
 
     if (selectedSplits.isEmpty) {
-      ScaffoldMessenger.of(context).showSnackBar(
+      ErrorService().showError(
-        const SnackBar(
+        message: 'Veuillez sélectionner au moins un participant',
-          content: Text('Veuillez sélectionner au moins un participant'),
-          backgroundColor: Colors.red,
-        ),
       );
       return;
     }
@@ -299,22 +336,16 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
 
       if (mounted) {
         Navigator.of(context).pop();
-        ScaffoldMessenger.of(context).showSnackBar(
+        ErrorService().showSnackbar(
-          SnackBar(
+          message: widget.expenseToEdit == null
-            content: Text(
-              widget.expenseToEdit == null
               ? 'Dépense ajoutée'
               : 'Dépense modifiée',
-            ),
+          isError: false,
-            backgroundColor: Colors.green,
-          ),
         );
       }
     } catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        ErrorService().showError(message: 'Erreur: $e');
-          SnackBar(content: Text('Erreur: $e'), backgroundColor: Colors.red),
-        );
       }
     } finally {
       if (mounted) {

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({
+  const BalancesTab({super.key, required this.balances, required this.group});
-    super.key,
-    required this.balances,
-  });
 
   @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(
+      return const Center(child: Text('Aucune balance à afficher'));
-        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(
+                      style: TextStyle(fontSize: 12, color: balanceColor),
-                    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/expense_detail_dialog.dart

@@ -42,49 +42,79 @@ class ExpenseDetailDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     // Formatters for displaying dates and times.
-    final dateFormat = DateFormat('dd MMMM yyyy');
+    final dateFormat = DateFormat('dd MMMM yyyy', 'fr_FR');
-    final timeFormat = DateFormat('HH:mm');
+
+    final theme = Theme.of(context);
 
     return BlocBuilder<UserBloc, user_state.UserState>(
       builder: (context, userState) {
         // Determine the current user and their permissions.
-        final currentUser = userState is user_state.UserLoaded ? userState.user : null;
+        final currentUser = userState is user_state.UserLoaded
+            ? userState.user
+            : null;
         final canEdit = currentUser?.id == expense.paidById;
 
         return Dialog(
+          backgroundColor: Colors.transparent,
+          insetPadding: const EdgeInsets.all(16),
           child: Container(
             constraints: const BoxConstraints(maxWidth: 500, maxHeight: 700),
-            child: Scaffold(
+            decoration: BoxDecoration(
-              appBar: AppBar(
+              color: theme.colorScheme.surface,
-                title: const Text('Détails de la dépense'),
+              borderRadius: BorderRadius.circular(28),
-                automaticallyImplyLeading: false,
+              boxShadow: [
-                actions: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.2),
+                  blurRadius: 20,
+                  offset: const Offset(0, 10),
+                ),
+              ],
+            ),
+            child: Column(
+              children: [
+                // Header with actions
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(24, 20, 16, 0),
+                  child: Row(
+                    children: [
+                      Text(
+                        'Détails',
+                        style: theme.textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const Spacer(),
                       if (canEdit) ...[
-                    // Edit button.
                         IconButton(
-                      icon: const Icon(Icons.edit),
+                          icon: const Icon(Icons.edit_outlined),
+                          tooltip: 'Modifier',
                           onPressed: () {
                             Navigator.of(context).pop();
                             _showEditDialog(context, currentUser!);
                           },
                         ),
-                    // Delete button.
                         IconButton(
-                      icon: const Icon(Icons.delete, color: Colors.red),
+                          icon: const Icon(
+                            Icons.delete_outline,
+                            color: Colors.red,
+                          ),
+                          tooltip: 'Supprimer',
                           onPressed: () => _confirmDelete(context),
                         ),
                       ],
-                  // Close button.
                       IconButton(
                         icon: const Icon(Icons.close),
                         onPressed: () => Navigator.of(context).pop(),
                       ),
                     ],
                   ),
-              body: ListView(
+                ),
-                padding: const EdgeInsets.all(16),
+
+                Expanded(
+                  child: ListView(
+                    padding: const EdgeInsets.fromLTRB(24, 10, 24, 24),
                     children: [
-                  // Header with icon and description.
+                      // Icon and Category
                       Center(
                         child: Column(
                           children: [
@@ -92,30 +122,84 @@ class ExpenseDetailDialog extends StatelessWidget {
                               width: 80,
                               height: 80,
                               decoration: BoxDecoration(
-                            color: Colors.blue.withValues(alpha: 0.1),
+                                color: theme.colorScheme.primaryContainer
+                                    .withValues(alpha: 0.3),
                                 shape: BoxShape.circle,
                               ),
                               child: Icon(
                                 expense.category.icon,
-                            size: 40,
+                                size: 36,
-                            color: Colors.blue,
+                                color: theme.colorScheme.primary,
                               ),
                             ),
                             const SizedBox(height: 16),
                             Text(
                               expense.description,
-                          style: const TextStyle(
+                              style: theme.textTheme.headlineSmall?.copyWith(
-                            fontSize: 24,
                                 fontWeight: FontWeight.bold,
                               ),
                               textAlign: TextAlign.center,
                             ),
+                            const SizedBox(height: 4),
+                            Container(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 12,
+                                vertical: 6,
+                              ),
+                              decoration: BoxDecoration(
+                                color:
+                                    theme.colorScheme.surfaceContainerHighest,
+                                borderRadius: BorderRadius.circular(20),
+                              ),
+                              child: Text(
+                                expense.category.displayName,
+                                style: theme.textTheme.labelMedium?.copyWith(
+                                  color: theme.colorScheme.onSurfaceVariant,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 32),
+
+                      // Amount Display
+                      Container(
+                        padding: const EdgeInsets.all(24),
+                        decoration: BoxDecoration(
+                          color: theme.colorScheme.surfaceContainerHighest
+                              .withValues(alpha: 0.3),
+                          borderRadius: BorderRadius.circular(24),
+                          border: Border.all(
+                            color: theme.colorScheme.outline.withValues(
+                              alpha: 0.1,
+                            ),
+                          ),
+                        ),
+                        child: Column(
+                          children: [
+                            Text(
+                              'Montant total',
+                              style: theme.textTheme.labelLarge?.copyWith(
+                                color: theme.colorScheme.onSurfaceVariant,
+                              ),
+                            ),
                             const SizedBox(height: 8),
                             Text(
-                          expense.category.displayName,
+                              '${expense.amount.toStringAsFixed(2)} ${expense.currency.symbol}',
-                          style: TextStyle(
+                              style: theme.textTheme.displaySmall?.copyWith(
-                            fontSize: 14,
+                                fontWeight: FontWeight.w800,
-                            color: Colors.grey[600],
+                                color: theme.colorScheme.primary,
+                              ),
+                            ),
+                            if (expense.currency != ExpenseCurrency.eur)
+                              Padding(
+                                padding: const EdgeInsets.only(top: 4),
+                                child: Text(
+                                  '≈ ${expense.amountInEur.toStringAsFixed(2)} €',
+                                  style: theme.textTheme.bodyMedium?.copyWith(
+                                    color: theme.colorScheme.onSurfaceVariant,
+                                  ),
                                 ),
                               ),
                           ],
@@ -123,188 +207,322 @@ class ExpenseDetailDialog extends StatelessWidget {
                       ),
                       const SizedBox(height: 24),
 
-                  // Amount card.
+                      // Info Grid
-                  Card(
+                      Row(
-                    child: Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Column(
                         children: [
-                          Text(
+                          Expanded(
-                            '${expense.amount.toStringAsFixed(2)} ${expense.currency.symbol}',
+                            child: _buildInfoCard(
-                            style: const TextStyle(
+                              context,
-                              fontSize: 32,
+                              Icons.person_outline,
-                              fontWeight: FontWeight.bold,
+                              'Payé par',
-                              color: Colors.green,
+                              expense.paidByName,
                             ),
                           ),
-                          if (expense.currency != ExpenseCurrency.eur)
+                          const SizedBox(width: 12),
-                            Text(
+                          Expanded(
-                              '≈ ${expense.amountInEur.toStringAsFixed(2)} €',
+                            child: _buildInfoCard(
-                              style: TextStyle(
+                              context,
-                                fontSize: 16,
+                              Icons.calendar_today_outlined,
-                                color: Colors.grey[600],
+                              'Date',
+                              dateFormat.format(expense.date),
                             ),
                           ),
                         ],
                       ),
-                    ),
+                      const SizedBox(height: 24),
-                  ),
-                  const SizedBox(height: 16),
 
-                  // Information rows.
+                      // Splits Section
-                  _buildInfoRow(Icons.person, 'Payé par', expense.paidByName),
+                      Text(
-                  _buildInfoRow(Icons.calendar_today, 'Date', dateFormat.format(expense.date)),
-                  _buildInfoRow(Icons.access_time, 'Heure', timeFormat.format(expense.createdAt)),
-
-                  if (expense.isEdited && expense.editedAt != null)
-                    _buildInfoRow(
-                      Icons.edit,
-                      'Modifié le',
-                      dateFormat.format(expense.editedAt!),
-                    ),
-
-                  const SizedBox(height: 16),
-                  const Divider(),
-                  const SizedBox(height: 8),
-
-                  // Splits section.
-                  const Text(
                         'Répartition',
-                    style: TextStyle(
+                        style: theme.textTheme.titleMedium?.copyWith(
-                      fontSize: 18,
                           fontWeight: FontWeight.bold,
                         ),
                       ),
                       const SizedBox(height: 12),
-                  ...expense.splits.map((split) => _buildSplitTile(context, split)),
+                      Container(
+                        decoration: BoxDecoration(
+                          color: theme.colorScheme.surface,
+                          borderRadius: BorderRadius.circular(16),
+                          border: Border.all(
+                            color: theme.colorScheme.outline.withValues(
+                              alpha: 0.1,
+                            ),
+                          ),
+                        ),
+                        child: Column(
+                          children: expense.splits.asMap().entries.map((entry) {
+                            final index = entry.key;
+                            final split = entry.value;
+                            final isLast = index == expense.splits.length - 1;
+                            return Column(
+                              children: [
+                                _buildSplitTile(context, split),
+                                if (!isLast)
+                                  Divider(
+                                    height: 1,
+                                    indent: 16,
+                                    endIndent: 16,
+                                    color: theme.colorScheme.outline.withValues(
+                                      alpha: 0.1,
+                                    ),
+                                  ),
+                              ],
+                            );
+                          }).toList(),
+                        ),
+                      ),
 
-                  const SizedBox(height: 16),
+                      // Receipt Section
-
-                  // Receipt section.
                       if (expense.receiptUrl != null) ...[
-                    const Divider(),
+                        const SizedBox(height: 24),
-                    const SizedBox(height: 8),
+                        Text(
-                    const Text(
                           'Reçu',
-                      style: TextStyle(
+                          style: theme.textTheme.titleMedium?.copyWith(
-                        fontSize: 18,
                             fontWeight: FontWeight.bold,
                           ),
                         ),
                         const SizedBox(height: 12),
                         ClipRRect(
-                      borderRadius: BorderRadius.circular(12),
+                          borderRadius: BorderRadius.circular(16),
-                      child: Image.network(
+                          child: Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              Image.network(
                                 expense.receiptUrl!,
+                                width: double.infinity,
+                                height: 200,
                                 fit: BoxFit.cover,
-                        loadingBuilder: (context, child, loadingProgress) {
+                                loadingBuilder:
+                                    (context, child, loadingProgress) {
                                       if (loadingProgress == null) return child;
-                          return const Center(child: CircularProgressIndicator());
+                                      return Container(
+                                        height: 200,
+                                        color: theme
+                                            .colorScheme
+                                            .surfaceContainerHighest,
+                                        child: const Center(
+                                          child: CircularProgressIndicator(),
+                                        ),
+                                      );
                                     },
                                 errorBuilder: (context, error, stackTrace) {
-                          return const Center(
+                                  return Container(
-                            child: Text('Erreur de chargement de l\'image'),
+                                    height: 200,
+                                    color: theme
+                                        .colorScheme
+                                        .surfaceContainerHighest,
+                                    child: const Center(
+                                      child: Icon(Icons.broken_image_outlined),
+                                    ),
+                                  );
+                                },
+                              ),
+                              Positioned.fill(
+                                child: Material(
+                                  color: Colors.transparent,
+                                  child: InkWell(
+                                    onTap: () {
+                                      showDialog(
+                                        context: context,
+                                        builder: (context) => Dialog(
+                                          backgroundColor: Colors.transparent,
+                                          insetPadding: EdgeInsets.zero,
+                                          child: Stack(
+                                            alignment: Alignment.center,
+                                            children: [
+                                              InteractiveViewer(
+                                                minScale: 0.5,
+                                                maxScale: 4.0,
+                                                child: Image.network(
+                                                  expense.receiptUrl!,
+                                                  fit: BoxFit.contain,
+                                                ),
+                                              ),
+                                              Positioned(
+                                                top: 40,
+                                                right: 20,
+                                                child: IconButton(
+                                                  icon: const Icon(
+                                                    Icons.close,
+                                                    color: Colors.white,
+                                                    size: 30,
+                                                  ),
+                                                  onPressed: () => Navigator.of(
+                                                    context,
+                                                  ).pop(),
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
                                       );
                                     },
                                   ),
                                 ),
+                              ),
+                            ],
+                          ),
+                        ),
                       ],
 
-                  const SizedBox(height: 16),
+                      // Archive Button
-
+                      if (!expense.isArchived && canEdit) ...[
-                  // Archive button.
+                        const SizedBox(height: 32),
-                  if (!expense.isArchived && canEdit)
+                        SizedBox(
-                    OutlinedButton.icon(
+                          width: double.infinity,
+                          child: OutlinedButton.icon(
                             onPressed: () => _confirmArchive(context),
-                      icon: const Icon(Icons.archive),
+                            icon: const Icon(Icons.archive_outlined),
                             label: const Text('Archiver cette dépense'),
+                            style: OutlinedButton.styleFrom(
+                              padding: const EdgeInsets.symmetric(vertical: 16),
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                            ),
+                          ),
                         ),
                       ],
+                    ],
                   ),
                 ),
+              ],
+            ),
           ),
         );
       },
     );
   }
 
-  /// Builds a row displaying an icon, a label, and a value.
+  Widget _buildInfoCard(
-  Widget _buildInfoRow(IconData icon, String label, String value) {
+    BuildContext context,
-    return Padding(
+    IconData icon,
-      padding: const EdgeInsets.symmetric(vertical: 8),
+    String label,
-      child: Row(
+    String value,
+  ) {
+    final theme = Theme.of(context);
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surface,
+        borderRadius: BorderRadius.circular(16),
+        border: Border.all(
+          color: theme.colorScheme.outline.withValues(alpha: 0.1),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Icon(icon, size: 20, color: Colors.grey[600]),
+          Row(
-          const SizedBox(width: 12),
+            children: [
+              Icon(icon, size: 16, color: theme.colorScheme.onSurfaceVariant),
+              const SizedBox(width: 8),
               Text(
                 label,
-            style: TextStyle(
+                style: theme.textTheme.labelMedium?.copyWith(
-              fontSize: 14,
+                  color: theme.colorScheme.onSurfaceVariant,
-              color: Colors.grey[600],
                 ),
               ),
-          const Spacer(),
+            ],
+          ),
+          const SizedBox(height: 8),
           Text(
             value,
-            style: const TextStyle(
+            style: theme.textTheme.bodyLarge?.copyWith(
-              fontSize: 14,
+              fontWeight: FontWeight.w600,
+            ),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSplitTile(BuildContext context, ExpenseSplit split) {
+    return BlocBuilder<UserBloc, user_state.UserState>(
+      builder: (context, userState) {
+        final currentUser = userState is user_state.UserLoaded
+            ? userState.user
+            : null;
+        final isCurrentUser = currentUser?.id == split.userId;
+        final theme = Theme.of(context);
+
+        return Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+          child: Row(
+            children: [
+              Container(
+                width: 40,
+                height: 40,
+                decoration: BoxDecoration(
+                  color: split.isPaid
+                      ? Colors.green.withValues(alpha: 0.1)
+                      : Colors.orange.withValues(alpha: 0.1),
+                  shape: BoxShape.circle,
+                ),
+                child: Icon(
+                  split.isPaid ? Icons.check : Icons.access_time_rounded,
+                  color: split.isPaid ? Colors.green : Colors.orange,
+                  size: 20,
+                ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      isCurrentUser ? 'Moi' : split.userName,
+                      style: theme.textTheme.bodyLarge?.copyWith(
+                        fontWeight: isCurrentUser
+                            ? FontWeight.bold
+                            : FontWeight.w500,
+                      ),
+                    ),
+                    Text(
+                      split.isPaid ? 'Payé' : 'En attente',
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: split.isPaid ? Colors.green : Colors.orange,
                         fontWeight: FontWeight.w500,
                       ),
                     ),
                   ],
                 ),
-    );
-  }
-
-  /// Builds a tile displaying details about a split in the expense.
-  ///
-  /// The tile shows the user's name, the split amount, and whether the split is paid. If the current user
-  /// is responsible for the split and it is unpaid, a button is provided to mark it as paid.
-  Widget _buildSplitTile(BuildContext context, ExpenseSplit split) {
-    return BlocBuilder<UserBloc, user_state.UserState>(
-      builder: (context, userState) {
-        final currentUser = userState is user_state.UserLoaded ? userState.user : null;
-        final isCurrentUser = currentUser?.id == split.userId;
-
-        return ListTile(
-          leading: CircleAvatar(
-            backgroundColor: split.isPaid ? Colors.green : Colors.orange,
-            child: Icon(
-              split.isPaid ? Icons.check : Icons.pending,
-              color: Colors.white,
-              size: 20,
               ),
-          ),
+              Column(
-          title: Text(
+                crossAxisAlignment: CrossAxisAlignment.end,
-            split.userName,
-            style: TextStyle(
-              fontWeight: isCurrentUser ? FontWeight.bold : FontWeight.normal,
-            ),
-          ),
-          subtitle: Text(split.isPaid ? 'Payé' : 'En attente'),
-          trailing: Row(
-            mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
                     '${split.amount.toStringAsFixed(2)} €',
-                style: const TextStyle(
+                    style: theme.textTheme.bodyLarge?.copyWith(
-                  fontSize: 16,
                       fontWeight: FontWeight.bold,
                     ),
                   ),
-              if (!split.isPaid && isCurrentUser) ...[
+                  if (!split.isPaid && isCurrentUser)
-                const SizedBox(width: 8),
+                    GestureDetector(
-                IconButton(
+                      onTap: () {
-                  icon: const Icon(Icons.check_circle, color: Colors.green),
+                        context.read<ExpenseBloc>().add(
-                  onPressed: () {
+                          MarkSplitAsPaid(
-                    context.read<ExpenseBloc>().add(MarkSplitAsPaid(
                             expenseId: expense.id,
                             userId: split.userId,
-                    ));
+                          ),
+                        );
                         Navigator.of(context).pop();
                       },
+                      child: Padding(
+                        padding: const EdgeInsets.only(top: 4),
+                        child: Text(
+                          'Marquer payé',
+                          style: theme.textTheme.labelSmall?.copyWith(
+                            color: theme.colorScheme.primary,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ),
                     ),
                 ],
+              ),
             ],
           ),
         );
@@ -312,7 +530,6 @@ class ExpenseDetailDialog extends StatelessWidget {
     );
   }
 
-  /// Shows a dialog for editing the expense.
   void _showEditDialog(BuildContext context, user_state.UserModel currentUser) {
     showDialog(
       context: context,
@@ -327,13 +544,14 @@ class ExpenseDetailDialog extends StatelessWidget {
     );
   }
 
-  /// Shows a confirmation dialog for deleting the expense.
   void _confirmDelete(BuildContext context) {
     showDialog(
       context: context,
       builder: (dialogContext) => AlertDialog(
         title: const Text('Supprimer la dépense'),
-        content: const Text('Êtes-vous sûr de vouloir supprimer cette dépense ?'),
+        content: const Text(
+          'Êtes-vous sûr de vouloir supprimer cette dépense ?',
+        ),
         actions: [
           TextButton(
             onPressed: () => Navigator.of(dialogContext).pop(),
@@ -341,9 +559,7 @@ class ExpenseDetailDialog extends StatelessWidget {
           ),
           TextButton(
             onPressed: () {
-              context.read<ExpenseBloc>().add(DeleteExpense(
+              context.read<ExpenseBloc>().add(DeleteExpense(expense.id));
-                expense.id,
-              ));
               Navigator.of(dialogContext).pop();
               Navigator.of(context).pop();
             },
@@ -355,13 +571,14 @@ class ExpenseDetailDialog extends StatelessWidget {
     );
   }
 
-  /// Shows a confirmation dialog for archiving the expense.
   void _confirmArchive(BuildContext context) {
     showDialog(
       context: context,
       builder: (dialogContext) => AlertDialog(
         title: const Text('Archiver la dépense'),
-        content: const Text('Cette dépense sera archivée et n\'apparaîtra plus dans les calculs de balance.'),
+        content: const Text(
+          'Cette dépense sera archivée et n\'apparaîtra plus dans les calculs de balance.',
+        ),
         actions: [
           TextButton(
             onPressed: () => Navigator.of(dialogContext).pop(),
@@ -369,9 +586,7 @@ class ExpenseDetailDialog extends StatelessWidget {
           ),
           TextButton(
             onPressed: () {
-              context.read<ExpenseBloc>().add(ArchiveExpense(
+              context.read<ExpenseBloc>().add(ArchiveExpense(expense.id));
-                expense.id,
-              ));
               Navigator.of(dialogContext).pop();
               Navigator.of(context).pop();
             },

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

@@ -15,6 +15,7 @@ import 'balances_tab.dart';
 import 'expenses_tab.dart';
 import '../../models/user_balance.dart';
 import '../../models/expense.dart';
+import '../../services/error_service.dart';
 
 class GroupExpensesPage extends StatefulWidget {
   final Account account;
@@ -79,34 +80,20 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
           icon: const Icon(Icons.arrow_back),
           onPressed: () => Navigator.pop(context),
         ),
-        actions: [
+        actions: [],
-          IconButton(
-            icon: const Icon(Icons.filter_list),
-            onPressed: () {
-              _showFilterDialog();
-            },
-          ),
-        ],
       ),
       body: MultiBlocListener(
         listeners: [
           BlocListener<ExpenseBloc, ExpenseState>(
             listener: (context, state) {
               if (state is ExpenseOperationSuccess) {
-                ScaffoldMessenger.of(context).showSnackBar(
+                ErrorService().showSnackbar(
-                  SnackBar(
+                  message: state.message,
-                    content: Text(state.message),
+                  isError: false,
-                    backgroundColor: Colors.green,
-                  ),
                 );
                 _loadData(); // Recharger les données après une opération
               } else if (state is ExpenseError) {
-                ScaffoldMessenger.of(context).showSnackBar(
+                ErrorService().showError(message: state.message);
-                  SnackBar(
-                    content: Text(state.message),
-                    backgroundColor: Colors.red,
-                  ),
-                );
               } else if (state is ExpensesLoaded) {
                 // Rafraîchir les balances quand les dépenses changent (ex: via stream)
                 context.read<BalanceBloc>().add(
@@ -199,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}');
                       }
@@ -213,8 +203,8 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
         ),
       ),
       floatingActionButton: FloatingActionButton(
+        heroTag: 'group_expenses_fab',
         onPressed: _showAddExpenseDialog,
-        heroTag: "add_expense_fab",
         backgroundColor: Colors.blue,
         foregroundColor: Colors.white,
         elevation: 4,
@@ -393,104 +383,7 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
             AddExpenseDialog(group: widget.group, currentUser: userState.user),
       );
     } else {
-      ScaffoldMessenger.of(context).showSnackBar(
+      ErrorService().showError(message: 'Erreur: utilisateur non connecté');
-        const SnackBar(
-          content: Text('Erreur: utilisateur non connecté'),
-          backgroundColor: Colors.red,
-        ),
-      );
     }
   }
-
-  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/activities/activities_page.dart

@@ -1,15 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import '../../blocs/activity/activity_bloc.dart';
 import '../../blocs/activity/activity_event.dart';
 import '../../blocs/activity/activity_state.dart';
 import '../../models/trip.dart';
 import '../../models/activity.dart';
 import '../../services/activity_cache_service.dart';
+import '../../services/activity_places_service.dart';
+import 'dart:async';
 
 import '../loading/laoding_content.dart';
 import '../../blocs/user/user_bloc.dart';
 import '../../blocs/user/user_state.dart';
+import '../../services/error_service.dart';
+import 'activity_detail_dialog.dart';
+import 'package:geolocator/geolocator.dart';
 
 class ActivitiesPage extends StatefulWidget {
   final Trip trip;
@@ -35,6 +41,14 @@ class _ActivitiesPageState extends State<ActivitiesPage>
   List<Activity> _approvedActivities = [];
   bool _isLoadingTripActivities = false;
 
+  // Autocomplete variables
+  List<Map<String, String>> _suggestions = [];
+  final LayerLink _layerLink = LayerLink();
+  OverlayEntry? _overlayEntry;
+  final FocusNode _searchFocusNode = FocusNode();
+  Timer? _debounceTimer;
+  bool _isLoadingSuggestions = false;
+
   bool _autoReloadInProgress =
       false; // Protection contre les rechargements en boucle
   int _lastAutoReloadTriggerCount =
@@ -101,6 +115,9 @@ class _ActivitiesPageState extends State<ActivitiesPage>
   void dispose() {
     _tabController.dispose();
     _searchController.dispose();
+    _searchFocusNode.dispose();
+    _debounceTimer?.cancel();
+    _hideSuggestions();
     super.dispose();
   }
 
@@ -120,22 +137,15 @@ class _ActivitiesPageState extends State<ActivitiesPage>
     return BlocListener<ActivityBloc, ActivityState>(
       listener: (context, state) {
         if (state is ActivityError) {
-          ScaffoldMessenger.of(context).showSnackBar(
+          ErrorService().showError(
-            SnackBar(
+            message: state.message,
-              content: Text(state.message),
+            onRetry: () {
-              backgroundColor: Colors.red,
-              action: SnackBarAction(
-                label: 'Réessayer',
-                textColor: Colors.white,
-                onPressed: () {
               if (_tabController.index == 2) {
                 _searchGoogleActivities();
               } else {
                 _loadActivities();
               }
             },
-              ),
-            ),
           );
         }
 
@@ -152,20 +162,14 @@ class _ActivitiesPageState extends State<ActivitiesPage>
             });
 
             // Afficher un feedback de succès
-            ScaffoldMessenger.of(context).showSnackBar(
+            // Afficher un feedback de succès
-              SnackBar(
+            ErrorService().showSnackbar(
-                content: Text('${state.activity.name} ajoutée au voyage !'),
+              message: '${state.activity.name} ajoutée au voyage !',
-                duration: const Duration(seconds: 2),
+              isError: false,
-                backgroundColor: Colors.green,
+              onRetry: () {
-                action: SnackBarAction(
-                  label: 'Voir',
-                  textColor: Colors.white,
-                  onPressed: () {
                 // Revenir à l'onglet des activités du voyage
                 _tabController.animateTo(0);
               },
-                ),
-              ),
             );
           });
         }
@@ -217,21 +221,13 @@ class _ActivitiesPageState extends State<ActivitiesPage>
                 _tripActivities.add(state.newlyAddedActivity!);
               });
 
-              ScaffoldMessenger.of(context).showSnackBar(
+              ErrorService().showSnackbar(
-                SnackBar(
+                message:
-                  content: Text(
                     '${state.newlyAddedActivity!.name} ajoutée au voyage !',
-                  ),
+                isError: false,
-                  duration: const Duration(seconds: 2),
+                onRetry: () {
-                  backgroundColor: Colors.green,
-                  action: SnackBarAction(
-                    label: 'Voir',
-                    textColor: Colors.white,
-                    onPressed: () {
                   _tabController.animateTo(0);
                 },
-                  ),
-                ),
               );
             });
           }
@@ -295,9 +291,13 @@ class _ActivitiesPageState extends State<ActivitiesPage>
   }
 
   Widget _buildSearchBar(ThemeData theme) {
-    return Container(
+    return CompositedTransformTarget(
-      padding: const EdgeInsets.all(16),
+      link: _layerLink,
       child: Container(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          children: [
+            Container(
               decoration: BoxDecoration(
                 color: theme.colorScheme.surfaceContainerHighest.withValues(
                   alpha: 0.3,
@@ -306,6 +306,7 @@ class _ActivitiesPageState extends State<ActivitiesPage>
               ),
               child: TextField(
                 controller: _searchController,
+                focusNode: _searchFocusNode,
                 decoration: InputDecoration(
                   hintText: 'Rechercher restaurants, musées...',
                   hintStyle: TextStyle(
@@ -320,17 +321,174 @@ class _ActivitiesPageState extends State<ActivitiesPage>
                     horizontal: 16,
                     vertical: 12,
                   ),
+                  suffixIcon: _isLoadingSuggestions
+                      ? const SizedBox(
+                          width: 20,
+                          height: 20,
+                          child: Padding(
+                            padding: EdgeInsets.all(10.0),
+                            child: CircularProgressIndicator(strokeWidth: 2),
                           ),
+                        )
+                      : null,
+                ),
+                onChanged: _onSearchChanged,
                 onSubmitted: (value) {
+                  _hideSuggestions();
                   if (value.isNotEmpty) {
                     _performSearch(value);
                   }
                 },
               ),
             ),
+          ],
+        ),
+      ),
     );
   }
 
+  void _onSearchChanged(String value) {
+    if (_debounceTimer?.isActive ?? false) _debounceTimer!.cancel();
+
+    if (value.isEmpty) {
+      _hideSuggestions();
+      return;
+    }
+
+    _debounceTimer = Timer(const Duration(milliseconds: 300), () async {
+      setState(() {
+        _isLoadingSuggestions = true;
+      });
+
+      try {
+        final suggestions = await ActivityPlacesService().fetchSuggestions(
+          query: value,
+          lat: widget.trip.latitude,
+          lng: widget.trip.longitude,
+        );
+
+        if (mounted) {
+          setState(() {
+            _suggestions = suggestions;
+            _isLoadingSuggestions = false;
+          });
+
+          if (_suggestions.isNotEmpty) {
+            _showSuggestions();
+          } else {
+            _hideSuggestions();
+          }
+        }
+      } catch (e) {
+        if (mounted) {
+          setState(() {
+            _isLoadingSuggestions = false;
+          });
+        }
+      }
+    });
+  }
+
+  void _showSuggestions() {
+    _overlayEntry?.remove();
+    _overlayEntry = _createOverlayEntry();
+    Overlay.of(context).insert(_overlayEntry!);
+  }
+
+  void _hideSuggestions() {
+    _overlayEntry?.remove();
+    _overlayEntry = null;
+  }
+
+  OverlayEntry _createOverlayEntry() {
+    final renderBox = context.findRenderObject() as RenderBox;
+    final theme = Theme.of(context);
+    final size = renderBox.size;
+    final width = size.width - 32; // padding 16 * 2
+
+    return OverlayEntry(
+      builder: (context) => Positioned(
+        width: width,
+        child: CompositedTransformFollower(
+          link: _layerLink,
+          showWhenUnlinked: false,
+          offset: const Offset(16, 80), // Adjust vertical offset
+          child: Material(
+            elevation: 4,
+            borderRadius: BorderRadius.circular(12),
+            color: theme.colorScheme.surface,
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxHeight: 250),
+              child: ListView.separated(
+                padding: EdgeInsets.zero,
+                shrinkWrap: true,
+                itemCount: _suggestions.length,
+                separatorBuilder: (context, index) => const Divider(height: 1),
+                itemBuilder: (context, index) {
+                  final suggestion = _suggestions[index];
+                  return ListTile(
+                    leading: const Icon(Icons.location_on_outlined),
+                    title: Text(
+                      suggestion['description'] ?? '',
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    onTap: () {
+                      _selectSuggestion(suggestion);
+                    },
+                  );
+                },
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Future<void> _selectSuggestion(Map<String, String> suggestion) async {
+    _hideSuggestions();
+    _searchController.text = suggestion['description']!;
+    _searchFocusNode.unfocus();
+
+    // Passer à l'onglet "Suggestion" si ce n'est pas déjà fait
+    if (_tabController.index != 2) {
+      _tabController.animateTo(2);
+    }
+
+    // Charger l'activité spécifique via le Bloc ou Service
+    // Ici on va utiliser le Bloc pour ajouter l'activité aux résultats de recherche
+    // Pour ça, il faudrait idéalement un événement "LoadSingleActivity" dans le Bloc
+    // Mais pour faire simple et rapide, on peut faire une recherche "exacte" ou hack:
+    // On charge l'activité manuellement et on l'ajoute comme si c'était un résultat de recherche.
+
+    setState(() {
+      _isLoadingSuggestions = true;
+    });
+
+    try {
+      final activity = await ActivityPlacesService().getActivityByPlaceId(
+        placeId: suggestion['placeId']!,
+        tripId: widget.trip.id!,
+      );
+
+      if (mounted && activity != null) {
+        // Injecter ce résultat unique dans le Bloc
+        context.read<ActivityBloc>().add(
+          RestoreCachedSearchResults(searchResults: [activity]),
+        );
+      }
+    } catch (e) {
+      ErrorService().showError(message: "Impossible de charger l'activité");
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoadingSuggestions = false;
+        });
+      }
+    }
+  }
+
   Widget _buildCategoryTabs(ThemeData theme) {
     return Container(
       padding: const EdgeInsets.all(16),
@@ -655,7 +813,31 @@ class _ActivitiesPageState extends State<ActivitiesPage>
               activity.name.toLowerCase().trim(),
         );
 
-    return Card(
+    // Calculer la distance si c'est une suggestion Google et que le voyage a des coordonnées
+    double? distanceInKm;
+    if (isGoogleSuggestion &&
+        widget.trip.hasCoordinates &&
+        activity.latitude != null &&
+        activity.longitude != null) {
+      final distanceInMeters = Geolocator.distanceBetween(
+        widget.trip.latitude!,
+        widget.trip.longitude!,
+        activity.latitude!,
+        activity.longitude!,
+      );
+      distanceInKm = distanceInMeters / 1000;
+    }
+
+    final isFar = distanceInKm != null && distanceInKm > 50;
+
+    return GestureDetector(
+      onTap: () {
+        showDialog(
+          context: context,
+          builder: (context) => ActivityDetailDialog(activity: activity),
+        );
+      },
+      child: Card(
         margin: const EdgeInsets.only(bottom: 12),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -720,13 +902,49 @@ class _ActivitiesPageState extends State<ActivitiesPage>
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
+                  if (isFar)
+                    Container(
+                      margin: const EdgeInsets.only(bottom: 12),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                        vertical: 8,
+                      ),
+                      decoration: BoxDecoration(
+                        color: theme.colorScheme.errorContainer,
+                        borderRadius: BorderRadius.circular(8),
+                        border: Border.all(
+                          color: theme.colorScheme.error.withValues(alpha: 0.5),
+                        ),
+                      ),
+                      child: Row(
+                        children: [
+                          Icon(
+                            Icons.warning_amber_rounded,
+                            color: theme.colorScheme.error,
+                            size: 20,
+                          ),
+                          const SizedBox(width: 8),
+                          Expanded(
+                            child: Text(
+                              'Activité éloignée : ${distanceInKm!.toStringAsFixed(0)} km du lieu du voyage',
+                              style: theme.textTheme.bodySmall?.copyWith(
+                                color: theme.colorScheme.onErrorContainer,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
                   Row(
                     children: [
                       // Icône de catégorie
                       Container(
                         padding: const EdgeInsets.all(8),
                         decoration: BoxDecoration(
-                        color: theme.colorScheme.primary.withValues(alpha: 0.1),
+                          color: theme.colorScheme.primary.withValues(
+                            alpha: 0.1,
+                          ),
                           borderRadius: BorderRadius.circular(8),
                         ),
                         child: Icon(
@@ -792,7 +1010,9 @@ class _ActivitiesPageState extends State<ActivitiesPage>
                     Text(
                       activity.description,
                       style: theme.textTheme.bodyMedium?.copyWith(
-                      color: theme.colorScheme.onSurface.withValues(alpha: 0.8),
+                        color: theme.colorScheme.onSurface.withValues(
+                          alpha: 0.8,
+                        ),
                       ),
                       maxLines: 2,
                       overflow: TextOverflow.ellipsis,
@@ -866,13 +1086,16 @@ class _ActivitiesPageState extends State<ActivitiesPage>
                           // Bouton pour ajouter l'activité
                           Expanded(
                             child: ElevatedButton.icon(
-                            onPressed: () => _addGoogleActivityToTrip(activity),
+                              onPressed: () =>
+                                  _addGoogleActivityToTrip(activity),
                               icon: const Icon(Icons.add, size: 18),
                               label: const Text('Ajouter au voyage'),
                               style: ElevatedButton.styleFrom(
                                 backgroundColor: theme.colorScheme.primary,
                                 foregroundColor: Colors.white,
-                              padding: const EdgeInsets.symmetric(vertical: 12),
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 12,
+                                ),
                                 shape: RoundedRectangleBorder(
                                   borderRadius: BorderRadius.circular(12),
                                 ),
@@ -965,6 +1188,7 @@ class _ActivitiesPageState extends State<ActivitiesPage>
             ),
           ],
         ),
+      ),
     );
   }
 
@@ -1026,12 +1250,9 @@ class _ActivitiesPageState extends State<ActivitiesPage>
 
     // Si l'activité a été trouvée et que l'utilisateur a déjà voté
     if (currentActivity.id.isNotEmpty && currentActivity.hasUserVoted(userId)) {
-      ScaffoldMessenger.of(context).showSnackBar(
+      ErrorService().showSnackbar(
-        const SnackBar(
+        message: 'Vous avez déjà voté pour cette activité',
-          content: Text('Vous avez déjà voté pour cette activité'),
+        isError: true,
-          backgroundColor: Colors.orange,
-          duration: Duration(seconds: 2),
-        ),
       );
       return;
     }
@@ -1044,13 +1265,7 @@ class _ActivitiesPageState extends State<ActivitiesPage>
     final message = vote == 1
         ? 'Vote positif ajouté !'
         : 'Vote négatif ajouté !';
-    ScaffoldMessenger.of(context).showSnackBar(
+    ErrorService().showSnackbar(message: message, isError: false);
-      SnackBar(
-        content: Text(message),
-        duration: const Duration(seconds: 1),
-        backgroundColor: vote == 1 ? Colors.green : Colors.orange,
-      ),
-    );
   }
 
   void _addGoogleActivityToTrip(Activity activity) {
@@ -1059,6 +1274,7 @@ class _ActivitiesPageState extends State<ActivitiesPage>
       tripId: widget.trip.id,
       // Générer un nouvel ID unique pour cette activité dans le voyage
       id: DateTime.now().millisecondsSinceEpoch.toString(),
+      createdBy: FirebaseAuth.instance.currentUser?.uid,
     );
 
     // Afficher le LoadingContent avec la tâche d'ajout

lib/components/activities/activity_detail_dialog.dart

@@ -0,0 +1,322 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../services/map_navigation_service.dart';
+import '../../models/activity.dart';
+
+class ActivityDetailDialog extends StatelessWidget {
+  final Activity activity;
+
+  const ActivityDetailDialog({super.key, required this.activity});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    // final isDarkMode = theme.brightness == Brightness.dark;
+
+    // Traduction de la catégorie
+    String categoryDisplay = activity.category;
+    final categoryEnum = ActivityCategory.values.firstWhere(
+      (e) => e.name == activity.category,
+      orElse: () => ActivityCategory.attraction, // Fallback
+    );
+    categoryDisplay = categoryEnum.displayName;
+
+    return Dialog(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+      backgroundColor: theme.scaffoldBackgroundColor,
+      child: SingleChildScrollView(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            // Image header
+            if (activity.imageUrl != null && activity.imageUrl!.isNotEmpty)
+              ClipRRect(
+                borderRadius: const BorderRadius.vertical(
+                  top: Radius.circular(16),
+                ),
+                child: Image.network(
+                  activity.imageUrl!,
+                  height: 200,
+                  fit: BoxFit.cover,
+                  errorBuilder: (context, error, stackTrace) => Container(
+                    height: 100,
+                    color: Colors.grey[300],
+                    child: const Icon(Icons.image_not_supported, size: 50),
+                  ),
+                ),
+              ),
+
+            Padding(
+              padding: const EdgeInsets.all(20),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Titre et Catégorie
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
+                        child: Text(
+                          activity.name,
+                          style: theme.textTheme.headlineSmall?.copyWith(
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ),
+                      Container(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 10,
+                          vertical: 5,
+                        ),
+                        decoration: BoxDecoration(
+                          color: theme.colorScheme.primary.withValues(
+                            alpha: 0.1,
+                          ),
+                          borderRadius: BorderRadius.circular(20),
+                        ),
+                        child: Text(
+                          categoryDisplay,
+                          style: TextStyle(
+                            color: theme.colorScheme.primary,
+                            fontWeight: FontWeight.bold,
+                            fontSize: 12,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 16),
+
+                  // Date
+                  if (activity.date != null) ...[
+                    Row(
+                      children: [
+                        Icon(
+                          Icons.calendar_today,
+                          size: 20,
+                          color: Colors.grey[600],
+                        ),
+                        const SizedBox(width: 8),
+                        Text(
+                          DateFormat(
+                            'EEEE d MMMM yyyy',
+                            'fr_FR',
+                          ).format(activity.date!),
+                          style: theme.textTheme.bodyMedium,
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+
+                  // Heures d'ouverture
+                  if (activity.openingHours.isNotEmpty) ...[
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Icon(
+                          Icons.access_time,
+                          size: 20,
+                          color: Colors.grey[600],
+                        ),
+                        const SizedBox(width: 8),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: activity.openingHours
+                                .map(
+                                  (hour) => Padding(
+                                    padding: const EdgeInsets.only(bottom: 4),
+                                    child: Text(
+                                      hour,
+                                      style: theme.textTheme.bodyMedium,
+                                    ),
+                                  ),
+                                )
+                                .toList(),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+
+                  // Adresse
+                  if (activity.address != null) ...[
+                    Row(
+                      children: [
+                        Icon(
+                          Icons.location_on,
+                          size: 20,
+                          color: Colors.grey[600],
+                        ),
+                        const SizedBox(width: 8),
+                        Expanded(
+                          child: Text(
+                            activity.address!,
+                            style: theme.textTheme.bodyMedium,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+
+                  // Description
+                  if (activity.description.isNotEmpty) ...[
+                    Text(
+                      'Description',
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      activity.description,
+                      style: theme.textTheme.bodyMedium,
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+
+                  // Votes
+                  if (activity.votes.isNotEmpty) ...[
+                    const Divider(),
+                    const SizedBox(height: 8),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      children: [
+                        _buildVoteStat(
+                          Icons.thumb_up,
+                          Colors.green,
+                          activity.positiveVotes,
+                          'Pour',
+                        ),
+                        _buildVoteStat(
+                          Icons.thumb_down,
+                          Colors.red,
+                          activity.negativeVotes,
+                          'Contre',
+                        ),
+                      ],
+                    ),
+                  ],
+                ],
+              ),
+            ),
+
+            // Boutons
+            Padding(
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                children: [
+                  if (activity.latitude != null && activity.longitude != null)
+                    Padding(
+                      padding: const EdgeInsets.only(bottom: 8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: [
+                          ElevatedButton.icon(
+                            onPressed: () {
+                              // Déclencher la navigation
+                              context
+                                  .read<MapNavigationService>()
+                                  .navigateToLocation(
+                                    activity.latitude!,
+                                    activity.longitude!,
+                                    name: activity.name,
+                                  );
+
+                              // Revenir à la page d'accueil (fermer le dialog et les pages empilées comme ActivitiesPage)
+                              Navigator.of(
+                                context,
+                              ).popUntil((route) => route.isFirst);
+                            },
+                            icon: const Icon(Icons.map_outlined),
+                            label: const Text('Voir sur la carte de l\'app'),
+                            style: ElevatedButton.styleFrom(
+                              padding: const EdgeInsets.symmetric(
+                                vertical: 12,
+                                horizontal: 24,
+                              ),
+                              backgroundColor:
+                                  theme.colorScheme.secondaryContainer,
+                              foregroundColor:
+                                  theme.colorScheme.onSecondaryContainer,
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(10),
+                              ),
+                            ),
+                          ),
+                          const SizedBox(height: 8),
+                          ElevatedButton.icon(
+                            onPressed: () async {
+                              final url = Uri.parse(
+                                'https://www.google.com/maps/search/?api=1&query=${activity.latitude},${activity.longitude}',
+                              );
+                              if (await canLaunchUrl(url)) {
+                                await launchUrl(
+                                  url,
+                                  mode: LaunchMode.externalApplication,
+                                );
+                              }
+                            },
+                            icon: const Icon(Icons.map),
+                            label: const Text('Voir sur Google Maps'),
+                            style: ElevatedButton.styleFrom(
+                              padding: const EdgeInsets.symmetric(
+                                vertical: 12,
+                                horizontal: 24,
+                              ),
+                              backgroundColor:
+                                  theme.colorScheme.primaryContainer,
+                              foregroundColor:
+                                  theme.colorScheme.onPrimaryContainer,
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(10),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ElevatedButton(
+                    onPressed: () => Navigator.pop(context),
+                    style: ElevatedButton.styleFrom(
+                      padding: const EdgeInsets.symmetric(vertical: 12),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(10),
+                      ),
+                      minimumSize: const Size(double.infinity, 45),
+                    ),
+                    child: const Text('Fermer'),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildVoteStat(IconData icon, Color color, int count, String label) {
+    return Column(
+      children: [
+        Icon(icon, color: color),
+        const SizedBox(height: 4),
+        Text(
+          '$count',
+          style: TextStyle(
+            fontSize: 18,
+            fontWeight: FontWeight.bold,
+            color: color,
+          ),
+        ),
+        Text(label, style: const TextStyle(fontSize: 12, color: Colors.grey)),
+      ],
+    );
+  }
+}

lib/components/activities/add_activity_bottom_sheet.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import 'dart:math' as math;
 import '../../blocs/activity/activity_bloc.dart';
 import '../../blocs/activity/activity_event.dart';
@@ -25,6 +26,7 @@ class _AddActivityBottomSheetState extends State<AddActivityBottomSheet> {
   final ErrorService _errorService = ErrorService();
 
   ActivityCategory _selectedCategory = ActivityCategory.attraction;
+  DateTime? _selectedDate;
   bool _isLoading = false;
 
   @override
@@ -149,6 +151,13 @@ class _AddActivityBottomSheetState extends State<AddActivityBottomSheet> {
                       icon: Icons.location_on,
                     ),
 
+                    const SizedBox(height: 20),
+
+                    // Date et heure (optionnel)
+                    _buildSectionTitle('Date et heure (optionnel)'),
+                    const SizedBox(height: 8),
+                    _buildDateTimePicker(),
+
                     const SizedBox(height: 40),
 
                     // Boutons d'action
@@ -368,6 +377,8 @@ class _AddActivityBottomSheetState extends State<AddActivityBottomSheet> {
         votes: {},
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
+        date: _selectedDate,
+        createdBy: FirebaseAuth.instance.currentUser?.uid,
       );
 
       context.read<ActivityBloc>().add(AddActivity(activity));
@@ -412,4 +423,92 @@ class _AddActivityBottomSheetState extends State<AddActivityBottomSheet> {
         return Icons.spa;
     }
   }
+
+  Widget _buildDateTimePicker() {
+    final theme = Theme.of(context);
+    final isDarkMode = theme.brightness == Brightness.dark;
+
+    return InkWell(
+      onTap: _pickDateTime,
+      borderRadius: BorderRadius.circular(12),
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+        decoration: BoxDecoration(
+          color: theme.colorScheme.surface,
+          borderRadius: BorderRadius.circular(12),
+          border: Border.all(
+            color: isDarkMode
+                ? Colors.white.withValues(alpha: 0.2)
+                : Colors.black.withValues(alpha: 0.2),
+          ),
+        ),
+        child: Row(
+          children: [
+            Icon(
+              Icons.calendar_today,
+              color: theme.colorScheme.onSurface.withValues(alpha: 0.6),
+            ),
+            const SizedBox(width: 12),
+            Text(
+              _selectedDate != null
+                  ? '${_selectedDate!.day}/${_selectedDate!.month}/${_selectedDate!.year} à ${_selectedDate!.hour}:${_selectedDate!.minute.toString().padLeft(2, '0')}'
+                  : 'Choisir une date et une heure',
+              style: theme.textTheme.bodyMedium?.copyWith(
+                color: _selectedDate != null
+                    ? theme.colorScheme.onSurface
+                    : theme.colorScheme.onSurface.withValues(alpha: 0.6),
+              ),
+            ),
+            const Spacer(),
+            if (_selectedDate != null)
+              IconButton(
+                icon: const Icon(Icons.clear, size: 20),
+                onPressed: () {
+                  setState(() {
+                    _selectedDate = null;
+                  });
+                },
+                padding: EdgeInsets.zero,
+                constraints: const BoxConstraints(),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _pickDateTime() async {
+    final now = DateTime.now();
+    final initialDate = widget.trip.startDate.isAfter(now)
+        ? widget.trip.startDate
+        : now;
+
+    final date = await showDatePicker(
+      context: context,
+      initialDate: _selectedDate ?? initialDate,
+      firstDate: now.subtract(const Duration(days: 365)),
+      lastDate: now.add(const Duration(days: 365 * 2)),
+    );
+
+    if (date == null) return;
+
+    if (!mounted) return;
+
+    final time = await showTimePicker(
+      context: context,
+      initialTime: TimeOfDay.fromDateTime(_selectedDate ?? now),
+    );
+
+    if (time == null) return;
+
+    setState(() {
+      _selectedDate = DateTime(
+        date.year,
+        date.month,
+        date.day,
+        time.hour,
+        time.minute,
+      );
+    });
+  }
 }

lib/components/error/error_content.dart

@@ -79,11 +79,7 @@ class ErrorContent extends StatelessWidget {
               color: defaultIconColor?.withValues(alpha: 0.1),
               shape: BoxShape.circle,
             ),
-            child: Icon(
+            child: Icon(icon, size: 48, color: defaultIconColor),
-              icon,
-              size: 48,
-              color: defaultIconColor,
-            ),
           ),
 
           const SizedBox(height: 24),
@@ -167,9 +163,7 @@ void showErrorDialog(
     barrierDismissible: barrierDismissible,
     builder: (BuildContext dialogContext) {
       return Dialog(
-        shape: RoundedRectangleBorder(
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-          borderRadius: BorderRadius.circular(16),
-        ),
         child: ErrorContent(
           title: title,
           message: message,
@@ -187,70 +181,3 @@ void showErrorDialog(
     },
   );
 }
-
-// Fonction helper pour afficher l'erreur en bottom sheet
-void showErrorBottomSheet(
-  BuildContext context, {
-  String title = 'Une erreur est survenue',
-  required String message,
-  VoidCallback? onRetry,
-  IconData icon = Icons.error_outline,
-  Color? iconColor,
-  bool isDismissible = true,
-}) {
-  showModalBottomSheet(
-    context: context,
-    isDismissible: isDismissible,
-    enableDrag: isDismissible,
-    shape: const RoundedRectangleBorder(
-      borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
-    ),
-    builder: (BuildContext sheetContext) {
-      return SafeArea(
-        child: Padding(
-          padding: const EdgeInsets.all(16),
-          child: ErrorContent(
-            title: title,
-            message: message,
-            icon: icon,
-            iconColor: iconColor,
-            onRetry: onRetry != null
-                ? () {
-                    Navigator.of(sheetContext).pop();
-                    onRetry();
-                  }
-                : null,
-            onClose: () => Navigator.of(sheetContext).pop(),
-          ),
-        ),
-      );
-    },
-  );
-}
-
-// Fonction helper pour afficher en SnackBar (pour erreurs mineures)
-void showErrorSnackBar(
-  BuildContext context, {
-  required String message,
-  VoidCallback? onRetry,
-  Duration duration = const Duration(seconds: 4),
-}) {
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(
-      content: Text(message),
-      backgroundColor: Colors.red[400],
-      duration: duration,
-      action: onRetry != null
-          ? SnackBarAction(
-              label: 'Réessayer',
-              textColor: Colors.white,
-              onPressed: onRetry,
-            )
-          : null,
-      behavior: SnackBarBehavior.floating,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(10),
-      ),
-    ),
-  );
-}

lib/components/group/chat_group_content.dart

@@ -10,6 +10,7 @@ import '../../models/group.dart';
 import '../../models/group_member.dart';
 import '../../models/message.dart';
 import '../../repositories/group_repository.dart';
+import '../../services/error_service.dart';
 
 /// Chat group content widget for group messaging functionality.
 ///
@@ -220,12 +221,7 @@ class _ChatGroupContentState extends State<ChatGroupContent> {
                 child: BlocConsumer<MessageBloc, MessageState>(
                   listener: (context, state) {
                     if (state is MessageError) {
-                      ScaffoldMessenger.of(context).showSnackBar(
+                      ErrorService().showError(message: state.message);
-                        SnackBar(
-                          content: Text(state.message),
-                          backgroundColor: Colors.red,
-                        ),
-                      );
                     }
                   },
                   builder: (context, state) {
@@ -338,7 +334,8 @@ class _ChatGroupContentState extends State<ChatGroupContent> {
                               vertical: 12,
                             ),
                           ),
-                          maxLines: null,
+                          maxLines: 5,
+                          minLines: 1,
                           textCapitalization: TextCapitalization.sentences,
                         ),
                       ),
@@ -410,12 +407,10 @@ class _ChatGroupContentState extends State<ChatGroupContent> {
     }
 
     // Trouver le membre qui a envoyé le message pour récupérer son pseudo actuel
-    final senderMember =
+    final senderMember = widget.group.members.cast<GroupMember?>().firstWhere(
-        widget.group.members.firstWhere(
+      (m) => m?.userId == message.senderId,
-              (m) => m.userId == message.senderId,
+      orElse: () => null,
-              orElse: () => null as dynamic,
+    );
-            )
-            as dynamic;
 
     // Utiliser le pseudo actuel du membre, ou le senderName en fallback
     final displayName = senderMember != null
@@ -871,20 +866,15 @@ class _ChatGroupContentState extends State<ChatGroupContent> {
         // Le stream listener va automatiquement mettre à jour les membres
         // Pas besoin de fermer le dialog ou de faire un refresh manuel
 
-        ScaffoldMessenger.of(context).showSnackBar(
+        ErrorService().showSnackbar(
-          SnackBar(
+          message: 'Pseudo modifié en "$newPseudo"',
-            content: Text('Pseudo modifié en "$newPseudo"'),
+          isError: false,
-            backgroundColor: Colors.green,
-          ),
         );
       }
     } catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        ErrorService().showError(
-          SnackBar(
+          message: 'Erreur lors de la modification du pseudo: $e',
-            content: Text('Erreur lors de la modification du pseudo: $e'),
-            backgroundColor: Colors.red,
-          ),
         );
       }
     }

lib/components/group/group_content.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:travel_mate/components/error/error_content.dart';
+import '../../services/error_service.dart';
 import 'package:travel_mate/components/group/chat_group_content.dart';
 import 'package:travel_mate/components/widgets/user_state_widget.dart';
 import '../../blocs/user/user_bloc.dart';
@@ -50,19 +50,12 @@ class _GroupContentState extends State<GroupContent> {
         return BlocConsumer<GroupBloc, GroupState>(
           listener: (context, groupState) {
             if (groupState is GroupOperationSuccess) {
-              ScaffoldMessenger.of(context).showSnackBar(
+              ErrorService().showSnackbar(
-                SnackBar(
+                message: groupState.message,
-                  content: Text(groupState.message),
+                isError: false,
-                  backgroundColor: Colors.green,
-                ),
               );
             } else if (groupState is GroupError) {
-              ScaffoldMessenger.of(context).showSnackBar(
+              ErrorService().showError(message: groupState.message);
-                SnackBar(
-                  content: Text(groupState.message),
-                  backgroundColor: Colors.red,
-                ),
-              );
             }
           },
           builder: (context, groupState) {
@@ -209,8 +202,7 @@ class _GroupContentState extends State<GroupContent> {
       if (mounted) {
         if (retry) {
           if (userId == '') {
-            showErrorDialog(
+            ErrorService().showError(
-              context,
               title: 'Erreur utilisateur',
               message: 'Utilisateur non connecté. Veuillez vous reconnecter.',
               icon: Icons.error,
@@ -220,8 +212,7 @@ class _GroupContentState extends State<GroupContent> {
               },
             );
           } else {
-            showErrorDialog(
+            ErrorService().showError(
-              context,
               title: 'Erreur de chargement',
               message: error,
               icon: Icons.cloud_off,
@@ -232,8 +223,7 @@ class _GroupContentState extends State<GroupContent> {
             );
           }
         } else {
-          showErrorDialog(
+          ErrorService().showError(
-            context,
             title: 'Erreur',
             message: error,
             icon: Icons.error,

lib/components/home/calendar/calendar_page.dart

@@ -7,6 +7,8 @@ import '../../../models/activity.dart';
 import '../../../blocs/activity/activity_bloc.dart';
 import '../../../blocs/activity/activity_state.dart';
 import '../../../blocs/activity/activity_event.dart';
+import '../../../repositories/user_repository.dart';
+import '../../../models/user.dart';
 
 class CalendarPage extends StatefulWidget {
   final Trip trip;
@@ -20,7 +22,7 @@ class CalendarPage extends StatefulWidget {
 class _CalendarPageState extends State<CalendarPage> {
   late DateTime _focusedDay;
   DateTime? _selectedDay;
-  CalendarFormat _calendarFormat = CalendarFormat.month;
+  final CalendarFormat _calendarFormat = CalendarFormat.week;
 
   @override
   void initState() {
@@ -70,13 +72,32 @@ class _CalendarPageState extends State<CalendarPage> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
+    final isDarkMode = theme.brightness == Brightness.dark;
 
     return Scaffold(
+      backgroundColor: isDarkMode
+          ? theme.scaffoldBackgroundColor
+          : Colors.white,
       appBar: AppBar(
-        title: const Text('Calendrier du voyage'),
+        title: Text(
-        backgroundColor: theme.colorScheme.surface,
+          widget.trip.title,
-        foregroundColor: theme.colorScheme.onSurface,
+          style: theme.textTheme.titleLarge?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        centerTitle: true,
+        backgroundColor: Colors.transparent,
         elevation: 0,
+        leading: IconButton(
+          icon: Icon(Icons.arrow_back_ios, color: theme.colorScheme.onSurface),
+          onPressed: () => Navigator.pop(context),
+        ),
+        actions: [
+          IconButton(
+            icon: Icon(Icons.people, color: theme.colorScheme.onSurface),
+            onPressed: () => _showParticipantsDialog(context),
+          ),
+        ],
       ),
       body: BlocBuilder<ActivityBloc, ActivityState>(
         builder: (context, state) {
@@ -88,8 +109,7 @@ class _CalendarPageState extends State<CalendarPage> {
           if (state is ActivityLoaded) {
             allActivities = state.activities;
           } else if (state is ActivitySearchResults) {
-            // Fallback if we are in search state, though ideally we should be in loaded state
+            // Fallback if we are in search state
-            // This might happen if we navigate back and forth
           }
 
           // Filter approved activities
@@ -113,13 +133,46 @@ class _CalendarPageState extends State<CalendarPage> {
             scheduledActivities,
           );
 
+          // Sort by time
+          selectedActivities.sort((a, b) => a.date!.compareTo(b.date!));
+
           return Column(
             children: [
-              TableCalendar(
+              // Calendar Strip
+              Container(
+                margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                decoration: BoxDecoration(
+                  color: isDarkMode ? theme.cardColor : Colors.grey[100],
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: TableCalendar(
                   firstDay: DateTime.now().subtract(const Duration(days: 365)),
                   lastDay: DateTime.now().add(const Duration(days: 365)),
                   focusedDay: _focusedDay,
                   calendarFormat: _calendarFormat,
+                  headerStyle: HeaderStyle(
+                    formatButtonVisible: false,
+                    titleCentered: true,
+                    titleTextStyle: theme.textTheme.titleLarge!.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                    leftChevronIcon: const Icon(Icons.chevron_left),
+                    rightChevronIcon: const Icon(Icons.chevron_right),
+                  ),
+                  calendarStyle: CalendarStyle(
+                    todayDecoration: BoxDecoration(
+                      color: Colors.blue.withValues(alpha: 0.3),
+                      shape: BoxShape.circle,
+                    ),
+                    selectedDecoration: const BoxDecoration(
+                      color: Colors.blue,
+                      shape: BoxShape.circle,
+                    ),
+                    markerDecoration: const BoxDecoration(
+                      color: Colors.purple,
+                      shape: BoxShape.circle,
+                    ),
+                  ),
                   selectedDayPredicate: (day) {
                     return isSameDay(_selectedDay, day);
                   },
@@ -129,200 +182,76 @@ class _CalendarPageState extends State<CalendarPage> {
                       _focusedDay = focusedDay;
                     });
                   },
-                onFormatChanged: (format) {
-                  setState(() {
-                    _calendarFormat = format;
-                  });
-                },
                   onPageChanged: (focusedDay) {
                     _focusedDay = focusedDay;
                   },
                   eventLoader: (day) {
                     return _getActivitiesForDay(day, scheduledActivities);
                   },
-                calendarBuilders: CalendarBuilders(
-                  markerBuilder: (context, day, events) {
-                    if (events.isEmpty) return null;
-                    return Positioned(
-                      bottom: 1,
-                      child: Container(
-                        width: 7,
-                        height: 7,
-                        decoration: BoxDecoration(
-                          shape: BoxShape.circle,
-                          color: theme.colorScheme.primary,
                 ),
               ),
-                    );
+
-                  },
+              const SizedBox(height: 16),
-                ),
+
-                calendarStyle: CalendarStyle(
+              // Timeline View
-                  todayDecoration: BoxDecoration(
-                    color: theme.colorScheme.primary.withValues(alpha: 0.5),
-                    shape: BoxShape.circle,
-                  ),
-                  selectedDecoration: BoxDecoration(
-                    color: theme.colorScheme.primary,
-                    shape: BoxShape.circle,
-                  ),
-                ),
-              ),
-              const Divider(),
               Expanded(
-                child: Row(
+                child: SingleChildScrollView(
-                  children: [
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
-                    // Scheduled Activities for Selected Day
-                    Expanded(
-                      flex: 3,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
+                      // Timeline
+                      if (selectedActivities.isEmpty)
                         Padding(
-                            padding: const EdgeInsets.all(8.0),
+                          padding: const EdgeInsets.symmetric(vertical: 32),
-                            child: Text(
-                              'Activités du ${DateFormat('dd/MM/yyyy').format(_selectedDay!)}',
-                              style: theme.textTheme.titleMedium,
-                            ),
-                          ),
-                          Expanded(
-                            child: selectedActivities.isEmpty
-                                ? Center(
-                                    child: Text(
-                                      'Aucune activité prévue',
-                                      style: theme.textTheme.bodyMedium
-                                          ?.copyWith(
-                                            color: theme.colorScheme.onSurface
-                                                .withValues(alpha: 0.6),
-                                          ),
-                                    ),
-                                  )
-                                : ListView.builder(
-                                    itemCount: selectedActivities.length,
-                                    itemBuilder: (context, index) {
-                                      final activity =
-                                          selectedActivities[index];
-                                      return ListTile(
-                                        title: Text(activity.name),
-                                        subtitle: Text(
-                                          '${activity.category} - ${DateFormat('HH:mm').format(activity.date!)}',
-                                        ),
-                                        trailing: IconButton(
-                                          icon: const Icon(Icons.close),
-                                          onPressed: () {
-                                            context.read<ActivityBloc>().add(
-                                              UpdateActivityDate(
-                                                tripId: widget.trip.id!,
-                                                activityId: activity.id,
-                                                date: null,
-                                              ),
-                                            );
-                                          },
-                                        ),
-                                      );
-                                    },
-                                  ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    const VerticalDivider(),
-                    // Unscheduled Activities
-                    Expanded(
-                      flex: 2,
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.all(8.0),
-                            child: Text(
-                              'À planifier',
-                              style: theme.textTheme.titleMedium,
-                            ),
-                          ),
-                          Expanded(
-                            child: unscheduledActivities.isEmpty
-                                ? Center(
-                                    child: Text(
-                                      'Tout est planifié !',
-                                      style: theme.textTheme.bodyMedium
-                                          ?.copyWith(
-                                            color: theme.colorScheme.onSurface
-                                                .withValues(alpha: 0.6),
-                                          ),
-                                      textAlign: TextAlign.center,
-                                    ),
-                                  )
-                                : ListView.builder(
-                                    itemCount: unscheduledActivities.length,
-                                    itemBuilder: (context, index) {
-                                      final activity =
-                                          unscheduledActivities[index];
-                                      return Draggable<Activity>(
-                                        data: activity,
-                                        feedback: Material(
-                                          elevation: 4,
-                                          child: Container(
-                                            padding: const EdgeInsets.all(8),
-                                            color: theme.cardColor,
-                                            child: Text(activity.name),
-                                          ),
-                                        ),
-                                        child: ListTile(
-                                          title: Text(
-                                            activity.name,
-                                            style: theme.textTheme.bodySmall,
-                                          ),
-                                          trailing: IconButton(
-                                            icon: const Icon(Icons.arrow_back),
-                                            onPressed: () {
-                                              if (_selectedDay != null) {
-                                                _selectTimeAndSchedule(
-                                                  activity,
-                                                  _selectedDay!,
-                                                );
-                                              }
-                                            },
-                                          ),
-                                        ),
-                                      );
-                                    },
-                                  ),
-                          ),
-                          // Zone de drop pour le calendrier
-                          DragTarget<Activity>(
-                            onWillAcceptWithDetails: (details) => true,
-                            onAcceptWithDetails: (details) {
-                              if (_selectedDay != null) {
-                                _selectTimeAndSchedule(
-                                  details.data,
-                                  _selectedDay!,
-                                );
-                              }
-                            },
-                            builder: (context, candidateData, rejectedData) {
-                              return Container(
-                                height: 50,
-                                color: candidateData.isNotEmpty
-                                    ? theme.colorScheme.primary.withValues(
-                                        alpha: 0.1,
-                                      )
-                                    : null,
                           child: Center(
                             child: Text(
-                                    'Glisser ici pour planifier',
+                              'Aucune activité prévue ce jour',
-                                    style: TextStyle(
+                              style: theme.textTheme.bodyLarge?.copyWith(
-                                      color: theme.colorScheme.primary,
+                                color: theme.colorScheme.onSurface.withValues(
+                                  alpha: 0.5,
                                 ),
                               ),
                             ),
-                              );
-                            },
                           ),
+                        )
+                      else
+                        ...selectedActivities.map((activity) {
+                          return _buildTimelineItem(activity, theme);
+                        }),
+
+                      const SizedBox(height: 32),
+
+                      // Unscheduled Activities Section
+                      Text(
+                        'Activités à ajouter',
+                        style: theme.textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+
+                      if (unscheduledActivities.isEmpty)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          child: Text(
+                            'Toutes les activités sont planifiées !',
+                            style: theme.textTheme.bodyMedium?.copyWith(
+                              color: theme.colorScheme.onSurface.withValues(
+                                alpha: 0.5,
+                              ),
+                            ),
+                          ),
+                        )
+                      else
+                        ...unscheduledActivities.map((activity) {
+                          return _buildUnscheduledActivityCard(activity, theme);
+                        }),
+
+                      const SizedBox(height: 32),
                     ],
                   ),
                 ),
-                  ],
-                ),
               ),
             ],
           );
@@ -330,4 +259,229 @@ class _CalendarPageState extends State<CalendarPage> {
       ),
     );
   }
+
+  Widget _buildTimelineItem(Activity activity, ThemeData theme) {
+    final timeFormat = DateFormat('HH:mm'); // 10:00
+    final endTimeFormat = DateFormat('HH:mm'); // 11:30 (simulated duration)
+
+    // Simulate duration (1h30)
+    final endTime = activity.date!.add(const Duration(hours: 1, minutes: 30));
+
+    return IntrinsicHeight(
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          // Time Column
+          SizedBox(
+            width: 50,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  '${activity.date!.hour}h',
+                  style: theme.textTheme.bodyMedium?.copyWith(
+                    color: theme.colorScheme.onSurface.withValues(alpha: 0.5),
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          // Timeline Line
+          // Expanded(child: Container()), // Placeholder for line if needed
+
+          // Activity Card
+          Expanded(
+            child: Container(
+              margin: const EdgeInsets.only(bottom: 24),
+              padding: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                color: _getCategoryColor(
+                  activity.category,
+                ).withValues(alpha: 0.1),
+                borderRadius: BorderRadius.circular(12),
+                border: Border(
+                  left: BorderSide(
+                    color: _getCategoryColor(activity.category),
+                    width: 4,
+                  ),
+                ),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    activity.name,
+                    style: theme.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.bold,
+                      color: theme.colorScheme.onSurface,
+                    ),
+                  ),
+                  const SizedBox(height: 4),
+                  Text(
+                    '${timeFormat.format(activity.date!)} - ${endTimeFormat.format(endTime)}',
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      color: _getCategoryColor(activity.category),
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUnscheduledActivityCard(Activity activity, ThemeData theme) {
+    return Container(
+      margin: const EdgeInsets.only(bottom: 12),
+      decoration: BoxDecoration(
+        color: theme.cardColor,
+        borderRadius: BorderRadius.circular(16),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: 0.05),
+            blurRadius: 10,
+            offset: const Offset(0, 2),
+          ),
+        ],
+      ),
+      child: ListTile(
+        contentPadding: const EdgeInsets.all(16),
+        leading: Container(
+          padding: const EdgeInsets.all(12),
+          decoration: BoxDecoration(
+            color: _getCategoryColor(activity.category).withValues(alpha: 0.1),
+            shape: BoxShape.circle,
+          ),
+          child: Icon(
+            _getCategoryIcon(activity.category),
+            color: _getCategoryColor(activity.category),
+          ),
+        ),
+        title: Text(
+          activity.name,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        subtitle: Text(
+          activity.category,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            color: theme.colorScheme.onSurface.withValues(alpha: 0.6),
+          ),
+        ),
+        trailing: IconButton(
+          icon: const Icon(Icons.grid_view), // Drag handle icon
+          onPressed: () {
+            if (_selectedDay != null) {
+              _selectTimeAndSchedule(activity, _selectedDay!);
+            }
+          },
+        ),
+      ),
+    );
+  }
+
+  Color _getCategoryColor(String category) {
+    // Simple mapping based on category name
+    // You might want to use the enum if possible, but category is String in Activity model
+    if (category.toLowerCase().contains('musée') ||
+        category.toLowerCase().contains('museum')) {
+      return Colors.blue;
+    }
+    if (category.toLowerCase().contains('restaurant') ||
+        category.toLowerCase().contains('food')) {
+      return Colors.orange;
+    }
+    if (category.toLowerCase().contains('nature') ||
+        category.toLowerCase().contains('park')) {
+      return Colors.green;
+    }
+    if (category.toLowerCase().contains('photo') ||
+        category.toLowerCase().contains('attraction')) {
+      return Colors.purple;
+    }
+    if (category.toLowerCase().contains('détente') ||
+        category.toLowerCase().contains('relax')) {
+      return Colors.pink;
+    }
+    return Colors.teal;
+  }
+
+  IconData _getCategoryIcon(String category) {
+    if (category.toLowerCase().contains('musée')) return Icons.museum;
+    if (category.toLowerCase().contains('restaurant')) return Icons.restaurant;
+    if (category.toLowerCase().contains('nature')) return Icons.nature;
+    if (category.toLowerCase().contains('photo')) return Icons.camera_alt;
+    if (category.toLowerCase().contains('détente')) {
+      return Icons.icecream; // Gelato icon :)
+    }
+    return Icons.place;
+  }
+
+  void _showParticipantsDialog(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Participants'),
+        content: SizedBox(
+          width: double.maxFinite,
+          child: FutureBuilder<List<User>>(
+            future: UserRepository().getUsersByIds([
+              ...widget.trip.participants,
+              widget.trip.createdBy,
+            ]),
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.waiting) {
+                return const Center(child: CircularProgressIndicator());
+              }
+
+              if (snapshot.hasError) {
+                return const Center(child: Text('Erreur de chargement'));
+              }
+
+              final users = snapshot.data ?? [];
+              if (users.isEmpty) {
+                return const Center(child: Text('Aucun participant trouvé'));
+              }
+
+              return ListView.builder(
+                shrinkWrap: true,
+                itemCount: users.length,
+                itemBuilder: (context, index) {
+                  final user = users[index];
+                  final isCreator = user.id == widget.trip.createdBy;
+
+                  return ListTile(
+                    leading: CircleAvatar(
+                      backgroundImage: user.profilePictureUrl != null
+                          ? NetworkImage(user.profilePictureUrl!)
+                          : null,
+                      child: user.profilePictureUrl == null
+                          ? Text(
+                              '${user.prenom.isNotEmpty ? user.prenom[0] : ''}${user.nom.isNotEmpty ? user.nom[0] : ''}'
+                                  .toUpperCase(),
+                            )
+                          : null,
+                    ),
+                    title: Text(user.fullName),
+                    subtitle: isCreator ? const Text('Organisateur') : null,
+                  );
+                },
+              );
+            },
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Fermer'),
+          ),
+        ],
+      ),
+    );
+  }
 }

lib/components/home/calendar/calendar_page.dart_snippet

@@ -0,0 +1,59 @@
+  void _showParticipantsDialog(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Participants'),
+        content: SizedBox(
+          width: double.maxFinite,
+          child: FutureBuilder<List<User>>(
+            future: UserRepository().getUsersByIds([
+              ...widget.trip.participants,
+              widget.trip.createdBy,
+            ]),
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.waiting) {
+                return const Center(child: CircularProgressIndicator());
+              }
+              
+              if (snapshot.hasError) {
+                return const Center(child: Text('Erreur de chargement'));
+              }
+
+              final users = snapshot.data ?? [];
+              if (users.isEmpty) {
+                return const Center(child: Text('Aucun participant trouvé'));
+              }
+
+              return ListView.builder(
+                shrinkWrap: true,
+                itemCount: users.length,
+                itemBuilder: (context, index) {
+                  final user = users[index];
+                  final isCreator = user.id == widget.trip.createdBy;
+                  
+                  return ListTile(
+                    leading: CircleAvatar(
+                      backgroundImage: user.photoUrl != null
+                          ? NetworkImage(user.photoUrl!)
+                          : null,
+                      child: user.photoUrl == null
+                          ? Text(user.initials)
+                          : null,
+                    ),
+                    title: Text(user.fullName),
+                    subtitle: isCreator ? const Text('Organisateur') : null,
+                  );
+                },
+              );
+            },
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Fermer'),
+          ),
+        ],
+      ),
+    );
+  }

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';
@@ -23,6 +24,7 @@ import 'package:flutter_dotenv/flutter_dotenv.dart';
 import '../../services/place_image_service.dart';
 import '../../services/trip_geocoding_service.dart';
 import '../../services/logger_service.dart';
+import '../../firebase_options.dart';
 
 /// Create trip content widget for trip creation and editing functionality.
 ///
@@ -84,7 +86,9 @@ 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 {
+    return DefaultFirebaseOptions.currentPlatform.apiKey;
+  }
 
   /// Participant management
   final List<String> _participants = [];
@@ -123,7 +127,11 @@ class _CreateTripContentState extends State<CreateTripContent> {
     }
   }
 
+  bool _isProgrammaticUpdate = false;
+
   void _onLocationChanged() {
+    if (_isProgrammaticUpdate) return;
+
     final query = _locationController.text.trim();
 
     if (query.length < 2) {
@@ -203,15 +211,18 @@ class _CreateTripContentState extends State<CreateTripContent> {
 
     if (_placeSuggestions.isEmpty) return;
 
+    final overlay = Overlay.of(context);
+
+    // Calculer la largeur correcte en fonction du padding parent (16 margin + 24 padding = 40 de chaque côté)
+    final width = MediaQuery.of(context).size.width - 80;
+
     _suggestionsOverlay = OverlayEntry(
       builder: (context) => Positioned(
-        width:
+        width: width,
-            MediaQuery.of(context).size.width -
-            32, // Largeur du champ avec padding
         child: CompositedTransformFollower(
           link: _layerLink,
           showWhenUnlinked: false,
-          offset: const Offset(0, 60), // Position sous le champ
+          targetAnchor: Alignment.bottomLeft,
           child: Material(
             elevation: 4,
             borderRadius: BorderRadius.circular(8),
@@ -224,6 +235,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
               ),
               child: ListView.builder(
                 shrinkWrap: true,
+                padding: EdgeInsets.zero,
                 itemCount: _placeSuggestions.length,
                 itemBuilder: (context, index) {
                   final suggestion = _placeSuggestions[index];
@@ -244,7 +256,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
       ),
     );
 
-    Overlay.of(context).insert(_suggestionsOverlay!);
+    overlay.insert(_suggestionsOverlay!);
   }
 
   void _hideSuggestions() {
@@ -253,7 +265,10 @@ class _CreateTripContentState extends State<CreateTripContent> {
   }
 
   void _selectSuggestion(PlaceSuggestion suggestion) {
+    _isProgrammaticUpdate = true;
     _locationController.text = suggestion.description;
+    _isProgrammaticUpdate = false;
+
     _hideSuggestions();
     setState(() {
       _placeSuggestions = [];
@@ -876,17 +891,16 @@ class _CreateTripContentState extends State<CreateTripContent> {
     final emailRegex = RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
     if (!emailRegex.hasMatch(email)) {
       if (mounted) {
-        ScaffoldMessenger.of(
+        _errorService.showError(message: 'Email invalide');
-          context,
-        ).showSnackBar(SnackBar(content: Text('Email invalide')));
       }
       return;
     }
 
     if (_participants.contains(email)) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showSnackbar(
-          SnackBar(content: Text('Ce participant est déjà ajouté')),
+          message: 'Ce participant est déjà ajouté',
+          isError: true,
         );
       }
       return;
@@ -962,11 +976,9 @@ class _CreateTripContentState extends State<CreateTripContent> {
       }
 
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showSnackbar(
-          SnackBar(
+          message: 'Groupe et compte mis à jour avec succès !',
-            content: Text('Groupe et compte mis à jour avec succès !'),
+          isError: false,
-            backgroundColor: Colors.green,
-          ),
         );
         setState(() {
           _isLoading = false;
@@ -1048,11 +1060,9 @@ class _CreateTripContentState extends State<CreateTripContent> {
       );
 
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showSnackbar(
-          SnackBar(
+          message: 'Voyage, groupe et compte créés avec succès !',
-            content: Text('Voyage, groupe et compte créés avec succès !'),
+          isError: false,
-            backgroundColor: Colors.green,
-          ),
         );
         setState(() {
           _isLoading = false;
@@ -1066,9 +1076,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
       );
 
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showError(message: 'Erreur: $e');
-          SnackBar(content: Text('Erreur: $e'), backgroundColor: Colors.red),
-        );
         setState(() {
           _isLoading = false;
         });
@@ -1083,8 +1091,9 @@ class _CreateTripContentState extends State<CreateTripContent> {
 
     if (_startDate == null || _endDate == null) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showSnackbar(
-          SnackBar(content: Text('Veuillez sélectionner les dates')),
+          message: 'Veuillez sélectionner les dates',
+          isError: true,
         );
       }
       return;
@@ -1129,14 +1138,10 @@ class _CreateTripContentState extends State<CreateTripContent> {
         // Continuer sans coordonnées en cas d'erreur
         tripWithCoordinates = trip;
         if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
+          _errorService.showSnackbar(
-            SnackBar(
+            message:
-              content: Text(
                 'Voyage créé sans géolocalisation (pas d\'impact sur les fonctionnalités)',
-              ),
+            isError: true, // Warning displayed as error for now
-              backgroundColor: Colors.orange,
-              duration: Duration(seconds: 2),
-            ),
           );
         }
       }
@@ -1167,9 +1172,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
       }
     } catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showError(message: 'Erreur: $e');
-          SnackBar(content: Text('Erreur: $e'), backgroundColor: Colors.red),
-        );
 
         setState(() {
           _isLoading = false;
@@ -1200,11 +1203,9 @@ class _CreateTripContentState extends State<CreateTripContent> {
           });
         } else {
           if (mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
+            _errorService.showSnackbar(
-              SnackBar(
+              message: 'Utilisateur non trouvé: $email',
-                content: Text('Utilisateur non trouvé: $email'),
+              isError: true,
-                backgroundColor: Colors.orange,
-              ),
             );
           }
         }

lib/components/home/home_content.dart

@@ -11,6 +11,7 @@ import '../../blocs/trip/trip_bloc.dart';
 import '../../blocs/trip/trip_state.dart';
 import '../../blocs/trip/trip_event.dart';
 import '../../models/trip.dart';
+import '../../services/error_service.dart';
 
 /// Home content widget for the main application dashboard.
 ///
@@ -79,26 +80,16 @@ class _HomeContentState extends State<HomeContent>
         return BlocConsumer<TripBloc, TripState>(
           listener: (context, tripState) {
             if (tripState is TripOperationSuccess) {
-              ScaffoldMessenger.of(context).showSnackBar(
+              ErrorService().showSnackbar(
-                SnackBar(
+                message: tripState.message,
-                  content: Text(tripState.message),
+                isError: false,
-                  backgroundColor: Colors.green,
-                ),
               );
             } else if (tripState is TripError) {
-              ScaffoldMessenger.of(context).showSnackBar(
+              ErrorService().showError(message: tripState.message);
-                SnackBar(
-                  content: Text(tripState.message),
-                  backgroundColor: Colors.red,
-                ),
-              );
             } else if (tripState is TripCreated) {
-              ScaffoldMessenger.of(context).showSnackBar(
+              ErrorService().showSnackbar(
-                SnackBar(
+                message: 'Voyage en cours de création...',
-                  content: Text('Voyage en cours de création...'),
+                isError: false,
-                  backgroundColor: Colors.blue,
-                  duration: Duration(seconds: 1),
-                ),
               );
             }
           },
@@ -155,6 +146,7 @@ class _HomeContentState extends State<HomeContent>
                 ),
               ),
               floatingActionButton: FloatingActionButton(
+                heroTag: 'home_fab',
                 onPressed: () async {
                   final tripBloc = context.read<TripBloc>();
 

lib/components/home/show_trip_details_content.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:travel_mate/blocs/trip/trip_bloc.dart';
 import 'package:travel_mate/blocs/trip/trip_event.dart';
@@ -9,14 +9,31 @@ import 'package:travel_mate/components/home/create_trip_content.dart';
 import 'package:travel_mate/models/trip.dart';
 import 'package:travel_mate/components/map/map_content.dart';
 import 'package:travel_mate/services/error_service.dart';
-import 'package:travel_mate/services/activity_cache_service.dart';
+import 'package:travel_mate/services/logger_service.dart';
+
 import 'package:travel_mate/repositories/group_repository.dart';
 import 'package:travel_mate/repositories/user_repository.dart';
 import 'package:travel_mate/repositories/account_repository.dart';
 import 'package:travel_mate/models/group_member.dart';
 import 'package:travel_mate/components/activities/activities_page.dart';
+import 'package:travel_mate/components/activities/activity_detail_dialog.dart';
 import 'package:travel_mate/components/home/calendar/calendar_page.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:intl/intl.dart';
+import 'package:travel_mate/models/activity.dart';
+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;
+import 'package:travel_mate/components/account/group_expenses_page.dart';
+import 'package:travel_mate/models/group.dart';
+import 'package:travel_mate/models/account.dart';
+import 'package:travel_mate/models/user_balance.dart';
 
 class ShowTripDetailsContent extends StatefulWidget {
   final Trip trip;
@@ -28,49 +45,48 @@ class ShowTripDetailsContent extends StatefulWidget {
 
 class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
   final ErrorService _errorService = ErrorService();
-  final ActivityCacheService _cacheService = ActivityCacheService();
   final GroupRepository _groupRepository = GroupRepository();
   final UserRepository _userRepository = UserRepository();
   final AccountRepository _accountRepository = AccountRepository();
 
+  Group? _group;
+  Account? _account;
+
   @override
   void initState() {
     super.initState();
-    // Lancer la recherche d'activités Google en arrière-plan
+    // Charger les activités du voyage depuis la DB
-    _preloadGoogleActivities();
+    if (widget.trip.id != null) {
+      context.read<ActivityBloc>().add(LoadActivities(widget.trip.id!));
+      _loadGroupAndAccount();
+    }
   }
 
-  /// Précharger les activités Google en arrière-plan
+  Future<void> _loadGroupAndAccount() async {
-  void _preloadGoogleActivities() {
+    if (widget.trip.id == null) return;
-    // Attendre un moment avant de lancer la recherche pour ne pas bloquer l'UI
-    Future.delayed(const Duration(milliseconds: 500), () {
-      if (mounted && widget.trip.id != null) {
-        // Vérifier si on a déjà des activités en cache
-        if (_cacheService.hasCachedActivities(widget.trip.id!)) {
-          return; // Utiliser le cache
-        }
 
-        // Sinon, lancer la recherche avec le maximum d'activités
+    try {
-        context.read<ActivityBloc>().add(
+      final group = await _groupRepository.getGroupByTripId(widget.trip.id!);
-          widget.trip.hasCoordinates
+      final account = await _accountRepository.getAccountByTripId(
-              ? SearchActivitiesWithCoordinates(
+        widget.trip.id!,
-                  tripId: widget.trip.id!,
+      );
-                  latitude: widget.trip.latitude!,
+
-                  longitude: widget.trip.longitude!,
+      if (mounted) {
-                  category: null,
+        setState(() {
-                  maxResults: 100, // Charger le maximum d'activités possible
+          _group = group;
-                  reset: true,
+          _account = account;
-                )
+        });
-              : SearchActivities(
+
-                  tripId: widget.trip.id!,
+        if (group != null) {
-                  destination: widget.trip.location,
+          context.read<BalanceBloc>().add(LoadGroupBalances(group.id));
-                  category: null,
+        }
-                  maxResults: 100, // Charger le maximum d'activités possible
+      }
-                  reset: true,
+    } catch (e) {
-                ),
+      _errorService.logError(
+        'ShowTripDetailsContent',
+        'Error loading group/account: $e',
       );
     }
-    });
   }
 
   // Calculer les jours restants avant le voyage
@@ -227,30 +243,38 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
 
   // Méthode pour ouvrir Waze
   Future<void> _openWaze() async {
-    final location = Uri.encodeComponent(widget.trip.location);
-
     try {
-      // Essayer d'abord l'URL scheme pour l'app mobile
+      String wazeUrl;
-      final appUrl = 'waze://?q=$location';
+
-      final appUri = Uri.parse(appUrl);
+      // Utiliser les coordonnées si disponibles (plus précis)
-      if (await canLaunchUrl(appUri)) {
+      if (widget.trip.latitude != null && widget.trip.longitude != null) {
-        await launchUrl(appUri);
+        final lat = widget.trip.latitude;
-        return;
+        final lng = widget.trip.longitude;
+        // Format: https://www.waze.com/ul?ll=lat%2Clng&navigate=yes
+        wazeUrl = 'https://www.waze.com/ul?ll=$lat%2C$lng&navigate=yes';
+        LoggerService.info('Opening Waze with coordinates: $lat, $lng');
+      } else {
+        // Fallback sur l'adresse/nom
+        final location = Uri.encodeComponent(widget.trip.location);
+        wazeUrl = 'https://www.waze.com/ul?q=$location&navigate=yes';
+        LoggerService.info(
+          'Opening Waze with location query: ${widget.trip.location}',
+        );
       }
 
-      // Fallback vers l'URL web
+      final uri = Uri.parse(wazeUrl);
-      final webUrl = 'https://waze.com/ul?q=$location';
-      final webUri = Uri.parse(webUrl);
-      if (await canLaunchUrl(webUri)) {
-        await launchUrl(webUri, mode: LaunchMode.externalApplication);
-        return;
-      }
 
+      if (await canLaunchUrl(uri)) {
+        await launchUrl(uri, mode: LaunchMode.externalApplication);
+      } else {
+        LoggerService.warning('Could not launch Waze URL: $wazeUrl');
         _errorService.showError(
           message:
               'Impossible d\'ouvrir Waze. Vérifiez que l\'application est installée.',
         );
+      }
     } catch (e) {
+      LoggerService.error('Error opening Waze', error: e);
       _errorService.showError(message: 'Erreur lors de l\'ouverture de Waze');
     }
   }
@@ -446,7 +470,19 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                         icon: Icons.account_balance_wallet,
                         title: 'Dépenses',
                         color: Colors.orange,
-                        onTap: () => _showComingSoon('Dépenses'),
+                        onTap: () {
+                          if (_group != null && _account != null) {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                builder: (context) => GroupExpensesPage(
+                                  group: _group!,
+                                  account: _account!,
+                                ),
+                              ),
+                            );
+                          }
+                        },
                       ),
                       _buildActionButton(
                         icon: Icons.map,
@@ -546,15 +582,6 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
     );
   }
 
-  void _showComingSoon(String feature) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        content: Text('$feature - Fonctionnalité à venir'),
-        backgroundColor: Colors.blue,
-      ),
-    );
-  }
-
   void _showOptionsMenu() {
     final theme = Theme.of(context);
 
@@ -564,13 +591,25 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
       ),
-      builder: (context) => Container(
+      builder: (context) {
+        return BlocBuilder<UserBloc, user_state.UserState>(
+          builder: (context, state) {
+            final currentUser = state is user_state.UserLoaded
+                ? state.user
+                : null;
+            final isCreator = currentUser?.id == widget.trip.createdBy;
+
+            return Container(
               padding: const EdgeInsets.all(20),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
+                  if (isCreator) ...[
                     ListTile(
-              leading: Icon(Icons.edit, color: theme.colorScheme.primary),
+                      leading: Icon(
+                        Icons.edit,
+                        color: theme.colorScheme.primary,
+                      ),
                       title: Text(
                         'Modifier le voyage',
                         style: theme.textTheme.bodyLarge?.copyWith(
@@ -593,21 +632,125 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                       title: Text(
                         'Supprimer le voyage',
                         style: theme.textTheme.bodyLarge?.copyWith(
-                  color: theme.colorScheme.onSurface,
+                          color: Colors.red,
                         ),
                       ),
                       onTap: () {
                         Navigator.pop(context);
-                _showDeleteConfirmation();
+                        _confirmDeleteTrip();
+                      },
+                    ),
+                    const Divider(),
+                  ],
+                  if (!isCreator)
+                    ListTile(
+                      leading: Icon(Icons.exit_to_app, color: Colors.red[400]),
+                      title: Text(
+                        'Quitter le voyage',
+                        style: theme.textTheme.bodyLarge?.copyWith(
+                          color: Colors.red[400],
+                        ),
+                      ),
+                      onTap: () {
+                        Navigator.pop(context);
+                        _handleLeaveTrip(currentUser);
                       },
                     ),
                 ],
               ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  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 _showDeleteConfirmation() {
+  void _confirmDeleteTrip() {
     final theme = Theme.of(context);
 
     showDialog(
@@ -868,11 +1011,8 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                   _addParticipantByEmail(emailController.text);
                   Navigator.pop(context);
                 } else {
-                  ScaffoldMessenger.of(context).showSnackBar(
+                  _errorService.showError(
-                    const SnackBar(
+                    message: 'Veuillez entrer un email valide',
-                      content: Text('Veuillez entrer un email valide'),
-                      backgroundColor: Colors.red,
-                    ),
                   );
                 }
               },
@@ -940,11 +1080,9 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
               TripUpdateRequested(trip: updatedTrip),
             );
 
-            ScaffoldMessenger.of(context).showSnackBar(
+            _errorService.showSnackbar(
-              SnackBar(
+              message: '${user.prenom} a été ajouté au voyage',
-                content: Text('${user.prenom} a été ajouté au voyage'),
+              isError: false,
-                backgroundColor: Colors.green,
-              ),
             );
 
             // Rafraîchir la page
@@ -970,6 +1108,28 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
 
   Widget _buildNextActivitiesSection() {
     final theme = Theme.of(context);
+
+    return BlocBuilder<ActivityBloc, ActivityState>(
+      builder: (context, state) {
+        List<Activity> activities = [];
+        if (state is ActivityLoaded) {
+          activities = state.activities;
+        }
+
+        // Filter scheduled activities and sort by date
+        final scheduledActivities = activities
+            .where((a) => a.date != null && a.date!.isAfter(DateTime.now()))
+            .toList();
+
+        scheduledActivities.sort((a, b) => a.date!.compareTo(b.date!));
+
+        // Take next 3 activities
+        final nextActivities = scheduledActivities.take(3).toList();
+
+        if (nextActivities.isEmpty) {
+          return const SizedBox.shrink();
+        }
+
         return Column(
           children: [
             Row(
@@ -983,9 +1143,14 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                   ),
                 ),
                 TextButton(
-              onPressed: () => _navigateToActivities(),
+                  onPressed: () => Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => CalendarPage(trip: widget.trip),
+                    ),
+                  ),
                   child: Text(
-                'Tout voir',
+                    'Voir calendrier',
                     style: TextStyle(
                       color: Colors.teal,
                       fontWeight: FontWeight.w600,
@@ -995,30 +1160,45 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
               ],
             ),
             const SizedBox(height: 8),
-        _buildActivityCard(
+            ...nextActivities.map((activity) {
-          title: 'Visite du Colisée',
+              if (activity.date == null) return const SizedBox.shrink();
-          date: '11 août, 10:00',
+              return Padding(
-          icon: Icons.museum,
+                padding: const EdgeInsets.only(bottom: 12),
-        ),
+                child: _buildActivityCard(activity: activity),
-        const SizedBox(height: 12),
+              );
-        _buildActivityCard(
+            }),
-          title: 'Dîner à Trastevere',
-          date: '11 août, 20:30',
-          icon: Icons.restaurant,
-        ),
           ],
         );
+      },
+    );
   }
 
-  Widget _buildActivityCard({
+  IconData _getCategoryIcon(String category) {
-    required String title,
+    if (category.toLowerCase().contains('musée')) return Icons.museum;
-    required String date,
+    if (category.toLowerCase().contains('restaurant')) return Icons.restaurant;
-    required IconData icon,
+    if (category.toLowerCase().contains('nature')) return Icons.nature;
-  }) {
+    if (category.toLowerCase().contains('photo')) return Icons.camera_alt;
+    if (category.toLowerCase().contains('détente')) return Icons.icecream;
+    return Icons.place;
+  }
+
+  Widget _buildActivityCard({required Activity activity}) {
     final theme = Theme.of(context);
     final isDarkMode = theme.brightness == Brightness.dark;
 
-    return Container(
+    final date = activity.date != null
+        ? DateFormat('d MMM, HH:mm', 'fr_FR').format(activity.date!)
+        : 'Date inconnue';
+    final icon = _getCategoryIcon(activity.category);
+
+    return GestureDetector(
+      onTap: () {
+        showDialog(
+          context: context,
+          builder: (context) => ActivityDetailDialog(activity: activity),
+        );
+      },
+      child: Container(
         padding: const EdgeInsets.all(16),
         decoration: BoxDecoration(
           color: theme.cardColor,
@@ -1053,7 +1233,7 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
-                  title,
+                    activity.name,
                     style: theme.textTheme.bodyLarge?.copyWith(
                       fontWeight: FontWeight.bold,
                       color: theme.colorScheme.onSurface,
@@ -1075,13 +1255,116 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
             ),
           ],
         ),
+      ),
     );
   }
 
   Widget _buildExpensesCard() {
     final theme = Theme.of(context);
 
-    return Container(
+    return BlocBuilder<BalanceBloc, BalanceState>(
+      builder: (context, state) {
+        String balanceText = 'Chargement...';
+        bool isLoading = state is BalanceLoading;
+        bool isPositive = true;
+
+        if (state is GroupBalancesLoaded) {
+          final userState = context.read<UserBloc>().state;
+          if (userState is user_state.UserLoaded) {
+            final currentUserId = userState.user.id;
+
+            // Filter settlements involving the current user
+            final mySettlements = state.settlements
+                .where(
+                  (s) =>
+                      !s.isCompleted &&
+                      (s.fromUserId == currentUserId ||
+                          s.toUserId == currentUserId),
+                )
+                .toList();
+
+            if (mySettlements.isEmpty) {
+              // Check if user has a balance of 0
+              final myBalanceObj = state.balances.firstWhere(
+                (b) => b.userId == currentUserId,
+                orElse: () => const UserBalance(
+                  userId: '',
+                  userName: '',
+                  totalPaid: 0,
+                  totalOwed: 0,
+                  balance: 0,
+                ),
+              );
+
+              if (myBalanceObj.balance.abs() < 0.01) {
+                balanceText = 'Vous êtes à jour';
+              } else {
+                // Fallback to total balance if no settlements found but balance exists
+                isPositive = myBalanceObj.balance >= 0;
+                final amountStr =
+                    '${myBalanceObj.balance.abs().toStringAsFixed(2)} €';
+                balanceText = isPositive
+                    ? 'On vous doit $amountStr'
+                    : 'Vous devez $amountStr';
+              }
+            } else {
+              // Construct detailed string
+              final debtsToPay = mySettlements
+                  .where((s) => s.fromUserId == currentUserId)
+                  .toList();
+              final debtsToReceive = mySettlements
+                  .where((s) => s.toUserId == currentUserId)
+                  .toList();
+
+              if (debtsToPay.isNotEmpty) {
+                isPositive = false;
+                final details = debtsToPay
+                    .map(
+                      (s) =>
+                          '${s.amount.toStringAsFixed(2)}€ à ${s.toUserName}',
+                    )
+                    .join(' et ');
+                balanceText = 'Vous devez $details';
+              } else if (debtsToReceive.isNotEmpty) {
+                isPositive = true;
+                final details = debtsToReceive
+                    .map(
+                      (s) =>
+                          '${s.amount.toStringAsFixed(2)}€ de ${s.fromUserName}',
+                    )
+                    .join(' et ');
+                balanceText =
+                    'On vous doit $details'; // Or "X owes you..." but "On vous doit" is generic enough or we can be specific
+                // Let's be specific as requested: "X doit vous payer..." or similar?
+                // The user asked: "vous devez 21 euros à John..." (active voice for user paying).
+                // For receiving, "John vous doit 21 euros..." would be symmetric.
+                // Let's try to match the requested format for paying first.
+
+                if (debtsToReceive.length == 1) {
+                  balanceText =
+                      '${debtsToReceive.first.fromUserName} vous doit ${debtsToReceive.first.amount.toStringAsFixed(2)}€';
+                } else {
+                  balanceText =
+                      '${debtsToReceive.map((s) => '${s.fromUserName} (${s.amount.toStringAsFixed(2)}€)').join(' et ')} vous doivent de l\'argent';
+                }
+              }
+            }
+          }
+        }
+
+        return GestureDetector(
+          onTap: () {
+            if (_group != null && _account != null) {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) =>
+                      GroupExpensesPage(group: _group!, account: _account!),
+                ),
+              );
+            }
+          },
+          child: Container(
             margin: const EdgeInsets.only(top: 24),
             padding: const EdgeInsets.all(16),
             decoration: BoxDecoration(
@@ -1115,17 +1398,38 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                         ),
                       ),
                       const SizedBox(height: 4),
+                      if (isLoading)
+                        const SizedBox(
+                          height: 20,
+                          width: 20,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      else
                         Text(
-                  'Vous devez 25€ à Clara',
+                          balanceText,
                           style: theme.textTheme.bodyMedium?.copyWith(
                             color: const Color(0xFF8D6E63), // Lighter brown
                           ),
+                          maxLines: 2,
+                          overflow: TextOverflow.ellipsis,
                         ),
                     ],
                   ),
                 ),
                 TextButton(
-            onPressed: () => _showComingSoon('Régler les dépenses'),
+                  onPressed: () {
+                    if (_group != null && _account != null) {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) => GroupExpensesPage(
+                            group: _group!,
+                            account: _account!,
+                          ),
+                        ),
+                      );
+                    }
+                  },
                   child: Text(
                     'Régler',
                     style: TextStyle(
@@ -1136,6 +1440,9 @@ class _ShowTripDetailsContentState extends State<ShowTripDetailsContent> {
                 ),
               ],
             ),
+          ),
+        );
+      },
     );
   }
 }

lib/components/home/trip_card.dart

@@ -41,12 +41,9 @@ class _TripCardState extends State<TripCard> {
     });
 
     try {
-      // D'abord vérifier si une image existe déjà dans le Storage
       String? imageUrl = await _placeImageService.getExistingImageUrl(
         widget.trip.location,
       );
-
-      // Si aucune image n'existe, en télécharger une nouvelle
       imageUrl ??= await _placeImageService.getPlaceImageUrl(
         widget.trip.location,
       );
@@ -57,7 +54,6 @@ class _TripCardState extends State<TripCard> {
           _isLoadingImage = false;
         });
 
-        // Mettre à jour le voyage dans la base de données avec l'imageUrl
         _updateTripWithImage(imageUrl);
       } else {
         setState(() {
@@ -76,18 +72,13 @@ class _TripCardState extends State<TripCard> {
   Future<void> _updateTripWithImage(String imageUrl) async {
     try {
       if (widget.trip.id != null) {
-        // Créer une copie du voyage avec la nouvelle imageUrl
         final updatedTrip = widget.trip.copyWith(
           imageUrl: imageUrl,
           updatedAt: DateTime.now(),
         );
-
-        // Mettre à jour dans la base de données
         await _tripRepository.updateTrip(widget.trip.id!, updatedTrip);
       }
-    } catch (e) {
+    } catch (e) {}
-      // En cas d'erreur, on continue sans échec - l'image reste affichée localement
-    }
   }
 
   Widget _buildImageWidget() {

lib/components/loading/laoding_content.dart

@@ -58,6 +58,9 @@ class _LoadingContentState extends State<LoadingContent>
         }
       } catch (e) {
         debugPrint('Erreur lors de la tâche en arrière-plan: $e');
+        if (mounted) {
+          Navigator.pop(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';
@@ -5,6 +6,11 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'dart:ui' as ui;
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import '../../firebase_options.dart';
+import '../../services/error_service.dart';
+import '../../services/map_navigation_service.dart';
+import '../../services/logger_service.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 class MapContent extends StatefulWidget {
   final String? initialSearchQuery;
@@ -17,6 +23,7 @@ class MapContent extends StatefulWidget {
 class _MapContentState extends State<MapContent> {
   GoogleMapController? _mapController;
   LatLng _initialPosition = const LatLng(48.8566, 2.3522);
+  LatLng? _currentMapCenter;
   final TextEditingController _searchController = TextEditingController();
   bool _isLoadingLocation = false;
   bool _isSearching = false;
@@ -27,13 +34,44 @@ class _MapContentState extends State<MapContent> {
 
   List<PlaceSuggestion> _suggestions = [];
 
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+  static String get _apiKey {
+    return DefaultFirebaseOptions.currentPlatform.apiKey;
+  }
 
   @override
   void initState() {
     super.initState();
-    // Si une recherche initiale est fournie, la pré-remplir et lancer la recherche
+
-    if (widget.initialSearchQuery != null &&
+    final mapService = context.read<MapNavigationService>();
+
+    // Écouter les nouvelles demandes
+    mapService.requestStream.listen((request) {
+      LoggerService.info(
+        'MapContent: Received navigation request: ${request.name}',
+      );
+      _handleNavigationRequest(request);
+    });
+
+    // Vérifier s'il y a une demande de navigation en attente
+    if (mapService.lastRequest != null) {
+      LoggerService.info(
+        'MapContent: Found pending navigation request: ${mapService.lastRequest!.name}',
+      );
+      // Handle synchronously for initial build
+      final request = mapService.lastRequest!;
+      final position = LatLng(request.latitude, request.longitude);
+      _initialPosition = position;
+      _markers.add(
+        Marker(
+          markerId: MarkerId(
+            'nav_request_${request.timestamp.millisecondsSinceEpoch}',
+          ),
+          position: position,
+          infoWindow: InfoWindow(title: request.name ?? 'Lieu sélectionné'),
+        ),
+      );
+      // Ne pas lancer _getCurrentLocation() ici pour ne pas écraser la position
+    } else if (widget.initialSearchQuery != null &&
         widget.initialSearchQuery!.isNotEmpty) {
       _searchController.text = widget.initialSearchQuery!;
       // Lancer la recherche automatiquement après un court délai pour laisser l'interface se charger
@@ -46,6 +84,54 @@ class _MapContentState extends State<MapContent> {
     }
   }
 
+  void _handleNavigationRequest(MapLocationRequest request) {
+    if (!mounted) return;
+
+    LoggerService.info(
+      'MapContent: Handling navigation request to ${request.latitude}, ${request.longitude}',
+    );
+    final position = LatLng(request.latitude, request.longitude);
+
+    setState(() {
+      // Garder le marqueur de position utilisateur
+      _markers.removeWhere((m) => m.markerId.value != 'user_location');
+
+      // Ajouter le marqueur pour le lieu demandé
+      _markers.add(
+        Marker(
+          markerId: MarkerId(
+            'nav_request_${request.timestamp.millisecondsSinceEpoch}',
+          ),
+          position: position,
+          infoWindow: InfoWindow(title: request.name ?? 'Lieu sélectionné'),
+        ),
+      );
+      _isSearching = false;
+    });
+
+    // Animer la caméra si le contrôleur est prêt
+    if (_mapController != null) {
+      LoggerService.info(
+        'MapContent: Waiting for map to be visible before animating',
+      );
+      // Attendre un peu que l'onglet change et que la carte soit visible
+      Future.delayed(const Duration(milliseconds: 500), () {
+        if (mounted && _mapController != null) {
+          LoggerService.info('MapContent: Animating camera to position');
+          _mapController!.animateCamera(
+            CameraUpdate.newLatLngZoom(position, 15),
+          );
+        }
+      });
+    } else {
+      LoggerService.info(
+        'MapContent: MapController not ready, setting initial position',
+      );
+      // Si le contrôleur n'est pas encore prêt, définir la position initiale
+      _initialPosition = position;
+    }
+  }
+
   @override
   void dispose() {
     _searchController.dispose();
@@ -228,20 +314,30 @@ class _MapContentState extends State<MapContent> {
     }
   }
 
-  // Créer une icône personnalisée à partir de l'icône Material
+  // Créer une icône personnalisée
-  Future<BitmapDescriptor> _createCustomMarkerIcon() async {
+  Future<BitmapDescriptor> _createMarkerIcon(
+    IconData iconData,
+    Color color, {
+    double size = 60.0,
+  }) async {
     final pictureRecorder = ui.PictureRecorder();
     final canvas = Canvas(pictureRecorder);
-    const size = 120.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),
+      text: String.fromCharCode(iconData.codePoint),
       style: TextStyle(
-        fontSize: 100,
+        fontSize: size,
-        fontFamily: Icons.person_pin_circle.fontFamily,
+        fontFamily: iconData.fontFamily,
-        color: Colors.blue[700],
+        package: iconData.fontPackage,
+        color: color,
+        shadows: [
+          Shadow(
+            offset: const Offset(1, 1),
+            blurRadius: 2,
+            color: Colors.black.withValues(alpha: 0.3),
+          ),
+        ],
       ),
     );
     iconPainter.layout();
@@ -271,8 +367,12 @@ class _MapContentState extends State<MapContent> {
       ),
     );
 
-    // Créer l'icône personnalisée
+    // Créer l'icône personnalisée (plus petite: 60 au lieu de 80)
-    final icon = await _createCustomMarkerIcon();
+    final icon = await _createMarkerIcon(
+      Icons.person_pin_circle,
+      Colors.blue[700]!,
+      size: 60.0,
+    );
 
     // Ajouter le marqueur avec l'icône
     setState(() {
@@ -281,10 +381,7 @@ class _MapContentState extends State<MapContent> {
           markerId: const MarkerId('user_location'),
           position: position,
           icon: icon,
-          anchor: const Offset(
+          anchor: const Offset(0.5, 0.85), // Ancrer au bas de l'icône
-            0.5,
-            0.85,
-          ), // Ancrer au bas de l'icône (le point du pin)
           infoWindow: InfoWindow(
             title: 'Ma position',
             snippet:
@@ -308,10 +405,21 @@ class _MapContentState extends State<MapContent> {
     });
 
     try {
+      final apiKey = _apiKey;
+      LoggerService.info('MapContent: Searching places with query "$query"');
+      if (apiKey.isEmpty) {
+        LoggerService.error('MapContent: API Key is empty!');
+      } else {
+        // Log first few chars to verify correct key is loaded without leaking full key
+        LoggerService.info(
+          'MapContent: Using API Key starting with ${apiKey.substring(0, 5)}...',
+        );
+      }
+
       final url = Uri.parse(
         'https://maps.googleapis.com/maps/api/place/autocomplete/json'
         '?input=${Uri.encodeComponent(query)}'
-        '&key=$_apiKey'
+        '&key=$apiKey'
         '&language=fr',
       );
 
@@ -319,11 +427,21 @@ class _MapContentState extends State<MapContent> {
 
       if (!mounted) return;
 
+      LoggerService.info(
+        'MapContent: Response status code: ${response.statusCode}',
+      );
+
       if (response.statusCode == 200) {
         final data = json.decode(response.body);
+        final status = data['status'];
 
-        if (data['status'] == 'OK') {
+        LoggerService.info('MapContent: API Status: $status');
+
+        if (status == 'OK') {
           final predictions = data['predictions'] as List;
+          LoggerService.info(
+            'MapContent: Found ${predictions.length} predictions',
+          );
 
           setState(() {
             _suggestions = predictions
@@ -337,13 +455,19 @@ class _MapContentState extends State<MapContent> {
             _isSearching = false;
           });
         } else {
+          LoggerService.error(
+            'MapContent: API Error: $status - ${data['error_message'] ?? "No error message"}',
+          );
           setState(() {
             _suggestions = [];
             _isSearching = false;
           });
         }
+      } else {
+        LoggerService.error('MapContent: HTTP Error ${response.statusCode}');
       }
     } catch (e) {
+      LoggerService.error('MapContent: Exception during search: $e');
       _showError('Erreur lors de la recherche de lieux: $e');
       setState(() {
         _isSearching = false;
@@ -351,6 +475,128 @@ class _MapContentState extends State<MapContent> {
     }
   }
 
+  Future<void> _performTextSearch(String query) async {
+    if (query.isEmpty) return;
+
+    setState(() {
+      _isSearching = true;
+      _suggestions = []; // Hide suggestions
+    });
+
+    try {
+      final apiKey = _apiKey;
+      // Utiliser le centre actuel de la carte ou la position initiale
+      final center = _currentMapCenter ?? _initialPosition;
+
+      final url = Uri.parse(
+        'https://maps.googleapis.com/maps/api/place/textsearch/json'
+        '?query=${Uri.encodeComponent(query)}'
+        '&location=${center.latitude},${center.longitude}'
+        '&radius=5000' // Rechercher dans un rayon de 5km autour du centre
+        '&key=$apiKey'
+        '&language=fr',
+      );
+
+      final response = await http.get(url);
+
+      if (!mounted) return;
+
+      if (response.statusCode == 200) {
+        final data = json.decode(response.body);
+
+        if (data['status'] == 'OK') {
+          final results = data['results'] as List;
+          final List<Marker> newMarkers = [];
+
+          // Garder le marqueur de position utilisateur
+          final userMarker = _markers
+              .where((m) => m.markerId.value == 'user_location')
+              .toList();
+
+          double minLat = center.latitude;
+          double maxLat = center.latitude;
+          double minLng = center.longitude;
+          double maxLng = center.longitude;
+
+          // Créer le marqueur rouge standard personnalisé
+          final markerIcon = await _createMarkerIcon(
+            Icons.location_on,
+            Colors.red,
+            size: 50.0,
+          );
+
+          for (final place in results) {
+            final geometry = place['geometry']['location'];
+            final lat = geometry['lat'];
+            final lng = geometry['lng'];
+            final name = place['name'];
+            final placeId = place['place_id'];
+
+            final position = LatLng(lat, lng);
+
+            // Mettre à jour les bornes
+            if (lat < minLat) minLat = lat;
+            if (lat > maxLat) maxLat = lat;
+            if (lng < minLng) minLng = lng;
+            if (lng > maxLng) maxLng = lng;
+
+            newMarkers.add(
+              Marker(
+                markerId: MarkerId(placeId),
+                position: position,
+                icon: markerIcon,
+                anchor: const Offset(0.5, 0.85), // Standard anchor for pins
+                infoWindow: InfoWindow(
+                  title: name,
+                  snippet: place['formatted_address'] ?? 'Lieu trouvé',
+                ),
+              ),
+            );
+          }
+
+          setState(() {
+            _markers.clear();
+            if (userMarker.isNotEmpty) {
+              _markers.add(userMarker.first);
+            }
+            _markers.addAll(newMarkers);
+            _isSearching = false;
+          });
+
+          // Ajuster la caméra pour montrer tous les résultats
+          if (newMarkers.isNotEmpty) {
+            _mapController?.animateCamera(
+              CameraUpdate.newLatLngBounds(
+                LatLngBounds(
+                  southwest: LatLng(minLat, minLng),
+                  northeast: LatLng(maxLat, maxLng),
+                ),
+                50.0, // padding
+              ),
+            );
+          }
+
+          FocusScope.of(context).unfocus();
+        } else {
+          _showError('Aucun résultat trouvé pour "$query"');
+          setState(() {
+            _isSearching = false;
+          });
+        }
+      } else {
+        _showError('Erreur lors de la recherche: ${response.statusCode}');
+        setState(() {
+          _isSearching = false;
+        });
+      }
+    } catch (e) {
+      _showError('Erreur lors de la recherche: $e');
+      setState(() {
+        _isSearching = false;
+      });
+    }
+  }
+
   Future<void> _selectPlace(PlaceSuggestion suggestion) async {
     setState(() {
       _isSearching = true;
@@ -374,13 +620,21 @@ class _MapContentState extends State<MapContent> {
         final data = json.decode(response.body);
 
         if (data['status'] == 'OK') {
-          final location = data['result']['geometry']['location'];
+          final result = data['result'];
+          final location = result['geometry']['location'];
           final lat = location['lat'];
           final lng = location['lng'];
-          final name = data['result']['name'];
+          final name = result['name'];
 
           final newPosition = LatLng(lat, lng);
 
+          // Utiliser le marqueur rouge standard personnalisé
+          final markerIcon = await _createMarkerIcon(
+            Icons.location_on,
+            Colors.red,
+            size: 50.0,
+          );
+
           // Ajouter un marqueur pour le lieu recherché (ne pas supprimer le marqueur de position)
           setState(() {
             // Garder le marqueur de position utilisateur
@@ -391,6 +645,8 @@ class _MapContentState extends State<MapContent> {
               Marker(
                 markerId: MarkerId(suggestion.placeId),
                 position: newPosition,
+                icon: markerIcon,
+                anchor: const Offset(0.5, 0.85),
                 infoWindow: InfoWindow(title: name),
               ),
             );
@@ -416,13 +672,7 @@ class _MapContentState extends State<MapContent> {
 
   void _showError(String message) {
     if (mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(
+      ErrorService().showError(message: message);
-        SnackBar(
-          content: Text(message),
-          backgroundColor: Colors.red,
-          behavior: SnackBarBehavior.floating,
-        ),
-      );
     }
   }
 
@@ -446,6 +696,9 @@ class _MapContentState extends State<MapContent> {
                     onMapCreated: (GoogleMapController controller) {
                       _mapController = controller;
                     },
+                    onCameraMove: (CameraPosition position) {
+                      _currentMapCenter = position.target;
+                    },
                     markers: _markers,
                     circles: _circles,
                     myLocationEnabled: false,
@@ -577,6 +830,10 @@ class _MapContentState extends State<MapContent> {
                             vertical: 14,
                           ),
                         ),
+                        textInputAction: TextInputAction.search,
+                        onSubmitted: (value) {
+                          _performTextSearch(value);
+                        },
                         onChanged: (value) {
                           // Ne pas rechercher si c'est juste le remplissage initial
                           if (widget.initialSearchQuery != null &&
@@ -663,6 +920,7 @@ class _MapContentState extends State<MapContent> {
       ),
 
       floatingActionButton: FloatingActionButton(
+        heroTag: 'map_fab',
         onPressed: _getCurrentLocation,
         tooltip: 'Ma position',
         child: const Icon(Icons.my_location),

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
+            // Keep only the buttons
-            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],
-              ),
-            ),
             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/profile/profile_content.dart

@@ -150,7 +150,9 @@ class ProfileContent extends StatelessWidget {
                       style: TextStyle(
                         fontSize: 16,
                         fontWeight: FontWeight.bold,
-                        color: Colors.black87,
+                        color: Theme.of(context).brightness == Brightness.dark
+                            ? Colors.white
+                            : Colors.black87,
                       ),
                     ),
                   ],
@@ -502,11 +504,9 @@ class ProfileContent extends StatelessWidget {
                       );
 
                       Navigator.of(dialogContext).pop();
-                      ScaffoldMessenger.of(context).showSnackBar(
+                      _errorService.showSnackbar(
-                        SnackBar(
+                        message: 'Profil mis à jour !',
-                          content: Text('Profil mis à jour !'),
+                        isError: false,
-                          backgroundColor: Colors.green,
-                        ),
                       );
                     }
                   },
@@ -668,11 +668,9 @@ class ProfileContent extends StatelessWidget {
 
       if (context.mounted) {
         LoggerService.info('DEBUG: Affichage du succès');
-        ScaffoldMessenger.of(context).showSnackBar(
+        _errorService.showSnackbar(
-          SnackBar(
+          message: 'Photo de profil mise à jour !',
-            content: Text('Photo de profil mise à jour !'),
+          isError: false,
-            backgroundColor: Colors.green,
-          ),
         );
       }
     } catch (e, stackTrace) {
@@ -736,22 +734,16 @@ class ProfileContent extends StatelessWidget {
                 if (currentPasswordController.text.isEmpty ||
                     newPasswordController.text.isEmpty ||
                     confirmPasswordController.text.isEmpty) {
-                  ScaffoldMessenger.of(context).showSnackBar(
+                  _errorService.showError(
-                    SnackBar(
+                    message: 'Tous les champs sont requis',
-                      content: Text('Tous les champs sont requis'),
-                      backgroundColor: Colors.red,
-                    ),
                   );
                   return;
                 }
 
                 if (newPasswordController.text !=
                     confirmPasswordController.text) {
-                  ScaffoldMessenger.of(context).showSnackBar(
+                  _errorService.showError(
-                    SnackBar(
+                    message: 'Les mots de passe ne correspondent pas',
-                      content: Text('Les mots de passe ne correspondent pas'),
-                      backgroundColor: Colors.red,
-                    ),
                   );
                   return;
                 }
@@ -765,11 +757,9 @@ class ProfileContent extends StatelessWidget {
 
                   if (context.mounted) {
                     Navigator.of(dialogContext).pop();
-                    ScaffoldMessenger.of(context).showSnackBar(
+                    _errorService.showSnackbar(
-                      SnackBar(
+                      message: 'Mot de passe changé !',
-                        content: Text('Mot de passe changé !'),
+                      isError: false,
-                        backgroundColor: Colors.green,
-                      ),
                     );
                   }
                 } catch (e) {
@@ -823,11 +813,8 @@ class ProfileContent extends StatelessWidget {
             TextButton(
               onPressed: () async {
                 if (confirmationController.text != 'CONFIRMER') {
-                  ScaffoldMessenger.of(context).showSnackBar(
+                  _errorService.showError(
-                    SnackBar(
+                    message: 'Veuillez écrire CONFIRMER pour valider',
-                      content: Text('Veuillez écrire CONFIRMER pour valider'),
-                      backgroundColor: Colors.red,
-                    ),
                   );
                   return;
                 }
@@ -848,14 +835,10 @@ class ProfileContent extends StatelessWidget {
                   if (e.code == 'requires-recent-login') {
                     if (context.mounted) {
                       Navigator.of(dialogContext).pop();
-                      ScaffoldMessenger.of(context).showSnackBar(
+                      _errorService.showSnackbar(
-                        SnackBar(
+                        message:
-                          content: Text(
                             'Par sécurité, veuillez vous reconnecter avant de supprimer votre compte',
-                          ),
+                        isError: true, // It's a warning/error
-                          backgroundColor: Colors.orange,
-                          duration: Duration(seconds: 4),
-                        ),
                       );
                     }
                   } else {

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/components/signup/password_requirements.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+
+class PasswordRequirements extends StatelessWidget {
+  final String password;
+
+  const PasswordRequirements({super.key, required this.password});
+
+  bool get _hasMinLength => password.length >= 8;
+  bool get _hasUppercase => password.contains(RegExp(r'[A-Z]'));
+  bool get _hasLowercase => password.contains(RegExp(r'[a-z]'));
+  bool get _hasDigit => password.contains(RegExp(r'[0-9]'));
+  bool get _hasSpecialChar =>
+      password.contains(RegExp(r'[!@#\$%^&*(),.?":{}|<>]'));
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const SizedBox(height: 10),
+        const Text(
+          'Votre mot de passe doit contenir :',
+          style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+        ),
+        const SizedBox(height: 8),
+        _buildRequirement(_hasMinLength, 'Au moins 8 caractères'),
+        _buildRequirement(_hasUppercase, 'Une majuscule'),
+        _buildRequirement(_hasLowercase, 'Une minuscule'),
+        _buildRequirement(_hasDigit, 'Un chiffre'),
+        _buildRequirement(_hasSpecialChar, 'Un caractère spécial'),
+      ],
+    );
+  }
+
+  Widget _buildRequirement(bool isMet, String text) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 2.0),
+      child: Row(
+        children: [
+          Icon(
+            isMet ? Icons.check_circle : Icons.circle_outlined,
+            color: isMet ? Colors.green : Colors.grey,
+            size: 16,
+          ),
+          const SizedBox(width: 8),
+          Text(
+            text,
+            style: TextStyle(
+              color: isMet ? Colors.green : Colors.grey,
+              fontSize: 12,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/components/whats_new_dialog.dart

@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import '../../services/whats_new_service.dart';
+
+class WhatsNewDialog extends StatelessWidget {
+  final VoidCallback onDismiss;
+  final List<WhatsNewItem> features;
+
+  const WhatsNewDialog({
+    super.key,
+    required this.onDismiss,
+    required this.features,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Dialog(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+      backgroundColor: theme.colorScheme.surface,
+      child: Padding(
+        padding: const EdgeInsets.all(24.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Header
+            Row(
+              children: [
+                Container(
+                  padding: const EdgeInsets.all(8),
+                  decoration: BoxDecoration(
+                    color: theme.colorScheme.primaryContainer,
+                    shape: BoxShape.circle,
+                  ),
+                  child: Icon(
+                    Icons.auto_awesome,
+                    color: theme.colorScheme.primary,
+                    size: 24,
+                  ),
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Text(
+                    'Quoi de neuf ?',
+                    style: theme.textTheme.headlineSmall?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
+
+            // Features List
+            Flexible(
+              child: ListView.separated(
+                shrinkWrap: true,
+                itemCount: features.length,
+                separatorBuilder: (_, __) => const SizedBox(height: 16),
+                itemBuilder: (context, index) {
+                  final feature = features[index];
+                  return Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Icon(
+                        feature.icon,
+                        color: theme.colorScheme.primary,
+                        size: 20,
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              feature.title,
+                              style: theme.textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                            const SizedBox(height: 4),
+                            Text(
+                              feature.description,
+                              style: theme.textTheme.bodyMedium?.copyWith(
+                                color: theme.colorScheme.onSurfaceVariant,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
+            ),
+
+            const SizedBox(height: 32),
+
+            // Button
+            SizedBox(
+              width: double.infinity,
+              height: 50,
+              child: ElevatedButton(
+                onPressed: () {
+                  // Marquer comme vu via le service
+                  WhatsNewService().markCurrentVersionAsSeen();
+                  onDismiss();
+                },
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: theme.colorScheme.primary,
+                  foregroundColor: theme.colorScheme.onPrimary,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                ),
+                child: const Text(
+                  'C\'est parti !',
+                  style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class WhatsNewItem {
+  final IconData icon;
+  final String title;
+  final String description;
+
+  const WhatsNewItem({
+    required this.icon,
+    required this.title,
+    required this.description,
+  });
+}

lib/firebase_options.dart

@@ -27,18 +27,6 @@ class DefaultFirebaseOptions {
         return android;
       case TargetPlatform.iOS:
         return ios;
-      case TargetPlatform.macOS:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for macos - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      case TargetPlatform.windows:
-        return windows;
-      case TargetPlatform.linux:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for linux - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
       default:
         throw UnsupportedError(
           'DefaultFirebaseOptions are not supported for this platform.',
@@ -63,15 +51,4 @@ class DefaultFirebaseOptions {
     iosClientId: '521527250907-3i1qe2656eojs8k9hjdi573j09i9p41m.apps.googleusercontent.com',
     iosBundleId: 'com.example.travelMate',
   );
-
-  static const FirebaseOptions windows = FirebaseOptions(
-    apiKey: 'AIzaSyC4t-WOvp22zns9b9t58urznsNAhSHRAag',
-    appId: '1:521527250907:web:53ff98bcdb8c218f7da1fe',
-    messagingSenderId: '521527250907',
-    projectId: 'travelmate-a47f5',
-    authDomain: 'travelmate-a47f5.firebaseapp.com',
-    storageBucket: 'travelmate-a47f5.firebasestorage.app',
-    measurementId: 'G-J246Y7J61M',
-  );
-
 }

lib/main.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 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';
@@ -11,6 +14,10 @@ import 'package:travel_mate/services/error_service.dart';
 import 'package:travel_mate/services/activity_places_service.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:travel_mate/services/expense_service.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:travel_mate/services/notification_service.dart';
+import 'package:travel_mate/services/map_navigation_service.dart';
+import 'package:travel_mate/services/analytics_service.dart';
 import 'blocs/auth/auth_bloc.dart';
 import 'blocs/auth/auth_event.dart';
 import 'blocs/theme/theme_bloc.dart';
@@ -34,14 +41,33 @@ import 'pages/home.dart';
 import 'pages/signup.dart';
 import 'pages/resetpswd.dart';
 
+import 'package:intl/date_symbol_data_local.dart';
+
 /// Entry point of the Travel Mate application.
 ///
 /// This function initializes Flutter widgets, loads environment variables,
 /// initializes Firebase, and starts the application.
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  await SystemChrome.setPreferredOrientations([
+    DeviceOrientation.portraitUp,
+    DeviceOrientation.portraitDown,
+  ]);
   await dotenv.load(fileName: ".env");
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  await initializeDateFormatting('fr_FR', null);
+
+  // Set the background messaging handler early on, as a named top-level function
+  FirebaseMessaging.onBackgroundMessage(firebaseMessagingBackgroundHandler);
+
+  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());
 }
@@ -117,6 +143,14 @@ class MyApp extends StatelessWidget {
             expenseRepository: context.read<ExpenseRepository>(),
           ),
         ),
+        // Map navigation service
+        RepositoryProvider<MapNavigationService>(
+          create: (context) => MapNavigationService(),
+        ),
+        // Analysis service
+        RepositoryProvider<AnalyticsService>(
+          create: (context) => AnalyticsService(),
+        ),
       ],
       child: MultiBlocProvider(
         providers: [
@@ -177,6 +211,9 @@ class MyApp extends StatelessWidget {
               title: 'Travel Mate',
               navigatorKey: ErrorService.navigatorKey,
               themeMode: themeState.themeMode,
+              navigatorObservers: [
+                context.read<AnalyticsService>().getAnalyticsObserver(),
+              ],
               // Light theme configuration
               theme: ThemeData(
                 colorScheme: ColorScheme.fromSeed(

lib/models/activity.dart

@@ -21,6 +21,7 @@ class Activity {
   final DateTime createdAt;
   final DateTime updatedAt;
   final DateTime? date; // Date prévue pour l'activité
+  final String? createdBy; // ID de l'utilisateur qui a créé l'activité
 
   Activity({
     required this.id,
@@ -42,6 +43,7 @@ class Activity {
     required this.createdAt,
     required this.updatedAt,
     this.date,
+    this.createdBy,
   });
 
   /// Calcule le score total des votes
@@ -108,6 +110,7 @@ class Activity {
     DateTime? updatedAt,
     DateTime? date,
     bool clearDate = false,
+    String? createdBy,
   }) {
     return Activity(
       id: id ?? this.id,
@@ -129,6 +132,7 @@ class Activity {
       createdAt: createdAt ?? this.createdAt,
       updatedAt: updatedAt ?? this.updatedAt,
       date: clearDate ? null : (date ?? this.date),
+      createdBy: createdBy ?? this.createdBy,
     );
   }
 
@@ -154,6 +158,7 @@ class Activity {
       'createdAt': Timestamp.fromDate(createdAt),
       'updatedAt': Timestamp.fromDate(updatedAt),
       'date': date != null ? Timestamp.fromDate(date!) : null,
+      'createdBy': createdBy,
     };
   }
 
@@ -179,6 +184,7 @@ class Activity {
       createdAt: (map['createdAt'] as Timestamp).toDate(),
       updatedAt: (map['updatedAt'] as Timestamp).toDate(),
       date: map['date'] != null ? (map['date'] as Timestamp).toDate() : null,
+      createdBy: map['createdBy'],
     );
   }
 

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/pages/home.dart

@@ -11,6 +11,11 @@ import '../blocs/user/user_bloc.dart';
 import '../blocs/user/user_event.dart';
 import '../blocs/auth/auth_bloc.dart';
 import '../blocs/auth/auth_event.dart';
+import '../services/error_service.dart';
+import '../services/notification_service.dart';
+import '../services/map_navigation_service.dart';
+import '../services/whats_new_service.dart';
+import '../components/whats_new_dialog.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
@@ -36,6 +41,63 @@ class _HomePageState extends State<HomePage> {
     super.initState();
     // Initialiser les données utilisateur
     context.read<UserBloc>().add(UserInitialized());
+
+    // Setup notifications listener and check for initial message
+    final notificationService = NotificationService();
+    notificationService.startListening();
+
+    // Check for initial message after a slight delay to ensure the widget tree is fully built
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      notificationService.handleInitialMessage();
+    });
+
+    // Écouter les demandes de navigation vers la carte
+    context.read<MapNavigationService>().requestStream.listen((request) {
+      if (_currentIndex != 2) {
+        setState(() {
+          _currentIndex = 2;
+        });
+      }
+    });
+
+    // Vérifier les nouveautés
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      await _checkAndShowWhatsNew();
+    });
+  }
+
+  Future<void> _checkAndShowWhatsNew() async {
+    final service = WhatsNewService();
+    if (await service.shouldShowWhatsNew()) {
+      if (!mounted) return;
+      showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder: (context) => WhatsNewDialog(
+          onDismiss: () => Navigator.pop(context),
+          features: const [
+            WhatsNewItem(
+              icon: Icons.map_outlined,
+              title: 'Recherche globale',
+              description:
+                  'Recherchez des restaurants, musées et plus encore directement depuis la carte.',
+            ),
+            WhatsNewItem(
+              icon: Icons.search,
+              title: 'Autocomplétion améliorée',
+              description:
+                  'Découvrez des suggestions intelligentes lors de la recherche de lieux et d\'activités.',
+            ),
+            WhatsNewItem(
+              icon: Icons.warning_amber_rounded,
+              title: 'Alertes de distance',
+              description:
+                  'Soyez averti si une activité est trop éloignée de votre lieu de séjour.',
+            ),
+          ],
+        ),
+      );
+    }
   }
 
   Widget _buildPage(int index) {
@@ -119,12 +181,7 @@ class _HomePageState extends State<HomePage> {
       );
     } catch (e) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        ErrorService().showError(message: 'Erreur lors de la déconnexion: $e');
-          SnackBar(
-            content: Text('Erreur lors de la déconnexion: $e'),
-            backgroundColor: Colors.red,
-          ),
-        );
       }
     }
   }
@@ -132,9 +189,7 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: Text(titles[_currentIndex])),
-        title: Text(titles[_currentIndex]),
-      ),
       drawer: Drawer(
         child: ListView(
           padding: EdgeInsets.zero,
@@ -156,14 +211,29 @@ class _HomePageState extends State<HomePage> {
               ),
             ),
             _buildDrawerItem(icon: Icons.home, title: "Mes voyages", index: 0),
-            _buildDrawerItem(icon: Icons.settings, title: "Paramètres", index: 1),
+            _buildDrawerItem(
+              icon: Icons.settings,
+              title: "Paramètres",
+              index: 1,
+            ),
             _buildDrawerItem(icon: Icons.map, title: "Carte", index: 2),
-            _buildDrawerItem(icon: Icons.group, title: "Chat de groupe", index: 3),
+            _buildDrawerItem(
-            _buildDrawerItem(icon: Icons.account_balance_wallet, title: "Comptes", index: 4),
+              icon: Icons.group,
+              title: "Chat de groupe",
+              index: 3,
+            ),
+            _buildDrawerItem(
+              icon: Icons.account_balance_wallet,
+              title: "Comptes",
+              index: 4,
+            ),
             const Divider(),
             ListTile(
               leading: const Icon(Icons.logout, color: Colors.red),
-              title: const Text("Déconnexion", style: TextStyle(color: Colors.red)),
+              title: const Text(
+                "Déconnexion",
+                style: TextStyle(color: Colors.red),
+              ),
               onTap: _handleLogout, // Utiliser la nouvelle méthode
             ),
           ],
@@ -191,7 +261,9 @@ class _HomePageState extends State<HomePage> {
       leading: Icon(icon),
       title: Text(title),
       selected: _currentIndex == index,
-      selectedTileColor: Theme.of(context).colorScheme.primary.withValues(alpha: 0.1),
+      selectedTileColor: Theme.of(
+        context,
+      ).colorScheme.primary.withValues(alpha: 0.1),
       onTap: () => _onNavigationTap(index),
     );
   }

lib/pages/login.dart

@@ -4,6 +4,7 @@ import '../blocs/auth/auth_bloc.dart';
 import '../blocs/auth/auth_event.dart';
 import '../blocs/auth/auth_state.dart';
 import 'package:sign_in_button/sign_in_button.dart';
+import '../services/error_service.dart';
 
 /// Login page widget for user authentication.
 ///
@@ -87,14 +88,13 @@ class _LoginPageState extends State<LoginPage> {
       body: BlocConsumer<AuthBloc, AuthState>(
         listener: (context, state) {
           if (state is AuthAuthenticated) {
-            Navigator.pushReplacementNamed(context, '/home');
+            Navigator.pushNamedAndRemoveUntil(
-          } else if (state is AuthError) {
+              context,
-            ScaffoldMessenger.of(context).showSnackBar(
+              '/home',
-              SnackBar(
+              (route) => false,
-                content: Text(state.message),
-                backgroundColor: Colors.red,
-              ),
             );
+          } else if (state is AuthError) {
+            ErrorService().showError(message: state.message);
           }
         },
         builder: (context, state) {

lib/pages/resetpswd.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import '../blocs/auth/auth_bloc.dart';
 import '../blocs/auth/auth_event.dart';
 import '../blocs/auth/auth_state.dart';
+import '../services/error_service.dart';
 
 class ForgotPasswordPage extends StatefulWidget {
   const ForgotPasswordPage({super.key});
@@ -56,20 +57,13 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
       body: BlocListener<AuthBloc, AuthState>(
         listener: (context, state) {
           if (state is AuthPasswordResetSent) {
-            ScaffoldMessenger.of(context).showSnackBar(
+            ErrorService().showSnackbar(
-              SnackBar(
+              message: 'Email de réinitialisation envoyé !',
-                content: Text('Email de réinitialisation envoyé !'),
+              isError: false,
-                backgroundColor: Colors.green,
-              ),
             );
             Navigator.pop(context);
           } else if (state is AuthError) {
-            ScaffoldMessenger.of(context).showSnackBar(
+            ErrorService().showError(message: state.message);
-              SnackBar(
-                content: Text(state.message),
-                backgroundColor: Colors.red,
-              ),
-            );
           }
         },
         child: SafeArea(

lib/pages/signup.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:sign_in_button/sign_in_button.dart';
 import 'package:travel_mate/components/loading/laoding_content.dart';
+import 'package:travel_mate/components/signup/password_requirements.dart';
 import 'package:travel_mate/components/signup/sign_up_platform_content.dart';
 import 'package:travel_mate/services/auth_service.dart';
 import '../blocs/auth/auth_bloc.dart';
@@ -66,6 +67,18 @@ class _SignUpPageState extends State<SignUpPage> {
     if (value.length < 8) {
       return 'Le mot de passe doit contenir au moins 8 caractères';
     }
+    if (!value.contains(RegExp(r'[A-Z]'))) {
+      return 'Le mot de passe doit contenir une majuscule';
+    }
+    if (!value.contains(RegExp(r'[a-z]'))) {
+      return 'Le mot de passe doit contenir une minuscule';
+    }
+    if (!value.contains(RegExp(r'[0-9]'))) {
+      return 'Le mot de passe doit contenir un chiffre';
+    }
+    if (!value.contains(RegExp(r'[!@#\$%^&*(),.?":{}|<>]'))) {
+      return 'Le mot de passe doit contenir un caractère spécial';
+    }
     return null;
   }
 
@@ -115,11 +128,13 @@ class _SignUpPageState extends State<SignUpPage> {
                 backgroundColor: Colors.green,
               ),
             );
-            Navigator.pushReplacementNamed(context, '/home');
+            Navigator.pushNamedAndRemoveUntil(
-          } else if (state is AuthError) {
+              context,
-            _errorService.showError(
+              '/home',
-              message: 'Erreur lors de la création du compte',
+              (route) => false,
             );
+          } else if (state is AuthError) {
+            _errorService.showError(message: state.message);
           }
         },
         builder: (context, state) {
@@ -211,6 +226,7 @@ class _SignUpPageState extends State<SignUpPage> {
                         controller: _passwordController,
                         validator: _validatePassword,
                         obscureText: _obscurePassword,
+                        onChanged: (value) => setState(() {}),
                         decoration: InputDecoration(
                           labelText: 'Mot de passe',
                           border: const OutlineInputBorder(
@@ -231,6 +247,7 @@ class _SignUpPageState extends State<SignUpPage> {
                           ),
                         ),
                       ),
+                      PasswordRequirements(password: _passwordController.text),
                       const SizedBox(height: 20),
 
                       // Champ Confirmation mot de passe

lib/repositories/account_repository.dart

@@ -7,7 +7,8 @@ class AccountRepository {
   final FirebaseFirestore _firestore = FirebaseFirestore.instance;
   final _errorService = ErrorService();
 
-  CollectionReference get _accountCollection => _firestore.collection('accounts');
+  CollectionReference get _accountCollection =>
+      _firestore.collection('accounts');
 
   CollectionReference _membersCollection(String accountId) {
     return _accountCollection.doc(accountId).collection('members');
@@ -32,8 +33,13 @@ class AccountRepository {
 
         return accountRef.id;
       });
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la création du compte: $e');
+      _errorService.logError(
+        'account_repository.dart',
+        'Erreur lors de la création du compte: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de créer le compte');
     }
   }
 
@@ -41,7 +47,6 @@ class AccountRepository {
     return _accountCollection
         .snapshots()
         .asyncMap((snapshot) async {
-
           List<Account> userAccounts = [];
 
           for (var accountDoc in snapshot.docs) {
@@ -54,14 +59,24 @@ class AccountRepository {
                   .get();
               if (memberDoc.exists) {
                 final accountData = accountDoc.data() as Map<String, dynamic>;
-                final account = Account.fromMap(accountData, accountId); // ✅ Ajout de l'ID
+                final account = Account.fromMap(
+                  accountData,
+                  accountId,
+                ); // ✅ Ajout de l'ID
                 final members = await getAccountMembers(accountId);
                 userAccounts.add(account.copyWith(members: members));
               } else {
-                _errorService.logInfo('account_repository.dart', 'Utilisateur NON membre de $accountId');
+                _errorService.logInfo(
+                  'account_repository.dart',
+                  'Utilisateur NON membre de $accountId',
+                );
               }
             } catch (e, stackTrace) {
-              _errorService.logError(e.toString(), stackTrace);
+              _errorService.logError(
+                'account_repository.dart',
+                'Erreur processing account doc: $e',
+                stackTrace,
+              );
             }
           }
           return userAccounts;
@@ -71,13 +86,18 @@ class AccountRepository {
           final prevIds = prev.map((a) => a.id).toSet();
           final nextIds = next.map((a) => a.id).toSet();
 
-          final identical = prevIds.difference(nextIds).isEmpty && 
+          final identical =
+              prevIds.difference(nextIds).isEmpty &&
               nextIds.difference(prevIds).isEmpty;
 
           return identical;
         })
         .handleError((error, stackTrace) {
-          _errorService.logError(error, stackTrace);
+          _errorService.logError(
+            'account_repository.dart',
+            'Erreur stream accounts: $error',
+            stackTrace,
+          );
           return <Account>[];
         });
   }
@@ -85,16 +105,16 @@ class AccountRepository {
   Future<List<GroupMember>> getAccountMembers(String accountId) async {
     try {
       final snapshot = await _membersCollection(accountId).get();
-      return snapshot.docs
+      return snapshot.docs.map((doc) {
-          .map((doc) {
+        return GroupMember.fromMap(doc.data() as Map<String, dynamic>, doc.id);
-            return GroupMember.fromMap(
+      }).toList();
-              doc.data() as Map<String, dynamic>,
+    } catch (e, stackTrace) {
-              doc.id,
+      _errorService.logError(
+        'account_repository.dart',
+        'Erreur lors de la récupération des membres: $e',
+        stackTrace,
       );
-          })
+      throw Exception('Impossible de récupérer les membres');
-          .toList();
-    } catch (e) {
-      throw Exception('Erreur lors de la récupération des membres: $e');
     }
   }
 
@@ -105,8 +125,13 @@ class AccountRepository {
         return Account.fromMap(doc.data() as Map<String, dynamic>, doc.id);
       }
       return null;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération du compte: $e');
+      _errorService.logError(
+        'account_repository.dart',
+        'Erreur lors de la récupération du compte: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer le compte');
     }
   }
 
@@ -123,8 +148,13 @@ class AccountRepository {
         return Account.fromMap(doc.data(), doc.id);
       }
       return null;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération du compte: $e');
+      _errorService.logError(
+        'account_repository.dart',
+        'Erreur lors de la récupération du compte: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer le compte');
     }
   }
 
@@ -132,10 +162,17 @@ class AccountRepository {
     try {
       // Mettre à jour la date de modification
       final updatedAccount = account.copyWith(updatedAt: DateTime.now());
-      await _firestore.collection('accounts').doc(accountId).update(updatedAccount.toMap());
+      await _firestore
-    } catch (e) {
+          .collection('accounts')
-      _errorService.logError('account_repository.dart', 'Erreur lors de la mise à jour du compte: $e');
+          .doc(accountId)
-      throw Exception('Erreur lors de la mise à jour du compte: $e');
+          .update(updatedAccount.toMap());
+    } catch (e, stackTrace) {
+      _errorService.logError(
+        'account_repository.dart',
+        'Erreur lors de la mise à jour du compte: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de mettre à jour le compte');
     }
   }
 
@@ -159,19 +196,23 @@ class AccountRepository {
 
       // Supprimer le compte
       await _accountCollection.doc(docId).delete();
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('account_repository.dart', 'Erreur lors de la suppression du compte: $e');
+      _errorService.logError(
-      throw Exception('Erreur lors de la suppression du compte: $e');
+        'account_repository.dart',
+        'Erreur lors de la suppression du compte: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de supprimer le compte');
     }
   }
 
   Stream<List<GroupMember>> watchGroupMembers(String accountId) {
     return _membersCollection(accountId).snapshots().map(
       (snapshot) => snapshot.docs
-              .map((doc) => GroupMember.fromMap(
+          .map(
-                    doc.data() as Map<String, dynamic>,
+            (doc) =>
-                    doc.id,
+                GroupMember.fromMap(doc.data() as Map<String, dynamic>, doc.id),
-                  ))
+          )
           .toList(),
     );
   }
@@ -201,19 +242,32 @@ class AccountRepository {
 
   Future<void> addMemberToAccount(String accountId, GroupMember member) async {
     try {
-      await _membersCollection(accountId).doc(member.userId).set(member.toMap());
+      await _membersCollection(
-    } catch (e) {
+        accountId,
-      _errorService.logError('account_repository.dart', 'Erreur lors de l\'ajout du membre: $e');
+      ).doc(member.userId).set(member.toMap());
-      throw Exception('Erreur lors de l\'ajout du membre: $e');
+    } catch (e, stackTrace) {
+      _errorService.logError(
+        'account_repository.dart',
+        'Erreur lors de l\'ajout du membre: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible d\'ajouter le membre');
     }
   }
 
-  Future<void> removeMemberFromAccount(String accountId, String memberId) async {
+  Future<void> removeMemberFromAccount(
+    String accountId,
+    String memberId,
+  ) async {
     try {
       await _membersCollection(accountId).doc(memberId).delete();
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('account_repository.dart', 'Erreur lors de la suppression du membre: $e');
+      _errorService.logError(
-      throw Exception('Erreur lors de la suppression du membre: $e');
+        'account_repository.dart',
+        'Erreur lors de la suppression du membre: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de supprimer le membre');
     }
   }
 }

lib/repositories/auth_repository.dart

@@ -60,10 +60,10 @@ class AuthRepository {
       );
       await _saveFCMToken(firebaseUser.user!.uid);
       return await getUserFromFirestore(firebaseUser.user!.uid);
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.showError(message: 'Utilisateur ou mot de passe incorrect');
+      _errorService.logError('AuthRepository', 'SignIn error: $e', stackTrace);
+      throw Exception('Utilisateur ou mot de passe incorrect');
     }
-    return null;
   }
 
   /// Creates a new user account with email and password.
@@ -108,10 +108,10 @@ class AuthRepository {
         await _saveFCMToken(user.id!);
       }
       return user;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.showError(message: 'Erreur lors de la création du compte');
+      _errorService.logError('AuthRepository', 'SignUp error: $e', stackTrace);
+      throw Exception('Erreur lors de la création du compte');
     }
-    return null;
   }
 
   /// Signs in a user using Google authentication.
@@ -160,10 +160,14 @@ class AuthRepository {
         return user;
       }
       return null;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.showError(message: 'Erreur lors de la connexion Google');
+      _errorService.logError(
+        'AuthRepository',
+        'Google SignUp error: $e',
+        stackTrace,
+      );
+      throw Exception('Erreur lors de la connexion Google');
     }
-    return null;
   }
 
   Future<User?> signInWithGoogle() async {
@@ -178,10 +182,14 @@ class AuthRepository {
       } else {
         throw Exception('Utilisateur non trouvé');
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.showError(message: 'Erreur lors de la connexion Google');
+      _errorService.logError(
+        'AuthRepository',
+        'Google SignIn error: $e',
+        stackTrace,
+      );
+      throw Exception('Erreur lors de la connexion Google');
     }
-    return null;
   }
 
   /// Signs in a user using Apple authentication.
@@ -228,10 +236,14 @@ class AuthRepository {
         return user;
       }
       return null;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.showError(message: 'Erreur lors de la connexion Apple');
+      _errorService.logError(
+        'AuthRepository',
+        'Apple SignUp error: $e',
+        stackTrace,
+      );
+      throw Exception('Erreur lors de la connexion Apple');
     }
-    return null;
   }
 
   Future<User?> signInWithApple() async {
@@ -246,10 +258,14 @@ class AuthRepository {
       } else {
         throw Exception('Utilisateur non trouvé');
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.showError(message: 'Erreur lors de la connexion Apple');
+      _errorService.logError(
+        'AuthRepository',
+        'Apple SignIn error: $e',
+        stackTrace,
+      );
+      throw Exception('Erreur lors de la connexion Apple');
     }
-    return null;
   }
 
   /// Signs out the current user.
@@ -298,9 +314,13 @@ class AuthRepository {
           'fcmToken': token,
         }, SetOptions(merge: true));
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
       // Non-blocking error
-      print('Error saving FCM token: $e');
+      _errorService.logError(
+        'AuthRepository',
+        'Error saving FCM token: $e',
+        stackTrace,
+      );
     }
   }
 }

lib/repositories/balance_repository.dart

@@ -37,9 +37,13 @@ class BalanceRepository {
         totalExpenses: totalExpenses,
         calculatedAt: DateTime.now(),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('BalanceRepository', 'Erreur calcul balance: $e');
+      _errorService.logError(
-      rethrow;
+        'BalanceRepository',
+        'Erreur calcul balance: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de calculer la balance');
     }
   }
 
@@ -50,9 +54,13 @@ class BalanceRepository {
           .first;
 
       return _calculateUserBalances(expenses);
-    } catch (e) {
+    } catch (e, stackTrace) {
-      _errorService.logError('BalanceRepository', 'Erreur calcul user balances: $e');
+      _errorService.logError(
-      rethrow;
+        'BalanceRepository',
+        'Erreur calcul user balances: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de calculer les balances utilisateurs');
     }
   }
 
@@ -65,19 +73,17 @@ class BalanceRepository {
       if (expense.isArchived) continue;
 
       // Ajouter le payeur
-      userBalanceMap.putIfAbsent(expense.paidById, () => {
+      userBalanceMap.putIfAbsent(
-        'name': expense.paidByName,
+        expense.paidById,
-        'paid': 0.0,
+        () => {'name': expense.paidByName, 'paid': 0.0, 'owed': 0.0},
-        'owed': 0.0,
+      );
-      });
 
       // Ajouter les participants
       for (final split in expense.splits) {
-        userBalanceMap.putIfAbsent(split.userId, () => {
+        userBalanceMap.putIfAbsent(
-          'name': split.userName,
+          split.userId,
-          'paid': 0.0,
+          () => {'name': split.userName, 'paid': 0.0, 'owed': 0.0},
-          'owed': 0.0,
+        );
-        });
       }
     }
 
@@ -125,10 +131,10 @@ class BalanceRepository {
 
     // Créer des copies mutables des montants
     final creditorsRemaining = Map.fromEntries(
-      creditors.map((c) => MapEntry(c.userId, c.balance))
+      creditors.map((c) => MapEntry(c.userId, c.balance)),
     );
     final debtorsRemaining = Map.fromEntries(
-      debtors.map((d) => MapEntry(d.userId, -d.balance))
+      debtors.map((d) => MapEntry(d.userId, -d.balance)),
     );
 
     // Algorithme glouton pour minimiser le nombre de transactions
@@ -139,15 +145,20 @@ class BalanceRepository {
 
         if (creditAmount <= 0.01 || debtAmount <= 0.01) continue;
 
-        final settlementAmount = [creditAmount, debtAmount].reduce((a, b) => a < b ? a : b);
+        final settlementAmount = [
+          creditAmount,
+          debtAmount,
+        ].reduce((a, b) => a < b ? a : b);
 
-        settlements.add(Settlement(
+        settlements.add(
+          Settlement(
             fromUserId: debtor.userId,
             fromUserName: debtor.userName,
             toUserId: creditor.userId,
             toUserName: creditor.userName,
             amount: settlementAmount,
-        ));
+          ),
+        );
 
         creditorsRemaining[creditor.userId] = creditAmount - settlementAmount;
         debtorsRemaining[debtor.userId] = debtAmount - settlementAmount;

lib/repositories/group_repository.dart

@@ -35,8 +35,13 @@ class GroupRepository {
 
         return groupRef.id;
       });
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la création du groupe: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur création groupe: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de créer le groupe');
     }
   }
 
@@ -51,7 +56,11 @@ class GroupRepository {
           }).toList();
         })
         .handleError((error, stackTrace) {
-          _errorService.logError(error, stackTrace);
+          _errorService.logError(
+            'GroupRepository',
+            'Erreur stream groups: $error',
+            stackTrace,
+          );
           return <Group>[];
         });
   }
@@ -66,8 +75,13 @@ class GroupRepository {
       final members = await getGroupMembers(groupId);
 
       return group.copyWith(members: members);
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération du groupe: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur get group: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer le groupe');
     }
   }
 
@@ -104,8 +118,13 @@ class GroupRepository {
       final members = await getGroupMembers(doc.id);
 
       return group.copyWith(members: members);
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération du groupe: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur get group by trip: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer le groupe du voyage');
     }
   }
 
@@ -122,10 +141,11 @@ class GroupRepository {
           'Migration réussie pour le groupe $groupId',
         );
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'GroupRepository',
         'Erreur de migration pour le groupe $groupId: $e',
+        stackTrace,
       );
     }
   }
@@ -136,8 +156,13 @@ class GroupRepository {
       return snapshot.docs.map((doc) {
         return GroupMember.fromMap(doc.data() as Map<String, dynamic>, doc.id);
       }).toList();
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération des membres: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur get members: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer les membres');
     }
   }
 
@@ -160,8 +185,13 @@ class GroupRepository {
       await _firestore.collection('trips').doc(group.tripId).update({
         'participants': FieldValue.arrayUnion([member.userId]),
       });
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de l\'ajout du membre: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur add member: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible d\'ajouter le membre');
     }
   }
 
@@ -184,8 +214,13 @@ class GroupRepository {
       await _firestore.collection('trips').doc(group.tripId).update({
         'participants': FieldValue.arrayRemove([userId]),
       });
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la suppression du membre: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur remove member: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de supprimer le membre');
     }
   }
 
@@ -197,8 +232,13 @@ class GroupRepository {
             group.toMap()
               ..['updatedAt'] = DateTime.now().millisecondsSinceEpoch,
           );
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la mise à jour du groupe: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur update group: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de mettre à jour le groupe');
     }
   }
 
@@ -226,8 +266,13 @@ class GroupRepository {
       }
 
       await _groupsCollection.doc(groupId).delete();
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la suppression du groupe: $e');
+      _errorService.logError(
+        'GroupRepository',
+        'Erreur delete group: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de supprimer le groupe');
     }
   }
 
@@ -241,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/repositories/trip_repository.dart

@@ -1,8 +1,10 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import '../models/trip.dart';
+import '../services/error_service.dart';
 
 class TripRepository {
   final FirebaseFirestore _firestore = FirebaseFirestore.instance;
+  final _errorService = ErrorService();
 
   CollectionReference get _tripsCollection => _firestore.collection('trips');
 
@@ -18,7 +20,12 @@ class TripRepository {
                   try {
                     final data = doc.data() as Map<String, dynamic>;
                     return Trip.fromMap(data, doc.id);
-              } catch (e) {
+                  } catch (e, stackTrace) {
+                    _errorService.logError(
+                      'TripRepository',
+                      'Erreur parsing trip ${doc.id}: $e',
+                      stackTrace,
+                    );
                     return null;
                   }
                 })
@@ -26,8 +33,13 @@ class TripRepository {
                 .toList();
             return trips;
           });
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération des voyages: $e');
+      _errorService.logError(
+        'TripRepository',
+        'Erreur stream trips: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer les voyages');
     }
   }
 
@@ -38,8 +50,13 @@ class TripRepository {
       // Ne pas modifier les timestamps ici, ils sont déjà au bon format
       final docRef = await _tripsCollection.add(tripData);
       return docRef.id;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la création du voyage: $e');
+      _errorService.logError(
+        'TripRepository',
+        'Erreur création trip: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de créer le voyage');
     }
   }
 
@@ -53,8 +70,13 @@ class TripRepository {
       }
 
       return Trip.fromMap(doc.data() as Map<String, dynamic>, doc.id);
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la récupération du voyage: $e');
+      _errorService.logError(
+        'TripRepository',
+        'Erreur get trip: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer le voyage');
     }
   }
 
@@ -66,8 +88,13 @@ class TripRepository {
       tripData['updatedAt'] = Timestamp.now();
 
       await _tripsCollection.doc(tripId).update(tripData);
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la mise à jour du voyage: $e');
+      _errorService.logError(
+        'TripRepository',
+        'Erreur update trip: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de mettre à jour le voyage');
     }
   }
 
@@ -75,8 +102,13 @@ class TripRepository {
   Future<void> deleteTrip(String tripId) async {
     try {
       await _tripsCollection.doc(tripId).delete();
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la suppression du voyage: $e');
+      _errorService.logError(
+        'TripRepository',
+        'Erreur delete trip: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de supprimer le voyage');
     }
   }
 }

lib/repositories/user_repository.dart

@@ -1,6 +1,7 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import '../models/user.dart';
 import '../services/auth_service.dart';
+import '../services/error_service.dart';
 
 /// Repository for user data operations in Firestore.
 ///
@@ -14,13 +15,13 @@ class UserRepository {
   /// Authentication service for user-related operations.
   final AuthService _authService;
 
+  final _errorService = ErrorService();
+
   /// Creates a new [UserRepository] with optional dependencies.
   ///
   /// If [firestore] or [authService] are not provided, default instances will be used.
-  UserRepository({
+  UserRepository({FirebaseFirestore? firestore, AuthService? authService})
-    FirebaseFirestore? firestore,
+    : _firestore = firestore ?? FirebaseFirestore.instance,
-    AuthService? authService,
-  })  : _firestore = firestore ?? FirebaseFirestore.instance,
       _authService = authService ?? AuthService();
 
   /// Retrieves a user by their unique ID.
@@ -39,8 +40,13 @@ class UserRepository {
         return User.fromMap({...data, 'id': uid});
       }
       return null;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Error retrieving user: $e');
+      _errorService.logError(
+        'UserRepository',
+        'Error retrieving user: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de récupérer l\'utilisateur');
     }
   }
 
@@ -67,8 +73,13 @@ class UserRepository {
         return User.fromMap({...data, 'id': doc.id});
       }
       return null;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Error searching for user: $e');
+      _errorService.logError(
+        'UserRepository',
+        'Error searching for user: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de trouver l\'utilisateur');
     }
   }
 
@@ -87,8 +98,13 @@ class UserRepository {
       await _authService.updateDisplayName(displayName: user.fullName);
 
       return true;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la mise à jour: $e');
+      _errorService.logError(
+        'UserRepository',
+        'Erreur lors de la mise à jour: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de mettre à jour l\'utilisateur');
     }
   }
 
@@ -98,8 +114,13 @@ class UserRepository {
       await _firestore.collection('users').doc(uid).delete();
       // Note: Vous devrez également supprimer le compte Firebase Auth
       return true;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors de la suppression: $e');
+      _errorService.logError(
+        'UserRepository',
+        'Erreur lors de la suppression: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de supprimer l\'utilisateur');
     }
   }
 
@@ -120,8 +141,52 @@ class UserRepository {
         newPassword: newPassword,
       );
       return true;
-    } catch (e) {
+    } catch (e, stackTrace) {
-      throw Exception('Erreur lors du changement de mot de passe: $e');
+      _errorService.logError(
+        'UserRepository',
+        'Erreur lors du changement de mot de passe: $e',
+        stackTrace,
+      );
+      throw Exception('Impossible de changer le mot de passe');
+    }
+  }
+
+  // Récupérer plusieurs utilisateurs par leurs IDs
+  Future<List<User>> getUsersByIds(List<String> uids) async {
+    if (uids.isEmpty) return [];
+
+    try {
+      // Firestore 'in' query supports up to 10 values.
+      // If we have more, we need to split into chunks.
+      List<User> users = [];
+
+      // Remove duplicates
+      final uniqueIds = uids.toSet().toList();
+
+      // Split into chunks of 10
+      for (var i = 0; i < uniqueIds.length; i += 10) {
+        final end = (i + 10 < uniqueIds.length) ? i + 10 : uniqueIds.length;
+        final chunk = uniqueIds.sublist(i, end);
+
+        final querySnapshot = await _firestore
+            .collection('users')
+            .where(FieldPath.documentId, whereIn: chunk)
+            .get();
+
+        for (var doc in querySnapshot.docs) {
+          final data = doc.data();
+          users.add(User.fromMap({...data, 'id': doc.id}));
+        }
+      }
+
+      return users;
+    } catch (e, stackTrace) {
+      _errorService.logError(
+        'UserRepository',
+        'Error retrieving users by IDs: $e',
+        stackTrace,
+      );
+      return [];
     }
   }
 }

lib/services/activity_places_service.dart

@@ -1,6 +1,7 @@
+import 'dart:io';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
-import 'package:flutter_dotenv/flutter_dotenv.dart';
+import '../firebase_options.dart'; // Add this import
 import '../models/activity.dart';
 import '../services/error_service.dart';
 import '../services/logger_service.dart';
@@ -13,7 +14,17 @@ class ActivityPlacesService {
   ActivityPlacesService._internal();
 
   final ErrorService _errorService = ErrorService();
-  static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? '';
+
+  static String get _apiKey {
+    try {
+      return DefaultFirebaseOptions.currentPlatform.apiKey;
+    } catch (e) {
+      LoggerService.error(
+        'ActivityPlacesService: Impossible de récupérer la clé API Firebase: $e',
+      );
+      return '';
+    }
+  }
 
   /// Recherche des activités près d'une destination
   Future<List<Activity>> searchActivities({
@@ -24,7 +35,6 @@ class ActivityPlacesService {
     int maxResults = 20,
     int offset = 0,
   }) async {
-    try {
     LoggerService.info(
       'ActivityPlacesService: Recherche d\'activités pour: $destination (max: $maxResults, offset: $offset)',
     );
@@ -94,13 +104,6 @@ class ActivityPlacesService {
     );
 
     return paginatedResults;
-    } catch (e) {
-      LoggerService.error(
-        'ActivityPlacesService: Erreur lors de la recherche: $e',
-      );
-      _errorService.logError('activity_places_service', e);
-      return [];
-    }
   }
 
   /// Géocode une destination pour obtenir les coordonnées
@@ -111,12 +114,18 @@ class ActivityPlacesService {
         LoggerService.error(
           'ActivityPlacesService: Clé API Google Maps manquante',
         );
-        throw Exception('Clé API Google Maps non configurée');
+        throw Exception(
+          'Clé API Google Maps non configurée dans DefaultFirebaseOptions. Platform: ${Platform.isAndroid
+              ? 'Android'
+              : Platform.isIOS
+              ? 'iOS'
+              : 'Autre'}',
+        );
       }
 
       final encodedDestination = Uri.encodeComponent(destination);
       final url =
-          'https://maps.googleapis.com/maps/api/geocode/json?address=$encodedDestination&key=$_apiKey';
+          'https://maps.googleapis.com/maps/api/geocode/json?address=$encodedDestination&key=$_apiKey&language=fr';
 
       LoggerService.info('ActivityPlacesService: Géocodage de "$destination"');
       LoggerService.info('ActivityPlacesService: URL = $url');
@@ -178,13 +187,13 @@ class ActivityPlacesService {
     String tripId,
     int radius,
   ) async {
-    try {
     final url =
         'https://maps.googleapis.com/maps/api/place/nearbysearch/json'
         '?location=$lat,$lng'
         '&radius=$radius'
         '&type=${category.googlePlaceType}'
-          '&key=$_apiKey';
+        '&key=$_apiKey'
+        '&language=fr';
 
     final response = await http.get(Uri.parse(url));
 
@@ -212,15 +221,18 @@ class ActivityPlacesService {
         }
 
         return activities;
-        }
+      } else if (data['status'] == 'ZERO_RESULTS') {
-      }
-
         return [];
-    } catch (e) {
+      } else {
         LoggerService.error(
-        'ActivityPlacesService: Erreur recherche par catégorie: $e',
+          'ActivityPlacesService: Erreur API Places: ${data['status']} - ${data['error_message']}',
         );
-      return [];
+        throw Exception(
+          'API Places Error: ${data['status']} - ${data['error_message']}',
+        );
+      }
+    } else {
+      throw Exception('Erreur HTTP ${response.statusCode}');
     }
   }
 
@@ -287,7 +299,8 @@ class ActivityPlacesService {
           'https://maps.googleapis.com/maps/api/place/details/json'
           '?place_id=$placeId'
           '&fields=formatted_address,formatted_phone_number,website,opening_hours,editorial_summary'
-          '&key=$_apiKey';
+          '&key=$_apiKey'
+          '&language=fr';
 
       final response = await http.get(Uri.parse(url));
 
@@ -342,7 +355,6 @@ class ActivityPlacesService {
     required String tripId,
     int radius = 5000,
   }) async {
-    try {
     LoggerService.info(
       'ActivityPlacesService: Recherche textuelle: $query à $destination',
     );
@@ -353,10 +365,11 @@ class ActivityPlacesService {
     final encodedQuery = Uri.encodeComponent(query);
     final url =
         'https://maps.googleapis.com/maps/api/place/textsearch/json'
-          '?query=$encodedQuery in $destination'
+        '?query=$encodedQuery'
         '&location=${coordinates['lat']},${coordinates['lng']}'
         '&radius=$radius'
-          '&key=$_apiKey';
+        '&key=$_apiKey'
+        '&language=fr';
 
     final response = await http.get(Uri.parse(url));
 
@@ -388,15 +401,16 @@ class ActivityPlacesService {
         }
 
         return activities;
-        }
+      } else if (data['status'] == 'ZERO_RESULTS') {
-      }
-
         return [];
-    } catch (e) {
+      } else {
         LoggerService.error(
-        'ActivityPlacesService: Erreur recherche textuelle: $e',
+          'ActivityPlacesService: Erreur API Places Text Search: ${data['status']}',
         );
-      return [];
+        throw Exception('API Error: ${data['status']}');
+      }
+    } else {
+      throw Exception('Erreur HTTP ${response.statusCode}');
     }
   }
 
@@ -507,13 +521,13 @@ class ActivityPlacesService {
     int pageSize,
     String? nextPageToken,
   ) async {
-    try {
     String url =
         'https://maps.googleapis.com/maps/api/place/nearbysearch/json'
         '?location=$lat,$lng'
         '&radius=$radius'
         '&type=${category.googlePlaceType}'
-          '&key=$_apiKey';
+        '&key=$_apiKey'
+        '&language=fr';
 
     if (nextPageToken != null) {
       url += '&pagetoken=$nextPageToken';
@@ -553,23 +567,17 @@ class ActivityPlacesService {
           'nextPageToken': data['next_page_token'],
           'hasMoreData': data['next_page_token'] != null,
         };
-        }
+      } else if (data['status'] == 'ZERO_RESULTS') {
-      }
-
-      return {
-        'activities': <Activity>[],
-        'nextPageToken': null,
-        'hasMoreData': false,
-      };
-    } catch (e) {
-      LoggerService.error(
-        'ActivityPlacesService: Erreur recherche catégorie paginée: $e',
-      );
         return {
           'activities': <Activity>[],
           'nextPageToken': null,
           'hasMoreData': false,
         };
+      } else {
+        throw Exception('API Error: ${data['status']}');
+      }
+    } else {
+      throw Exception('Erreur HTTP ${response.statusCode}');
     }
   }
 
@@ -582,14 +590,14 @@ class ActivityPlacesService {
     int pageSize,
     String? nextPageToken,
   ) async {
-    try {
     // Pour toutes les catégories, on utilise une recherche plus générale
     String url =
         'https://maps.googleapis.com/maps/api/place/nearbysearch/json'
         '?location=$lat,$lng'
         '&radius=$radius'
         '&type=tourist_attraction'
-          '&key=$_apiKey';
+        '&key=$_apiKey'
+        '&language=fr';
 
     if (nextPageToken != null) {
       url += '&pagetoken=$nextPageToken';
@@ -633,23 +641,85 @@ class ActivityPlacesService {
           'nextPageToken': data['next_page_token'],
           'hasMoreData': data['next_page_token'] != null,
         };
+      } else if (data['status'] == 'ZERO_RESULTS') {
+        return {
+          'activities': <Activity>[],
+          'nextPageToken': null,
+          'hasMoreData': false,
+        };
+      } else {
+        throw Exception('API Error: ${data['status']}');
+      }
+    } else {
+      throw Exception('Erreur HTTP ${response.statusCode}');
     }
   }
 
+  /// Récupère des suggestions d'autocomplétion
+  Future<List<Map<String, String>>> fetchSuggestions({
+    required String query,
+    double? lat,
+    double? lng,
+  }) async {
+    if (query.isEmpty) return [];
+
+    try {
+      String url =
+          'https://maps.googleapis.com/maps/api/place/autocomplete/json'
+          '?input=${Uri.encodeComponent(query)}'
+          '&key=$_apiKey'
+          '&language=fr';
+
+      if (lat != null && lng != null) {
+        url += '&location=$lat,$lng&radius=50000'; // 50km bias
+      }
+
+      final response = await http.get(Uri.parse(url));
+
+      if (response.statusCode == 200) {
+        final data = json.decode(response.body);
+        if (data['status'] == 'OK') {
+          return (data['predictions'] as List).map<Map<String, String>>((p) {
             return {
-        'activities': <Activity>[],
+              'description': p['description'] as String,
-        'nextPageToken': null,
+              'placeId': p['place_id'] as String,
-        'hasMoreData': false,
             };
+          }).toList();
+        }
+      }
+      return [];
     } catch (e) {
-      LoggerService.error(
+      LoggerService.error('ActivityPlacesService: Erreur autocomplete: $e');
-        'ActivityPlacesService: Erreur recherche toutes catégories paginée: $e',
+      return [];
+    }
+  }
+
+  /// Récupère une activité via son Place ID
+  Future<Activity?> getActivityByPlaceId({
+    required String placeId,
+    required String tripId,
+  }) async {
+    try {
+      final details = await _getPlaceDetails(placeId);
+      if (details == null) return null;
+
+      // Créer une map simulant la structure "place" attendue par _convertPlaceToActivity
+      // Note: _getPlaceDetails retourne "result", qui est déjà ce qu'on veut,
+      // mais _convertPlaceToActivity attend le format "search result" qui a geometry au premier niveau.
+      // Heureusement _getPlaceDetails retourne une structure compatible pour geometry/photos etc.
+
+      // On doit s'assurer d'avoir les types pour déterminer la catégorie
+      final types = List<String>.from(details['types'] ?? []);
+      final category = _determineCategoryFromTypes(types);
+
+      return await _convertPlaceToActivity(
+        details, // details a la structure nécessaire (geometry, name, etc)
+        tripId,
+        category,
       );
-      return {
+    } catch (e) {
-        'activities': <Activity>[],
+      LoggerService.error('ActivityPlacesService: Erreur get details: $e');
-        'nextPageToken': null,
+      return null;
-        'hasMoreData': false,
-      };
     }
   }
 }

lib/services/analytics_service.dart

@@ -0,0 +1,54 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:flutter/foundation.dart';
+
+/// Service wrapper for Google Analytics
+class AnalyticsService {
+  final FirebaseAnalytics _analytics = FirebaseAnalytics.instance;
+
+  FirebaseAnalyticsObserver getAnalyticsObserver() =>
+      FirebaseAnalyticsObserver(analytics: _analytics);
+
+  Future<void> logEvent({
+    required String name,
+    Map<String, Object>? parameters,
+  }) async {
+    try {
+      await _analytics.logEvent(name: name, parameters: parameters);
+    } catch (e) {
+      debugPrint('Error logging analytics event: $e');
+    }
+  }
+
+  Future<void> setUserProperty({
+    required String name,
+    required String? value,
+  }) async {
+    try {
+      await _analytics.setUserProperty(name: name, value: value);
+    } catch (e) {
+      debugPrint('Error setting user property: $e');
+    }
+  }
+
+  Future<void> setUserId(String? id) async {
+    try {
+      await _analytics.setUserId(id: id);
+    } catch (e) {
+      debugPrint('Error setting user ID: $e');
+    }
+  }
+
+  Future<void> logScreenView({
+    required String screenName,
+    String? screenClass,
+  }) async {
+    try {
+      await _analytics.logScreenView(
+        screenName: screenName,
+        screenClass: screenClass,
+      );
+    } catch (e) {
+      debugPrint('Error logging screen view: $e');
+    }
+  }
+}

lib/services/auth_service.dart

@@ -171,18 +171,35 @@ class AuthService {
       }
     } on GoogleSignInException catch (e) {
       _errorService.logError('Google Sign-In error: $e', StackTrace.current);
+      _errorService.showError(
+        message: 'La connexion avec Google a échoué. Veuillez réessayer.',
+      );
       rethrow;
     } on FirebaseAuthException catch (e) {
       _errorService.logError(
         'Firebase error during Google Sign-In initialization: $e',
         StackTrace.current,
       );
+      if (e.code == 'account-exists-with-different-credential') {
+        _errorService.showError(
+          message:
+              'Un compte existe déjà avec cette adresse email. Veuillez vous connecter avec la méthode utilisée précédemment.',
+        );
+      } else {
+        _errorService.showError(
+          message:
+              'Une erreur est survenue lors de la connexion avec Google. Veuillez réessayer plus tard.',
+        );
+      }
       rethrow;
     } catch (e) {
       _errorService.logError(
         'Unknown error during Google Sign-In initialization: $e',
         StackTrace.current,
       );
+      _errorService.showError(
+        message: 'Une erreur inattendue est survenue. Veuillez réessayer.',
+      );
       rethrow;
     }
   }
@@ -208,17 +225,17 @@ class AuthService {
       }
 
       // Request Apple ID credential with platform-specific configuration
-      final AuthorizationCredentialAppleID credential =
+      final AuthorizationCredentialAppleID
-          await SignInWithApple.getAppleIDCredential(
+      credential = await SignInWithApple.getAppleIDCredential(
         scopes: [
           AppleIDAuthorizationScopes.email,
           AppleIDAuthorizationScopes.fullName,
         ],
         // Configuration for Android/Web
         webAuthenticationOptions: WebAuthenticationOptions(
-              clientId: 'be.devdayronvl.TravelMate',
+          clientId: 'be.devdayronvl.TravelMate.service',
           redirectUri: Uri.parse(
-                'https://your-project-id.firebaseapp.com/__/auth/handler',
+            'https://us-central1-travelmate-a47f5.cloudfunctions.net/callbacks_signInWithApple',
           ),
         ),
       );
@@ -247,24 +264,49 @@ class AuthService {
       return userCredential;
     } on SignInWithAppleException catch (e) {
       _errorService.logError('Apple Sign-In error: $e', StackTrace.current);
+      _errorService.showError(
+        message: 'La connexion avec Apple a échoué. Veuillez réessayer.',
+      );
       throw FirebaseAuthException(
         code: 'ERROR_APPLE_SIGNIN_FAILED',
-        message: 'Apple Sign-In failed: ${e.toString()}',
+        message: 'Apple Sign-In failed',
       );
     } on FirebaseAuthException catch (e) {
       _errorService.logError(
         'Firebase error during Apple Sign-In: $e',
         StackTrace.current,
       );
+      if (e.code == 'account-exists-with-different-credential') {
+        _errorService.showError(
+          message:
+              'Un compte existe déjà avec cette adresse email. Veuillez vous connecter avec la méthode utilisée précédemment.',
+        );
+      } else if (e.code == 'invalid-credential') {
+        _errorService.showError(
+          message: 'Les informations de connexion sont invalides.',
+        );
+      } else if (e.code == 'user-disabled') {
+        _errorService.showError(
+          message: 'Ce compte utilisateur a été désactivé.',
+        );
+      } else {
+        _errorService.showError(
+          message:
+              'Une erreur est survenue lors de la connexion avec Apple. Veuillez réessayer plus tard.',
+        );
+      }
       rethrow;
     } catch (e) {
       _errorService.logError(
         'Unknown error during Apple Sign-In: $e',
         StackTrace.current,
       );
+      _errorService.showError(
+        message: 'Une erreur inattendue est survenue. Veuillez réessayer.',
+      );
       throw FirebaseAuthException(
         code: 'ERROR_APPLE_SIGNIN_UNKNOWN',
-        message: 'Unknown error during Apple Sign-In: $e',
+        message: 'Unknown error during Apple Sign-In',
       );
     }
   }

lib/services/map_navigation_service.dart

@@ -0,0 +1,36 @@
+import 'dart:async';
+
+class MapLocationRequest {
+  final double latitude;
+  final double longitude;
+  final String? name;
+  final DateTime timestamp;
+
+  MapLocationRequest({
+    required this.latitude,
+    required this.longitude,
+    this.name,
+  }) : timestamp = DateTime.now();
+}
+
+class MapNavigationService {
+  final _requestController = StreamController<MapLocationRequest>.broadcast();
+  MapLocationRequest? _lastRequest;
+
+  Stream<MapLocationRequest> get requestStream => _requestController.stream;
+  MapLocationRequest? get lastRequest => _lastRequest;
+
+  void navigateToLocation(double lat, double lng, {String? name}) {
+    final request = MapLocationRequest(
+      latitude: lat,
+      longitude: lng,
+      name: name,
+    );
+    _lastRequest = request;
+    _requestController.add(request);
+  }
+
+  void dispose() {
+    _requestController.close();
+  }
+}

lib/services/message_service.dart

@@ -30,12 +30,13 @@ class MessageService {
         senderId: senderId,
         senderName: senderName,
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'message_service.dart',
         'Erreur lors de l\'envoi du message: $e',
+        stackTrace,
       );
-      rethrow;
+      throw Exception('Impossible d\'envoyer le message');
     }
   }
 
@@ -43,12 +44,13 @@ class MessageService {
   Stream<List<Message>> getMessagesStream(String groupId) {
     try {
       return _messageRepository.getMessagesStream(groupId);
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'message_service.dart',
         'Erreur lors de la récupération des messages: $e',
+        stackTrace,
       );
-      rethrow;
+      throw Exception('Impossible de récupérer les messages');
     }
   }
 
@@ -62,12 +64,13 @@ class MessageService {
         groupId: groupId,
         messageId: messageId,
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'message_service.dart',
         'Erreur lors de la suppression du message: $e',
+        stackTrace,
       );
-      rethrow;
+      throw Exception('Impossible de supprimer le message');
     }
   }
 
@@ -87,12 +90,13 @@ class MessageService {
         messageId: messageId,
         newText: newText.trim(),
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'message_service.dart',
         'Erreur lors de la modification du message: $e',
+        stackTrace,
       );
-      rethrow;
+      throw Exception('Impossible de modifier le message');
     }
   }
 
@@ -110,12 +114,13 @@ class MessageService {
         userId: userId,
         reaction: reaction,
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'message_service.dart',
         'Erreur lors de l\'ajout de la réaction: $e',
+        stackTrace,
       );
-      rethrow;
+      throw Exception('Impossible d\'ajouter la réaction');
     }
   }
 
@@ -131,12 +136,13 @@ class MessageService {
         messageId: messageId,
         userId: userId,
       );
-    } catch (e) {
+    } catch (e, stackTrace) {
       _errorService.logError(
         'message_service.dart',
         'Erreur lors de la suppression de la réaction: $e',
+        stackTrace,
       );
-      rethrow;
+      throw Exception('Impossible de supprimer la réaction');
     }
   }
 }

lib/services/notification_service.dart

@@ -1,14 +1,30 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:travel_mate/services/logger_service.dart';
+import 'package:flutter/material.dart';
+import 'package:travel_mate/services/error_service.dart';
+import 'package:travel_mate/repositories/group_repository.dart';
+import 'package:travel_mate/repositories/account_repository.dart';
+import 'package:travel_mate/components/group/chat_group_content.dart';
+import 'package:travel_mate/components/account/group_expenses_page.dart';
+
+@pragma('vm:entry-point')
+Future<void> firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  await Firebase.initializeApp();
+  LoggerService.info('Handling a background message: ${message.messageId}');
+}
 
 class NotificationService {
   static final NotificationService _instance = NotificationService._internal();
   factory NotificationService() => _instance;
   NotificationService._internal();
 
-  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
+  late final FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
-  final FlutterLocalNotificationsPlugin _localNotifications =
+  late final FlutterLocalNotificationsPlugin _localNotifications =
       FlutterLocalNotificationsPlugin();
 
   bool _isInitialized = false;
@@ -34,14 +50,123 @@ class NotificationService {
       onDidReceiveNotificationResponse: (details) {
         // Handle notification tap
         LoggerService.info('Notification tapped: ${details.payload}');
+        if (details.payload != null) {
+          try {
+            final data = json.decode(details.payload!) as Map<String, dynamic>;
+            _handleNotificationTap(data);
+          } catch (e) {
+            LoggerService.error('Error parsing notification payload', error: e);
+          }
+        }
       },
     );
 
     // Handle foreground messages
     FirebaseMessaging.onMessage.listen(_handleForegroundMessage);
 
+    // Handle token refresh
+    FirebaseMessaging.instance.onTokenRefresh.listen(_onTokenRefresh);
+
+    // Setup interacted message (Deep Linking)
+    // We don't call this here anymore, it will be called from HomePage
+    // await setupInteractedMessage();
+
     _isInitialized = true;
     LoggerService.info('NotificationService initialized');
+
+    // Print current token for debugging
+    final token = await getFCMToken();
+    LoggerService.info('Current FCM Token: $token');
+  }
+
+  /// Sets up the background message listener.
+  /// Should be called when the app is ready to handle navigation.
+  void startListening() {
+    // Handle any interaction when the app is in the background via a
+    // Stream listener
+    FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
+      _handleNotificationTap(message.data);
+    });
+  }
+
+  /// Checks for an initial message (app opened from terminated state)
+  /// and handles it if present.
+  Future<void> handleInitialMessage() async {
+    // Get any messages which caused the application to open from
+    // a terminated state.
+    RemoteMessage? initialMessage = await _firebaseMessaging
+        .getInitialMessage();
+
+    if (initialMessage != null) {
+      LoggerService.info('Found initial message: ${initialMessage.data}');
+      _handleNotificationTap(initialMessage.data);
+    }
+  }
+
+  Future<void> _handleNotificationTap(Map<String, dynamic> data) async {
+    LoggerService.info('Handling notification tap with data: $data');
+    // DEBUG: Show snackbar to verify payload
+    // ErrorService().showSnackbar(message: 'Debug: Payload $data', isError: false);
+
+    final type = data['type'];
+
+    try {
+      if (type == 'message') {
+        final groupId = data['groupId'];
+        if (groupId != null) {
+          final groupRepository = GroupRepository();
+          final group = await groupRepository.getGroupById(groupId);
+          if (group != null) {
+            ErrorService.navigatorKey.currentState?.push(
+              MaterialPageRoute(
+                builder: (context) => ChatGroupContent(group: group),
+              ),
+            );
+          } else {
+            LoggerService.error('Group not found: $groupId');
+            // ErrorService().showError(message: 'Groupe introuvable: $groupId');
+          }
+        } else {
+          LoggerService.error('Missing groupId in payload');
+          // ErrorService().showError(message: 'Payload invalide: groupId manquant');
+        }
+      } else if (type == 'expense') {
+        final tripId = data['tripId'];
+        if (tripId != null) {
+          final accountRepository = AccountRepository();
+          final groupRepository = GroupRepository();
+
+          final account = await accountRepository.getAccountByTripId(tripId);
+          final group = await groupRepository.getGroupByTripId(tripId);
+
+          if (account != null && group != null) {
+            ErrorService.navigatorKey.currentState?.push(
+              MaterialPageRoute(
+                builder: (context) =>
+                    GroupExpensesPage(account: account, group: group),
+              ),
+            );
+          } else {
+            LoggerService.error('Account or Group not found for trip: $tripId');
+            // ErrorService().showError(message: 'Compte ou Groupe introuvable');
+          }
+        }
+      } else {
+        LoggerService.info('Unknown notification type: $type');
+      }
+    } catch (e) {
+      LoggerService.error('Error handling notification tap: $e');
+      ErrorService().showError(message: 'Erreur navigation: $e');
+    }
+  }
+
+  Future<void> _onTokenRefresh(String newToken) async {
+    LoggerService.info('FCM Token refreshed: $newToken');
+    // We need the user ID to save the token.
+    // Since this service is a singleton, we might not have direct access to the user ID here
+    // without injecting the repository or bloc.
+    // For now, we rely on the AuthBloc to update the token on login/start.
+    // Ideally, we should save it here if we have the user ID.
   }
 
   Future<void> _requestPermissions() async {
@@ -58,13 +183,46 @@ class NotificationService {
 
   Future<String?> getFCMToken() async {
     try {
-      return await _firebaseMessaging.getToken();
+      if (Platform.isIOS) {
+        String? apnsToken = await _firebaseMessaging.getAPNSToken();
+        int retries = 0;
+        while (apnsToken == null && retries < 10) {
+          LoggerService.info(
+            'Waiting for APNS token... (Attempt ${retries + 1}/10)',
+          );
+          await Future.delayed(const Duration(seconds: 2));
+          apnsToken = await _firebaseMessaging.getAPNSToken();
+          retries++;
+        }
+        if (apnsToken == null) {
+          LoggerService.error('APNS token not available after retries');
+          return null;
+        }
+      }
+
+      final token = await _firebaseMessaging.getToken();
+      LoggerService.info('NotificationService - FCM Token: $token');
+      return token;
     } catch (e) {
       LoggerService.error('Error getting FCM token: $e');
       return null;
     }
   }
 
+  Future<void> saveTokenToFirestore(String userId) async {
+    try {
+      final token = await getFCMToken();
+      if (token != null) {
+        await FirebaseFirestore.instance.collection('users').doc(userId).set({
+          'fcmToken': token,
+        }, SetOptions(merge: true));
+        LoggerService.info('FCM Token saved to Firestore for user: $userId');
+      }
+    } catch (e) {
+      LoggerService.error('Error saving FCM token to Firestore: $e');
+    }
+  }
+
   Future<void> _handleForegroundMessage(RemoteMessage message) async {
     LoggerService.info('Got a message whilst in the foreground!');
     LoggerService.info('Message data: ${message.data}');

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 {

lib/services/user_service.dart

@@ -5,6 +5,7 @@ import '../blocs/user/user_state.dart';
 
 /// Service for managing user operations with Firestore and Firebase Auth.
 /// 
+/// 
 /// This service provides functionality for user management including creating,
 /// retrieving, updating, and deleting user data in Firestore. It also handles
 /// user authentication state and provides methods for user profile management.

lib/services/whats_new_service.dart

@@ -0,0 +1,68 @@
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import '../../services/logger_service.dart';
+
+class WhatsNewService {
+  static const String _lastVersionKey = 'last_known_version';
+
+  /// Vérifie si le popup "Nouveautés" doit être affiché.
+  ///
+  /// Retourne true si:
+  /// - Ce n'est PAS une nouvelle installation
+  /// - ET la version actuelle est plus récente que la version stockée
+  Future<bool> shouldShowWhatsNew() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final packageInfo = await PackageInfo.fromPlatform();
+
+      final currentVersion = packageInfo.version;
+      final lastVersion = prefs.getString(_lastVersionKey);
+
+      LoggerService.info(
+        'WhatsNewService: Current=$currentVersion, Last=$lastVersion',
+      );
+
+      // Cas 1: Première installation (lastVersion est null)
+      if (lastVersion == null) {
+        // On sauvegarde la version actuelle pour ne pas afficher le popup
+        // la prochaine fois, et on retourne false maintenant.
+        await prefs.setString(_lastVersionKey, currentVersion);
+        LoggerService.info(
+          'WhatsNewService: Fresh install detected. Marking version $currentVersion as read.',
+        );
+        return false;
+      }
+
+      // Cas 2: Mise à jour (lastVersion != currentVersion)
+      if (lastVersion != currentVersion) {
+        // C'est une mise à jour, on doit afficher le popup.
+        // On NE met PAS à jour la version ici, on attend que l'utilisateur ait vu le popup.
+        LoggerService.info(
+          'WhatsNewService: Update detected ($lastVersion -> $currentVersion). Showing popup.',
+        );
+        return true;
+      }
+
+      // Cas 3: Même version
+      return false;
+    } catch (e) {
+      LoggerService.error('WhatsNewService: Error checking version: $e');
+      return false;
+    }
+  }
+
+  /// Marque la version actuelle comme "Vue".
+  /// À appeler quand l'utilisateur ferme le popup.
+  Future<void> markCurrentVersionAsSeen() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final packageInfo = await PackageInfo.fromPlatform();
+      await prefs.setString(_lastVersionKey, packageInfo.version);
+      LoggerService.info(
+        'WhatsNewService: Version ${packageInfo.version} marked as seen.',
+      );
+    } catch (e) {
+      LoggerService.error('WhatsNewService: Error marking seen: $e');
+    }
+  }
+}

pubspec.lock

@@ -1,14 +1,30 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
+      url: "https://pub.dev"
+    source: hosted
+    version: "85.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "8a1f5f3020ef2a74fb93f7ab3ef127a8feea33a7a2276279113660784ee7516a"
+      sha256: e4a1b612fd2955908e26116075b3a4baf10c353418ca645b4deae231c82bf144
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.64"
+    version: "1.3.65"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.7.1"
   archive:
     dependency: transitive
     description:
@@ -49,6 +65,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "9.1.0"
+  bloc_test:
+    dependency: "direct dev"
+    description:
+      name: bloc_test
+      sha256: "1dd549e58be35148bc22a9135962106aa29334bc1e3f285994946a1057b29d7b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -57,6 +81,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.1"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.3.1"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.12.1"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -97,6 +185,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.4"
+  cli_config:
+    dependency: transitive
+    description:
+      name: cli_config
+      sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   cli_util:
     dependency: transitive
     description:
@@ -137,6 +233,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.3"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.0"
   collection:
     dependency: transitive
     description:
@@ -145,6 +249,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.15.0"
   cross_file:
     dependency: transitive
     description:
@@ -177,6 +297,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
   dbus:
     dependency: transitive
     description:
@@ -185,6 +313,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.11"
+  diff_match_patch:
+    dependency: transitive
+    description:
+      name: diff_match_patch
+      sha256: "2efc9e6e8f449d0abe15be240e2c2a3bcd977c8d126cfd70598aee60af35c0a4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
   dio:
     dependency: transitive
     description:
@@ -265,6 +401,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.3+4"
+  firebase_analytics:
+    dependency: "direct main"
+    description:
+      name: firebase_analytics
+      sha256: "8ca4832c7a6d145ce987fd07d6dfbb8c91d9058178342f20de6305fb77b1b40d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.1.0"
+  firebase_analytics_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_analytics_platform_interface
+      sha256: d00234716f415f89eb5c2cefb1238d7fd2f3120275d71414b84ae434dcdb7a19
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.5"
+  firebase_analytics_web:
+    dependency: transitive
+    description:
+      name: firebase_analytics_web
+      sha256: e42b294e51aedb4bd4b761a886c8d6b473c44b44aa4c0b47cab06b2c66ac3fba
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1+1"
   firebase_auth:
     dependency: "direct main"
     description:
@@ -293,10 +453,10 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "1f2dfd9f535d81f8b06d7a50ecda6eac1e6922191ed42e09ca2c84bd2288927c"
+      sha256: "29cfa93c771d8105484acac340b5ea0835be371672c91405a300303986f4eba9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.1"
+    version: "4.3.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -309,10 +469,10 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: ff18fabb0ad0ed3595d2f2c85007ecc794aadecdff5b3bb1460b7ee47cded398
+      sha256: a631bbfbfa26963d68046aed949df80b228964020e9155b086eff94f462bbf1f
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.3.1"
   firebase_messaging:
     dependency: "direct main"
     description:
@@ -472,6 +632,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "10.12.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
   geoclue:
     dependency: transitive
     description:
@@ -536,6 +704,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.5"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
   google_identity_services_web:
     dependency: transitive
     description:
@@ -561,13 +737,13 @@ packages:
     source: hosted
     version: "2.13.1"
   google_maps_flutter_android:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: google_maps_flutter_android
-      sha256: f820a3990d4ff23e3baf01ce794f7f08cca9a9ce6c875ec96882d605f6f039df
+      sha256: "3835f6ae5e8b8d4d454d913575069513c9f216e088b87aa5c18cb3610951c6b4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.18.4"
+    version: "2.18.6"
   google_maps_flutter_ios:
     dependency: transitive
     description:
@@ -577,13 +753,13 @@ packages:
     source: hosted
     version: "2.15.5"
   google_maps_flutter_platform_interface:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: google_maps_flutter_platform_interface
-      sha256: f4b9b44f7b12a1f6707ffc79d082738e0b7e194bf728ee61d2b3cdf5fdf16081
+      sha256: e8b1232419fcdd35c1fdafff96843f5a40238480365599d8ca661dde96d283dd
       url: "https://pub.dev"
     source: hosted
-    version: "2.14.0"
+    version: "2.14.1"
   google_maps_flutter_web:
     dependency: transitive
     description:
@@ -640,6 +816,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
   gsettings:
     dependency: transitive
     description:
@@ -664,6 +848,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -752,6 +944,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.20.2"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.2"
   json_annotation:
     dependency: transitive
     description:
@@ -816,6 +1024,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.1"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -848,6 +1064,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  mockito:
+    dependency: "direct dev"
+    description:
+      name: mockito
+      sha256: "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.5.0"
+  mocktail:
+    dependency: transitive
+    description:
+      name: mocktail
+      sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   nested:
     dependency: transitive
     description:
@@ -856,6 +1088,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   octo_image:
     dependency: transitive
     description:
@@ -864,8 +1104,16 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
-  package_info_plus:
+  package_config:
     dependency: transitive
+    description:
+      name: package_config
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  package_info_plus:
+    dependency: "direct main"
     description:
       name: package_info_plus
       sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"
@@ -960,6 +1208,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.2"
   posix:
     dependency: transitive
     description:
@@ -976,6 +1232,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.5+1"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
   rxdart:
     dependency: transitive
     description:
@@ -1048,6 +1320,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.1"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.2"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sign_in_button:
     dependency: "direct main"
     description:
@@ -1093,6 +1397,30 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.13"
   source_span:
     dependency: transitive
     description:
@@ -1205,6 +1533,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.2"
+  test:
+    dependency: transitive
+    description:
+      name: test
+      sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.26.2"
   test_api:
     dependency: transitive
     description:
@@ -1213,6 +1549,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.6"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.11"
   timezone:
     dependency: transitive
     description:
@@ -1221,6 +1565,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.1"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   typed_data:
     dependency: transitive
     description:
@@ -1317,6 +1669,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "15.0.2"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
   web:
     dependency: transitive
     description:
@@ -1325,6 +1685,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   win32:
     dependency: transitive
     description:

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: 2026.1.3+1
 
 environment:
   sdk: ^3.9.2
@@ -63,18 +63,21 @@ dependencies:
   image: ^4.5.4
   firebase_messaging: ^16.0.4
   flutter_local_notifications: ^19.5.0
+  package_info_plus: ^8.3.1
+  google_maps_flutter_platform_interface: ^2.14.1
+  google_maps_flutter_android: ^2.18.6
+  firebase_analytics: ^12.1.0
 
 dev_dependencies:
   flutter_launcher_icons: ^0.13.1
   flutter_test:
     sdk: flutter
 
-  # The "flutter_lints" package below contains a set of recommended lints to
+
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
   flutter_lints: ^6.0.0
+  mockito: ^5.4.4
+  build_runner: ^2.4.8
+  bloc_test: ^10.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

test/blocs/auth_bloc_test.dart

@@ -0,0 +1,130 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:bloc_test/bloc_test.dart';
+import 'package:mockito/mockito.dart';
+import 'package:mockito/annotations.dart';
+import 'package:travel_mate/blocs/auth/auth_bloc.dart';
+import 'package:travel_mate/blocs/auth/auth_event.dart';
+import 'package:travel_mate/blocs/auth/auth_state.dart';
+import 'package:travel_mate/repositories/auth_repository.dart';
+import 'package:travel_mate/models/user.dart';
+import 'package:firebase_auth/firebase_auth.dart' as firebase_auth;
+
+import 'package:travel_mate/services/notification_service.dart';
+
+import 'auth_bloc_test.mocks.dart';
+
+@GenerateMocks([AuthRepository, NotificationService])
+void main() {
+  group('AuthBloc', () {
+    late MockAuthRepository mockAuthRepository;
+    late MockNotificationService mockNotificationService;
+    late AuthBloc authBloc;
+
+    final user = User(
+      id: '123',
+      nom: 'Doe',
+      prenom: 'John',
+      email: 'test@example.com',
+      platform: 'email',
+    );
+
+    setUp(() {
+      mockAuthRepository = MockAuthRepository();
+      mockNotificationService = MockNotificationService();
+      authBloc = AuthBloc(
+        authRepository: mockAuthRepository,
+        notificationService: mockNotificationService,
+      );
+
+      // Default stub for saveTokenToFirestore to avoid strict mock errors
+      when(
+        mockNotificationService.saveTokenToFirestore(any),
+      ).thenAnswer((_) async {});
+    });
+
+    tearDown(() {
+      authBloc.close();
+    });
+
+    test('initial state is AuthUninitialized', () {
+      expect(authBloc.state, AuthInitial());
+    });
+
+    blocTest<AuthBloc, AuthState>(
+      'emits [AuthAuthenticated] when AuthCheckRequested is added and user is logged in',
+      build: () {
+        when(
+          mockAuthRepository.currentUser,
+        ).thenReturn(MockFirebaseUser(uid: '123', email: 'test@example.com'));
+        when(
+          mockAuthRepository.getUserFromFirestore('123'),
+        ).thenAnswer((_) async => user);
+        return authBloc;
+      },
+      act: (bloc) => bloc.add(AuthCheckRequested()),
+      expect: () => [AuthLoading(), AuthAuthenticated(user: user)],
+    );
+
+    blocTest<AuthBloc, AuthState>(
+      'emits [AuthUnauthenticated] when AuthCheckRequested is added and user is not logged in',
+      build: () {
+        when(mockAuthRepository.currentUser).thenReturn(null);
+        return authBloc;
+      },
+      act: (bloc) => bloc.add(AuthCheckRequested()),
+      expect: () => [AuthLoading(), AuthUnauthenticated()],
+    );
+
+    blocTest<AuthBloc, AuthState>(
+      'emits [AuthAuthenticated] when AuthSignInRequested is added',
+      build: () {
+        when(
+          mockAuthRepository.signInWithEmailAndPassword(
+            email: 'test@example.com',
+            password: 'password',
+          ),
+        ).thenAnswer((_) async => user);
+        return authBloc;
+      },
+      act: (bloc) => bloc.add(
+        const AuthSignInRequested(
+          email: 'test@example.com',
+          password: 'password',
+        ),
+      ),
+      expect: () => [AuthLoading(), AuthAuthenticated(user: user)],
+    );
+
+    blocTest<AuthBloc, AuthState>(
+      'emits [AuthUnauthenticated] when AuthSignOutRequested is added',
+      build: () {
+        when(mockAuthRepository.signOut()).thenAnswer((_) async {});
+        return authBloc;
+      },
+      act: (bloc) => bloc.add(AuthSignOutRequested()),
+      expect: () => [AuthUnauthenticated()],
+      verify: (_) {
+        verify(mockAuthRepository.signOut()).called(1);
+      },
+    );
+  });
+}
+
+// Simple Mock for FirebaseUser since we can't easily mock the real one without more boilerplate
+// or using firebase_auth_mocks package which we didn't add.
+// However, AuthRepository.currentUser returns firebase_auth.User.
+// Attempting to mock it via extends might be tricky due to private constructors.
+// Let's rely on Mockito to generate a mock for firebase_auth.User if needed,
+// or adjusting the test to not depend on the return value of currentUser being a complex object
+// if the Bloc only checks for null.
+//
+// Looking at AuthBloc source (I haven't read it yet), it probably checks `authRepository.currentUser`.
+// I'll read AuthBloc code in the next step to be sure how to mock the return value.
+class MockFirebaseUser extends Mock implements firebase_auth.User {
+  @override
+  final String uid;
+  @override
+  final String? email;
+
+  MockFirebaseUser({required this.uid, this.email});
+}

test/blocs/auth_bloc_test.mocks.dart

@@ -0,0 +1,198 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in travel_mate/test/blocs/auth_bloc_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:firebase_auth/firebase_auth.dart' as _i4;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:travel_mate/models/user.dart' as _i5;
+import 'package:travel_mate/repositories/auth_repository.dart' as _i2;
+import 'package:travel_mate/services/notification_service.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+/// A class which mocks [AuthRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAuthRepository extends _i1.Mock implements _i2.AuthRepository {
+  MockAuthRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<_i4.User?> get authStateChanges =>
+      (super.noSuchMethod(
+            Invocation.getter(#authStateChanges),
+            returnValue: _i3.Stream<_i4.User?>.empty(),
+          )
+          as _i3.Stream<_i4.User?>);
+
+  @override
+  _i3.Future<_i5.User?> signInWithEmailAndPassword({
+    required String? email,
+    required String? password,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#signInWithEmailAndPassword, [], {
+              #email: email,
+              #password: password,
+            }),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+
+  @override
+  _i3.Future<_i5.User?> signUpWithEmailAndPassword({
+    required String? email,
+    required String? password,
+    required String? nom,
+    required String? prenom,
+    required String? phoneNumber,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#signUpWithEmailAndPassword, [], {
+              #email: email,
+              #password: password,
+              #nom: nom,
+              #prenom: prenom,
+              #phoneNumber: phoneNumber,
+            }),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+
+  @override
+  _i3.Future<_i5.User?> signUpWithGoogle(
+    String? phoneNumber,
+    String? name,
+    String? firstname,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#signUpWithGoogle, [
+              phoneNumber,
+              name,
+              firstname,
+            ]),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+
+  @override
+  _i3.Future<_i5.User?> signInWithGoogle() =>
+      (super.noSuchMethod(
+            Invocation.method(#signInWithGoogle, []),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+
+  @override
+  _i3.Future<_i5.User?> signUpWithApple(
+    String? phoneNumber,
+    String? name,
+    String? firstname,
+  ) =>
+      (super.noSuchMethod(
+            Invocation.method(#signUpWithApple, [phoneNumber, name, firstname]),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+
+  @override
+  _i3.Future<_i5.User?> signInWithApple() =>
+      (super.noSuchMethod(
+            Invocation.method(#signInWithApple, []),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+
+  @override
+  _i3.Future<void> signOut() =>
+      (super.noSuchMethod(
+            Invocation.method(#signOut, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> resetPassword(String? email) =>
+      (super.noSuchMethod(
+            Invocation.method(#resetPassword, [email]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<_i5.User?> getUserFromFirestore(String? uid) =>
+      (super.noSuchMethod(
+            Invocation.method(#getUserFromFirestore, [uid]),
+            returnValue: _i3.Future<_i5.User?>.value(),
+          )
+          as _i3.Future<_i5.User?>);
+}
+
+/// A class which mocks [NotificationService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockNotificationService extends _i1.Mock
+    implements _i6.NotificationService {
+  MockNotificationService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<void> initialize() =>
+      (super.noSuchMethod(
+            Invocation.method(#initialize, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  void startListening() => super.noSuchMethod(
+    Invocation.method(#startListening, []),
+    returnValueForMissingStub: null,
+  );
+
+  @override
+  _i3.Future<void> handleInitialMessage() =>
+      (super.noSuchMethod(
+            Invocation.method(#handleInitialMessage, []),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<String?> getFCMToken() =>
+      (super.noSuchMethod(
+            Invocation.method(#getFCMToken, []),
+            returnValue: _i3.Future<String?>.value(),
+          )
+          as _i3.Future<String?>);
+
+  @override
+  _i3.Future<void> saveTokenToFirestore(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveTokenToFirestore, [userId]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}

test/blocs/group_bloc_test.dart

@@ -0,0 +1,108 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:bloc_test/bloc_test.dart';
+import 'package:mockito/mockito.dart';
+import 'package:mockito/annotations.dart';
+import 'package:travel_mate/blocs/group/group_bloc.dart';
+import 'package:travel_mate/blocs/group/group_event.dart';
+import 'package:travel_mate/blocs/group/group_state.dart';
+import 'package:travel_mate/repositories/group_repository.dart';
+import 'package:travel_mate/models/group.dart';
+import 'package:travel_mate/models/group_member.dart';
+
+import 'group_bloc_test.mocks.dart';
+
+@GenerateMocks([GroupRepository])
+void main() {
+  group('GroupBloc', () {
+    late MockGroupRepository mockGroupRepository;
+    late GroupBloc groupBloc;
+
+    final group = Group(
+      id: 'group1',
+      name: 'Test Group',
+      tripId: 'trip1',
+      createdBy: 'user1',
+    );
+
+    setUp(() {
+      mockGroupRepository = MockGroupRepository();
+      groupBloc = GroupBloc(mockGroupRepository);
+    });
+
+    tearDown(() {
+      groupBloc.close();
+    });
+
+    test('initial state is GroupInitial', () {
+      expect(groupBloc.state, GroupInitial());
+    });
+
+    // LoadGroupsByUserId - Stream test
+    // Stream mocking is a bit verbose with Mockito. We simulate stream behavior.
+    blocTest<GroupBloc, GroupState>(
+      'emits [GroupLoading, GroupsLoaded] when LoadGroupsByUserId is added',
+      setUp: () {
+        when(
+          mockGroupRepository.getGroupsByUserId('user1'),
+        ).thenAnswer((_) => Stream.value([group]));
+      },
+      build: () => groupBloc,
+      act: (bloc) => bloc.add(LoadGroupsByUserId('user1')),
+      expect: () => [
+        GroupLoading(),
+        GroupsLoaded([group]),
+      ],
+    );
+
+    blocTest<GroupBloc, GroupState>(
+      'emits [GroupLoading, GroupError] when LoadGroupsByUserId stream errors',
+      setUp: () {
+        when(
+          mockGroupRepository.getGroupsByUserId('user1'),
+        ).thenAnswer((_) => Stream.error('Error loading groups'));
+      },
+      build: () => groupBloc,
+      act: (bloc) => bloc.add(LoadGroupsByUserId('user1')),
+      expect: () => [GroupLoading(), GroupError('Error loading groups')],
+    );
+
+    // CreateGroup
+    blocTest<GroupBloc, GroupState>(
+      'emits [GroupLoading, GroupCreated, GroupOperationSuccess] when CreateGroup is added',
+      setUp: () {
+        when(
+          mockGroupRepository.createGroupWithMembers(
+            group: anyNamed('group'),
+            members: anyNamed('members'),
+          ),
+        ).thenAnswer((_) async => 'group1');
+      },
+      build: () => groupBloc,
+      act: (bloc) => bloc.add(CreateGroup(group)),
+      expect: () => [
+        GroupLoading(),
+        GroupCreated(groupId: 'group1'),
+        GroupOperationSuccess('Group created successfully'),
+      ],
+    );
+
+    // AddMemberToGroup
+    final member = GroupMember(
+      userId: 'user2',
+      firstName: 'Bob',
+      role: 'member',
+      joinedAt: DateTime.now(),
+    );
+    blocTest<GroupBloc, GroupState>(
+      'emits [GroupOperationSuccess] when AddMemberToGroup is added',
+      setUp: () {
+        when(
+          mockGroupRepository.addMember('group1', member),
+        ).thenAnswer((_) async {});
+      },
+      build: () => groupBloc,
+      act: (bloc) => bloc.add(AddMemberToGroup('group1', member)),
+      expect: () => [GroupOperationSuccess('Member added')],
+    );
+  });
+}

test/blocs/group_bloc_test.mocks.dart

@@ -0,0 +1,135 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in travel_mate/test/blocs/group_bloc_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i6;
+import 'package:travel_mate/models/group.dart' as _i4;
+import 'package:travel_mate/models/group_member.dart' as _i5;
+import 'package:travel_mate/repositories/group_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+/// A class which mocks [GroupRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockGroupRepository extends _i1.Mock implements _i2.GroupRepository {
+  MockGroupRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Future<String> createGroupWithMembers({
+    required _i4.Group? group,
+    required List<_i5.GroupMember>? members,
+  }) =>
+      (super.noSuchMethod(
+            Invocation.method(#createGroupWithMembers, [], {
+              #group: group,
+              #members: members,
+            }),
+            returnValue: _i3.Future<String>.value(
+              _i6.dummyValue<String>(
+                this,
+                Invocation.method(#createGroupWithMembers, [], {
+                  #group: group,
+                  #members: members,
+                }),
+              ),
+            ),
+          )
+          as _i3.Future<String>);
+
+  @override
+  _i3.Stream<List<_i4.Group>> getGroupsByUserId(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getGroupsByUserId, [userId]),
+            returnValue: _i3.Stream<List<_i4.Group>>.empty(),
+          )
+          as _i3.Stream<List<_i4.Group>>);
+
+  @override
+  _i3.Future<_i4.Group?> getGroupById(String? groupId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getGroupById, [groupId]),
+            returnValue: _i3.Future<_i4.Group?>.value(),
+          )
+          as _i3.Future<_i4.Group?>);
+
+  @override
+  _i3.Future<_i4.Group?> getGroupByTripId(String? tripId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getGroupByTripId, [tripId]),
+            returnValue: _i3.Future<_i4.Group?>.value(),
+          )
+          as _i3.Future<_i4.Group?>);
+
+  @override
+  _i3.Future<List<_i5.GroupMember>> getGroupMembers(String? groupId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getGroupMembers, [groupId]),
+            returnValue: _i3.Future<List<_i5.GroupMember>>.value(
+              <_i5.GroupMember>[],
+            ),
+          )
+          as _i3.Future<List<_i5.GroupMember>>);
+
+  @override
+  _i3.Future<void> addMember(String? groupId, _i5.GroupMember? member) =>
+      (super.noSuchMethod(
+            Invocation.method(#addMember, [groupId, member]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> removeMember(String? groupId, String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#removeMember, [groupId, userId]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> updateGroup(String? groupId, _i4.Group? group) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateGroup, [groupId, group]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteGroup(String? tripId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteGroup, [tripId]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Stream<List<_i5.GroupMember>> watchGroupMembers(String? groupId) =>
+      (super.noSuchMethod(
+            Invocation.method(#watchGroupMembers, [groupId]),
+            returnValue: _i3.Stream<List<_i5.GroupMember>>.empty(),
+          )
+          as _i3.Stream<List<_i5.GroupMember>>);
+}

test/blocs/trip_bloc_test.dart

@@ -0,0 +1,103 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:bloc_test/bloc_test.dart';
+import 'package:mockito/mockito.dart';
+import 'package:mockito/annotations.dart';
+import 'package:travel_mate/blocs/trip/trip_bloc.dart';
+import 'package:travel_mate/blocs/trip/trip_event.dart';
+import 'package:travel_mate/blocs/trip/trip_state.dart';
+import 'package:travel_mate/repositories/trip_repository.dart';
+import 'package:travel_mate/models/trip.dart';
+
+import 'trip_bloc_test.mocks.dart';
+
+@GenerateMocks([TripRepository])
+void main() {
+  group('TripBloc', () {
+    late MockTripRepository mockTripRepository;
+    late TripBloc tripBloc;
+
+    final trip = Trip(
+      id: 'trip1',
+      title: 'Summer Vacation',
+      description: 'Trip to the beach',
+      location: 'Miami',
+      startDate: DateTime(2023, 6, 1),
+      endDate: DateTime(2023, 6, 10),
+      createdBy: 'user1',
+      createdAt: DateTime(2023, 1, 1),
+      updatedAt: DateTime(2023, 1, 2),
+      participants: ['user1'],
+      status: 'active',
+    );
+
+    setUp(() {
+      mockTripRepository = MockTripRepository();
+      tripBloc = TripBloc(mockTripRepository);
+    });
+
+    tearDown(() {
+      tripBloc.close();
+    });
+
+    test('initial state is TripInitial', () {
+      expect(tripBloc.state, TripInitial());
+    });
+
+    // LoadTripsByUserId
+    blocTest<TripBloc, TripState>(
+      'emits [TripLoading, TripLoaded] when LoadTripsByUserId is added',
+      setUp: () {
+        when(
+          mockTripRepository.getTripsByUserId('user1'),
+        ).thenAnswer((_) => Stream.value([trip]));
+      },
+      build: () => tripBloc,
+      act: (bloc) => bloc.add(const LoadTripsByUserId(userId: 'user1')),
+      expect: () => [
+        TripLoading(),
+        TripLoaded([trip]),
+      ],
+    );
+
+    blocTest<TripBloc, TripState>(
+      'emits [TripLoading, TripError] when stream error',
+      setUp: () {
+        when(
+          mockTripRepository.getTripsByUserId('user1'),
+        ).thenAnswer((_) => Stream.error('Error loading trips'));
+      },
+      build: () => tripBloc,
+      act: (bloc) => bloc.add(const LoadTripsByUserId(userId: 'user1')),
+      expect: () => [
+        TripLoading(),
+        const TripError('Impossible de charger les voyages'),
+      ],
+    );
+
+    // TripCreateRequested
+    blocTest<TripBloc, TripState>(
+      'emits [TripLoading, TripCreated] when TripCreateRequested is added',
+      setUp: () {
+        when(
+          mockTripRepository.createTrip(any),
+        ).thenAnswer((_) async => 'trip1');
+      },
+      build: () => tripBloc,
+      act: (bloc) => bloc.add(TripCreateRequested(trip: trip)),
+      // Note: TripBloc automatically refreshes list if _currentUserId is set.
+      // Here we haven't loaded trips so _currentUserId is null.
+      expect: () => [TripLoading(), const TripCreated(tripId: 'trip1')],
+    );
+
+    // TripDeleteRequested
+    blocTest<TripBloc, TripState>(
+      'emits [TripOperationSuccess] when TripDeleteRequested is added',
+      setUp: () {
+        when(mockTripRepository.deleteTrip('trip1')).thenAnswer((_) async {});
+      },
+      build: () => tripBloc,
+      act: (bloc) => bloc.add(const TripDeleteRequested(tripId: 'trip1')),
+      expect: () => [const TripOperationSuccess('Trip deleted successfully')],
+    );
+  });
+}

test/blocs/trip_bloc_test.mocks.dart

@@ -0,0 +1,81 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in travel_mate/test/blocs/trip_bloc_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i3;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i5;
+import 'package:travel_mate/models/trip.dart' as _i4;
+import 'package:travel_mate/repositories/trip_repository.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+/// A class which mocks [TripRepository].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTripRepository extends _i1.Mock implements _i2.TripRepository {
+  MockTripRepository() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.Stream<List<_i4.Trip>> getTripsByUserId(String? userId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getTripsByUserId, [userId]),
+            returnValue: _i3.Stream<List<_i4.Trip>>.empty(),
+          )
+          as _i3.Stream<List<_i4.Trip>>);
+
+  @override
+  _i3.Future<String> createTrip(_i4.Trip? trip) =>
+      (super.noSuchMethod(
+            Invocation.method(#createTrip, [trip]),
+            returnValue: _i3.Future<String>.value(
+              _i5.dummyValue<String>(
+                this,
+                Invocation.method(#createTrip, [trip]),
+              ),
+            ),
+          )
+          as _i3.Future<String>);
+
+  @override
+  _i3.Future<_i4.Trip?> getTripById(String? tripId) =>
+      (super.noSuchMethod(
+            Invocation.method(#getTripById, [tripId]),
+            returnValue: _i3.Future<_i4.Trip?>.value(),
+          )
+          as _i3.Future<_i4.Trip?>);
+
+  @override
+  _i3.Future<void> updateTrip(String? tripId, _i4.Trip? trip) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateTrip, [tripId, trip]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+
+  @override
+  _i3.Future<void> deleteTrip(String? tripId) =>
+      (super.noSuchMethod(
+            Invocation.method(#deleteTrip, [tripId]),
+            returnValue: _i3.Future<void>.value(),
+            returnValueForMissingStub: _i3.Future<void>.value(),
+          )
+          as _i3.Future<void>);
+}

test/models/expense_test.dart

@@ -0,0 +1,91 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:travel_mate/models/expense.dart';
+import 'package:travel_mate/models/expense_split.dart';
+
+void main() {
+  group('Expense Model Tests', () {
+    const id = 'expense1';
+    const groupId = 'group1';
+    const description = 'Lunch';
+    const amount = 50.0;
+    const currency = ExpenseCurrency.eur;
+    const amountInEur = 50.0;
+    const category = ExpenseCategory.restaurant;
+    const paidById = 'user1';
+    const paidByName = 'Alice';
+    final date = DateTime(2023, 6, 1);
+    final createdAt = DateTime(2023, 6, 1);
+    const split = ExpenseSplit(
+      userId: 'user1',
+      userName: 'Alice',
+      amount: 25.0,
+    );
+    const splits = [
+      split,
+      ExpenseSplit(userId: 'user2', userName: 'Bob', amount: 25.0),
+    ];
+
+    final expense = Expense(
+      id: id,
+      groupId: groupId,
+      description: description,
+      amount: amount,
+      currency: currency,
+      amountInEur: amountInEur,
+      category: category,
+      paidById: paidById,
+      paidByName: paidByName,
+      date: date,
+      createdAt: createdAt,
+      splits: splits,
+    );
+
+    test('supports value equality', () {
+      final expense2 = Expense(
+        id: id,
+        groupId: groupId,
+        description: description,
+        amount: amount,
+        currency: currency,
+        amountInEur: amountInEur,
+        category: category,
+        paidById: paidById,
+        paidByName: paidByName,
+        date: date,
+        createdAt: createdAt,
+        splits: splits,
+      );
+      expect(expense, equals(expense2));
+    });
+
+    group('fromMap', () {
+      test('parses correctly', () {
+        final map = {
+          'groupId': groupId,
+          'description': description,
+          'amount': amount,
+          'currency': 'EUR',
+          'amountInEur': amountInEur,
+          'category': 'restaurant', // matching category name
+          'paidById': paidById,
+          'paidByName': paidByName,
+          'date': Timestamp.fromDate(date),
+          'createdAt': Timestamp.fromDate(createdAt),
+          'splits': splits.map((s) => s.toMap()).toList(),
+        };
+
+        final fromMapExpense = Expense.fromMap(map, id);
+        expect(fromMapExpense, equals(expense));
+      });
+    });
+
+    group('copyWith', () {
+      test('updates fields correctly', () {
+        final updated = expense.copyWith(amount: 100.0);
+        expect(updated.amount, 100.0);
+        expect(updated.description, description);
+      });
+    });
+  });
+}