diff --git a/app/lib/widgets/bar_graph/bar_data.dart b/app/lib/widgets/bar_graph/bar_data.dart index b0374fe40a4be9131a11d429ae810ec88bfb85b1..caa0ffeafd00ec0fecd745c24e4359fd88f646d2 100644 --- a/app/lib/widgets/bar_graph/bar_data.dart +++ b/app/lib/widgets/bar_graph/bar_data.dart @@ -98,9 +98,7 @@ class _BarDataState extends State<BarData> { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only(top: 16), - child: Column( + return Column( children: [ SizedBox( width: MediaQuery.of(context).size.width, // Set the desired width @@ -164,7 +162,6 @@ class _BarDataState extends State<BarData> { ), ), ], - ), ); } } \ No newline at end of file diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart index 4dcfd6db052e42141fd7ffa8b5d1087da1cb78bd..672ffdd3554124932d5b1d196e44022c06a67641 100644 --- a/app/lib/widgets/main_layout.dart +++ b/app/lib/widgets/main_layout.dart @@ -217,49 +217,57 @@ class _MapContainerWidgetState extends State<MapContainerWidget> { ], ), const SizedBox(height: contPadding), // Padding between containers - ClipRRect( - borderRadius: BorderRadius.circular(20), - child: SizedBox( + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: screenWidth * boxWidth, + child: Align( + alignment: Alignment.topLeft, + child: Padding( + padding: const EdgeInsets.only(top: 20, left: 30), // Updated padding + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Ice stats', + style: titleStyle, + ), + const Divider(), + const SizedBox(height: 10), // Reduced padding + Text( + 'Measured at ', + style: subHeadingStyle, + ), + Text( + 'Date: ${(selectedTile?.timeMeasured.day ?? '-')}/${(selectedTile?.timeMeasured.month ?? '-')}/${(selectedTile?.timeMeasured.year ?? '-')}', + style: regTextStyle, + ), + Text( + 'Time: ${selectedTile?.timeMeasured.hour}:00', + style: regTextStyle, + ), + ], + ), + ), + ), + ), + const SizedBox(height: contPadding*2), + SizedBox( width: screenWidth * boxWidth * 1.2, - height: screenWidth * boxHeight * 1.5, // NB: make dynamic - child: Align( - alignment: Alignment.topLeft, - child: Padding( - padding: const EdgeInsets.only(top: 20, left: 20), // Edge padding, text - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Ice stats', - style: titleStyle, - ), - const Divider(), - const Padding(padding: EdgeInsets.all(10)), - Text( - 'Measured at ', - style: subHeadingStyle, - ), - Text( - 'Date: ${(selectedTile?.timeMeasured.day ?? '-')}/${(selectedTile?.timeMeasured.month ?? '-')}/${(selectedTile?.timeMeasured.year ?? '-')}', - style: regTextStyle, - ), - Text( - 'Time: ${selectedTile?.timeMeasured.hour}:00', - style: regTextStyle, - ), - const SizedBox(height: contPadding), - Text( - 'Measuring point: (${selectedTile?.measurementID}, ${selectedTile?.measurementID})', - style: regTextStyle, - ), - const SizedBox(height: contPadding), - const SizedBox(height: 15), - const StatCharts(), - ], + child: Center( + child: Text( + 'Measuring point: (${selectedTile?.measurementID}, ${selectedTile?.measurementID})', + style: regTextStyle, ), ), ), - ), + SizedBox( + width: screenWidth * boxWidth * 1.2, + height: screenWidth * boxHeight * 1.5, + child: const StatCharts(), + ) + ], ), ], ); diff --git a/app/lib/widgets/stat_charts.dart b/app/lib/widgets/stat_charts.dart index b335a87d1fb3f419a8e4241814b61669d70c18b0..f97ee153ee00e797d83b30065e7371f4e7c6be1e 100644 --- a/app/lib/widgets/stat_charts.dart +++ b/app/lib/widgets/stat_charts.dart @@ -64,70 +64,6 @@ class StatCharts extends StatelessWidget { ); } - Widget buildBarChart(BuildContext context) { - return Padding( - padding: const EdgeInsets.only(right: 20), - child: BarChart( - BarChartData( - alignment: BarChartAlignment.spaceAround, - maxY: 20, - barTouchData: BarTouchData(enabled: false), - backgroundColor: Colors.grey.shade800, - titlesData: FlTitlesData( - bottomTitles: SideTitles( - showTitles: true, - getTextStyles: (value) => const TextStyle(color: Colors.white60), - margin: 10, - getTitles: (value) { - switch (value.toInt()) { - case 0: - return 'Value'; - case 1: - return 'Value'; - case 2: - return 'Value'; - default: - return ''; - } - }, - ), - leftTitles: SideTitles( - showTitles: true, - getTextStyles: (value) => const TextStyle(color: Colors.white60), - margin: 10, - reservedSize: 30, - interval: 5, - ), - ), - borderData: FlBorderData( - show: true, - border: Border.all(color: Colors.white60, width: 1), - ), - barGroups: [ - BarChartGroupData( - x: 0, - barRods: [ - BarChartRodData(y: 15, width: 10), - ], - ), - BarChartGroupData( - x: 1, - barRods: [ - BarChartRodData(y: 10, width: 10), - ], - ), - BarChartGroupData( - x: 2, - barRods: [ - BarChartRodData(y: 18, width: 10), - ], - ), - ], - ), - ), - ); - } - @override Widget build(BuildContext context) { return Column(