From 6defa8c7bb5531d0e482eade42511f89e068b45e Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 9 Nov 2023 14:51:43 -0500 Subject: [PATCH] updates to display ratio of analytics charts and tiles --- lib/pangea/pages/analytics/bar_chart_card.dart | 7 +++---- lib/pangea/pages/analytics/base_analytics_page.dart | 6 +++++- lib/pangea/pages/analytics/construct_list.dart | 9 +++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/pangea/pages/analytics/bar_chart_card.dart b/lib/pangea/pages/analytics/bar_chart_card.dart index bbdac5435..cf01ab35a 100644 --- a/lib/pangea/pages/analytics/bar_chart_card.dart +++ b/lib/pangea/pages/analytics/bar_chart_card.dart @@ -33,13 +33,12 @@ class BarChartCard extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium, ), const SizedBox(height: 14), - AspectRatio( - aspectRatio: 2, - child: loadingData + Expanded( + child: loadingData || barChart == null ? const Center( child: CircularProgressIndicator(), ) - : barChart, + : barChart!, ), const SizedBox(height: 10), legend, diff --git a/lib/pangea/pages/analytics/base_analytics_page.dart b/lib/pangea/pages/analytics/base_analytics_page.dart index ac664040f..d59723e7d 100644 --- a/lib/pangea/pages/analytics/base_analytics_page.dart +++ b/lib/pangea/pages/analytics/base_analytics_page.dart @@ -197,8 +197,12 @@ class BaseAnalyticsView extends StatelessWidget { withScrolling: false, child: Column( children: [ - chartView(context), Expanded( + flex: 1, + child: chartView(context), + ), + Expanded( + flex: 1, child: DefaultTabController( length: 2, child: Column( diff --git a/lib/pangea/pages/analytics/construct_list.dart b/lib/pangea/pages/analytics/construct_list.dart index bb9ce1da8..0c607d815 100644 --- a/lib/pangea/pages/analytics/construct_list.dart +++ b/lib/pangea/pages/analytics/construct_list.dart @@ -154,19 +154,16 @@ class ConstructListView extends StatelessWidget { @override Widget build(BuildContext context) { if (!init) { - return const SizedBox( - height: 400, + return const Expanded( child: Center(child: CircularProgressIndicator()), ); } if (constructs.isEmpty) { - return SizedBox( - height: 400, + return Expanded( child: Center(child: Text(L10n.of(context)!.noDataFound)), ); } - return SizedBox( - height: 400, + return Expanded( child: ListView.builder( itemCount: constructs.length, itemBuilder: (context, index) {