Compare commits

..

109 Commits

Author SHA1 Message Date
Van Leemput Dayron
e665dea82a feat(activities): add autocomplete & what's new popup
All checks were successful
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 2m6s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Successful in 4m3s
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.
2026-01-13 17:36:51 +01:00
Van Leemput Dayron
b511ec5df0 Update map autocompletion
All checks were successful
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 2m5s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Successful in 3m53s
2026-01-13 17:15:22 +01:00
Van Leemput Dayron
c0e53cd3f6 feat: enhance global search and map experience
All checks were successful
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 2m10s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Successful in 4m19s
- Global Activity Search:
  - Allow searching activities globally (not just in destination).
  - Add distance warning for activities > 50km away.
- Create Trip UI:
  - Fix destination suggestion list overflow.
  - Prevent suggestion list from reappearing after selection.
- Map:
  - Add generic text search support (e.g., "Restaurants") on 'Enter'.
  - Display multiple results for generic searches.
  - Resize markers (User 60.0, Places 50.0).
  - Standardize place markers to red pin.
2026-01-13 16:59:04 +01:00
Van Leemput Dayron
4fc7abc5b4 test 36
All checks were successful
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 2m16s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Successful in 3m54s
2026-01-11 19:37:53 +01:00
Van Leemput Dayron
e04bf6f405 test 35
Some checks failed
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 1m59s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Failing after 28s
2026-01-11 19:34:17 +01:00
Van Leemput Dayron
bed761401f test 34
Some checks failed
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 1m57s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Failing after 3m8s
2026-01-11 19:25:16 +01:00
Van Leemput Dayron
55463649b2 test 33
Some checks failed
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 1m55s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Failing after 3m14s
2026-01-11 19:15:48 +01:00
Van Leemput Dayron
62d2aa17be test 32
Some checks failed
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 2m16s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Failing after 3m2s
2026-01-11 19:08:23 +01:00
Van Leemput Dayron
acfb2259cc test 31
Some checks failed
Deploy TravelMate Final Fix / deploy-all (push) Failing after 1m12s
2026-01-11 00:12:56 +01:00
Van Leemput Dayron
d1d2194861 test 30
Some checks failed
Deploy TravelMate (Full Mobile) / deploy-android (push) Successful in 2m2s
Deploy TravelMate (Full Mobile) / deploy-ios (push) Failing after 3m28s
2026-01-11 00:04:59 +01:00
Van Leemput Dayron
b542f98a91 test 29
Some checks failed
Deploy TravelMate (Android & iOS) / deploy-android (push) Successful in 1m59s
Deploy TravelMate (Android & iOS) / deploy-ios (push) Failing after 3m27s
2026-01-10 23:57:25 +01:00
Van Leemput Dayron
f983b869ba test 28
Some checks failed
Deploy TravelMate (Android & iOS) / deploy-android (push) Successful in 2m19s
Deploy TravelMate (Android & iOS) / deploy-ios (push) Failing after 3m24s
2026-01-10 23:49:53 +01:00
Van Leemput Dayron
ead346bb1b test 27
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Has been cancelled
2026-01-10 23:44:33 +01:00
Van Leemput Dayron
8d27e771a7 test 26
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m18s
2026-01-10 23:40:18 +01:00
Van Leemput Dayron
31fe3a4260 test 25
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m7s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m4s
2026-01-10 23:33:36 +01:00
Van Leemput Dayron
a2c6cd1d4f test 24
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m12s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m13s
2026-01-10 23:26:05 +01:00
Van Leemput Dayron
5fe9f371b2 test 23
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m0s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m7s
2026-01-10 23:19:44 +01:00
Van Leemput Dayron
b27fb7ed4c test 22
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m12s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m19s
2026-01-10 23:12:47 +01:00
Van Leemput Dayron
919ef611bc test 21
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m15s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m14s
2026-01-10 23:05:59 +01:00
Van Leemput Dayron
3eeed888b5 test 20
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m12s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m25s
2026-01-10 22:57:46 +01:00
Van Leemput Dayron
322f611522 test 19
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m21s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 3m21s
2026-01-10 22:50:49 +01:00
Van Leemput Dayron
a7d2634c5f test 18
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Has been cancelled
Deploy Flutter to Firebase iOS (Fixed) / deploy-ios (push) Failing after 2m59s
2026-01-10 22:39:47 +01:00
Van Leemput Dayron
ae125f1144 test 17
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m15s
Deploy Flutter to Firebase iOS (Fixed) / deploy-ios (push) Failing after 47s
2026-01-10 22:31:30 +01:00
Van Leemput Dayron
d66907f636 test 16
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m25s
Deploy Flutter to Firebase iOS (Final) / deploy-ios (push) Failing after 28s
2026-01-10 22:26:24 +01:00
Van Leemput Dayron
508d69a4f4 test 15
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m35s
Deploy Flutter to Firebase iOS (Final & Safe) / deploy-ios (push) Failing after 1m3s
2026-01-10 22:02:09 +01:00
Van Leemput Dayron
ee00415d23 Test 14
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m59s
Deploy Flutter to Firebase iOS (Final & Safe) / deploy-ios (push) Failing after 57s
2026-01-10 21:55:31 +01:00
Van Leemput Dayron
576b86fbbb Test 13
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 3m12s
Deploy Flutter to Firebase iOS (Safe Mode) / deploy-ios (push) Failing after 1m1s
2026-01-10 21:46:59 +01:00
Van Leemput Dayron
918742293b test 12 2026-01-10 21:38:04 +01:00
Van Leemput Dayron
19c06c71f8 test 11
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m42s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 1m11s
2026-01-10 21:30:24 +01:00
Van Leemput Dayron
3e5f3a7ece test 10
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m24s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 1m12s
2026-01-10 21:24:58 +01:00
Van Leemput Dayron
12fdd6da62 test 9
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m20s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 45s
2026-01-10 21:20:16 +01:00
Van Leemput Dayron
15a7319239 test 8
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m23s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 44s
2026-01-10 21:13:42 +01:00
Van Leemput Dayron
911fb86611 test 7
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m21s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 48s
2026-01-10 21:08:13 +01:00
Van Leemput Dayron
8b4c66ba0d Test 6
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m25s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 42s
2026-01-10 21:03:07 +01:00
Van Leemput Dayron
1352dc49cc Test 5
Some checks failed
Deploy Flutter to Firebase iOS / deploy-ios (push) Has been cancelled
Deploy Flutter to Firebase (Mac) / deploy-android (push) Has been cancelled
2026-01-10 20:51:13 +01:00
Van Leemput Dayron
51ffe2031d test 4
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m36s
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 47s
2026-01-10 20:23:02 +01:00
Van Leemput Dayron
c70ed9c504 test 3
Some checks failed
Deploy Flutter to Firebase iOS / deploy-ios (push) Failing after 13s
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m52s
2026-01-10 20:17:54 +01:00
Van Leemput Dayron
67d798f590 Test 2 ios
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m36s
Deploy Flutter to Firebase iOS / deploy-ios (push) Has been cancelled
2026-01-10 19:56:46 +01:00
Van Leemput Dayron
d60cce83c9 Firebase IOS distrivution
Some checks are pending
Deploy Flutter to Firebase iOS (Mac) / deploy-ios (push) Waiting to run
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 3m39s
2026-01-10 19:18:38 +01:00
Van Leemput Dayron
c03d2b969c preparing to deploy on ios 2026-01-03 16:25:33 +01:00
Van Leemput Dayron
4af4450b94 feat: add Firebase Analytics and make Google Maps Flutter dependencies direct.
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 3m23s
2026-01-02 17:27:27 +01:00
Van Leemput Dayron
6be4bed2e0 Merge branch 'main' into release 2026-01-02 17:26:26 +01:00
Van Leemput Dayron
d13094c662 Fix problems 2026-01-02 17:24:59 +01:00
Van Leemput Dayron
a9c3087f53 feat: integrate Firebase Analytics, add Google Maps dependencies, and expose new GA4 metric API endpoints. 2026-01-02 17:10:03 +01:00
Van Leemput Dayron
1b6d40627d feat: Switch API key retrieval from flutter_dotenv to firebase_options.dart and update build version.
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 3m4s
2025-12-30 17:10:12 +01:00
Van Leemput Dayron
67a7d1ad2a feat: Streamline Google Maps API key retrieval and update Google Maps Flutter dependencies.
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m48s
2025-12-30 16:56:13 +01:00
Van Leemput Dayron
4ef550f48b Fix theme in settings
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m59s
2025-12-30 16:34:05 +01:00
Van Leemput Dayron
993a5870c5 fix: enhance missing Google Maps API key error message with debug details including available keys and platform information.
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m53s
2025-12-30 16:23:56 +01:00
Van Leemput Dayron
5a682bb6d7 refactor: Remove generic try-catch blocks and add explicit API error handling in activity places service.
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 3m41s
2025-12-30 16:05:04 +01:00
Van Leemput Dayron
bb5a89a06d feat: clear navigation stack after successful authentication in login and signup flows 2025-12-30 15:53:53 +01:00
Van Leemput Dayron
3036eec3af Add backend to monitore the app in a desktop app 2025-12-30 15:37:10 +01:00
Van Leemput Dayron
63fc18ea74 feat: add password requirement display and enhance password validation on the signup page.
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m40s
2025-12-15 16:02:50 +01:00
Van Leemput Dayron
ca3f62c709 Launch Android Firebase
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m57s
2025-12-15 15:41:46 +01:00
Van Leemput Dayron
b13f0b87a3 Last Test Android
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m49s
2025-12-15 15:33:01 +01:00
Van Leemput Dayron
8ec8f35a31 test 48
All checks were successful
Deploy Flutter to Firebase (Mac) / deploy-android (push) Successful in 2m43s
2025-12-15 14:37:19 +01:00
Van Leemput Dayron
230b7abf8b test 47
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 1m49s
2025-12-15 13:45:56 +01:00
Van Leemput Dayron
2abb080c09 Test 46
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 2m7s
2025-12-15 13:31:12 +01:00
Van Leemput Dayron
a34c1e5a3d test 45
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 1m46s
2025-12-15 13:27:39 +01:00
Van Leemput Dayron
68605dea78 test 44
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 1m36s
2025-12-15 13:24:06 +01:00
Van Leemput Dayron
59b708a160 test 43
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 15s
2025-12-15 01:16:32 +01:00
Van Leemput Dayron
2849dfaade Test 42
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 1m34s
2025-12-15 01:12:49 +01:00
Van Leemput Dayron
b08f9164e6 test 41
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 1m38s
2025-12-15 01:07:59 +01:00
Van Leemput Dayron
5fb9fbaf2b test 40
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 1m46s
2025-12-15 01:03:07 +01:00
Van Leemput Dayron
520c38782f test 39
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 2m14s
2025-12-15 00:59:03 +01:00
Van Leemput Dayron
5b21fb12e3 test 38
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 15s
2025-12-15 00:56:12 +01:00
Van Leemput Dayron
a49aa198f4 test 37
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 32s
2025-12-15 00:53:49 +01:00
Van Leemput Dayron
ef895ff892 test 36
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 16s
2025-12-15 00:51:11 +01:00
Van Leemput Dayron
06c8d2c589 Test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 24s
2025-12-15 00:12:47 +01:00
Van Leemput Dayron
20be1ab64c test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 23s
2025-12-14 21:21:13 +01:00
Van Leemput Dayron
795f0e8853 test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 33s
2025-12-14 21:04:48 +01:00
Van Leemput Dayron
d3f2cc6eb0 test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 35s
2025-12-13 12:49:25 +01:00
Van Leemput Dayron
e34780c9a7 test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 16s
2025-12-13 12:45:26 +01:00
Van Leemput Dayron
495b0dc98f Test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 5s
2025-12-13 12:43:30 +01:00
Van Leemput Dayron
7b03381f7c fix: Configure Ruby 3.0 and use bundle exec for Fastlane deployment, and remove outdated comments.
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 21s
2025-12-13 12:42:03 +01:00
Van Leemput Dayron
800a402046 test
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 12s
2025-12-13 12:37:37 +01:00
Van Leemput Dayron
50101d1196 chore: Adjust Gemfile.lock dependencies, including AWS and Google Cloud SDKs, and update Bundler version.
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 14s
2025-12-13 12:36:35 +01:00
Van Leemput Dayron
ae25ea73a8 Test Mac OS
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 12s
2025-12-13 12:29:57 +01:00
Van Leemput Dayron
407425a2b9 chore: remove unnecessary comment from Fastfile
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 12s
2025-12-13 12:27:26 +01:00
Van Leemput Dayron
088f4a2833 feat: Migrate Android deployment workflow to macOS runner, simplifying setup steps and updating Fastlane descriptions.
Some checks failed
Deploy Flutter to Firebase (Mac) / deploy-android (push) Failing after 22s
2025-12-13 12:25:39 +01:00
Van Leemput Dayron
c63124b16b fix: Increase Gradle JVM memory allocation in Android deployment workflow to 3072m.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 22m42s
2025-12-13 11:47:08 +01:00
Van Leemput Dayron
329708fe6c Test N°22
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 9m42s
2025-12-12 16:56:00 +01:00
Van Leemput Dayron
e5b2be5245 Retry
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 14m25s
2025-12-09 16:26:23 +01:00
Van Leemput Dayron
0fb1634a91 fix: Configure Gradle JVM memory with GRADLE_OPTS and update workflow comments.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 14m55s
2025-12-09 16:02:56 +01:00
Van Leemput Dayron
8634edc916 feat: Enforce portrait orientation across platforms and switch Android Fastlane deployment from APK to AAB.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 13m51s
2025-12-09 15:29:00 +01:00
Van Leemput Dayron
1211569078 ci: add step to create .env file from secrets in Android deploy workflow
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 12m5s
2025-12-09 15:04:33 +01:00
Van Leemput Dayron
26b970982c chore: ensure Android license acceptance step always succeeds in CI workflow.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 11m0s
2025-12-09 14:51:22 +01:00
Van Leemput Dayron
e77393dd13 ci: update deploy-android workflow to trigger only on the release branch
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 1m23s
2025-12-09 14:47:36 +01:00
Van Leemput Dayron
020fa8823d ci: add Android SDK setup and license acceptance to the Android deployment workflow. 2025-12-09 14:47:04 +01:00
Van Leemput Dayron
959fc33fe4 refactor: use direct shell command for Flutter release APK build.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 34s
2025-12-09 11:31:21 +01:00
Van Leemput Dayron
a57fc811d8 ci: Disable Flutter action cache in Android deployment workflow.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Failing after 50s
2025-12-09 11:27:54 +01:00
Van Leemput Dayron
a96084ba17 ci: Update Ruby version to 3.3 in Android deployment workflow.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Has been cancelled
2025-12-09 11:21:33 +01:00
Van Leemput Dayron
b96c988e80 feat: Set up Fastlane for Android with Firebase App Distribution and adjust build configurations.
Some checks failed
Deploy Flutter to Firebase / deploy-android (push) Has been cancelled
2025-12-09 11:07:09 +01:00
Van Leemput Dayron
14d2761832 ci: Add .env file creation for Google Maps API keys and fix Android package name in deploy workflow.
Some checks failed
Deploy Android to Play Store / build-and-deploy (push) Failing after 26m39s
2025-12-08 21:30:59 +01:00
Van Leemput Dayron
bd3fd28d3c Try resolving CI/CD
Some checks failed
Deploy Android to Play Store / build-and-deploy (push) Failing after 26m33s
2025-12-08 21:01:29 +01:00
Van Leemput Dayron
e8ef20d046 ci: Add Android SDK setup step to the Android deployment workflow.
Some checks failed
Deploy Android to Play Store / build-and-deploy (push) Has been cancelled
2025-12-08 20:48:02 +01:00
Van Leemput Dayron
9fc8d5d1de ci: Add Flutter action cache and remove explicit Flutter version.
Some checks failed
Deploy Android to Play Store / build-and-deploy (push) Failing after 20m38s
2025-12-08 18:20:03 +01:00
Van Leemput Dayron
73db84896a feat: Migrate Android deployment from Jenkins and Fastlane to Gitea Actions workflow.
Some checks failed
Deploy Android to Play Store / build-and-deploy (push) Failing after 4m10s
2025-12-08 18:04:42 +01:00
Van Leemput Dayron
9734532491 style: Fix indentation of Android build and deploy stage in Jenkinsfile 2025-12-08 17:08:35 +01:00
Van Leemput Dayron
7d38f54123 feat: Add retrieval and copying of Flutter .env file from Jenkins credentials for Android build. 2025-12-08 17:06:29 +01:00
Van Leemput Dayron
d02a627b86 fix: Remove Jenkins tools block and hardcode Java path in PATH environment variable. 2025-12-08 16:58:36 +01:00
Van Leemput Dayron
6ce40dd2d6 fix: Consolidate Jenkinsfile PATH environment variable into a single line and clarify related comments for JAVA_HOME and ANDROID_HOME. 2025-12-08 16:51:40 +01:00
Van Leemput Dayron
00ffdcf10b ci: Add JDK 17 tool definition and configure JAVA_HOME in Jenkinsfile. 2025-12-08 16:43:57 +01:00
Van Leemput Dayron
e4d38692fe ci: Add /usr/local/bin to the PATH environment variable in Jenkinsfile. 2025-12-08 16:23:06 +01:00
Van Leemput Dayron
1f93a4e42d ci: Migrate Android Play Store deployment from GitHub Actions to Jenkins using Fastlane. 2025-12-08 16:11:40 +01:00
Van Leemput Dayron
bf48971dc4 feat: Propagate user profile updates to group member details and remove trip code sharing UI.
Some checks failed
Deploy to Play Store / build_and_deploy (push) Has been cancelled
2025-12-06 16:43:40 +01:00
Van Leemput Dayron
13933fc56c Resolve map problem. 2025-12-06 15:50:19 +01:00
Van Leemput Dayron
ca28e0a780 feat: Implement platform-specific Google Maps API key handling and update app version.
Some checks failed
Deploy to Play Store / build_and_deploy (push) Has been cancelled
2025-12-06 14:43:22 +01:00
Van Leemput Dayron
34b5efb1fc feat: remove notifications settings option from settings content
Some checks failed
Deploy to Play Store / build_and_deploy (push) Has been cancelled
2025-12-05 18:45:34 +01:00
Van Leemput Dayron
f96a51c7cf refactor: standardize API error and success responses with explicit returns and JSON messages
Some checks failed
Deploy to Play Store / build_and_deploy (push) Has been cancelled
2025-12-05 18:42:59 +01:00
58 changed files with 2151 additions and 1256 deletions

View File

@@ -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)

View File

@@ -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

View File

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

View File

@@ -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)

View File

@@ -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 |
+----------+----------+------------+------------+------------+------------+

View File

@@ -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
1 filename language YAML Markdown Dart JSON Swift C++ XML Ruby Properties HTML comment blank total
2 c:\Users\dayro\Documents\coding\travel_mate\README.md Markdown 0 45 0 0 0 0 0 0 0 0 0 16 61
3 c:\Users\dayro\Documents\coding\travel_mate\analysis_options.yaml YAML 3 0 0 0 0 0 0 0 0 0 22 4 29
4 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
5 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
6 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
7 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
8 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
9 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
10 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
11 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
12 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
13 c:\Users\dayro\Documents\coding\travel_mate\android\gradle.properties Properties 0 0 0 0 0 0 0 0 3 0 0 1 4
14 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
15 c:\Users\dayro\Documents\coding\travel_mate\firebase.json JSON 0 0 0 1 0 0 0 0 0 0 0 0 1
16 c:\Users\dayro\Documents\coding\travel_mate\ios\Podfile Ruby 0 0 0 0 0 0 0 32 0 0 2 10 44
17 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
18 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
19 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
20 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
21 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
22 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
23 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
24 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
25 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
26 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
27 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
28 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
29 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
30 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
31 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
32 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
33 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
34 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
35 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
36 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
37 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
38 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
39 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
40 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
41 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
42 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
43 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
44 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
45 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
46 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
47 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
48 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
49 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
50 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
51 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
52 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
53 c:\Users\dayro\Documents\coding\travel_mate\lib\main.dart Dart 0 0 89 0 0 0 0 0 0 0 0 5 94
54 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
55 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
56 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
57 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
58 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
59 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
60 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
61 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
62 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
63 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
64 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
65 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
66 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
67 c:\Users\dayro\Documents\coding\travel_mate\pubspec.yaml YAML 31 0 0 0 0 0 0 0 0 0 58 14 103
68 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
69 Total - 34 48 4134 200 21 1 133 32 8 548 328 739 6226

File diff suppressed because one or more lines are too long

View File

@@ -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)

View File

@@ -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 |
+-----------------------------------------------------------------------------------------------------------+------------+------------+------------+------------+------------+

View File

@@ -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

View File

@@ -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

5
.gitignore vendored
View File

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

View File

@@ -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 Places API** - Recherche de lieux et points d'intérêt
- **Google Maps API** - Cartes et navigation - **Google Maps API** - Cartes et navigation
- **Google Directions API** - Calcul d'itinéraires - **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**.

6
android/Gemfile Normal file
View File

@@ -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)

View File

@@ -30,10 +30,7 @@ android {
} }
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "be.devdayronvl.travel_mate" 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 minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode versionCode = flutter.versionCode
@@ -45,16 +42,18 @@ android {
keyAlias = keystoreProperties["keyAlias"] as String? keyAlias = keystoreProperties["keyAlias"] as String?
keyPassword = keystoreProperties["keyPassword"] as String? keyPassword = keystoreProperties["keyPassword"] as String?
storeFile = if (keystoreProperties["storeFile"] != null) { storeFile = if (keystoreProperties["storeFile"] != null) {
file(keystoreProperties["storeFile"] as String) rootProject.file(keystoreProperties["storeFile"] as String)
} else { } else {
null null
} }
storePassword = keystoreProperties["storePassword"] as String? storePassword = keystoreProperties["storePassword"] as String?
} }
} }
buildTypes { buildTypes {
release { release {
// Applique la configuration de signature définie au-dessus
signingConfig = signingConfigs.getByName("release") signingConfig = signingConfigs.getByName("release")
} }
} }

View File

@@ -21,6 +21,7 @@
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:screenOrientation="portrait"
android:exported="true" android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:taskAffinity="" android:taskAffinity=""
@@ -62,7 +63,7 @@
android:value="2" /> android:value="2" />
<meta-data <meta-data
android:name="com.google.android.geo.API_KEY" android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyCAtz1_d5K0ANwxAA_T84iq7Ac_gsUs_oM"/> android:value="AIzaSyAON_ol0Jr34tKbETvdDK9JCQdKNawxBeQ"/>
<meta-data <meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id" android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="high_importance_channel" /> android:value="high_importance_channel" />

2
android/fastlane/Appfile Normal file
View File

@@ -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

28
android/fastlane/Fastfile Normal file
View File

@@ -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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 KiB

View File

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

View File

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

View File

@@ -65,15 +65,11 @@
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UISupportedInterfaceOrientations~ipad</key> <key>UISupportedInterfaceOrientations~ipad</key>
<array> <array>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>LSApplicationQueriesSchemes</key> <key>LSApplicationQueriesSchemes</key>

View File

@@ -174,7 +174,11 @@ class ActivityBloc extends Bloc<ActivityEvent, ActivityState> {
'Erreur recherche activités: $e', 'Erreur recherche activités: $e',
stackTrace, stackTrace,
); );
emit(const ActivityError('Impossible de rechercher les activités')); // Extraire le message d'erreur si disponible
final errorMessage = e.toString().replaceAll('Exception: ', '');
emit(
ActivityError('Impossible de rechercher les activités: $errorMessage'),
);
} }
} }

View File

@@ -26,12 +26,14 @@ import '../../repositories/auth_repository.dart';
import 'auth_event.dart'; import 'auth_event.dart';
import 'auth_state.dart'; import 'auth_state.dart';
import '../../services/notification_service.dart'; import '../../services/notification_service.dart';
import '../../services/analytics_service.dart';
/// BLoC for managing authentication state and operations. /// BLoC for managing authentication state and operations.
class AuthBloc extends Bloc<AuthEvent, AuthState> { class AuthBloc extends Bloc<AuthEvent, AuthState> {
/// Repository for authentication operations. /// Repository for authentication operations.
final AuthRepository _authRepository; final AuthRepository _authRepository;
final NotificationService _notificationService; final NotificationService _notificationService;
final AnalyticsService _analyticsService;
/// Creates an [AuthBloc] with the provided [authRepository]. /// Creates an [AuthBloc] with the provided [authRepository].
/// ///
@@ -40,8 +42,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
AuthBloc({ AuthBloc({
required AuthRepository authRepository, required AuthRepository authRepository,
NotificationService? notificationService, NotificationService? notificationService,
AnalyticsService? analyticsService,
}) : _authRepository = authRepository, }) : _authRepository = authRepository,
_notificationService = notificationService ?? NotificationService(), _notificationService = notificationService ?? NotificationService(),
_analyticsService = analyticsService ?? AnalyticsService(),
super(AuthInitial()) { super(AuthInitial()) {
on<AuthCheckRequested>(_onAuthCheckRequested); on<AuthCheckRequested>(_onAuthCheckRequested);
on<AuthSignInRequested>(_onSignInRequested); on<AuthSignInRequested>(_onSignInRequested);
@@ -76,6 +80,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
if (user != null) { if (user != null) {
// Save FCM Token on auto-login // Save FCM Token on auto-login
await _notificationService.saveTokenToFirestore(user.id!); await _notificationService.saveTokenToFirestore(user.id!);
await _analyticsService.setUserId(user.id);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit(AuthUnauthenticated()); emit(AuthUnauthenticated());
@@ -107,6 +112,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
if (user != null) { if (user != null) {
// Save FCM Token // Save FCM Token
await NotificationService().saveTokenToFirestore(user.id!); await NotificationService().saveTokenToFirestore(user.id!);
await _analyticsService.setUserId(user.id);
await _analyticsService.logEvent(
name: 'login',
parameters: {'method': 'email'},
);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit(const AuthError(message: 'Invalid email or password')); emit(const AuthError(message: 'Invalid email or password'));
@@ -138,6 +148,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
if (user != null) { if (user != null) {
// Save FCM Token // Save FCM Token
await NotificationService().saveTokenToFirestore(user.id!); await NotificationService().saveTokenToFirestore(user.id!);
await _analyticsService.setUserId(user.id);
await _analyticsService.logEvent(
name: 'sign_up',
parameters: {'method': 'email'},
);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit(const AuthError(message: 'Failed to create account')); emit(const AuthError(message: 'Failed to create account'));
@@ -163,6 +178,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
if (user != null) { if (user != null) {
// Save FCM Token // Save FCM Token
await NotificationService().saveTokenToFirestore(user.id!); await NotificationService().saveTokenToFirestore(user.id!);
await _analyticsService.setUserId(user.id);
await _analyticsService.logEvent(
name: 'login',
parameters: {'method': 'google'},
);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit( emit(
@@ -191,6 +211,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
); );
if (user != null) { if (user != null) {
await _analyticsService.setUserId(user.id);
await _analyticsService.logEvent(
name: 'sign_up',
parameters: {'method': 'google'},
);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit(const AuthError(message: 'Failed to create account with Google')); emit(const AuthError(message: 'Failed to create account with Google'));
@@ -214,6 +239,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
); );
if (user != null) { if (user != null) {
await _analyticsService.setUserId(user.id);
await _analyticsService.logEvent(
name: 'sign_up',
parameters: {'method': 'apple'},
);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit(const AuthError(message: 'Failed to create account with Apple')); emit(const AuthError(message: 'Failed to create account with Apple'));
@@ -239,6 +269,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
if (user != null) { if (user != null) {
// Save FCM Token // Save FCM Token
await NotificationService().saveTokenToFirestore(user.id!); await NotificationService().saveTokenToFirestore(user.id!);
await _analyticsService.setUserId(user.id);
await _analyticsService.logEvent(
name: 'login',
parameters: {'method': 'apple'},
);
emit(AuthAuthenticated(user: user)); emit(AuthAuthenticated(user: user));
} else { } else {
emit( emit(
@@ -261,6 +296,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
Emitter<AuthState> emit, Emitter<AuthState> emit,
) async { ) async {
await _authRepository.signOut(); await _authRepository.signOut();
await _analyticsService.setUserId(null); // Clear user ID
emit(AuthUnauthenticated()); emit(AuthUnauthenticated());
} }

View File

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

View File

@@ -18,6 +18,7 @@
/// ///
/// The component automatically loads account data when initialized and /// The component automatically loads account data when initialized and
/// provides a clean interface for managing group-based expenses. /// provides a clean interface for managing group-based expenses.
///
library; library;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

View File

@@ -85,6 +85,18 @@ class AddExpenseDialog extends StatefulWidget {
/// The expense to edit (null for new expense). /// The expense to edit (null for new expense).
final Expense? expenseToEdit; 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. /// Creates an AddExpenseDialog.
/// ///
/// [group] is the group for the expense. /// [group] is the group for the expense.
@@ -95,6 +107,10 @@ class AddExpenseDialog extends StatefulWidget {
required this.group, required this.group,
required this.currentUser, required this.currentUser,
this.expenseToEdit, this.expenseToEdit,
this.initialCategory,
this.initialAmount,
this.initialSplits,
this.initialDescription,
}); });
@override @override
@@ -146,7 +162,10 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
super.initState(); super.initState();
// Initialize form fields and splits based on whether editing or creating // Initialize form fields and splits based on whether editing or creating
_selectedDate = widget.expenseToEdit?.date ?? DateTime.now(); _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; _selectedCurrency = widget.expenseToEdit?.currency ?? ExpenseCurrency.eur;
_paidById = widget.expenseToEdit?.paidById ?? widget.currentUser.id; _paidById = widget.expenseToEdit?.paidById ?? widget.currentUser.id;
@@ -159,12 +178,35 @@ class _AddExpenseDialogState extends State<AddExpenseDialog> {
} }
_splitEqually = false; _splitEqually = false;
} else { } 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) { for (final member in widget.group.members) {
_splits[member.userId] = 0; _splits[member.userId] = 0;
} }
} }
} }
}
@override @override
void dispose() { void dispose() {

View File

@@ -6,7 +6,13 @@
library; library;
import 'package:flutter/material.dart'; 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 '../../models/user_balance.dart';
import 'add_expense_dialog.dart';
/// A stateless widget that displays a list of user balances in a group. /// 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. /// The list of user balances to display.
final List<UserBalance> balances; final List<UserBalance> balances;
/// The group associated with these balances.
final Group group;
/// Creates a `BalancesTab` widget. /// Creates a `BalancesTab` widget.
/// ///
/// The [balances] parameter must not be null. /// 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// Check if the balances list is empty and display a placeholder message if true. // Check if the balances list is empty and display a placeholder message if true.
if (balances.isEmpty) { 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. // Render the list of balances as a scrollable list.
@@ -79,7 +83,9 @@ class BalancesTab extends StatelessWidget {
margin: const EdgeInsets.only(bottom: 12), margin: const EdgeInsets.only(bottom: 12),
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Row( child: Column(
children: [
Row(
children: [ children: [
// Display the user's initial in a circular avatar. // Display the user's initial in a circular avatar.
CircleAvatar( CircleAvatar(
@@ -144,15 +150,81 @@ class BalancesTab extends StatelessWidget {
// Text indicating the balance status (e.g., "À recevoir"). // Text indicating the balance status (e.g., "À recevoir").
Text( Text(
balanceText, 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)
},
), ),
); );
} }

View File

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

View File

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

View File

@@ -7,12 +7,15 @@ import '../../blocs/activity/activity_state.dart';
import '../../models/trip.dart'; import '../../models/trip.dart';
import '../../models/activity.dart'; import '../../models/activity.dart';
import '../../services/activity_cache_service.dart'; import '../../services/activity_cache_service.dart';
import '../../services/activity_places_service.dart';
import 'dart:async';
import '../loading/laoding_content.dart'; import '../loading/laoding_content.dart';
import '../../blocs/user/user_bloc.dart'; import '../../blocs/user/user_bloc.dart';
import '../../blocs/user/user_state.dart'; import '../../blocs/user/user_state.dart';
import '../../services/error_service.dart'; import '../../services/error_service.dart';
import 'activity_detail_dialog.dart'; import 'activity_detail_dialog.dart';
import 'package:geolocator/geolocator.dart';
class ActivitiesPage extends StatefulWidget { class ActivitiesPage extends StatefulWidget {
final Trip trip; final Trip trip;
@@ -38,6 +41,14 @@ class _ActivitiesPageState extends State<ActivitiesPage>
List<Activity> _approvedActivities = []; List<Activity> _approvedActivities = [];
bool _isLoadingTripActivities = false; 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 = bool _autoReloadInProgress =
false; // Protection contre les rechargements en boucle false; // Protection contre les rechargements en boucle
int _lastAutoReloadTriggerCount = int _lastAutoReloadTriggerCount =
@@ -104,6 +115,9 @@ class _ActivitiesPageState extends State<ActivitiesPage>
void dispose() { void dispose() {
_tabController.dispose(); _tabController.dispose();
_searchController.dispose(); _searchController.dispose();
_searchFocusNode.dispose();
_debounceTimer?.cancel();
_hideSuggestions();
super.dispose(); super.dispose();
} }
@@ -277,9 +291,13 @@ class _ActivitiesPageState extends State<ActivitiesPage>
} }
Widget _buildSearchBar(ThemeData theme) { Widget _buildSearchBar(ThemeData theme) {
return Container( return CompositedTransformTarget(
padding: const EdgeInsets.all(16), link: _layerLink,
child: Container( child: Container(
padding: const EdgeInsets.all(16),
child: Column(
children: [
Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest.withValues( color: theme.colorScheme.surfaceContainerHighest.withValues(
alpha: 0.3, alpha: 0.3,
@@ -288,6 +306,7 @@ class _ActivitiesPageState extends State<ActivitiesPage>
), ),
child: TextField( child: TextField(
controller: _searchController, controller: _searchController,
focusNode: _searchFocusNode,
decoration: InputDecoration( decoration: InputDecoration(
hintText: 'Rechercher restaurants, musées...', hintText: 'Rechercher restaurants, musées...',
hintStyle: TextStyle( hintStyle: TextStyle(
@@ -302,17 +321,174 @@ class _ActivitiesPageState extends State<ActivitiesPage>
horizontal: 16, horizontal: 16,
vertical: 12, 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) { onSubmitted: (value) {
_hideSuggestions();
if (value.isNotEmpty) { if (value.isNotEmpty) {
_performSearch(value); _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) { Widget _buildCategoryTabs(ThemeData theme) {
return Container( return Container(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
@@ -637,6 +813,23 @@ class _ActivitiesPageState extends State<ActivitiesPage>
activity.name.toLowerCase().trim(), activity.name.toLowerCase().trim(),
); );
// 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( return GestureDetector(
onTap: () { onTap: () {
showDialog( showDialog(
@@ -709,6 +902,40 @@ class _ActivitiesPageState extends State<ActivitiesPage>
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ 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( Row(
children: [ children: [
// Icône de catégorie // Icône de catégorie

View File

@@ -1,3 +1,4 @@
import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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/place_image_service.dart';
import '../../services/trip_geocoding_service.dart'; import '../../services/trip_geocoding_service.dart';
import '../../services/logger_service.dart'; import '../../services/logger_service.dart';
import '../../firebase_options.dart';
/// Create trip content widget for trip creation and editing functionality. /// Create trip content widget for trip creation and editing functionality.
/// ///
@@ -84,7 +86,9 @@ class _CreateTripContentState extends State<CreateTripContent> {
String? _selectedImageUrl; String? _selectedImageUrl;
/// Google Maps API key for location services /// 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 /// Participant management
final List<String> _participants = []; final List<String> _participants = [];
@@ -123,7 +127,11 @@ class _CreateTripContentState extends State<CreateTripContent> {
} }
} }
bool _isProgrammaticUpdate = false;
void _onLocationChanged() { void _onLocationChanged() {
if (_isProgrammaticUpdate) return;
final query = _locationController.text.trim(); final query = _locationController.text.trim();
if (query.length < 2) { if (query.length < 2) {
@@ -203,15 +211,18 @@ class _CreateTripContentState extends State<CreateTripContent> {
if (_placeSuggestions.isEmpty) return; 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( _suggestionsOverlay = OverlayEntry(
builder: (context) => Positioned( builder: (context) => Positioned(
width: width: width,
MediaQuery.of(context).size.width -
32, // Largeur du champ avec padding
child: CompositedTransformFollower( child: CompositedTransformFollower(
link: _layerLink, link: _layerLink,
showWhenUnlinked: false, showWhenUnlinked: false,
offset: const Offset(0, 60), // Position sous le champ targetAnchor: Alignment.bottomLeft,
child: Material( child: Material(
elevation: 4, elevation: 4,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@@ -224,6 +235,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
), ),
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsets.zero,
itemCount: _placeSuggestions.length, itemCount: _placeSuggestions.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final suggestion = _placeSuggestions[index]; final suggestion = _placeSuggestions[index];
@@ -244,7 +256,7 @@ class _CreateTripContentState extends State<CreateTripContent> {
), ),
); );
Overlay.of(context).insert(_suggestionsOverlay!); overlay.insert(_suggestionsOverlay!);
} }
void _hideSuggestions() { void _hideSuggestions() {
@@ -253,7 +265,10 @@ class _CreateTripContentState extends State<CreateTripContent> {
} }
void _selectSuggestion(PlaceSuggestion suggestion) { void _selectSuggestion(PlaceSuggestion suggestion) {
_isProgrammaticUpdate = true;
_locationController.text = suggestion.description; _locationController.text = suggestion.description;
_isProgrammaticUpdate = false;
_hideSuggestions(); _hideSuggestions();
setState(() { setState(() {
_placeSuggestions = []; _placeSuggestions = [];

View File

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

View File

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

View File

@@ -1,3 +1,4 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
@@ -5,6 +6,7 @@ import 'dart:convert';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart';
import '../../firebase_options.dart';
import '../../services/error_service.dart'; import '../../services/error_service.dart';
import '../../services/map_navigation_service.dart'; import '../../services/map_navigation_service.dart';
import '../../services/logger_service.dart'; import '../../services/logger_service.dart';
@@ -21,6 +23,7 @@ class MapContent extends StatefulWidget {
class _MapContentState extends State<MapContent> { class _MapContentState extends State<MapContent> {
GoogleMapController? _mapController; GoogleMapController? _mapController;
LatLng _initialPosition = const LatLng(48.8566, 2.3522); LatLng _initialPosition = const LatLng(48.8566, 2.3522);
LatLng? _currentMapCenter;
final TextEditingController _searchController = TextEditingController(); final TextEditingController _searchController = TextEditingController();
bool _isLoadingLocation = false; bool _isLoadingLocation = false;
bool _isSearching = false; bool _isSearching = false;
@@ -31,7 +34,9 @@ class _MapContentState extends State<MapContent> {
List<PlaceSuggestion> _suggestions = []; List<PlaceSuggestion> _suggestions = [];
static final String _apiKey = dotenv.env['GOOGLE_MAPS_API_KEY'] ?? ''; static String get _apiKey {
return DefaultFirebaseOptions.currentPlatform.apiKey;
}
@override @override
void initState() { void initState() {
@@ -309,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 pictureRecorder = ui.PictureRecorder();
final canvas = Canvas(pictureRecorder); final canvas = Canvas(pictureRecorder);
const size = 120.0;
// Dessiner l'icône person_pin_circle en bleu
final iconPainter = TextPainter(textDirection: TextDirection.ltr); final iconPainter = TextPainter(textDirection: TextDirection.ltr);
iconPainter.text = TextSpan( iconPainter.text = TextSpan(
text: String.fromCharCode(Icons.person_pin_circle.codePoint), text: String.fromCharCode(iconData.codePoint),
style: TextStyle( 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(); iconPainter.layout();
@@ -352,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 // Ajouter le marqueur avec l'icône
setState(() { setState(() {
@@ -362,10 +381,7 @@ class _MapContentState extends State<MapContent> {
markerId: const MarkerId('user_location'), markerId: const MarkerId('user_location'),
position: position, position: position,
icon: icon, 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( infoWindow: InfoWindow(
title: 'Ma position', title: 'Ma position',
snippet: snippet:
@@ -389,10 +405,21 @@ class _MapContentState extends State<MapContent> {
}); });
try { 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( final url = Uri.parse(
'https://maps.googleapis.com/maps/api/place/autocomplete/json' 'https://maps.googleapis.com/maps/api/place/autocomplete/json'
'?input=${Uri.encodeComponent(query)}' '?input=${Uri.encodeComponent(query)}'
'&key=$_apiKey' '&key=$apiKey'
'&language=fr', '&language=fr',
); );
@@ -400,11 +427,21 @@ class _MapContentState extends State<MapContent> {
if (!mounted) return; if (!mounted) return;
LoggerService.info(
'MapContent: Response status code: ${response.statusCode}',
);
if (response.statusCode == 200) { if (response.statusCode == 200) {
final data = json.decode(response.body); 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; final predictions = data['predictions'] as List;
LoggerService.info(
'MapContent: Found ${predictions.length} predictions',
);
setState(() { setState(() {
_suggestions = predictions _suggestions = predictions
@@ -418,13 +455,19 @@ class _MapContentState extends State<MapContent> {
_isSearching = false; _isSearching = false;
}); });
} else { } else {
LoggerService.error(
'MapContent: API Error: $status - ${data['error_message'] ?? "No error message"}',
);
setState(() { setState(() {
_suggestions = []; _suggestions = [];
_isSearching = false; _isSearching = false;
}); });
} }
} else {
LoggerService.error('MapContent: HTTP Error ${response.statusCode}');
} }
} catch (e) { } catch (e) {
LoggerService.error('MapContent: Exception during search: $e');
_showError('Erreur lors de la recherche de lieux: $e'); _showError('Erreur lors de la recherche de lieux: $e');
setState(() { setState(() {
_isSearching = false; _isSearching = false;
@@ -432,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 { Future<void> _selectPlace(PlaceSuggestion suggestion) async {
setState(() { setState(() {
_isSearching = true; _isSearching = true;
@@ -455,13 +620,21 @@ class _MapContentState extends State<MapContent> {
final data = json.decode(response.body); final data = json.decode(response.body);
if (data['status'] == 'OK') { if (data['status'] == 'OK') {
final location = data['result']['geometry']['location']; final result = data['result'];
final location = result['geometry']['location'];
final lat = location['lat']; final lat = location['lat'];
final lng = location['lng']; final lng = location['lng'];
final name = data['result']['name']; final name = result['name'];
final newPosition = LatLng(lat, lng); 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) // Ajouter un marqueur pour le lieu recherché (ne pas supprimer le marqueur de position)
setState(() { setState(() {
// Garder le marqueur de position utilisateur // Garder le marqueur de position utilisateur
@@ -472,6 +645,8 @@ class _MapContentState extends State<MapContent> {
Marker( Marker(
markerId: MarkerId(suggestion.placeId), markerId: MarkerId(suggestion.placeId),
position: newPosition, position: newPosition,
icon: markerIcon,
anchor: const Offset(0.5, 0.85),
infoWindow: InfoWindow(title: name), infoWindow: InfoWindow(title: name),
), ),
); );
@@ -521,6 +696,9 @@ class _MapContentState extends State<MapContent> {
onMapCreated: (GoogleMapController controller) { onMapCreated: (GoogleMapController controller) {
_mapController = controller; _mapController = controller;
}, },
onCameraMove: (CameraPosition position) {
_currentMapCenter = position.target;
},
markers: _markers, markers: _markers,
circles: _circles, circles: _circles,
myLocationEnabled: false, myLocationEnabled: false,
@@ -652,6 +830,10 @@ class _MapContentState extends State<MapContent> {
vertical: 14, vertical: 14,
), ),
), ),
textInputAction: TextInputAction.search,
onSubmitted: (value) {
_performTextSearch(value);
},
onChanged: (value) { onChanged: (value) {
// Ne pas rechercher si c'est juste le remplissage initial // Ne pas rechercher si c'est juste le remplissage initial
if (widget.initialSearchQuery != null && if (widget.initialSearchQuery != null &&

View File

@@ -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 { Future<void> _onBackPressed(BuildContext context) async {
if (Navigator.canPop(context)) { if (Navigator.canPop(context)) {
Navigator.pop(context); Navigator.pop(context);
@@ -44,108 +51,8 @@ class PoliciesContent extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ 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), 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 // Bouton Google Privacy Policy
SizedBox( SizedBox(
width: double.infinity, 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), const SizedBox(height: 32),
], ],
), ),

View File

@@ -150,7 +150,9 @@ class ProfileContent extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.black87, color: Theme.of(context).brightness == Brightness.dark
? Colors.white
: Colors.black87,
), ),
), ),
], ],

View File

@@ -3,9 +3,33 @@ import 'package:travel_mate/components/settings/policies/policies_content.dart';
import 'theme/settings_theme_content.dart'; import 'theme/settings_theme_content.dart';
import 'profile/profile_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}); 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 { Future<void> changePage(BuildContext context, Widget page) async {
Navigator.push(context, MaterialPageRoute(builder: (context) => page)); 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( ListTile(
leading: const Icon(Icons.privacy_tip), leading: const Icon(Icons.privacy_tip),
title: const Text('Confidentialité'), title: const Text('Confidentialité'),
@@ -77,7 +94,7 @@ class SettingsContent extends StatelessWidget {
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
Text( Text(
'1.0.0', _version,
style: TextStyle(fontSize: 14, color: Colors.grey[500]), style: TextStyle(fontSize: 14, color: Colors.grey[500]),
), ),
], ],

View File

@@ -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,
),
),
],
),
);
}
}

View File

@@ -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,
});
}

View File

@@ -27,18 +27,6 @@ class DefaultFirebaseOptions {
return android; return android;
case TargetPlatform.iOS: case TargetPlatform.iOS:
return 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: default:
throw UnsupportedError( throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.', 'DefaultFirebaseOptions are not supported for this platform.',
@@ -63,15 +51,4 @@ class DefaultFirebaseOptions {
iosClientId: '521527250907-3i1qe2656eojs8k9hjdi573j09i9p41m.apps.googleusercontent.com', iosClientId: '521527250907-3i1qe2656eojs8k9hjdi573j09i9p41m.apps.googleusercontent.com',
iosBundleId: 'com.example.travelMate', 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',
);
} }

View File

@@ -1,8 +1,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:travel_mate/blocs/balance/balance_bloc.dart'; import 'package:travel_mate/blocs/balance/balance_bloc.dart';
import 'package:travel_mate/blocs/expense/expense_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/message/message_bloc.dart';
import 'package:travel_mate/blocs/activity/activity_bloc.dart'; import 'package:travel_mate/blocs/activity/activity_bloc.dart';
import 'package:travel_mate/firebase_options.dart'; import 'package:travel_mate/firebase_options.dart';
@@ -14,6 +17,7 @@ import 'package:travel_mate/services/expense_service.dart';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:travel_mate/services/notification_service.dart'; import 'package:travel_mate/services/notification_service.dart';
import 'package:travel_mate/services/map_navigation_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_bloc.dart';
import 'blocs/auth/auth_event.dart'; import 'blocs/auth/auth_event.dart';
import 'blocs/theme/theme_bloc.dart'; import 'blocs/theme/theme_bloc.dart';
@@ -45,6 +49,10 @@ import 'package:intl/date_symbol_data_local.dart';
/// initializes Firebase, and starts the application. /// initializes Firebase, and starts the application.
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
DeviceOrientation.portraitDown,
]);
await dotenv.load(fileName: ".env"); await dotenv.load(fileName: ".env");
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
await initializeDateFormatting('fr_FR', null); await initializeDateFormatting('fr_FR', null);
@@ -54,6 +62,13 @@ void main() async {
await NotificationService().initialize(); 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()); runApp(const MyApp());
} }
@@ -132,6 +147,10 @@ class MyApp extends StatelessWidget {
RepositoryProvider<MapNavigationService>( RepositoryProvider<MapNavigationService>(
create: (context) => MapNavigationService(), create: (context) => MapNavigationService(),
), ),
// Analysis service
RepositoryProvider<AnalyticsService>(
create: (context) => AnalyticsService(),
),
], ],
child: MultiBlocProvider( child: MultiBlocProvider(
providers: [ providers: [
@@ -192,6 +211,9 @@ class MyApp extends StatelessWidget {
title: 'Travel Mate', title: 'Travel Mate',
navigatorKey: ErrorService.navigatorKey, navigatorKey: ErrorService.navigatorKey,
themeMode: themeState.themeMode, themeMode: themeState.themeMode,
navigatorObservers: [
context.read<AnalyticsService>().getAnalyticsObserver(),
],
// Light theme configuration // Light theme configuration
theme: ThemeData( theme: ThemeData(
colorScheme: ColorScheme.fromSeed( colorScheme: ColorScheme.fromSeed(

View File

@@ -45,7 +45,10 @@ enum ExpenseCategory {
shopping('Shopping', Icons.shopping_bag), shopping('Shopping', Icons.shopping_bag),
/// Other miscellaneous expenses /// 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); const ExpenseCategory(this.displayName, this.icon);

View File

@@ -14,6 +14,8 @@ import '../blocs/auth/auth_event.dart';
import '../services/error_service.dart'; import '../services/error_service.dart';
import '../services/notification_service.dart'; import '../services/notification_service.dart';
import '../services/map_navigation_service.dart'; import '../services/map_navigation_service.dart';
import '../services/whats_new_service.dart';
import '../components/whats_new_dialog.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
const HomePage({super.key}); const HomePage({super.key});
@@ -57,6 +59,45 @@ class _HomePageState extends State<HomePage> {
}); });
} }
}); });
// 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) { Widget _buildPage(int index) {

View File

@@ -88,7 +88,11 @@ class _LoginPageState extends State<LoginPage> {
body: BlocConsumer<AuthBloc, AuthState>( body: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) { listener: (context, state) {
if (state is AuthAuthenticated) { if (state is AuthAuthenticated) {
Navigator.pushReplacementNamed(context, '/home'); Navigator.pushNamedAndRemoveUntil(
context,
'/home',
(route) => false,
);
} else if (state is AuthError) { } else if (state is AuthError) {
ErrorService().showError(message: state.message); ErrorService().showError(message: state.message);
} }

View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:sign_in_button/sign_in_button.dart'; import 'package:sign_in_button/sign_in_button.dart';
import 'package:travel_mate/components/loading/laoding_content.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/components/signup/sign_up_platform_content.dart';
import 'package:travel_mate/services/auth_service.dart'; import 'package:travel_mate/services/auth_service.dart';
import '../blocs/auth/auth_bloc.dart'; import '../blocs/auth/auth_bloc.dart';
@@ -66,6 +67,18 @@ class _SignUpPageState extends State<SignUpPage> {
if (value.length < 8) { if (value.length < 8) {
return 'Le mot de passe doit contenir au moins 8 caractères'; 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; return null;
} }
@@ -115,7 +128,11 @@ class _SignUpPageState extends State<SignUpPage> {
backgroundColor: Colors.green, backgroundColor: Colors.green,
), ),
); );
Navigator.pushReplacementNamed(context, '/home'); Navigator.pushNamedAndRemoveUntil(
context,
'/home',
(route) => false,
);
} else if (state is AuthError) { } else if (state is AuthError) {
_errorService.showError(message: state.message); _errorService.showError(message: state.message);
} }
@@ -209,6 +226,7 @@ class _SignUpPageState extends State<SignUpPage> {
controller: _passwordController, controller: _passwordController,
validator: _validatePassword, validator: _validatePassword,
obscureText: _obscurePassword, obscureText: _obscurePassword,
onChanged: (value) => setState(() {}),
decoration: InputDecoration( decoration: InputDecoration(
labelText: 'Mot de passe', labelText: 'Mot de passe',
border: const OutlineInputBorder( border: const OutlineInputBorder(
@@ -229,6 +247,7 @@ class _SignUpPageState extends State<SignUpPage> {
), ),
), ),
), ),
PasswordRequirements(password: _passwordController.text),
const SizedBox(height: 20), const SizedBox(height: 20),
// Champ Confirmation mot de passe // Champ Confirmation mot de passe

View File

@@ -286,4 +286,42 @@ class GroupRepository {
.toList(), .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"
}
}
} }

View File

@@ -1,6 +1,7 @@
import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'package:http/http.dart' as http; 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 '../models/activity.dart';
import '../services/error_service.dart'; import '../services/error_service.dart';
import '../services/logger_service.dart'; import '../services/logger_service.dart';
@@ -13,7 +14,17 @@ class ActivityPlacesService {
ActivityPlacesService._internal(); ActivityPlacesService._internal();
final ErrorService _errorService = ErrorService(); 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 /// Recherche des activités près d'une destination
Future<List<Activity>> searchActivities({ Future<List<Activity>> searchActivities({
@@ -24,7 +35,6 @@ class ActivityPlacesService {
int maxResults = 20, int maxResults = 20,
int offset = 0, int offset = 0,
}) async { }) async {
try {
LoggerService.info( LoggerService.info(
'ActivityPlacesService: Recherche d\'activités pour: $destination (max: $maxResults, offset: $offset)', 'ActivityPlacesService: Recherche d\'activités pour: $destination (max: $maxResults, offset: $offset)',
); );
@@ -94,13 +104,6 @@ class ActivityPlacesService {
); );
return paginatedResults; 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 /// Géocode une destination pour obtenir les coordonnées
@@ -111,7 +114,13 @@ class ActivityPlacesService {
LoggerService.error( LoggerService.error(
'ActivityPlacesService: Clé API Google Maps manquante', '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 encodedDestination = Uri.encodeComponent(destination);
@@ -178,7 +187,6 @@ class ActivityPlacesService {
String tripId, String tripId,
int radius, int radius,
) async { ) async {
try {
final url = final url =
'https://maps.googleapis.com/maps/api/place/nearbysearch/json' 'https://maps.googleapis.com/maps/api/place/nearbysearch/json'
'?location=$lat,$lng' '?location=$lat,$lng'
@@ -213,15 +221,18 @@ class ActivityPlacesService {
} }
return activities; return activities;
} } else if (data['status'] == 'ZERO_RESULTS') {
}
return []; return [];
} catch (e) { } else {
LoggerService.error( 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}');
} }
} }
@@ -344,7 +355,6 @@ class ActivityPlacesService {
required String tripId, required String tripId,
int radius = 5000, int radius = 5000,
}) async { }) async {
try {
LoggerService.info( LoggerService.info(
'ActivityPlacesService: Recherche textuelle: $query à $destination', 'ActivityPlacesService: Recherche textuelle: $query à $destination',
); );
@@ -355,7 +365,7 @@ class ActivityPlacesService {
final encodedQuery = Uri.encodeComponent(query); final encodedQuery = Uri.encodeComponent(query);
final url = final url =
'https://maps.googleapis.com/maps/api/place/textsearch/json' 'https://maps.googleapis.com/maps/api/place/textsearch/json'
'?query=$encodedQuery in $destination' '?query=$encodedQuery'
'&location=${coordinates['lat']},${coordinates['lng']}' '&location=${coordinates['lat']},${coordinates['lng']}'
'&radius=$radius' '&radius=$radius'
'&key=$_apiKey' '&key=$_apiKey'
@@ -391,15 +401,16 @@ class ActivityPlacesService {
} }
return activities; return activities;
} } else if (data['status'] == 'ZERO_RESULTS') {
}
return []; return [];
} catch (e) { } else {
LoggerService.error( 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}');
} }
} }
@@ -510,7 +521,6 @@ class ActivityPlacesService {
int pageSize, int pageSize,
String? nextPageToken, String? nextPageToken,
) async { ) async {
try {
String url = String url =
'https://maps.googleapis.com/maps/api/place/nearbysearch/json' 'https://maps.googleapis.com/maps/api/place/nearbysearch/json'
'?location=$lat,$lng' '?location=$lat,$lng'
@@ -557,23 +567,17 @@ class ActivityPlacesService {
'nextPageToken': data['next_page_token'], 'nextPageToken': data['next_page_token'],
'hasMoreData': data['next_page_token'] != null, '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 { return {
'activities': <Activity>[], 'activities': <Activity>[],
'nextPageToken': null, 'nextPageToken': null,
'hasMoreData': false, 'hasMoreData': false,
}; };
} else {
throw Exception('API Error: ${data['status']}');
}
} else {
throw Exception('Erreur HTTP ${response.statusCode}');
} }
} }
@@ -586,7 +590,6 @@ class ActivityPlacesService {
int pageSize, int pageSize,
String? nextPageToken, String? nextPageToken,
) async { ) async {
try {
// Pour toutes les catégories, on utilise une recherche plus générale // Pour toutes les catégories, on utilise une recherche plus générale
String url = String url =
'https://maps.googleapis.com/maps/api/place/nearbysearch/json' 'https://maps.googleapis.com/maps/api/place/nearbysearch/json'
@@ -638,23 +641,85 @@ class ActivityPlacesService {
'nextPageToken': data['next_page_token'], 'nextPageToken': data['next_page_token'],
'hasMoreData': data['next_page_token'] != null, '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 { return {
'activities': <Activity>[], 'description': p['description'] as String,
'nextPageToken': null, 'placeId': p['place_id'] as String,
'hasMoreData': false,
}; };
}).toList();
}
}
return [];
} catch (e) { } 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,
};
} }
} }
} }

View File

@@ -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');
}
}
}

View File

@@ -1,3 +1,4 @@
import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:flutter_dotenv/flutter_dotenv.dart'; 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'; import 'package:travel_mate/services/error_service.dart';
class PlaceImageService { 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 FirebaseStorage _storage = FirebaseStorage.instance;
final ErrorService _errorService = ErrorService(); final ErrorService _errorService = ErrorService();

View File

@@ -1,3 +1,4 @@
import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -13,7 +14,18 @@ class TripGeocodingService {
TripGeocodingService._internal(); TripGeocodingService._internal();
final ErrorService _errorService = ErrorService(); 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 /// Géocode la destination d'un voyage et retourne un Trip mis à jour
Future<Trip> geocodeTrip(Trip trip) async { Future<Trip> geocodeTrip(Trip trip) async {

View File

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

View File

@@ -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');
}
}
}

View File

@@ -13,10 +13,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: _flutterfire_internals name: _flutterfire_internals
sha256: "8a1f5f3020ef2a74fb93f7ab3ef127a8feea33a7a2276279113660784ee7516a" sha256: e4a1b612fd2955908e26116075b3a4baf10c353418ca645b4deae231c82bf144
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.64" version: "1.3.65"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
@@ -401,6 +401,30 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.3+4" 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: firebase_auth:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -429,10 +453,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: firebase_core name: firebase_core
sha256: "1f2dfd9f535d81f8b06d7a50ecda6eac1e6922191ed42e09ca2c84bd2288927c" sha256: "29cfa93c771d8105484acac340b5ea0835be371672c91405a300303986f4eba9"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.2.1" version: "4.3.0"
firebase_core_platform_interface: firebase_core_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -445,10 +469,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: firebase_core_web name: firebase_core_web
sha256: ff18fabb0ad0ed3595d2f2c85007ecc794aadecdff5b3bb1460b7ee47cded398 sha256: a631bbfbfa26963d68046aed949df80b228964020e9155b086eff94f462bbf1f
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.3.0" version: "3.3.1"
firebase_messaging: firebase_messaging:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -713,13 +737,13 @@ packages:
source: hosted source: hosted
version: "2.13.1" version: "2.13.1"
google_maps_flutter_android: google_maps_flutter_android:
dependency: transitive dependency: "direct main"
description: description:
name: google_maps_flutter_android name: google_maps_flutter_android
sha256: f820a3990d4ff23e3baf01ce794f7f08cca9a9ce6c875ec96882d605f6f039df sha256: "3835f6ae5e8b8d4d454d913575069513c9f216e088b87aa5c18cb3610951c6b4"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.18.4" version: "2.18.6"
google_maps_flutter_ios: google_maps_flutter_ios:
dependency: transitive dependency: transitive
description: description:
@@ -729,13 +753,13 @@ packages:
source: hosted source: hosted
version: "2.15.5" version: "2.15.5"
google_maps_flutter_platform_interface: google_maps_flutter_platform_interface:
dependency: transitive dependency: "direct main"
description: description:
name: google_maps_flutter_platform_interface name: google_maps_flutter_platform_interface
sha256: f4b9b44f7b12a1f6707ffc79d082738e0b7e194bf728ee61d2b3cdf5fdf16081 sha256: e8b1232419fcdd35c1fdafff96843f5a40238480365599d8ca661dde96d283dd
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.14.0" version: "2.14.1"
google_maps_flutter_web: google_maps_flutter_web:
dependency: transitive dependency: transitive
description: description:
@@ -1089,7 +1113,7 @@ packages:
source: hosted source: hosted
version: "2.2.0" version: "2.2.0"
package_info_plus: package_info_plus:
dependency: transitive dependency: "direct main"
description: description:
name: package_info_plus name: package_info_plus
sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968" sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"

View File

@@ -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 # 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 # 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. # 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: environment:
sdk: ^3.9.2 sdk: ^3.9.2
@@ -63,17 +63,17 @@ dependencies:
image: ^4.5.4 image: ^4.5.4
firebase_messaging: ^16.0.4 firebase_messaging: ^16.0.4
flutter_local_notifications: ^19.5.0 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: dev_dependencies:
flutter_launcher_icons: ^0.13.1 flutter_launcher_icons: ^0.13.1
flutter_test: flutter_test:
sdk: flutter 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 flutter_lints: ^6.0.0
mockito: ^5.4.4 mockito: ^5.4.4
build_runner: ^2.4.8 build_runner: ^2.4.8