diff --git a/app/lib/reports/models/warning_level.dart b/app/lib/common/models/medication/warning_level.dart similarity index 100% rename from app/lib/reports/models/warning_level.dart rename to app/lib/common/models/medication/warning_level.dart diff --git a/app/lib/common/models/module.dart b/app/lib/common/models/module.dart index cbc5fd893..5e0ef3ff6 100644 --- a/app/lib/common/models/module.dart +++ b/app/lib/common/models/module.dart @@ -1,6 +1,7 @@ export 'cpic_lookup_response.dart'; export 'medication/guideline.dart'; export 'medication/medication.dart'; +export 'medication/warning_level.dart'; export 'metadata.dart'; export 'userdata/diplotype.dart'; export 'userdata/userdata.dart'; diff --git a/app/lib/common/pages/medications/medication.dart b/app/lib/common/pages/medications/medication.dart index a45cccb15..85a343c40 100644 --- a/app/lib/common/pages/medications/medication.dart +++ b/app/lib/common/pages/medications/medication.dart @@ -3,9 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import '../../../reports/models/warning_level.dart'; import '../../l10n.dart'; -import '../../models/medication/medication.dart'; +import '../../models/module.dart'; import '../../theme.dart'; import '../../utilities/module.dart'; import '../../utilities/pdf_utils.dart'; diff --git a/app/lib/common/pages/medications/widgets/recommendation_card.dart b/app/lib/common/pages/medications/widgets/recommendation_card.dart index 1f85f6530..78649d905 100644 --- a/app/lib/common/pages/medications/widgets/recommendation_card.dart +++ b/app/lib/common/pages/medications/widgets/recommendation_card.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import '../../../../reports/models/warning_level.dart'; import '../../../l10n.dart'; import '../../../models/module.dart'; import '../../../theme.dart'; diff --git a/app/lib/reports/pages/cubit.dart b/app/lib/reports/pages/cubit.dart index fa139ec34..45c802782 100644 --- a/app/lib/reports/pages/cubit.dart +++ b/app/lib/reports/pages/cubit.dart @@ -3,7 +3,6 @@ import 'package:http/http.dart'; import '../../common/models/medication/cached_medications.dart'; import '../../common/module.dart'; -import '../models/warning_level.dart'; part 'cubit.freezed.dart'; diff --git a/app/lib/reports/pages/reports.dart b/app/lib/reports/pages/reports.dart index 2293118df..c7437e2e0 100644 --- a/app/lib/reports/pages/reports.dart +++ b/app/lib/reports/pages/reports.dart @@ -1,5 +1,4 @@ import '../../common/module.dart'; -import '../models/warning_level.dart'; import 'cubit.dart'; class ReportsPage extends StatelessWidget { @@ -154,29 +153,29 @@ class ReportCard extends StatelessWidget { children: [ Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row(children: [ - Icon( - warningLevel == WarningLevel.danger - ? Icons.dangerous_rounded - : Icons.warning_amber, - ), - SizedBox(width: 12), - Text( - medicationName, - style: PharmeTheme.textTheme.titleMedium, - ), - ]), - if (medicationIndication.isNotNullOrBlank) ...[ - SizedBox(height: 12), - Text( - medicationIndication!, - style: PharmeTheme.textTheme.titleSmall, - ), - ] - ], - ), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row(children: [ + Icon( + warningLevel == WarningLevel.danger + ? Icons.dangerous_rounded + : Icons.warning_amber, + ), + SizedBox(width: 12), + Text( + medicationName, + style: PharmeTheme.textTheme.titleMedium, + ), + ]), + if (medicationIndication.isNotNullOrBlank) ...[ + SizedBox(height: 12), + Text( + medicationIndication!, + style: PharmeTheme.textTheme.titleSmall, + ), + ] + ], + ), ), Icon(Icons.arrow_forward_ios), ],