From 46a39f2407d29aa71212ebcf14fb360483468651 Mon Sep 17 00:00:00 2001 From: Tamara Slosarek Date: Fri, 20 Sep 2024 19:50:15 +0200 Subject: [PATCH] feat(app): only render table rows for better alignment --- .../common/models/drug/drug_inhibitors.dart | 4 +-- app/lib/common/widgets/annotation_table.dart | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/lib/common/models/drug/drug_inhibitors.dart b/app/lib/common/models/drug/drug_inhibitors.dart index e55fcc2f..16a5fab2 100644 --- a/app/lib/common/models/drug/drug_inhibitors.dart +++ b/app/lib/common/models/drug/drug_inhibitors.dart @@ -161,7 +161,7 @@ String _inhibitionTooltipText( }${displayConfig.partSeparator}$inhibitorsString'; } -Table _drugInteractionTemplate( +Widget _drugInteractionTemplate( BuildContext context, String tooltipText, _DisplayConfig displayConfig, @@ -291,7 +291,7 @@ String inhibitionTooltipText( return tooltipText; } -Table buildDrugInteractionInfo( +Widget buildDrugInteractionInfo( BuildContext context, List genotypeResults, { required String? drug } diff --git a/app/lib/common/widgets/annotation_table.dart b/app/lib/common/widgets/annotation_table.dart index 1d9cbaf3..b225c29c 100644 --- a/app/lib/common/widgets/annotation_table.dart +++ b/app/lib/common/widgets/annotation_table.dart @@ -8,23 +8,30 @@ class TableRowDefinition { final String? tooltip; } -Table buildTable( +Widget buildTable( List rowDefinitions, { TextStyle? style, bool boldHeader = true, } ) { - return Table( - defaultColumnWidth: IntrinsicColumnWidth(), - children: rowDefinitions.mapIndexed((index, rowDefinition) => _buildRow( - rowDefinition.key, - rowDefinition.value, - style ?? PharMeTheme.textTheme.bodyMedium!, - boldHeader: boldHeader, - isLast: index == rowDefinitions.length - 1, - tooltip: rowDefinition.tooltip, - )).toList(), + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: rowDefinitions.mapIndexed( + (index, rowDefinition) => Table( + defaultColumnWidth: IntrinsicColumnWidth(), + children: [ + _buildRow( + rowDefinition.key, + rowDefinition.value, + style ?? PharMeTheme.textTheme.bodyMedium!, + boldHeader: boldHeader, + isLast: index == rowDefinitions.length - 1, + tooltip: rowDefinition.tooltip, + ), + ], + ), + ).toList(), ); }