Performance Enhancements

lib/ui/availability/availability_card.dart

@@ -43,24 +43,24 @@ class _AvailabilityCardState extends State<AvailabilityCard> {
   }
 
   Widget buildAvailabilityCard(List<AvailabilityModel?> data) {
-    List<Widget> locationsList = [];
-    RegExp multiPager = RegExp(r' \(\d+/\d+\)$');
-    // loop through all the models, adding each one to locationsList
-    for (AvailabilityModel? model in data) {
-      if (model != null) {
-        String curName = model.name!;
-        RegExpMatch? match = multiPager.firstMatch(curName);
-        if (match != null) {
-          curName = curName.replaceRange(match.start, match.end, '');
-        }
-        if (_availabilityDataProvider.locationViewState[curName]!) {
-          locationsList.add(AvailabilityDisplay(model: model));
-        }
+    // RegExp multiPager = RegExp(r' \(\d+/\d+\)$');
+    // Filter the models and create a list of only the valid ones
+    List<Widget> locationsList = data
+        .where((model) {
+      if (model == null) return false;
+      String curName = model.name!;
+      RegExp multiPager = RegExp(r' \(\d+/\d+\)$');
+      RegExpMatch? match = multiPager.firstMatch(curName);
+      if (match != null) {
+        curName = curName.replaceRange(match.start, match.end, '');
       }
-    }
+      return _availabilityDataProvider.locationViewState[curName]!;
+    })
+        .map((model) => AvailabilityDisplay(model: model!))
+        .toList();
 
-    // the user chose no location, so instead show "No Location to Display"
-    if (locationsList.length == 0) {
+    // If no location is available, show "No Location to Display"
+    if (locationsList.isEmpty) {
       return Column(
         mainAxisAlignment: MainAxisAlignment.center,
         mainAxisSize: MainAxisSize.min,
@@ -85,9 +85,12 @@ class _AvailabilityCardState extends State<AvailabilityCard> {
     return Column(
       children: <Widget>[
         Flexible(
-          child: PageView(
+          child: PageView.builder(
             controller: _controller,
-            children: locationsList,
+            itemCount: locationsList.length,
+            itemBuilder: (context, index) {
+              return locationsList[index];
+            },
           ),
         ),
         SingleChildScrollView(

lib/ui/availability/availability_detail_view.dart

@@ -15,65 +15,63 @@ class AvailabilityDetailedView extends StatelessWidget {
   }
 
   Widget buildLocationsList(BuildContext context, subLocation) {
-    // Add a tile for the subLocation name
-    List<Widget> list = [];
-    list.add(ListTile(
-      title: Text(
-        "${subLocation.name}",
-        style: TextStyle(
-            color: Theme.of(context).colorScheme.secondary,
-            fontSize: 24,
-            fontWeight: FontWeight.bold),
-      ),
-    ));
-
-    // Add a tile for every floor in the subLocation list
-    for (int i = 0; i < subLocation.floors.length; i++) {
-      Floor floor = subLocation.floors[i];
-      list.add(
-        ListTile(
-          title: Text(
-            "${floor.name}",
-            style: TextStyle(
+    return ListView.builder(
+      physics: BouncingScrollPhysics(),
+      itemCount: subLocation.floors.length + 1, // +1 to include the subLocation name tile
+      itemBuilder: (context, index) {
+        if (index == 0) {
+          // Add the subLocation name as the first ListTile
+          return ListTile(
+            title: Text(
+              "${subLocation.name}",
+              style: TextStyle(
                 color: Theme.of(context).colorScheme.secondary,
-                fontSize: LOCATION_FONT_SIZE),
-          ),
-          subtitle: Column(
-            children: <Widget>[
-              Align(
+                fontSize: 24,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          );
+        } else {
+          // Add tiles for each floor in the subLocation
+          Floor floor = subLocation.floors[index - 1]; // Adjust index for floors
+          return ListTile(
+            title: Text(
+              "${floor.name}",
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.secondary,
+                fontSize: LOCATION_FONT_SIZE,
+              ),
+            ),
+            subtitle: Column(
+              children: <Widget>[
+                Align(
                   alignment: Alignment.centerLeft,
                   child: Text(
-                    (100 * percentAvailability(floor)).toInt().toString() +
-                        '% Busy',
-                    // style: TextStyle(color: Colors.black),
-                  )),
-              Align(
-                alignment: Alignment.centerLeft,
-                child: SizedBox(
-                  height: PROGRESS_BAR_HEIGHT,
-                  width: PROGRESS_BAR_WIDTH,
-                  child: ClipRRect(
-                    borderRadius: BorderRadius.circular(BORDER_RADIUS),
-                    child: LinearProgressIndicator(
-                      value: percentAvailability(floor) as double?,
-                      backgroundColor: Colors.grey[BACKGROUND_GREY_SHADE],
-                      valueColor: AlwaysStoppedAnimation<Color>(
-                        setIndicatorColor(
-                          percentAvailability(floor),
+                    (100 * percentAvailability(floor)).toInt().toString() + '% Busy',
+                  ),
+                ),
+                Align(
+                  alignment: Alignment.centerLeft,
+                  child: SizedBox(
+                    height: PROGRESS_BAR_HEIGHT,
+                    width: PROGRESS_BAR_WIDTH,
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(BORDER_RADIUS),
+                      child: LinearProgressIndicator(
+                        value: percentAvailability(floor) as double?,
+                        backgroundColor: Colors.grey[BACKGROUND_GREY_SHADE],
+                        valueColor: AlwaysStoppedAnimation<Color>(
+                          setIndicatorColor(percentAvailability(floor)),
                         ),
                       ),
                     ),
                   ),
                 ),
-              ),
-            ],
-          ),
-        ),
-      );
-    }
-    return ListView(
-      physics: BouncingScrollPhysics(),
-      children: list,
+              ],
+            ),
+          );
+        }
+      },
     );
   }
 

lib/ui/availability/availability_display.dart

@@ -41,71 +41,8 @@ class AvailabilityDisplay extends StatelessWidget {
   }
 
   Widget buildAvailabilityBars(BuildContext context) {
-    List<Widget> locations = [];
-    // add any children the model contains to the listview
-    if (model.subLocations!.isNotEmpty) {
-      for (SubLocations subLocation in model.subLocations!) {
-        locations.add(
-          SizedBox(
-            height: 75,
-            child: Center(
-              child: ListTile(
-                onTap: () => subLocation.floors!.length > 0
-                    ? Navigator.pushNamed(
-                        context, RoutePaths.AvailabilityDetailedView,
-                        arguments: subLocation)
-                    : print('_handleIconClick: no subLocations'),
-                visualDensity: VisualDensity.compact,
-                trailing: subLocation.floors!.length > 0
-                    ? Icon(Icons.arrow_forward_ios_rounded)
-                    : null,
-                title: Text(
-                  subLocation.name!,
-                  style: TextStyle(
-                    fontSize: LOCATION_FONT_SIZE,
-                  ),
-                ),
-                subtitle: Column(
-                  children: <Widget>[
-                    Align(
-                        alignment: Alignment.centerLeft,
-                        child: Text(
-                          (100 * percentAvailability(subLocation))
-                                  .toInt()
-                                  .toString() +
-                              '% Busy',
-                          // style: TextStyle(color: Colors.black),
-                        )),
-                    Align(
-                      alignment: Alignment.centerLeft,
-                      child: SizedBox(
-                        height: PROGRESS_BAR_HEIGHT,
-                        width: PROGRESS_BAR_WIDTH,
-                        child: ClipRRect(
-                          borderRadius: BorderRadius.circular(BORDER_RADIUS),
-                          child: LinearProgressIndicator(
-                            value: percentAvailability(subLocation) as double?,
-                            backgroundColor: Colors.grey[BACKGROUND_GREY_SHADE],
-                            valueColor: AlwaysStoppedAnimation<Color>(
-                              setIndicatorColor(
-                                percentAvailability(subLocation),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        );
-      }
-    }
-
     // if no children, return an error container
-    else {
+    if (model.subLocations!.isEmpty) {
       return Container(
         alignment: Alignment.center,
         child: Text(
@@ -117,14 +54,59 @@ class AvailabilityDisplay extends StatelessWidget {
         ),
       );
     }
-    locations =
-        ListTile.divideTiles(tiles: locations, context: context).toList();
 
     return Flexible(
       child: Scrollbar(
-        child: ListView(
-          physics: NeverScrollableScrollPhysics(),
-          children: locations,
+        child: ListView.builder(
+          itemCount: model.subLocations!.length,
+          itemBuilder: (context, index) {
+            SubLocations subLocation = model.subLocations![index];
+            return ListTile(
+              onTap: () => subLocation.floors!.length > 0
+                  ? Navigator.pushNamed(
+                  context, RoutePaths.AvailabilityDetailedView,
+                  arguments: subLocation)
+                  : print('_handleIconClick: no subLocations'),
+              visualDensity: VisualDensity.compact,
+              trailing: subLocation.floors!.length > 0
+                  ? Icon(Icons.arrow_forward_ios_rounded)
+                  : null,
+              title: Text(
+                subLocation.name!,
+                style: TextStyle(
+                  fontSize: LOCATION_FONT_SIZE,
+                ),
+              ),
+              subtitle: Column(
+                children: <Widget>[
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      (100 * percentAvailability(subLocation)).toInt().toString() +
+                          '% Busy',
+                    ),
+                  ),
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: SizedBox(
+                      height: PROGRESS_BAR_HEIGHT,
+                      width: PROGRESS_BAR_WIDTH,
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(BORDER_RADIUS),
+                        child: LinearProgressIndicator(
+                          value: percentAvailability(subLocation) as double?,
+                          backgroundColor: Colors.grey[BACKGROUND_GREY_SHADE],
+                          valueColor: AlwaysStoppedAnimation<Color>(
+                            setIndicatorColor(percentAvailability(subLocation)),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
         ),
       ),
     );

lib/ui/classes/upcoming_classes.dart

@@ -16,16 +16,17 @@ class UpcomingCoursesList extends StatelessWidget {
 
   Widget buildListOfCourses(
       List<SectionData> data, int? selectedCourse, BuildContext context) {
-    List<Widget> listOfCourses = List.generate(data.length, (int index) {
-      return buildTile(index, selectedCourse, data[index], context);
-    });
     return Container(
-        constraints:
-            BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.3),
-        child: ListView(
-          children: listOfCourses,
-          shrinkWrap: true,
-        ));
+      constraints:
+          BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.3),
+      child: ListView.builder(
+        itemCount: data.length,
+        itemBuilder: (context, index) {
+          return buildTile(index, selectedCourse, data[index], context);
+        },
+        shrinkWrap: true,
+      ),
+    );
   }
 
   Widget buildTile(

lib/ui/common/card_container.dart

@@ -133,7 +133,7 @@ class CardContainer extends StatelessWidget {
       // web cards are still sized with static values
       return Container(
         width: double.infinity,
-        constraints: BoxConstraints(minHeight: cardMinHeight, maxHeight: 340),
+        constraints: BoxConstraints(minHeight: cardMinHeight, maxHeight: 260),
         child: child(),
       );
     } else if (titleText == "Parking") {

lib/ui/common/image_loader.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 
 class ImageLoader extends StatelessWidget {
   final String? url;
@@ -17,23 +18,19 @@ class ImageLoader extends StatelessWidget {
             width: 0,
             height: 0,
           )
-        : Image.network(
-            url!,
+        : CachedNetworkImage(
+            imageUrl: url!,
             width: fullSize ? null : width,
             height: fullSize ? null : height,
-            loadingBuilder: (BuildContext context, Widget child,
-                ImageChunkEvent? loadingProgress) {
-              if (loadingProgress == null) return child;
+            progressIndicatorBuilder: (context, url, downloadProgress) {
               return Center(
                 child: CircularProgressIndicator(
                   color: Theme.of(context).colorScheme.secondary,
-                  value: loadingProgress.expectedTotalBytes != null
-                      ? loadingProgress.cumulativeBytesLoaded /
-                          loadingProgress.expectedTotalBytes!
-                      : null,
+                  value: downloadProgress.progress,
                 ),
               );
             },
+            errorWidget: (context, url, error) => Icon(Icons.error),
           );
   }
 }