refactored code to encapsulate date formatting

lib/pages/flood_station_page.dart

@@ -16,6 +16,8 @@ class FloodStationPage extends StatefulWidget {
 }
 
 class _FloodStationPageState extends State<FloodStationPage> {
+  bool _tableVisible = false;
+
   @override
   void deactivate() {
     context.read<FloodStationProvider>().selectedStation = null;
@@ -29,6 +31,14 @@ class _FloodStationPageState extends State<FloodStationPage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(station?.label ?? ''),
+        actions: [
+          TextButton(
+            onPressed: () => setState(() {
+              _tableVisible = !_tableVisible;
+            }),
+            child: _tableVisible ? Text('Show Graph') : Text('Show Table'),
+          ),
+        ],
       ),
       body: FutureBuilder<List<Reading>>(
           future: Api.fetchReadingsFromStation(station?.id ?? ''),
@@ -36,6 +46,12 @@ class _FloodStationPageState extends State<FloodStationPage> {
             if (snapshot.hasData) {
               if (snapshot.data!.isEmpty) {
                 return Center(child: Text('No readings on record.'));
+              } else if (_tableVisible) {
+                return SingleChildScrollView(
+                  child: Table(
+                    children: _getTableChildren(snapshot.data!),
+                  ),
+                );
               }
               return Center(
                 child: Padding(
@@ -53,4 +69,17 @@ class _FloodStationPageState extends State<FloodStationPage> {
           }),
     );
   }
+
+  List<TableRow> _getTableChildren(List<Reading> list) {
+    return list
+        .map<TableRow>(
+          (e) => TableRow(
+            children: [
+              Text(e.dateTime.toString()),
+              Text(e.value.toString()),
+            ],
+          ),
+        )
+        .toList();
+  }
 }

lib/pages/map_page.dart

@@ -20,36 +20,22 @@ class MapPage extends StatefulWidget {
 }
 
 class _MapPageState extends State<MapPage> {
-  final _mapController = MapController();
+  final mapController = MapController();
   late FloodStationProvider _floodStationProvider;
-  bool _loading = false;
 
   @override
   Widget build(BuildContext context) {
     _floodStationProvider = context.watch<FloodStationProvider>();
-    if (_loading == true) {
+    if (_floodStationProvider.allStations.isEmpty) {
-      return Center(
-        child: CircularProgressIndicator(),
-      );
-    } else if (_floodStationProvider.allStations.isEmpty) {
       return Center(
         child: ElevatedButton(
-          onPressed: () {
+          onPressed: _floodStationProvider.loadAllStations,
-            setState(() {
-              _loading = true;
-            });
-            _floodStationProvider
-                .loadAllStations()
-                .whenComplete(() => setState(() {
-                      _loading = false;
-                    }));
-          },
           child: Text('Load Map'),
         ),
       );
     }
     return FlutterMap(
-      mapController: _mapController,
+      mapController: mapController,
       options: MapOptions(
         cameraConstraint: CameraConstraint.containCenter(
             bounds: LatLngBounds.fromPoints(_floodStationProvider.allStations
@@ -70,14 +56,13 @@ class _MapPageState extends State<MapPage> {
               padding: EdgeInsets.all(50),
               maxZoom: 15,
               markers: _stationsAsMarkers(_floodStationProvider.allStations),
-              builder: _clusterMarkerBuilder),
+              builder: _markerBuilder),
         )
       ],
     );
   }
 
-  // builds the clustered marker
+  Widget _markerBuilder(BuildContext context, List<Marker> markers) {
-  Widget _clusterMarkerBuilder(BuildContext context, List<Marker> markers) {
     return Container(
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(20),
@@ -86,7 +71,7 @@ class _MapPageState extends State<MapPage> {
       child: Center(
         child: Text(
           markers.length.toString(),
-          style: TextStyle(color: Theme.of(context).colorScheme.onTertiary),
+          style: const TextStyle(color: Colors.white),
         ),
       ),
     );
@@ -107,7 +92,7 @@ class _MapPageState extends State<MapPage> {
         .toList();
   }
 
-  void _markerTapped(FloodStation station) {
+  _markerTapped(FloodStation station) {
     showDialog(
       context: context,
       builder: (context) => MapPopup(

lib/services/api.dart

@@ -1,11 +1,13 @@
 import 'package:http/http.dart' as http;
 import 'dart:convert';
-import 'package:timezone/timezone.dart' as tz;
 
 import '../model/flood_station.dart';
 import '../model/reading.dart';
+import 'date_utility.dart';
 
 class Api {
+  Api._();
+
   static const String _rootUrl =
       'https://environment.data.gov.uk/flood-monitoring';
 
@@ -56,7 +58,8 @@ class Api {
   static Future<List<Reading>> fetchReadingsFromStation(
       String stationId) async {
     List<Reading> readings = [];
-    final dateTime = _getCurrentUKTime().subtract(Duration(days: 1)).toUtc();
+    final dateTime =
+        DateUtility.currentUKTimeUtc.subtract(Duration(days: 1)).toUtc();
     final url =
         '$_rootUrl/id/stations/$stationId/readings?since=${dateTime.toIso8601String()}&_sorted';
     final response = await http.get(Uri.parse(url));
@@ -68,9 +71,4 @@ class Api {
     }
     return readings.reversed.toList();
   }
-
-  static DateTime _getCurrentUKTime() {
-    final london = tz.getLocation('Europe/London');
-    return tz.TZDateTime.now(london);
-  }
 }

lib/services/date_utility.dart

@@ -0,0 +1,36 @@
+import 'package:timezone/timezone.dart' as tz;
+import 'package:intl/intl.dart' as intl;
+
+class DateUtility {
+  static final intl.DateFormat _hmFormat = intl.DateFormat('Hm');
+  static final intl.DateFormat _ymdhmFormat = intl.DateFormat('yyyy-MM-dd H:m');
+  static final intl.DateFormat _ymdFormat = intl.DateFormat('yyyy-MM-dd');
+
+  // private default contructor so class can't be instanciated
+  DateUtility._();
+
+  static DateTime get currentUKTimeUtc {
+    final london = tz.getLocation('Europe/London');
+    return tz.TZDateTime.now(london).toUtc();
+  }
+
+  /// Formats a date in minutesSinceEpoch to a formatted String of HH:mm
+  static String formatMinutesToHm(double value) {
+    return _hmFormat.format(
+        DateTime.fromMillisecondsSinceEpoch((value * 1000 * 60).toInt()));
+  }
+
+  static String formatDateToHm(DateTime date) {
+    return _hmFormat.format(date);
+  }
+
+  /// Formats a date to yyyy-MM-dd H:m
+  static String formatDateToYmdhm(DateTime date) {
+    return _ymdhmFormat.format(date);
+  }
+
+  /// Formats a date to yyyy-MM-dd
+  static String formatDateToYmd(DateTime date) {
+    return _ymdFormat.format(date);
+  }
+}

lib/widgets/map_popup.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart' as intl;
 
 import '../model/flood_station.dart';
+import '../services/date_utility.dart';
 
 class MapPopup extends StatelessWidget {
   const MapPopup(
@@ -43,7 +43,7 @@ class MapPopup extends StatelessWidget {
               Padding(padding: EdgeInsets.only(left: 8)),
               Text(
                 _station.dateOpened != null
-                    ? intl.DateFormat.yMd().format(_station.dateOpened!)
+                    ? DateUtility.formatDateToYmd(_station.dateOpened!)
                     : '-',
               ),
             ],

lib/widgets/reading_graph.dart

@@ -1,9 +1,9 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart' as intl;
 import 'dart:math';
 
 import '../model/reading.dart';
+import '../services/date_utility.dart';
 
 class ReadingGraph extends StatelessWidget {
   const ReadingGraph({super.key, required List<Reading> readings})
@@ -73,7 +73,7 @@ class ReadingGraph extends StatelessWidget {
         minIncluded: false,
         getTitlesWidget: (value, meta) => SideTitleWidget(
           meta: meta,
-          child: Text(_getDate(value)),
+          child: Text(DateUtility.formatMinutesToHm(value)),
         ),
       ),
     );
@@ -94,23 +94,17 @@ class ReadingGraph extends StatelessWidget {
     );
   }
 
-  String _getDate(double value) {
-    intl.DateFormat hmFormat = intl.DateFormat('Hm');
-    return hmFormat.format(
-        DateTime.fromMillisecondsSinceEpoch((value * 1000 * 60).toInt()));
-  }
-
   String _getLongDate(double value) {
     DateTime date =
         DateTime.fromMillisecondsSinceEpoch((value * 1000 * 60).toInt());
     int daysDifference = (DateTime.now().weekday - date.weekday + 7) % 7;
 
     if (daysDifference == 0) {
-      return 'Today ${intl.DateFormat('Hm').format(date)}';
+      return 'Today ${DateUtility.formatDateToHm(date)}';
     } else if (daysDifference == 1) {
-      return 'Yesterday ${intl.DateFormat('Hm').format(date)}';
+      return 'Yesterday ${DateUtility.formatDateToHm(date)}';
     }
 
-    return intl.DateFormat('yyyy-MM-dd H:m').format(date);
+    return DateUtility.formatDateToYmdhm(date);
   }
 }