-
Notifications
You must be signed in to change notification settings - Fork 12
Tripscheduling adesina ictu20241322 newtravelagency v2 #372
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Adesinaictu
wants to merge
23
commits into
tripsheduling
Choose a base branch
from
tripscheduling-adesina-ictu20241322-newtravelagency-v2
base: tripsheduling
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Tripscheduling adesina ictu20241322 newtravelagency v2 #372
Adesinaictu
wants to merge
23
commits into
tripsheduling
from
tripscheduling-adesina-ictu20241322-newtravelagency-v2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pulling the changes from the main branch
Update Android Gradle Plugin (AGP) from 8.4.1 to 8.9.2 and Gradle wrapper from 8.6 to 8.11.1 to leverage the latest features, bug fixes, and performance improvements.
This commit introduces a new navigation system and screens for trip management, including a dashboard, trip creation, and itinerary editor. The navigation is implemented using Jetpack Navigation Compose, and the screens are built with Material 3 components. Additionally, the compileSdkVersion is updated to 35, and the navigation-compose dependency is added.
- Add TripRepository to handle trip data operations - Replace sample data with repository in TripDashboard - Update TripCreation to use repository for trip creation - Remove hardcoded sample trips from TripDashboard
- Add ActivityRepository for managing trip activities with add, update, delete functionality - Create ActivityDialog composable for adding/editing activities - Enhance ItineraryEditor with activity management features including: - Day selection and activity display - Add/edit/delete functionality - Confirmation dialogs for deletion - Remove sample data and integrate with repository
…ion and activity editing - Add Material3 date picker dependencies to build.gradle.kts - Implement date picker dialogs for start/end date selection in TripCreation - Add combined date and time picker for activity time selection in ActivityDialog - Update ItineraryEditor to recompose when activities change
Add helper function to parse trip dates in multiple formats (ISO and "MMMM d, yyyy") and use it to accurately calculate trip duration. Fallback to 1 day if parsing fails to ensure minimum valid duration.
Improve state handling in ItineraryEditor by using derivedStateOf to observe changes to activities list. This provides better reactivity and performance by only recomputing when tripId or selectedDay changes, rather than watching the entire activities list.
- Add deleteTrip method to TripRepository to remove trips by ID - Implement delete button and confirmation dialog in TripCard - Maintain existing view itinerary functionality while adding deletion feature
Remove date picker functionality and streamline time selection to use only time picker. Time is now displayed in 12-hour format with AM/PM indicator for better user experience.
Trip scheduling gnowa rickneil
Maestro-jr
approved these changes
Jun 30, 2025
Collaborator
Maestro-jr
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This structure is really striking
With impressive ui 🙌
Anwi-Jennifer78
approved these changes
Jun 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝
This Pull Request introduces the core functionality for integrating verified travel agencies directly into the app, allowing users to browse and interact with their services.
🎯 (Goal):
This feature directly supports the app’s mission to promote tourism by:
🔑 Key Changes & Functionality
🧭 Travel Agency Module – Users can explore and book services from verified travel agencies.
🎯 Filter Options – Agencies can be filtered by ⭐ rating, 💰 price, and 🧳 services offered.
🧩 New UI Components – Added UI screens for agency listings and booking details.
🧪 How to Test:
🧭 Navigate to the new Travel Agencies section
(e.g., via the bottom navigation bar or from the “Discover” screen)
🔍 Browse through the listed agencies
🎛️ Apply different filters
(⭐ Ratings, 💰 Price, 🧳 Service Type) and verify that results update correctly
🏢 Click on an agency to view its detailed profile and services
📝 Attempt to initiate a booking





and observe the full booking flow including confirmation ✅