Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions lib/app_constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ class RoutePaths {
// static const String DINING_NUTRITION_VIEW = 'dining/dining_nutrition_view';
static const String PARKING = "parking/parking_view";
static const String SPOT_TYPES_VIEW = "parking/spot_types_view";
static const String PARKING_STRUCTURE_VIEW = "parking/parking_structure_view";
static const String PARKING_LOTS_VIEW = "parking/parking_lots_view";
static const String NEIGHBORHOODS_VIEW = "parking/neighborhoods_view";
static const String NEIGHBORHOODS_LOTS_VIEW = "parking/neighborhoods_lot_view";
static const String AVAILABILITY_DETAILED_VIEW = "availability/detailed_view";
static const String TGPT_CITATION_WEB = 'ai_assistant/citation_web';
}
Expand All @@ -57,10 +54,7 @@ class RouteTitles {
'shuttle/manage_shuttle_view': 'MANAGE SHUTTLE STOPS',
'shuttle/add_shuttle_stops_view': 'ADD SHUTTLE STOPS',
'parking/manage_parking_view': 'MANAGE LOTS',
'parking/neighborhoods_lot_view': 'MANAGE LOTS',
'parking/neighborhoods_view': 'MANAGE LOTS',
'parking/parking_lots_view': 'MANAGE LOTS',
'parking/parking_structure_view': 'MANAGE LOTS',
'parking/spot_types_view': 'MANAGE SPOTS',
'dining/view_all_dining_options': 'DINING',
'dining/option_detail_view': 'DINING',
Expand Down
25 changes: 0 additions & 25 deletions lib/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ import 'package:campus_mobile_experimental/ui/notifications/notifications_filter
import 'package:campus_mobile_experimental/ui/onboarding/onboarding_slides.dart';
import 'package:campus_mobile_experimental/ui/onboarding/onboarding_login.dart';
import 'package:campus_mobile_experimental/ui/parking/manage_parking_view.dart';
import 'package:campus_mobile_experimental/ui/parking/neighborhood_lot_view.dart';
import 'package:campus_mobile_experimental/ui/parking/neighborhoods_view.dart';
import 'package:campus_mobile_experimental/ui/parking/parking_structure_view.dart';
import 'package:campus_mobile_experimental/ui/parking/spot_types_view.dart';
import 'package:campus_mobile_experimental/ui/profile/cards.dart';
import 'package:campus_mobile_experimental/ui/profile/profile.dart';
Expand Down Expand Up @@ -204,28 +201,6 @@ class Router {
return ClassList();
},
);
case RoutePaths.PARKING_STRUCTURE_VIEW:
return MaterialPageRoute(
builder: (context) {
Provider.of<CustomAppBar>(context).changeTitle(settings.name, done: true);
return ParkingStructureView();
},
);
case RoutePaths.NEIGHBORHOODS_VIEW:
return MaterialPageRoute(
builder: (context) {
Provider.of<CustomAppBar>(context).changeTitle(settings.name, done: true);
return NeighborhoodsView();
},
);
case RoutePaths.NEIGHBORHOODS_LOTS_VIEW:
List<String> data = settings.arguments as List<String>;
return MaterialPageRoute(
builder: (context) {
Provider.of<CustomAppBar>(context).changeTitle(settings.name, done: true);
return NeighborhoodLotsView(data);
},
);
default:
return MaterialPageRoute(
builder: (context) {
Expand Down
4 changes: 3 additions & 1 deletion lib/core/providers/dining.dart
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ class DiningDataProvider extends ChangeNotifier {
final bool hasLongitude = _coordinates?.lon != null;
if (hasCoordinates && hasLatitude && hasLongitude) {
for (DiningModel model in _diningModels.values.toList()) {
if (model.coordinates != null) {
// Some locations from the API have no lat/lon; skip them instead of crashing.
final bool modelHasLocation = model.coordinates?.lat != null && model.coordinates?.lon != null;
if (modelHasLocation) {
var distance = calculateDistance(
_coordinates!.lat!,
_coordinates!.lon!,
Expand Down
26 changes: 0 additions & 26 deletions lib/core/providers/parking.dart
Original file line number Diff line number Diff line change
Expand Up @@ -206,32 +206,6 @@ class ParkingDataProvider extends ChangeNotifier {
return totalAndOpenSpots;
}

Map<String, List<String>> getParkingMap() {
Map<String, List<String>> parkingMap = {};
List<String> neighborhoodsToSort = [];
for (ParkingModel model in _parkingService.data!) {
neighborhoodsToSort.add(model.neighborhood);
}
neighborhoodsToSort.sort();
for (String neighborhood in neighborhoodsToSort) {
List<String> val = [];
parkingMap[neighborhood] = val;
}

for (ParkingModel model in _parkingService.data!) {
parkingMap[model.neighborhood]!.add(model.locationName);
}
return parkingMap;
}

List<String> getStructures() {
List<String> structureMap = [];
for (ParkingModel model in _parkingService.data!) {
if (model.isStructure) structureMap.add(model.locationName);
}
return structureMap;
}

List<String> getLots() {
List<String> lotMap = [];
for (ParkingModel model in _parkingService.data!) {
Expand Down
141 changes: 97 additions & 44 deletions lib/ui/parking/manage_parking_view.dart
Original file line number Diff line number Diff line change
@@ -1,60 +1,113 @@
import 'package:campus_mobile_experimental/app_constants.dart';
import 'package:campus_mobile_experimental/ui/common/container_view.dart';
import 'package:campus_mobile_experimental/app_styles.dart';
import 'package:campus_mobile_experimental/core/models/parking.dart';
import 'package:campus_mobile_experimental/core/providers/parking.dart';
import 'package:campus_mobile_experimental/ui/common/alert_dialog_widget.dart';
import 'package:campus_mobile_experimental/ui/common/container_view.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

class ManageParkingView extends StatefulWidget {
@override
_ManageParkingViewState createState() => _ManageParkingViewState();
}

class _ManageParkingViewState extends State<ManageParkingView> {
/// Flat list of every parking structure and lot, each with an on/off switch
/// that controls whether it appears on the parking card.
class ManageParkingView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ContainerView(child: buildLocationsList(context));
}
Widget build(BuildContext context) => ContainerView(child: buildLocationsList(context));

Widget buildLocationsList(BuildContext context) {
const List<String> parkingType = ["Neighborhoods", "Parking Structures"];

List<Widget> listTiles = [];
for (int i = 0; i < parkingType.length; i++) {
listTiles.add(
ListTile(
title: Text(parkingType[i], style: Theme.of(context).textTheme.bodyMedium),
trailing: Icon(Icons.arrow_forward_ios, color: dotsSelectedColorLight, size: 18.0),
onTap: () {
if (i == 0) {
Navigator.pushNamed(context, RoutePaths.NEIGHBORHOODS_VIEW);
} else if (i == 1) {
Navigator.pushNamed(context, RoutePaths.PARKING_STRUCTURE_VIEW);
}
},
),
);
final parkingDataProvider = Provider.of<ParkingDataProvider>(context);

if (parkingDataProvider.isLoading == true) {
return Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.secondary));
}

if (parkingDataProvider.error != null) {
return _statusMessage(context, 'Unable to load parking locations. Please try again later.');
}

// Sort by name so each location is easy to find in one list.
final List<ParkingModel> locations = List<ParkingModel>.from(parkingDataProvider.parkingModels)
..sort((a, b) => a.locationName.toLowerCase().compareTo(b.locationName.toLowerCase()));

if (locations.isEmpty) {
return _statusMessage(context, 'No parking locations available.');
}

final Map<String, bool> viewState = parkingDataProvider.parkingViewState;
final int selectedLots = viewState.values.where((selected) => selected).length;

final List<Widget> listTiles = [
for (ParkingModel location in locations)
_locationTile(
context,
parkingDataProvider,
location.locationName,
viewState[location.locationName] ?? false,
selectedLots,
),
];

return Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: ListView(
shrinkWrap: true,
children: [
for (int i = 0; i < listTiles.length; i++) ...[
listTiles[i],
if (i != listTiles.length - 1)
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Divider(
color: Theme.of(context).brightness == Brightness.dark
? listTileDividerColorDark
: listTileDividerColorLight,
thickness: 0.5,
height: 0,
),
),
],
],
physics: const BouncingScrollPhysics(),
children: ListTile.divideTiles(
tiles: listTiles,
context: context,
color: Theme.of(context).brightness == Brightness.dark ? listTileDividerColorDark : listTileDividerColorLight,
).toList(),
),
);
}

Widget _locationTile(
BuildContext context,
ParkingDataProvider parkingDataProvider,
String locationName,
bool isSelected,
int selectedLots,
) {
void toggle() {
if (!isSelected && selectedLots >= ParkingDataProvider.MAX_SELECTED_LOTS) {
showDialog(
context: context,
builder: (context) => AlertDialogWidget(
type: MessageTypeConstants.ERROR,
icon: Icons.block_flipped,
title: ParkingConstants.LOT_MAX_TITLE,
description: ParkingConstants.LOT_MAX_DESC,
onClose: () => Navigator.of(context).pop(),
),
);
return;
}
parkingDataProvider.toggleLot(locationName, selectedLots);
}

// MergeSemantics lets screen readers announce the name and switch state together.
return MergeSemantics(
child: ListTile(
key: Key(locationName),
contentPadding: const EdgeInsets.symmetric(horizontal: 16.0),
title: Text(locationName, style: Theme.of(context).textTheme.bodyMedium),
onTap: toggle,
trailing: Transform.scale(
scale: 0.9,
child: CupertinoSwitch(
value: isSelected,
activeTrackColor: toggleActiveColor,
inactiveTrackColor: Colors.grey.shade400,
onChanged: (_) => toggle(),
),
),
),
);
}

Widget _statusMessage(BuildContext context, String message) => Center(
child: Padding(
padding: const EdgeInsets.all(32.0),
child: Text(message, style: Theme.of(context).textTheme.bodyMedium, textAlign: TextAlign.center),
),
);
}
103 changes: 0 additions & 103 deletions lib/ui/parking/neighborhood_lot_view.dart

This file was deleted.

Loading
Loading