Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
5151d0d
added gitignore
klortiz13 Jul 27, 2026
a44cfec
changed pusbpec
klortiz13 Jul 27, 2026
42bc93e
successfully upgraded dependencies
klortiz13 Jul 27, 2026
f867992
finished android configuration
klortiz13 Jul 27, 2026
73037e5
added Alessio's work
klortiz13 Jul 27, 2026
fcdc741
fixed and cleaned up alessio's work
klortiz13 Jul 27, 2026
1a3b37a
fixed pre-commit things
klortiz13 Jul 27, 2026
40f27db
fixed precommit so it pushes automatic changes
klortiz13 Jul 27, 2026
6e39578
style: auto fix formatting violations
klortiz13 Jul 27, 2026
33c790d
style: auto fix formatting violations
github-actions[bot] Jul 27, 2026
d408e19
fixed iOS issues
alberthoangg Jul 27, 2026
ff8f8df
applied separation of concerns to the main esrimap.dart file
klortiz13 Jul 27, 2026
904445f
style: auto fix formatting violations
klortiz13 Jul 27, 2026
35053ea
fix for pre-commit
klortiz13 Jul 27, 2026
6d2dbe4
style: auto fix formatting violations
klortiz13 Jul 27, 2026
308e127
fully organized the esri map
klortiz13 Jul 27, 2026
cfb0b7a
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Jul 27, 2026
947c259
a
klortiz13 Jul 28, 2026
1ae223c
mapConfig was a reference, now used as fallback when offline
klortiz13 Jul 28, 2026
8dc9a5d
renamed folders
klortiz13 Jul 28, 2026
0dc3dee
moved models to the models folder and services to the services folder
klortiz13 Jul 28, 2026
084536d
fixed podfile
klortiz13 Jul 28, 2026
32872aa
hid dark and light maps, 3d view and drone view
klortiz13 Jul 28, 2026
22691ca
instead of commenting out and deleting code, we simply prevented dart…
klortiz13 Jul 28, 2026
5a0f6a6
style: auto fix formatting violations
klortiz13 Jul 28, 2026
690f83a
Implemented esri_map_feature_flags.dart which makes it easy to toggle…
klortiz13 Jul 28, 2026
8da2222
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Jul 28, 2026
f4ec8aa
added pod file dependacy
alberthoangg Jul 28, 2026
b4e4ebf
removed arm64 exclusion
alberthoangg Jul 28, 2026
de445ca
location recenter button fixes
alberthoangg Jul 28, 2026
a90cc97
Transit layer works now
klortiz13 Jul 29, 2026
9e6a6fb
optimized the map display for performance
klortiz13 Jul 29, 2026
9129baa
made Satellite basemap work
klortiz13 Jul 29, 2026
81bb1b2
Merge pull request #2336 from UCSD/map-buttons-alberthoangg
klortiz13 Jul 29, 2026
2495ab5
Polished Satellite basemap
klortiz13 Jul 29, 2026
de09cde
improved construction layer
klortiz13 Jul 29, 2026
4b6bf28
added transit routes
klortiz13 Jul 29, 2026
e6b3d49
Added legend
klortiz13 Jul 29, 2026
332d6e8
Merge pull request #2337 from UCSD/map-display-klortiz13
klortiz13 Jul 29, 2026
acccfcb
style: auto fix formatting violations
klortiz13 Jul 29, 2026
abfc4c0
added start and end labels for directions
klortiz13 Jul 29, 2026
7282655
fixed toast in dark theme
klortiz13 Jul 29, 2026
ae1f8d7
fixed location fetching
klortiz13 Jul 29, 2026
8d3b2ce
Implemented driving navigation
klortiz13 Jul 29, 2026
3a689ef
polished ui
klortiz13 Jul 29, 2026
1b06996
a
klortiz13 Jul 29, 2026
247633a
routing and navigation
alberthoangg Jul 29, 2026
24a2f6b
fixed existing bug of "Current Location" not working from the startin…
klortiz13 Jul 30, 2026
858cdf2
style: auto fix formatting violations
klortiz13 Jul 30, 2026
9500a30
Merge pull request #2339 from UCSD/routing-navigation-alberthoangg
klortiz13 Jul 30, 2026
549a65f
merged with albert's work
klortiz13 Jul 30, 2026
efc2b8a
Merge pull request #2338 from UCSD/esri-map-get-directions-klortiz13
klortiz13 Jul 30, 2026
bfa81a0
added search history up to 10 items
klortiz13 Jul 30, 2026
53abd01
fixed location details formatting
klortiz13 Jul 30, 2026
bf7d5a1
added collapsible UI for the location details, removing the unstable …
klortiz13 Jul 30, 2026
cd49b8c
style: auto fix formatting violations
klortiz13 Jul 30, 2026
09dfe79
fixed red dot pill on an adge case
klortiz13 Jul 30, 2026
fcdc1ad
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Jul 30, 2026
934fd43
style: auto fix formatting violations
klortiz13 Jul 30, 2026
25b60b8
added pills on top of red dots for missing cases
klortiz13 Jul 30, 2026
e48fb64
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Jul 30, 2026
8133ead
pushing all i have
klortiz13 Jul 30, 2026
b0929a1
UI fixes and route calcuation loading
alberthoangg Jul 30, 2026
b87f9e8
search bar loading animation
alberthoangg Jul 30, 2026
4b57d3e
fixed ui bugs
alberthoangg Jul 30, 2026
0644de5
fixed iOS builds
klortiz13 Aug 3, 2026
44a73d5
made post-clone download arcgis
klortiz13 Aug 3, 2026
e98ad86
Merge pull request #2344 from UCSD/esri-build-error-klortiz13
klortiz13 Aug 3, 2026
1a11594
Changed basemap to render vectors in the client side to get rid of th…
klortiz13 Aug 15, 2026
6353e80
added UCSD boundaries to let the user know where UCSD is and the area…
klortiz13 Aug 15, 2026
59e3ff9
restored geographical visibility outside ucsd
klortiz13 Aug 15, 2026
f547765
Added a maximum zoom limit of 2ft and added a zoom scale widget
klortiz13 Aug 15, 2026
62134ff
made boundary thinner
klortiz13 Aug 15, 2026
dcd7451
cleaned up
klortiz13 Aug 15, 2026
42e41b6
added max zoom out level
klortiz13 Aug 15, 2026
b2cb0ab
fixed max zoom
klortiz13 Aug 15, 2026
b492853
added buttons highlight fix and code to remove the licence watermark
klortiz13 Aug 15, 2026
c6becef
Improved the center on me button
klortiz13 Aug 15, 2026
595c99d
Rearranged map buttons
klortiz13 Aug 15, 2026
91db7c7
Created the center on campus icon to make the button more explicit
klortiz13 Aug 15, 2026
64c98b4
Completed center on me re-design
klortiz13 Aug 15, 2026
d2f3fc1
cleaned up 'Map Displays' UI
klortiz13 Aug 15, 2026
0319638
made displays 20% bigger
klortiz13 Aug 15, 2026
eb9d29d
reduced FPS to about 30 for a smoother experience
klortiz13 Aug 15, 2026
11e48c8
satellite now uses ESRI's highly optimized global CDN so it loads fas…
klortiz13 Aug 15, 2026
07700cb
Merge pull request #2348 from UCSD/esrimap-ui-cleanup-klortiz13
klortiz13 Aug 15, 2026
cdaf1d9
style: auto fix formatting violations
klortiz13 Aug 15, 2026
9bc7457
dark and light mode search fix
alberthoangg Aug 16, 2026
3ea438c
style: auto fix formatting violations
alberthoangg Aug 16, 2026
4e86d9e
made construction icons render always on top
klortiz13 Aug 17, 2026
aca5faa
Merge pull request #2349 from UCSD/color-contrast-search
klortiz13 Aug 17, 2026
44ff99a
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Aug 17, 2026
c50001c
Merge pull request #2350 from UCSD/improve-construction-icons-klortiz13
klortiz13 Aug 17, 2026
70a73e4
Merge branch 'experimental' into esri-map-integration-v2
klortiz13 Aug 17, 2026
369b67a
Fixed all pre-commit violations
klortiz13 Aug 17, 2026
d3eaca4
improved the user's location
klortiz13 Aug 17, 2026
d3629eb
fixed location pin
klortiz13 Aug 17, 2026
521bf9f
fixed the location on edge cases
klortiz13 Aug 17, 2026
b7d9699
applied asynchronous animations
klortiz13 Aug 17, 2026
2c5f046
completed the UI/UX of the user location on the esri map
klortiz13 Aug 17, 2026
cf14478
Merge pull request #2351 from UCSD/improve-getting-user-location-klor…
klortiz13 Aug 17, 2026
90ddd27
style: auto fix formatting violations
klortiz13 Aug 17, 2026
5a599cb
Merge branch 'experimental' of https://github.com/UCSD/campus-mobile …
klortiz13 Aug 17, 2026
53cf3d6
Added a very basic tooltip for buildings. Improving on it now
klortiz13 Aug 17, 2026
de32dc0
added loading and highlighting animations
klortiz13 Aug 18, 2026
353827f
improved loading circle
klortiz13 Aug 18, 2026
3cb1eae
fixed fallback
klortiz13 Aug 18, 2026
2771f38
completely integrated building tooltips
klortiz13 Aug 18, 2026
8b7a327
Merge pull request #2352 from UCSD/add-building-tooltips-klortiz13
klortiz13 Aug 18, 2026
78d74d7
style: auto fix formatting violations
klortiz13 Aug 18, 2026
900af31
added a consistent search results (bottom)
klortiz13 Aug 19, 2026
a22a5dc
cleaned up
klortiz13 Aug 19, 2026
714fbbe
fixed driving directions
klortiz13 Aug 19, 2026
1b79ef4
added cached tooltips
klortiz13 Aug 19, 2026
1f91991
added a Time-To-Live to the cached data
klortiz13 Aug 19, 2026
792d1d5
smoothed out the user experience
klortiz13 Aug 19, 2026
7f6d8f2
fixed the default zoom level and issues with closing buttons
klortiz13 Aug 19, 2026
61855a5
added an errorBuilder fallback to all unprotected network images:
klortiz13 Aug 19, 2026
76b40aa
improved recreation results
klortiz13 Aug 19, 2026
7cda500
Merge pull request #2353 from UCSD/improving-search-categories-klortiz13
klortiz13 Aug 19, 2026
6f09154
style: auto fix formatting violations
klortiz13 Aug 19, 2026
0dc2f1f
fixed violations
klortiz13 Aug 19, 2026
7a7e342
Added useful data to map pins
klortiz13 Aug 19, 2026
217ffe4
style: auto fix formatting violations
klortiz13 Aug 19, 2026
e6a0825
Merge pull request #2354 from UCSD/improve-map-pin-labels-klortiz13
klortiz13 Aug 19, 2026
00616f8
style: auto fix formatting violations
klortiz13 Aug 19, 2026
e32567c
fixed violations
klortiz13 Aug 19, 2026
6ce414d
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Aug 19, 2026
1686c58
color contrast issues
alberthoangg Aug 20, 2026
47fbb38
style: auto fix formatting violations
alberthoangg Aug 20, 2026
f6776f8
added a graceful fallback so the map tries to render after failure
klortiz13 Aug 24, 2026
dfba122
fixed loading UI bug
klortiz13 Aug 24, 2026
6c1d77b
cleaned ui
klortiz13 Aug 24, 2026
6be7461
started VO implementation
klortiz13 Aug 24, 2026
81174f3
Added VO for search bar and routing
klortiz13 Aug 24, 2026
3691f67
added VO to the entire esri map
klortiz13 Aug 25, 2026
4d5fb4f
Finished esri map VO
klortiz13 Aug 25, 2026
7619aef
Merge pull request #2356 from UCSD/esri-map-voice-over
klortiz13 Aug 25, 2026
0d309f8
Merge pull request #2355 from UCSD/ma-647-menu-bar-contrast
klortiz13 Aug 25, 2026
bc2ee37
style: auto fix formatting violations
klortiz13 Aug 25, 2026
bc10a73
fixed violations
klortiz13 Aug 25, 2026
a34c6f8
fixed UI overlap between menus and search results
klortiz13 Aug 27, 2026
a6d085e
fixed ui overlap from search bar and legends
klortiz13 Aug 27, 2026
0d75990
Improved the UX of the category results list
klortiz13 Aug 27, 2026
ee504cb
added a share location button
klortiz13 Aug 27, 2026
6b1f1b1
fixed colors in light and dark theme across all ESRI Map components
klortiz13 Aug 27, 2026
497b355
fixed triton gpt button color
klortiz13 Aug 27, 2026
a13261d
applied a highlight to each button
klortiz13 Aug 27, 2026
509bf0f
style: auto fix formatting violations
klortiz13 Aug 27, 2026
7c5a22d
Added route toggles
klortiz13 Aug 27, 2026
830a9b8
fixed colors
klortiz13 Aug 27, 2026
eb20db6
fixed glowing colors
klortiz13 Aug 27, 2026
e7247bd
highlighting more buttons
klortiz13 Aug 27, 2026
1036b97
improved the UI of the to and from bar
klortiz13 Aug 27, 2026
dd7aa98
polished legends
klortiz13 Aug 27, 2026
f4d731b
fixed overflow
klortiz13 Aug 27, 2026
f8f10e0
optimized the basemap
klortiz13 Aug 27, 2026
7fde707
style: auto fix formatting violations
klortiz13 Aug 27, 2026
1236f8a
Revered to a non-labeled basemap. We should create our own custom bas…
klortiz13 Aug 27, 2026
5d8dbd3
Merge branch 'esri-map-integration-v2' of https://github.com/UCSD/cam…
klortiz13 Aug 27, 2026
b28e899
fixed violations
klortiz13 Aug 27, 2026
6f336c5
merged with experimental
klortiz13 Nov 7, 2026
f7760e9
Merge branch 'dev' of https://github.com/UCSD/campus-mobile into esri…
klortiz13 Nov 7, 2026
5c0d872
fixed dependencies
klortiz13 Nov 7, 2026
5b1ad69
fixed precommit error
klortiz13 Nov 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/pre_commit_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ env:

jobs:
precommit:
runs-on: ubuntu-latest
# ArcGIS Maps' native build hook rejects Linux before Flutter tests start.
# Its test-host hook supports Windows, while production builds remain
# limited to the Android and iOS targets declared by the package.
runs-on: windows-latest
timeout-minutes: 20
defaults:
run:
shell: bash
steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,6 @@ android/app/google-services.json
!**/ios/**/default.pbxuser
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

# ESRI Map
arcgis_maps_core
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (keystorePropertiesFile.exists()) {
android {
namespace = "edu.ucsd"
compileSdk = 36
ndkVersion = "27.0.12077973"
ndkVersion = "28.2.13676358"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
Expand All @@ -34,7 +34,7 @@ android {

defaultConfig {
applicationId = "edu.ucsd"
minSdkVersion = flutter.minSdkVersion
minSdkVersion = 28
targetSdk = 36
versionCode = flutter.versionCode
versionName = flutter.versionName
Expand Down
119 changes: 119 additions & 0 deletions assets/esri_map_assets/Center-Trident.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/esri_map_assets/construction-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/esri_map_assets/dark-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/esri_map_assets/default-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/esri_map_assets/districts-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/esri_map_assets/light-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
170 changes: 170 additions & 0 deletions assets/esri_map_assets/mapConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"portals": {
"age": "https://admin-enterprise-gis.ucsd.edu/portal",
"ago": "https://www.arcgis.com"
},

"serviceUrls": {
"hillshade": "https://services.arcgisonline.com/arcgis/rest/services/Elevation/World_Hillshade/MapServer",
"lightGrayBase": "https://services.arcgisonline.com/arcgis/rest/services/Canvas/World_Light_Gray_Base/MapServer",
"darkGrayBase": "https://services.arcgisonline.com/arcgis/rest/services/Canvas/World_Dark_Gray_Base/MapServer",
"nearmap": "https://admin-enterprise-gis.ucsd.edu/server/rest/services/Campus_Imagery_Nearmap_9in_2025_0423_0514/MapServer",
"worldImagery": "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer"
},

"basemaps": {
"defaultMap": {
"label": "Default",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/default-thumbnail.png",
"baseLayers": [
{
"type": "arcgisVectorTiled",
"portalKey": "ago",
"itemId": "291da5eab3a0412593b66d384379f89f"
},
{
"type": "arcgisVectorTiled",
"portalKey": "age",
"itemId": "e19f33d2c1f44967aef673306c483913"
}
]
},
"light": {
"label": "Light",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/light-thumbnail.png",
"baseLayers": [
{
"type": "arcgisVectorTiled",
"portalKey": "ago",
"itemId": "291da5eab3a0412593b66d384379f89f"
},
{
"type": "arcgisVectorTiled",
"portalKey": "age",
"itemId": "6643ee62af494f5bafe7dfdb8eb3f857"
}
]
},
"dark": {
"label": "Dark",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/dark-thumbnail.png",
"baseLayers": [
{
"type": "arcgisVectorTiled",
"portalKey": "ago",
"itemId": "5e9b3685f4c24d8781073dd928ebda50"
},
{
"type": "arcgisVectorTiled",
"portalKey": "age",
"itemId": "09d7b3934b6c4c2cad8380c04e08c1b1"
}
]
},
"satellite": {
"label": "Satellite",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/satellite-thumbnail.png",
"baseLayers": [
{
"type": "arcgisTiled",
"serviceKey": "worldImagery"
}
]
}
},

"layers": {
"tritonTransit": {
"label": "Transit",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/shuttles-thumbnail.png",
"source": "portalItem",
"portalKey": "ago",
"itemId": "ea5cdd8987414942b62178726120d5c7",
"refreshInterval": 0,
"popup": false
},
"campusDistricts": {
"label": "Districts",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/districts-thumbnail.png",
"source": "url",
"url": "https://admin-enterprise-gis.ucsd.edu/server/rest/services/AdministrationServices/Areas_and_Boundaries/MapServer/4",
"refreshInterval": 0,
"popup": false
},
"construction": {
"label": "Construction",
"thumbnailAsset": "https://dvsbke0idzv4u.cloudfront.net/thumbnails/construction-thumbnail.png",
"source": "url",
"sublayers": [
{
"source": "url",
"url": "https://admin-enterprise-gis.ucsd.edu/server/rest/services/Construction/Construction_Alert_Approved/MapServer/0",
"refreshInterval": 0
},
{
"source": "url",
"url": "https://admin-enterprise-gis.ucsd.edu/server/rest/services/Construction/Construction_Alert_Approved/MapServer/1",
"refreshInterval": 0
},
{
"source": "url",
"url": "https://admin-enterprise-gis.ucsd.edu/server/rest/services/Construction/Construction_Alert_Approved/MapServer/2",
"refreshInterval": 0
}
],
"refreshInterval": 0,
"popup": false
}
},

"scenes": {
"default": {
"label": "Default",
"type": "2d"
},
"building3d": {
"label": "3D Building",
"type": "scene",
"portalKey": "ago",
"itemId": "b6931d8c429c4138afd9dd936ee7bcd1"
},
"droneView": {
"label": "Drone View",
"type": "scene",
"portalKey": "age",
"itemId": "0ffe293479844ce49ff5c30ffc0a0b67"
}
},

"features": {
"aiSearch": true,
"scenes": true
},

"searchCategories": [
{
"label": "Dining",
"poiClass": "Dining and Beverage",
"icon": "restaurant",
"color": "#00C6D7"
},
{
"label": "Library",
"poiClass": "Library",
"icon": "menu_book",
"color": "#D462AD"
},
{
"label": "Parking",
"poiClass": "Parking",
"icon": "local_parking",
"color": "#6E963B"
},
{
"label": "Recreation",
"poiClass": "Recreation Facilities",
"icon": "fitness_center",
"color": "#FC8900"
}
]
}
Binary file added assets/esri_map_assets/satellite-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/esri_map_assets/shuttles-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions assets/esri_map_assets/tgpt-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions assets/esri_map_assets/tgpt-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>16.0</string>
<string>17.0</string>
</dict>
</plist>
Loading
Loading