refactor(app, reports, common): Move warning level to common

hpi-dhc · Jul 25, 2022 · f79bfe9 · f79bfe9
1 parent feb8395
commit f79bfe9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 28 deletions.
diff --git a/app/lib/reports/models/warning_level.dart → ...mmon/models/medication/warning_level.dart b/app/lib/reports/models/warning_level.dart → ...mmon/models/medication/warning_level.dart
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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),
             ],