Commit Graph

67 Commits

Author SHA1 Message Date
mystery012728
a2bad0f139 Added NetworkApiService File 2026-01-08 17:07:53 +05:30
mystery012728
22f2de1bbe Flexi rename into Selective and mad taht dynamic and bug fixes 2026-01-07 18:27:24 +05:30
mystery012728
b77bcea769 Bug fixes and error solved 2026-01-07 14:45:24 +05:30
ada6040514 Fix :- Fixed the grey screen bug in get a pass and cart section. 2026-01-06 15:34:37 +05:30
3c05534262 Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	android/app/src/main/res/drawable-hdpi/android12splash.png
#	android/app/src/main/res/drawable-mdpi/android12splash.png
#	android/app/src/main/res/drawable-night-hdpi/android12splash.png
#	android/app/src/main/res/drawable-night-mdpi/android12splash.png
#	android/app/src/main/res/drawable-night-xhdpi/android12splash.png
#	android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
#	android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
#	android/app/src/main/res/drawable-v21/launch_background.xml
#	android/app/src/main/res/drawable-xhdpi/android12splash.png
#	android/app/src/main/res/drawable-xxhdpi/android12splash.png
#	android/app/src/main/res/drawable-xxxhdpi/android12splash.png
#	android/app/src/main/res/drawable/launch_background.xml
#	android/app/src/main/res/values-night-v31/styles.xml
#	android/app/src/main/res/values-v31/styles.xml
#	lib/core/route_constants.dart
#	pubspec.yaml
2025-11-14 11:21:36 +05:30
3caa52d9f8 vinayak's pull merged 2025-11-11 11:14:22 +05:30
Vinayakkadge04
e2f9217d57 Updated Splash Screen... 2025-11-10 12:38:50 +05:30
Vinayakkadge04
7d4c015134 worked on onboarding screen 2025-11-07 17:44:51 +05:30
76e4fff06c Added all the navigation and all first time user condition also made changes in common app bar and added logo and splash screen 2025-10-30 03:39:40 +05:30
9121cf1b1b Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
2025-10-29 20:02:11 +05:30
Vinayakkadge04
a2ff4253ed Updated bottomsheet bg color 2025-10-29 19:59:49 +05:30
f43c2cc9f6 routing magic itenary 2025-10-29 19:59:11 +05:30
Vinayakkadge04
d73faf7506 Updated language bottomSheet bg color 2025-10-29 19:47:59 +05:30
Vinayakkadge04
560a10f4ea Used Back widget 2025-10-29 18:55:45 +05:30
Vinayakkadge04
5c11344c17 Used Screen Util in ticket card view 2025-10-29 17:56:38 +05:30
9dd76e1dac Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/main.dart
2025-10-29 17:12:05 +05:30
Vinayakkadge04
c771ce335c Changed serch_city_bottomsheet navigation 2025-10-29 17:11:07 +05:30
ede130224e working on make booking page 2025-10-29 17:09:04 +05:30
Vinayakkadge04
f93ba6dad2 Worked on Search city bottomsheet 2025-10-29 17:07:27 +05:30
abca972ba5 Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/main.dart
2025-10-29 16:13:43 +05:30
92ce97b553 working on my pass section 2025-10-29 16:13:10 +05:30
Vinayakkadge04
a8a3a618eb Completed offer pass view 2025-10-29 14:49:41 +05:30
Vinayakkadge04
167f85ad22 Updated card View 2025-10-29 13:01:57 +05:30
Vinayakkadge04
b42812f0c2 Updated itinerary creation view 2025-10-28 19:54:12 +05:30
85c17595f2 changes in main 2025-10-28 15:54:38 +05:30
548c4e2638 Merge remote-tracking branch 'origin/vinayak' into dinesh 2025-10-28 15:53:48 +05:30
5c4ffb1686 Postcard changes done 2025-10-28 15:53:26 +05:30
Vinayakkadge04
93749af445 Taken pull from origin/dinesh 2025-10-28 11:19:23 +05:30
Vinayakkadge04
c28d6a96af Merge remote-tracking branch 'origin/dinesh' into vinayak
# Conflicts:
#	lib/core/route_constants.dart
#	lib/main.dart
2025-10-28 11:18:07 +05:30
489a42d68c Itineary navigation 2025-10-27 19:45:47 +05:30
Vinayakkadge04
8edc5eec20 Changed in Buy a Pass View 2025-10-27 19:13:01 +05:30
Vinayakkadge04
69046649aa Completed purchase detail bottomsheet & add details screen 2025-10-27 18:45:57 +05:30
Vinayakkadge04
362b8d92e5 Completed coupon bottom sheet 2025-10-27 16:47:54 +05:30
66f9abe4e0 Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/core/app_router.dart
#	lib/main.dart
2025-10-27 15:47:54 +05:30
7c146c9f1e working on my pass section 2025-10-27 15:44:13 +05:30
Vinayakkadge04
9b79fb6db7 Completed Offer with Flexi Card Screen 2025-10-27 15:27:21 +05:30
4e7e2cad0e Merged vinayak's code. 2025-10-27 11:53:27 +05:30
a1d81ea31c Merge remote-tracking branch 'origin/vinayak' into dinesh 2025-10-27 11:46:07 +05:30
9042cd57d5 Completed the postcard section. 2025-10-26 19:34:41 +05:30
Vinayakkadge04
54cf642732 Completed By a Pass & Checkout View 2025-10-25 14:17:56 +05:30
Vinayakkadge04
94c91abf32 completed the attraction details screen with share bottom sheet. 2025-10-24 15:23:08 +05:30
Vinayakkadge04
741036188d Merge remote-tracking branch 'origin/dinesh' into vinayak
# Conflicts:
#	lib/main.dart
2025-10-24 11:36:19 +05:30
4956b9ea50 worked postcard section 2025-10-24 11:33:24 +05:30
Vinayakkadge04
c54f80626a Implemented bloc in itinerary creation screen 2025-10-24 11:18:56 +05:30
ba7ecd8a3c Merged vinayak's code 2025-10-16 20:13:42 +05:30
4ccf4e57ca Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/main.dart
2025-10-16 20:06:45 +05:30
ca26dd528b Started with post card creation tab 2025-10-16 20:06:04 +05:30
Vinayakkadge04
56e7613323 Merge remote-tracking branch 'origin/dinesh' into vinayak
# Conflicts:
#	lib/main.dart
2025-10-16 19:13:11 +05:30
Vinayakkadge04
672f984f3f Completed ESIM & Hotel offer view 2025-10-16 19:12:06 +05:30
fe4ed84c3f attractin details page added and added completed the registered_user_home_page.dart 2025-10-16 19:09:38 +05:30