diff --git a/app/lib/consts.dart b/app/lib/consts.dart index 13b7ca3b3bbebe953f24e62f53e93072154af512..d1c7751a71c5564ccd46cbcae484bfc4e276be05 100644 --- a/app/lib/consts.dart +++ b/app/lib/consts.dart @@ -16,8 +16,8 @@ Uint8List selectedRelation = Uint8List(0); List<Measurement> selectedMarkerList = []; LatLng mapCenter = LatLng(60.8000, 10.8471); DateTime ?lastUpdate; // Last time data was fetched from server - List<String> lakeSearchOptions = []; // Init empty +bool internetConnection = true; // Font settings const textColor = Colors.white; diff --git a/app/lib/widgets/bar_graph/bar_data.dart b/app/lib/widgets/bar_graph/bar_data.dart index 20c4e7a0805646d1a068f0440010079329e4a7ad..6ef9b182597faf1fd8a5cc2dab159c7edea16153 100644 --- a/app/lib/widgets/bar_graph/bar_data.dart +++ b/app/lib/widgets/bar_graph/bar_data.dart @@ -72,6 +72,7 @@ class _BarDataState extends State<BarData> { ); } + // _buildLegendItem renders a colored circle and text to form a legend Widget _buildLegendItem(Color color, String text) { return Row( children: [ diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart index 98d4c22e1069fd3e66f108f7fd3e2dd0b925f16a..767d42292b6ed5c7f3fbcdba7092036842e27d22 100644 --- a/app/lib/widgets/main_layout.dart +++ b/app/lib/widgets/main_layout.dart @@ -208,7 +208,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> { lastUpdate?.month == DateTime.now().month && lastUpdate?.year == DateTime.now().year ? '${lastUpdate?.hour}:${lastUpdate?.minute}' : - '${lastUpdate?.day}-${lastUpdate?.month}-${lastUpdate?.year}') : ''}', + '${lastUpdate?.day}.${formatMonth(lastUpdate!.month)} ${lastUpdate?.year}') : ''}', style: GoogleFonts.dmSans( fontSize: 14, color: Colors.white60, @@ -303,3 +303,34 @@ class _MapContainerWidgetState extends State<MapContainerWidget> { ); } } + +String formatMonth(int month) { + switch (month) { + case 1: + return 'Jan'; + case 2: + return 'Feb'; + case 3: + return 'Mar'; + case 4: + return 'Apr'; + case 5: + return 'May'; + case 6: + return 'Jun'; + case 7: + return 'Jul'; + case 8: + return 'Aug'; + case 9: + return 'Sep'; + case 10: + return 'Oct'; + case 11: + return 'Nov'; + case 12: + return 'Dec'; + default: + return ''; + } +} \ No newline at end of file