feat(#718): fix legend separators

hpi-dhc · Sep 3, 2024 · c15b242 · c15b242
1 parent a80f6f3
commit c15b242
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/app/lib/common/models/drug/warning_level.dart b/app/lib/common/models/drug/warning_level.dart
@@ -95,26 +95,32 @@ extension WarningLevelLegend on List<WarningLevel> {
     required String? Function(WarningLevel) getText,
     InlineSpan? separator,
   }) {
-    // TODO(tamslo): isLastItem should consider skipped items and consider potential icon margin to add after text, https://github.com/hpi-dhc/PharMe/issues/712
     var content = <InlineSpan>[];
-    for (final (index, warningLevel) in indexed) {
+    for (final warningLevel in this) {
       final text = getText(warningLevel);
       if (text.isNullOrEmpty) continue;
-      final warningLevelIndicator = warningLevel.getDescription(text!);
-      final isLastItem = index == WarningLevel.values.length - 1;
-      content = isLastItem
-        ? [ ...content, warningLevelIndicator ]
+      content = [
+        ...content,
+        warningLevel.getDescription(text!),
+      ];
+
+    }
+    var separatedContent = <InlineSpan>[];
+    for (final (index, contentItem) in content.indexed) {
+      final isLastItem = index == content.length - 1;
+      separatedContent = isLastItem
+        ? [ ...separatedContent, contentItem ]
         : [
-            ...content,
-            warningLevelIndicator,
+            ...separatedContent,
+            contentItem,
             separator ?? WidgetSpan(
               child: SizedBox(width: PharMeTheme.smallSpace * 0.8),
             ),
           ];
     }
     return TextSpan(
       style: PharMeTheme.textTheme.bodyMedium,
-      children: content,
+      children: separatedContent,
     );
   }
 

diff --git a/app/lib/report/pages/report.dart b/app/lib/report/pages/report.dart
@@ -159,7 +159,7 @@ class GeneCard extends StatelessWidget {
                     child: Padding(
                       padding: EdgeInsets.symmetric(
                         vertical: 2,
-                        horizontal: 4,
+                        horizontal: 6,
                       ),
                       child: Text.rich(WarningLevel.values.buildLegend(
                         getText: (warningLevel) {