Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
c90f413
reformat onboarding slides to fit most screen sizes
silkfiy Oct 10, 2026
cea117e
added background circles on app homepage
Oct 11, 2026
bf9fba3
optimize slide element positions
silkfiy Oct 11, 2026
a421369
iterated on the background circles and tried to debug them
Oct 12, 2026
62c77c6
Add caching to class data
silkfiy Oct 13, 2026
13bb367
Fix onboarding login sizing issues
silkfiy Oct 13, 2026
3c33cc8
restored podfile to facilitate the ios build
Oct 13, 2026
4456bb4
"changed pod file"
Oct 13, 2026
10437fe
"more changes to let ios build happen"
Oct 14, 2026
4aa98e5
"made minor change -- one circle needed to be in a different position"
Oct 14, 2026
816a3ad
"changed the position of one circle"
Oct 15, 2026
1a8cb45
"changed circle position again"
Oct 15, 2026
289324b
"moving circle yet again"
Oct 15, 2026
a74ae72
"changed some circle positions to better reflect the figma"
Oct 15, 2026
f5b1362
"changed the position of a couple more circles"
Oct 15, 2026
1f84878
"tweaked one circle"
Oct 15, 2026
88663c3
"tweaked the circle one MORE TIME"
Oct 15, 2026
cb1f31d
"tweaked the circle hopefully for the last time"
Oct 15, 2026
922cbcb
Fix incorrect top margin when header text wraps
silkfiy Oct 17, 2026
f6e1554
Fix overflow on Free Food notif button
silkfiy Oct 17, 2026
bc155af
Align text for empty shuttle card
silkfiy Oct 17, 2026
61e3a15
Fix notice card image not fitting in large screens
silkfiy Oct 17, 2026
ca199a4
Fix sizing for parking card on large screens
silkfiy Oct 19, 2026
02e8836
Apply pre-commit formatting
silkfiy Oct 19, 2026
cdccb22
Split cache load and API call into 2 steps
silkfiy Oct 22, 2026
31c3b51
Add load indicator when manually reloading
silkfiy Oct 23, 2026
86da264
Change class/finals to call API after Student ID
silkfiy Oct 24, 2026
dceb7a4
added live updating to busyness card
jod034 Oct 21, 2026
930f561
availablity card formatting
jod034 Oct 26, 2026
07c7a07
Remove debug print statements
silkfiy Oct 29, 2026
7888637
Apply pre-commit hook
silkfiy Oct 29, 2026
f18b04a
Fix tied reloading state of class/finals card
silkfiy Oct 30, 2026
9a2dc0f
Dining Locations with null coordinates broke the app. Fixed it so it …
klortiz13 Oct 30, 2026
08f6aed
Merge branch 'dev' of https://github.com/UCSD/campus-mobile into scre…
klortiz13 Oct 31, 2026
c60016c
fixed small ui bug in profile regarding the email
klortiz13 Oct 31, 2026
792b6c2
fixed alignment issue in profile
klortiz13 Oct 31, 2026
6a9c069
fixed map layout
klortiz13 Oct 31, 2026
76326e4
Merge pull request #2383 from UCSD/screen-size-ui-fixes-silkfiy
klortiz13 Oct 31, 2026
c6955e9
removed hardcoded height
klortiz13 Oct 31, 2026
04ef109
shrinked circles from 90MB+ to <15MB
klortiz13 Oct 31, 2026
bafb574
fixed left alignment
klortiz13 Oct 31, 2026
cafe390
optimized circles
klortiz13 Oct 31, 2026
6719ea1
finalized circles
klortiz13 Oct 31, 2026
ff70d51
Merge branch 'dev' of https://github.com/UCSD/campus-mobile into addi…
klortiz13 Oct 31, 2026
ea352ed
small fix
klortiz13 Oct 31, 2026
6866b46
Merge pull request #2379 from UCSD/adding-background-circles-prj002-d…
klortiz13 Oct 31, 2026
c7bbcd0
Merge branch 'dev' of https://github.com/UCSD/campus-mobile into opti…
klortiz13 Oct 31, 2026
a22aab3
added silent recovery
klortiz13 Oct 31, 2026
4733215
fixed overlapping refresh requests
klortiz13 Oct 31, 2026
edf3753
improved update readability
klortiz13 Oct 31, 2026
ff77e50
added fallback message when data couuldn't be updated
klortiz13 Oct 31, 2026
82ef176
stopped polling data when card was hidden
klortiz13 Oct 31, 2026
c7c5087
Merge pull request #2386 from UCSD/optimize-busyness-card-jod034
klortiz13 Oct 31, 2026
4c5afa3
Merge pull request #2388 from UCSD/optimize-student-cards-silkfiy
klortiz13 Oct 31, 2026
3687d3c
Add search function to dining list
silkfiy Oct 31, 2026
2b58aad
Add search helper for dining search
silkfiy Oct 31, 2026
71ac081
Fix bug with search bar losing focus
silkfiy Oct 31, 2026
8ea8b71
Changed search weights
silkfiy Nov 2, 2026
e46a315
Fix search box dark mode coloring
silkfiy Nov 2, 2026
0d0515b
Merge pull request #2391 from UCSD/dining-card-search-silkfiy
klortiz13 Nov 2, 2026
eb30e8c
Fix Classes card evaluation option for TSS data
CoGibby Nov 3, 2026
e439810
Map MyAcademicHistory grade options case-insensitively (MA-741)
CoGibby Nov 6, 2026
b456721
Add cache and API verification to events card
silkfiy Nov 7, 2026
9a4782e
remove print statements
silkfiy Nov 7, 2026
423bfe6
Apply dart formatting
silkfiy Nov 7, 2026
e92b53f
Fix overflow on event list view cards
silkfiy Nov 7, 2026
6a72f61
Merge pull request #2392 from UCSD/classes-card-evaluation-option
klortiz13 Nov 13, 2026
a1c45de
Merge pull request #2394 from UCSD/optimize-events-card-silkfiy
klortiz13 Nov 13, 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
Binary file added assets/images/circles/circle-1-background.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/images/circles/circle-2-background.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/images/circles/circle-3-background.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/images/circles/circle-4-background.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/images/circles/circle-5-background.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/images/circles/circle-6-background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions lib/app_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,10 @@ List<SingleChildWidget> dependentServices = [
var classDataProvider = ClassScheduleDataProvider();
return classDataProvider;
},
lazy: false,
update: (_, userDataProvider, classScheduleDataProvider) {
classScheduleDataProvider!.userDataProvider = userDataProvider;
final bool isLoggedIn = userDataProvider.isLoggedIn;
final bool isNotLoading = !classScheduleDataProvider.isLoading;
if (isLoggedIn && isNotLoading) classScheduleDataProvider.fetchData();
classScheduleDataProvider.handleLoginStateChange();
return classScheduleDataProvider;
},
),
Expand All @@ -176,6 +175,7 @@ List<SingleChildWidget> dependentServices = [
},
update: (_, userDataProvider, studentIdDataProvider) {
studentIdDataProvider!.userDataProvider = userDataProvider;
userDataProvider.studentIdDataProvider = studentIdDataProvider;
return studentIdDataProvider;
},
),
Expand Down
2 changes: 1 addition & 1 deletion lib/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class Router {
return MaterialPageRoute(
builder: (context) {
Provider.of<CustomAppBar>(context).changeTitle(settings.name);
return DiningList();
return DiningList(showSearch: true);
},
);
case RoutePaths.DINING_OPTION_DETAIL_VIEW:
Expand Down
2 changes: 1 addition & 1 deletion lib/core/models/classes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ClassData {
courseCode: json["course_code"] == null ? null : json["course_code"],
units: (json["units"] as num?)?.toDouble(),
courseLevel: json["course_level"] == null ? null : json["course_level"],
gradeOption: json["grade_option"] == null ? null : json["grade_option"],
gradeOption: json["grade_option"] ?? json["gradeOption"],
grade: json["grade"] == null ? null : json["grade"],
courseTitle: json["course_title"] == null ? null : json["course_title"],
enrollmentStatus: json["enrollment_status"] == null ? null : json["enrollment_status"],
Expand Down
4 changes: 2 additions & 2 deletions lib/core/models/events.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class EventModel {
Map<String, dynamic> toJson() => {
"title": title,
"description": description,
"startDate": startDate,
"endDate": endDate,
"startDate": startDate.toIso8601String(),
"endDate": endDate.toIso8601String(),
"imageHQ": imageHQ,
"imageThumb": imageThumb,
"link": link,
Expand Down
25 changes: 19 additions & 6 deletions lib/core/models/scheduled_class.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,29 @@ class ScheduledClass {
return dayCodes.isEmpty ? days : dayCodes.join(', ');
}

String get gradeOption {
switch (course.gradeOption) {
case 'L':
String? get gradeOption {
final raw = course.gradeOption?.trim();
if (raw == null || raw.isEmpty) return null;
switch (raw.toLowerCase()) {
case 'l':
case 'letter grade':
return 'Letter Grade';
case 'P':
case 'p':
case 'pn':
case 'pnp':
case 'pass/no pass':
case 'pass/not pass':
return 'Pass/No Pass';
case 'S':
case 's':
case 'su':
case 's/u':
case 'sat/unsat':
case 'satisfactory/unsatisfactory':
return 'Sat/Unsat';
default:
return 'Other';
// Surface the raw value instead of a misleading "Other" when the
// TSS API adds new grade-option codes.
return raw;
}
}
}
92 changes: 53 additions & 39 deletions lib/core/providers/availability.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import 'package:flutter/material.dart';
class AvailabilityDataProvider extends ChangeNotifier {
/// STATES
bool _isLoading = false;
bool _isFetching = false;
bool _refreshFailed = false;
DateTime? _lastUpdated;
String? _error;
Map<String?, bool> _locationViewState = {};
Expand All @@ -19,51 +21,62 @@ class AvailabilityDataProvider extends ChangeNotifier {
/// SERVICES
var _availabilityService = AvailabilityService();

void fetchAvailability() async {
_isLoading = true;
_error = null;
notifyListeners();
Future<void> fetchAvailability({bool silent = false}) async {
if (_isFetching) return;
_isFetching = true;
try {
if (!silent) {
_isLoading = true;
_error = null;
notifyListeners();
}

/// creating new map ensures we remove all unsupported lots
Map<String, AvailabilityModel> newMapOfLots = {};

if (await _availabilityService.fetchData()) {
Map<String?, bool> newLocationViewState = {};

/// setting the LocationViewState based on user data
for (AvailabilityModel model in _availabilityService.data) {
String curName = model.name;
RegExpMatch? match = RegExp(r' \(\d+/\d+\)$').firstMatch(curName);
if (match != null) curName = curName.replaceRange(match.start, match.end, '');
newMapOfLots[model.name] = model;

/// if the user is logged out and has not put any preferences,
/// show all locations by default
final selectedLocations = userDataProvider.userProfileModel.selectedOccuspaceLocations ?? [];
final bool hasNoSelectedLocations = selectedLocations.isEmpty;

if (hasNoSelectedLocations)
newLocationViewState[curName] = _locationViewState[curName] ?? true;
/// otherwise, LocationViewState should be true for all selectedOccuspaceLocations
else {
newLocationViewState[curName] = _locationViewState[curName] ?? selectedLocations.contains(curName);
/// creating new map ensures we remove all unsupported lots
Map<String, AvailabilityModel> newMapOfLots = {};

if (await _availabilityService.fetchData()) {
_refreshFailed = false;
_error = null;
Map<String?, bool> newLocationViewState = {};

/// setting the LocationViewState based on user data
for (AvailabilityModel model in _availabilityService.data) {
String curName = model.name;
RegExpMatch? match = RegExp(r' \(\d+/\d+\)$').firstMatch(curName);
if (match != null) curName = curName.replaceRange(match.start, match.end, '');
newMapOfLots[model.name] = model;

/// if the user is logged out and has not put any preferences,
/// show all locations by default
final selectedLocations = userDataProvider.userProfileModel.selectedOccuspaceLocations ?? [];
final bool hasNoSelectedLocations = selectedLocations.isEmpty;

if (hasNoSelectedLocations)
newLocationViewState[curName] = _locationViewState[curName] ?? true;
/// otherwise, LocationViewState should be true for all selectedOccuspaceLocations
else {
newLocationViewState[curName] = _locationViewState[curName] ?? selectedLocations.contains(curName);
}
}
}

// After the loop, assign it:
_locationViewState = newLocationViewState;
// After the loop, assign it:
_locationViewState = newLocationViewState;

/// replace old list of lots with new one
_availabilityModels = newMapOfLots;
/// replace old list of lots with new one
_availabilityModels = newMapOfLots;

/// if the user is logged in we want to sync the order of parking lots amongst all devices
reorderLocations(userDataProvider.userProfileModel.selectedOccuspaceLocations);
_lastUpdated = DateTime.now();
} else {
_error = _availabilityService.error;
/// if the user is logged in we want to sync the order of parking lots amongst all devices
reorderLocations(userDataProvider.userProfileModel.selectedOccuspaceLocations);
_lastUpdated = DateTime.now();
} else {
_refreshFailed = true;
if (!silent) _error = _availabilityService.error;
}
} finally {
_isFetching = false;
_isLoading = false;
notifyListeners();
}
_isLoading = false;
notifyListeners();
}

List<AvailabilityModel?> makeOrderedList(List<String?>? order) {
Expand Down Expand Up @@ -113,6 +126,7 @@ class AvailabilityDataProvider extends ChangeNotifier {
/// SIMPLE GETTERS
bool get isLoading => _isLoading;
String? get error => _error;
bool get refreshFailed => _refreshFailed;
DateTime? get lastUpdated => _lastUpdated;
Map<String?, bool> get locationViewState => _locationViewState;
List<AvailabilityModel?> get availabilityModels =>
Expand Down
Loading
Loading