diff --git a/app/lib/common/models/userdata/genotype_result.dart b/app/lib/common/models/userdata/genotype_result.dart index aa90cb0c..50e32ed3 100644 --- a/app/lib/common/models/userdata/genotype_result.dart +++ b/app/lib/common/models/userdata/genotype_result.dart @@ -51,6 +51,8 @@ class GenotypeResult implements Genotype { String get geneDisplayString => key.value; + String get variantDisplayString => key.allele; + String _removeAllele(String textWithAllele) => textWithAllele.removePrefix(key.allele).trim().capitalize(); diff --git a/app/lib/drug/widgets/sub_header.dart b/app/lib/drug/widgets/sub_header.dart index ea3913bb..ff6514cc 100644 --- a/app/lib/drug/widgets/sub_header.dart +++ b/app/lib/drug/widgets/sub_header.dart @@ -14,6 +14,7 @@ class SubHeader extends StatelessWidget { Widget build(BuildContext context) { return Row( mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( title.toUpperCase(), diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb index 5578f4f6..6545b18e 100644 --- a/app/lib/l10n/app_en.arb +++ b/app/lib/l10n/app_en.arb @@ -251,7 +251,7 @@ } } }, - "gene_page_name_tooltip": "{gene} is the name of a segment of your DNA.", + "gene_page_name_tooltip": "{gene} is the name of a gene.", "@gene_page_name_tooltip": { "placeholders": { "gene": { @@ -261,11 +261,19 @@ } }, "gene_page_genotype": "Genotype", - "gene_page_genotype_tooltip": "The genotype is the variant you carry for this DNA segment.", + "gene_page_genotype_tooltip": "The genotype is the variant you carry for this gene.", "gene_page_phenotype": "Phenotype", - "gene_page_phenotype_tooltip": "The phenotype is the observable impact that your genotype has for this protein. It often describes the gene's activity level or whether a specific variant is present.", + "gene_page_phenotype_tooltip": "The phenotype often describes the gene's activity level or whether a specific variant is present.", "gene_page_relevant_drugs": "Relevant drugs", - "gene_page_relevant_drugs_tooltip": "The drugs listed here are influenced by your phenotype for this DNA segment.", + "gene_page_relevant_drugs_tooltip": "The drugs listed here are influenced by your {geneDisplayString} result.", + "@gene_page_relevant_drugs_tooltip": { + "placeholders": { + "geneDisplayString": { + "type": "String", + "example": "HLA-B *58:01" + } + } + }, "gene_page_no_relevant_drugs": "This gene has no known effect on any drug.", "gene_page_inhibitor_drugs": "Your results for this gene can be influenced if you are currently taking any of the following drugs:", "gene_page_further_inhibitor_drugs": "Your results for this gene can also be influenced by taking any of the following drugs:", diff --git a/app/lib/report/pages/gene.dart b/app/lib/report/pages/gene.dart index 132baf85..e5cb78c9 100644 --- a/app/lib/report/pages/gene.dart +++ b/app/lib/report/pages/gene.dart @@ -38,7 +38,7 @@ class GenePage extends HookWidget { ), tooltip: context.l10n .gene_page_name_tooltip( - genotypeResult.geneDisplayString, + genotypeResult.gene, ), ), SizedBox(height: PharMeTheme.smallToMediumSpace), @@ -55,7 +55,7 @@ class GenePage extends HookWidget { children: [ _buildRow( context.l10n.gene_page_genotype, - genotypeResult.genotypeDisplayString, + genotypeResult.variantDisplayString, tooltip: context.l10n.gene_page_genotype_tooltip ), _buildPhenotypeRow(context), @@ -69,8 +69,12 @@ class GenePage extends HookWidget { ], )), SizedBox(height: PharMeTheme.smallToMediumSpace), - SubHeader(context.l10n.gene_page_relevant_drugs, - tooltip: context.l10n.gene_page_relevant_drugs_tooltip), + SubHeader( + context.l10n.gene_page_relevant_drugs, + tooltip: context.l10n.gene_page_relevant_drugs_tooltip( + genotypeResult.geneDisplayString + ), + ), SizedBox(height: PharMeTheme.smallSpace), ...buildDrugList(context, state, activeDrugs, noDrugsMessage: context.l10n.gene_page_no_relevant_drugs)