dinesh.patil 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

..

logo_city_cards_orange.png

Completed Offer with Flexi Card Screen

2025-10-27 15:27:21 +05:30

logo_city_cards_white.png

Created a common app bar and added the white logo in the app bar as per condition

2025-10-14 17:37:54 +05:30

logo_city_cards.png

Started working on homepage and created assets folder

2025-10-14 11:20:25 +05:30

logo_resized.png

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

logo_white_resized.png

vinayak's pull merged

2025-11-11 11:14:22 +05:30

logoframe.png

vinayak's pull merged

2025-11-11 11:14:22 +05:30

melbourne_logo.png

routing magic itenary

2025-10-29 19:59:11 +05:30

melbourne_white.png

routing magic itenary

2025-10-29 19:59:11 +05:30

splash.png

Updated Splash Screen...

2025-11-10 12:38:50 +05:30