[Presentation] Crash fix

Wolfteam · Nov 2, 2022 · 138734d · 138734d
1 parent d7b7be6
commit 138734d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/presentation/calculator_asc_materials/calculator_ascension_materials_page.dart b/lib/presentation/calculator_asc_materials/calculator_ascension_materials_page.dart
@@ -1,3 +1,4 @@
+import 'package:darq/darq.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:responsive_builder/responsive_builder.dart';
@@ -157,9 +158,10 @@ class _FabMenu extends StatelessWidget {
   }
 
   List<AscensionMaterialsSummaryWidget> _buildSummary(S s, List<AscensionMaterialsSummary> items) {
-    items.sort((x, y) => s.translateAscensionSummaryType(x.type).compareTo(s.translateAscensionSummaryType(y.type)));
-
-    return items.map((e) => AscensionMaterialsSummaryWidget(summary: e, sessionKey: sessionKey)).toList();
+    return items
+        .orderBy((x) => s.translateAscensionSummaryType(x.type))
+        .map((e) => AscensionMaterialsSummaryWidget(summary: e, sessionKey: sessionKey))
+        .toList();
   }
 
   Future<void> _openCharacterPage(BuildContext context) async {

diff --git a/lib/presentation/characters/widgets/character_ascension_materials.dart b/lib/presentation/characters/widgets/character_ascension_materials.dart
@@ -17,16 +17,17 @@ class CharacterAscensionMaterials extends StatelessWidget {
     final s = S.of(context);
     const minNumberOfMaterialsShown = 7;
     final needsDummyItems = images.length < minNumberOfMaterialsShown;
+    final imgsToRender = [...images];
     if (needsDummyItems) {
       final diff = minNumberOfMaterialsShown - images.length;
-      images.addAll(List.generate(diff, (index) => ''));
+      imgsToRender.addAll(List.generate(diff, (index) => ''));
     }
     return Tooltip(
       message: s.ascensionMaterials,
       child: Wrap(
         alignment: WrapAlignment.spaceEvenly,
         crossAxisAlignment: WrapCrossAlignment.center,
-        children: images.map((e) => _MaterialItem(image: e)).toList(),
+        children: imgsToRender.map((e) => _MaterialItem(image: e)).toList(),
       ),
     );
   }