[TheStaticBits]

Description

Consolidated search bars sheets into one search bar, added room search functionality, recent searches, cards for nearby POI search, settings features (Sign in banner and "Help" section), along with the header bar and back button for floorplan overview mode. Also fixed search result markers not showing up. Apologies for the large pull request, MaizeBus is the only thing I have been working on for the past four days :p

Type of Change

• New feature (feat)
• Bug fix (fix)
• Refactor / code improvement
• Dependency / build update
• Documentation
• Other (explain)

Changed Files

• map_screen.dart

  • Added floorplan title bar -- MaizeBus logo and settings button switches out for the title bar when zoomed in on a floor.
  • Added Android back button floorplan overlay exit zoom out
  • Loads user bathroom preference at startup
  • Awaits _loadStopsForLaunch() in _loadAllData() now, so that the code does not need to be duplicated in search_sheet_main.dart
  • _showSearchLocationMarker() takes a "showGetOnIcon" parameter, telling it whether to show a normal marker or an "enter" icon marker.
  • _searchLocationMarker is passed into CompositeMapWidget to properly display on map, as it was previously not being displayed (bug fix)
  • Added _selectedPOI state to track the currently selected room/POI for the POISheet overlay
  • Added _showPOISelection() to search around the user's location for a particular type of POI, opening the POI sheet and centering on the user after it finds them.
  • Added _showRoomSearchResult() to center onto a particular room. It switches to the floor of the room, centers it, places a marker, and opens its corresponding POISheet.

• search_sheet_main.dart

  • Consolidated search sheets both into one.
  • Added helper functions such as saveRecentSearch() and getRecentSearches().
  • Added Recent Searches functionality
  • Removed duplicated code, and moved search logic out of this file and into location_sheet.dart
  • Added LocationTile to reduce duplicate code in the search UI, between Recent Searches and normal searches.
  • Implemented bathroom selection popup
  • Added isRoomSearch, onPOISelected, and roomPois parameters to SearchSheet class.
  • Probably more that I'm forgetting because GitHub stopped showing diffs for this file due to the amount of changes

• search_rooms.dart

  • Removed. This was when we were still doing separate search sheets. It's all consolidated into the main sheet now.

• location_search.dart

  • Added a new class, RoomLocation, which extends from constants.json's Location class and stores a room POI on top of that.
  • It implements a fromJson and toJson, just like the parent Location class.
  • I moved the building search functions related to ngram search to this file for cleanliness.
  • Added searchLocations() function, which implements a new algorithm to search both buildings and rooms with a single query, and returns a List<Locations> (which can be RoomLocation objects when rooms are returned as search results)

• poi_sheet.dart

  • New class, POISheet, which handles the bottom modal that pops up when selecting a room or POI via search.
  • Pretty much purely UI elements, no functionality is implemented here.
  • "Get Directions" button does nothing right now.

• settings.dart

  • Added "Sign In" sheet at the top of settings, which does nothing right now.
  • Added "Help" section with DPSS and after-hours-transit options
  • Added "Bathroom Preference" toggle, which defaults to "inclusive" when the user hasn't chosen a gender yet. This uses the BathroomProvider class.
  • Modified coloring of various elements to match the Figma

• composite_map_widget.dart

  • Added _searchResultsMarker parameter that displays on the map (same bug fix from earlier).

• floorplan_marker_service.dart

  • Added highlighted icon generation and cache for a yellow circle around a map icon, used for card search results. this was vibecoded a lil

• floorplan_service.dart

  • Added LocatedFloorplanPoi class, which stores a POI along with its building, floor, etc.
  • Added a FloorplanPoiIndex class, which is used for searching. It projects all POIs onto the real world map, storing their actual latlng, and adding them all to a single List of LocatedFloorplanPois. It implements a nearest function, which returns the nearest X number of POIs of a particular type to a given LatLng.

• floorplan_style.dart

  • Added printer and vending machine into the icons. Vending uses printer icon as a temp fix (cause UI hasn't given us vending icon yet)

• floorplans_layer.dart

  • Added _poiIndex (using FloorplanPoiIndex) to the FloorplansLayer class
  • Added _searchMarkers list
  • Added a showNearbyPois() function as well, which uses the _poiIndex to populate the _searchMarkers list with search results for card searches (such as for nearby bathrooms or printers) to display on the map. This filters out POIs more than 600m away from the user, and returns a LatLng centered on the markers found. It does not adjust zoom level, which we might want to do.

• floorplan_overlay_widget.dart

  • Added onRoomSearch callback for FloorplanEntryBar class
  • Made style fixes to the FloorplanEntryBar
  • Made style fixes to the FloorplanOverlay class
  • Added onClosed and onRoomSearch callbacks to FloorplanOverlay
  • Updated search bar UI in FloorplanOverlay for consistency with the map search bar UI

• bathroom_provider.dart

  • New class which handles reading and updating the user's bathroom preference
  • Conntains an enum, BathroomPreference, with four values (not chosen, womens, mens, inclusive)
  • Has a load, save, and set function.

• main.dart

  • Added BathroomProvider to app initialization

• search_result_layer.dart

  • Merge changes to use icon parameter

• dialog.dart

  • Added showDialogOptions() function, which displays a dialog to the user with as many different options on it as the function caller passes in via the options parameter.

• constants.dart

  • Added DPSS and after-hours transit links
  • Added constant to control how many recent searches the search saves
  • Added room search colors
  • Changed default divider color
  • Added toJson() and fromJson() functions to Location class to help with saving recent search locations

• directions_sheet.dart

  • Added parameter to SearchSheet() calls (due to the new parameter in SearchSheet widget)

• journey_results_widget.dart

  • Added parameter to SearchSheet() calls (due to the new parameter in SearchSheet widget)

• floorplan.dart

  • Added printer
  • Changed the bathroom strings to be accurate to the latest version of floorplan data

• printer.png

  • Added icon for printers. Still missing vending machine icon, as UI is working on that.

• ci.yaml

  • I know I'm technically not supposed to change these things but this was causing a build error recently from GitHub actions due to some version change in the backend of GitHub, so this just ensures that Java 17 is used for the Gradle building to make it work again.

Does your code rely on another PR

None that are still open.

Testing Done

Flutter:

• Tested on:
  • iOS Simulator
  • Android Emulator
  • Physical device (android)

Screenshots / Demo (if UI or notification change)

Checklist

• Commit messages follow Conventional Commits (i'm really bad at doing this)
• PR title follows [type](scope): short description
• PR target branch is not main and is our current working update branch (e.g. maizebus2.1)
• No print() / debugPrint() / console.log() left in production code
• Secrets / keys not committed

[gusrod-coder]

On the Android Emulator, I can't see within the Dude any more. Is this supposed to work for this PR?