diff --git a/lib/domain/models/home/today_char_ascension_materials_model.dart b/lib/domain/models/home/today_char_ascension_materials_model.dart index 2782d0d5..db7bbf78 100644 --- a/lib/domain/models/home/today_char_ascension_materials_model.dart +++ b/lib/domain/models/home/today_char_ascension_materials_model.dart @@ -6,7 +6,7 @@ class TodayCharAscensionMaterialsModel { final String image; final List days; final String? bossName; - final List characters; + final List characters; bool get isFromBoss => bossName != null; bool get onlyObtainableInDays => days.isNotEmpty; diff --git a/lib/infrastructure/file/character_file_service.dart b/lib/infrastructure/file/character_file_service.dart index 39a3751d..f9dea6f4 100644 --- a/lib/infrastructure/file/character_file_service.dart +++ b/lib/infrastructure/file/character_file_service.dart @@ -143,7 +143,7 @@ class CharacterFileServiceImpl extends CharacterFileService { List getCharacterAscensionMaterials(int day) { return _materials.getCharacterAscensionMaterials(day).map((e) { final translation = _translations.getMaterialTranslation(e.key); - final characters = []; + final characters = []; for (final char in _charactersFile.characters) { if (char.isComingSoon) { @@ -174,7 +174,7 @@ class CharacterFileServiceImpl extends CharacterFileService { final materialIsBeingUsed = normalAscMaterial || specialAscMaterial; if (materialIsBeingUsed && !characters.any((el) => el.key == char.key)) { - characters.add(_fromCharFileModelToItemCommon(char)); + characters.add(_fromCharFileModelToItemCommonWithName(char)); } } diff --git a/lib/presentation/home/widgets/char_card_ascension_material.dart b/lib/presentation/home/widgets/char_card_ascension_material.dart index 1548ab04..70fef3cd 100644 --- a/lib/presentation/home/widgets/char_card_ascension_material.dart +++ b/lib/presentation/home/widgets/char_card_ascension_material.dart @@ -8,7 +8,7 @@ class CharCardAscensionMaterial extends StatelessWidget { final String itemKey; final String name; final String image; - final List charImgs; + final List characters; final String? bossName; final List days; @@ -18,7 +18,7 @@ class CharCardAscensionMaterial extends StatelessWidget { required this.name, required this.image, required this.days, - required this.charImgs, + required this.characters, }) : bossName = null; const CharCardAscensionMaterial.fromBoss({ @@ -27,7 +27,7 @@ class CharCardAscensionMaterial extends StatelessWidget { required this.name, required this.image, required this.bossName, - required this.charImgs, + required this.characters, }) : days = const []; @override @@ -41,10 +41,13 @@ class CharCardAscensionMaterial extends StatelessWidget { height: 70, child: ListView.builder( shrinkWrap: true, - itemCount: charImgs.length, + itemCount: characters.length, physics: const BouncingScrollPhysics(), scrollDirection: Axis.horizontal, - itemBuilder: (ctx, index) => CharacterIconImage.circleItem(item: charImgs[index]), + itemBuilder: (ctx, index) { + final item = characters[index]; + return CharacterIconImage(itemKey: item.key, image: item.iconImage); + }, ), ), ); diff --git a/lib/presentation/today_materials/widgets/sliver_character_ascension_materials.dart b/lib/presentation/today_materials/widgets/sliver_character_ascension_materials.dart index 60d40a59..26896976 100644 --- a/lib/presentation/today_materials/widgets/sliver_character_ascension_materials.dart +++ b/lib/presentation/today_materials/widgets/sliver_character_ascension_materials.dart @@ -35,8 +35,8 @@ class SliverCharacterAscensionMaterials extends StatelessWidget { itemBuilder: (ctx, index) { final e = charAscMaterials[index]; return e.isFromBoss - ? CharCardAscensionMaterial.fromBoss(itemKey: e.key, name: e.name, image: e.image, bossName: e.bossName, charImgs: e.characters) - : CharCardAscensionMaterial.fromDays(itemKey: e.key, name: e.name, image: e.image, days: e.days, charImgs: e.characters); + ? CharCardAscensionMaterial.fromBoss(itemKey: e.key, name: e.name, image: e.image, bossName: e.bossName, characters: e.characters) + : CharCardAscensionMaterial.fromDays(itemKey: e.key, name: e.name, image: e.image, days: e.days, characters: e.characters); }, ), ), @@ -53,8 +53,8 @@ class SliverCharacterAscensionMaterials extends StatelessWidget { itemBuilder: (context, index) { final e = charAscMaterials[index]; return e.isFromBoss - ? CharCardAscensionMaterial.fromBoss(itemKey: e.key, name: e.name, image: e.image, bossName: e.bossName, charImgs: e.characters) - : CharCardAscensionMaterial.fromDays(itemKey: e.key, name: e.name, image: e.image, days: e.days, charImgs: e.characters); + ? CharCardAscensionMaterial.fromBoss(itemKey: e.key, name: e.name, image: e.image, bossName: e.bossName, characters: e.characters) + : CharCardAscensionMaterial.fromDays(itemKey: e.key, name: e.name, image: e.image, days: e.days, characters: e.characters); }, ); }