Build fix

lib/application/artifact/artifact_bloc.dart

@@ -22,12 +22,12 @@ class ArtifactBloc extends Bloc<ArtifactEvent, ArtifactState> {
 
     final s = await event.map(
       loadFromKey: (e) async {
-        final artifact = _genshinService.getArtifact(e.key);
-        final translation = _genshinService.getArtifactTranslation(e.key);
-        final charImgs = _genshinService.getCharacterForItemsUsingArtifact(e.key);
-        final droppedBy = _genshinService.getRelatedMonsterToArtifactForItems(e.key);
-        final images = _genshinService.getArtifactRelatedParts(artifact.fullImagePath, artifact.image, translation.bonus.length);
-        final bonus = _genshinService.getArtifactBonus(translation);
+        final artifact = _genshinService.artifacts.getArtifact(e.key);
+        final translation = _genshinService.translations.getArtifactTranslation(e.key);
+        final charImgs = _genshinService.characters.getCharacterForItemsUsingArtifact(e.key);
+        final droppedBy = _genshinService.monsters.getRelatedMonsterToArtifactForItems(e.key);
+        final images = _genshinService.artifacts.getArtifactRelatedParts(artifact.fullImagePath, artifact.image, translation.bonus.length);
+        final bonus = _genshinService.artifacts.getArtifactBonus(translation);
 
         await _telemetryService.trackArtifactLoaded(e.key);
 

lib/application/artifacts/artifacts_bloc.dart

@@ -66,7 +66,7 @@ class ArtifactsBloc extends Bloc<ArtifactsEvent, ArtifactsState> {
     ArtifactType? type,
   }) {
     final isLoaded = state is _LoadedState;
-    var data = _genshinService.getArtifactsForCard(type: type);
+    var data = _genshinService.artifacts.getArtifactsForCard(type: type);
     if (excludeKeys.isNotEmpty) {
       data = data.where((el) => !excludeKeys.contains(el.key)).toList();
     }

lib/application/banner_history/banner_history_bloc.dart

@@ -48,10 +48,10 @@ class BannerHistoryBloc extends Bloc<BannerHistoryEvent, BannerHistoryState> {
 
   Future<BannerHistoryState> _init() async {
     await _telemetryService.trackBannerHistoryOpened();
-    _characterBanners.addAll(_genshinService.getBannerHistory(BannerHistoryItemType.character));
-    _weaponBanners.addAll(_genshinService.getBannerHistory(BannerHistoryItemType.weapon));
+    _characterBanners.addAll(_genshinService.bannerHistory.getBannerHistory(BannerHistoryItemType.character));
+    _weaponBanners.addAll(_genshinService.bannerHistory.getBannerHistory(BannerHistoryItemType.weapon));
 
-    final versions = _genshinService.getBannerHistoryVersions(SortDirectionType.asc);
+    final versions = _genshinService.bannerHistory.getBannerHistoryVersions(SortDirectionType.asc);
     final banners = _sortBanners(_characterBanners, versions, state.sortType);
     return BannerHistoryState.initial(
       type: BannerHistoryItemType.character,

lib/application/banner_history_item/banner_history_item_bloc.dart

@@ -28,7 +28,7 @@ class BannerHistoryItemBloc extends Bloc<BannerHistoryItemEvent, BannerHistoryIt
 
   Future<BannerHistoryItemState> _init(double version) async {
     await _telemetryService.trackBannerHistoryItemOpened(version);
-    final banners = _genshinService.getBanners(version);
+    final banners = _genshinService.bannerHistory.getBanners(version);
     final grouped = banners
         .groupListsBy(
           (el) => '${DateFormat(periodDateFormat).format(el.from)}_${DateFormat(periodDateFormat).format(el.until)}',

lib/application/calculator_asc_materials/material_item/calculator_asc_materials_item_bloc.dart

@@ -33,8 +33,8 @@ class CalculatorAscMaterialsItemBloc extends Bloc<CalculatorAscMaterialsItemEven
     final s = event.map(
       load: (e) {
         if (e.isCharacter) {
-          final char = _genshinService.getCharacter(e.key);
-          final translation = _genshinService.getCharacterTranslation(e.key);
+          final char = _genshinService.characters.getCharacter(e.key);
+          final translation = _genshinService.translations.getCharacterTranslation(e.key);
           return CalculatorAscMaterialsItemState.loaded(
             name: translation.name,
             imageFullPath: Assets.getCharacterPath(char.image),
@@ -46,8 +46,8 @@ class CalculatorAscMaterialsItemBloc extends Bloc<CalculatorAscMaterialsItemEven
             skills: _getCharacterSkillsToUse(char, translation),
           );
         }
-        final weapon = _genshinService.getWeapon(e.key);
-        final translation = _genshinService.getWeaponTranslation(e.key);
+        final weapon = _genshinService.weapons.getWeapon(e.key);
+        final translation = _genshinService.translations.getWeaponTranslation(e.key);
         return CalculatorAscMaterialsItemState.loaded(
           name: translation.name,
           imageFullPath: weapon.fullImagePath,
@@ -60,8 +60,8 @@ class CalculatorAscMaterialsItemBloc extends Bloc<CalculatorAscMaterialsItemEven
       },
       loadWith: (e) {
         if (e.isCharacter) {
-          final char = _genshinService.getCharacter(e.key);
-          final translation = _genshinService.getCharacterTranslation(e.key);
+          final char = _genshinService.characters.getCharacter(e.key);
+          final translation = _genshinService.translations.getCharacterTranslation(e.key);
           return CalculatorAscMaterialsItemState.loaded(
             name: translation.name,
             imageFullPath: Assets.getCharacterPath(char.image),
@@ -74,8 +74,8 @@ class CalculatorAscMaterialsItemBloc extends Bloc<CalculatorAscMaterialsItemEven
           );
         }
 
-        final weapon = _genshinService.getWeapon(e.key);
-        final translation = _genshinService.getWeaponTranslation(e.key);
+        final weapon = _genshinService.weapons.getWeapon(e.key);
+        final translation = _genshinService.translations.getWeaponTranslation(e.key);
         return CalculatorAscMaterialsItemState.loaded(
           name: translation.name,
           imageFullPath: weapon.fullImagePath,

lib/application/calculator_asc_materials/materials/calculator_asc_materials_bloc.dart

@@ -47,8 +47,8 @@ class CalculatorAscMaterialsBloc extends Bloc<CalculatorAscMaterialsEvent, Calcu
       },
       addCharacter: (e) async {
         await _telemetryService.trackCalculatorItemAscMaterialLoaded(e.key);
-        final char = _genshinService.getCharacter(e.key);
-        final translation = _genshinService.getCharacterTranslation(e.key);
+        final char = _genshinService.characters.getCharacter(e.key);
+        final translation = _genshinService.translations.getCharacterTranslation(e.key);
         var newItem = ItemAscensionMaterials.forCharacters(
           key: e.key,
           image: Assets.getCharacterPath(char.image),
@@ -80,8 +80,8 @@ class CalculatorAscMaterialsBloc extends Bloc<CalculatorAscMaterialsEvent, Calcu
       },
       addWeapon: (e) async {
         await _telemetryService.trackCalculatorItemAscMaterialLoaded(e.key);
-        final weapon = _genshinService.getWeapon(e.key);
-        final translation = _genshinService.getWeaponTranslation(e.key);
+        final weapon = _genshinService.weapons.getWeapon(e.key);
+        final translation = _genshinService.translations.getWeaponTranslation(e.key);
         var newItem = ItemAscensionMaterials.forWeapons(
           key: e.key,
           image: weapon.fullImagePath,
@@ -132,7 +132,7 @@ class CalculatorAscMaterialsBloc extends Bloc<CalculatorAscMaterialsEvent, Calcu
       },
       updateCharacter: (e) async {
         final currentChar = currentState.items.elementAt(e.index);
-        final char = _genshinService.getCharacter(currentChar.key);
+        final char = _genshinService.characters.getCharacter(currentChar.key);
         final updatedChar = currentChar.copyWith.call(
           materials: _calculatorService.getCharacterMaterialsToUse(
             char,
@@ -155,7 +155,7 @@ class CalculatorAscMaterialsBloc extends Bloc<CalculatorAscMaterialsEvent, Calcu
       },
       updateWeapon: (e) async {
         final currentWeapon = currentState.items.elementAt(e.index);
-        final weapon = _genshinService.getWeapon(currentWeapon.key);
+        final weapon = _genshinService.weapons.getWeapon(currentWeapon.key);
         final updatedWeapon = currentWeapon.copyWith.call(
           materials: _calculatorService.getWeaponMaterialsToUse(
             weapon,

lib/application/character/character_bloc.dart

@@ -32,8 +32,8 @@ class CharacterBloc extends Bloc<CharacterEvent, CharacterState> {
   Stream<CharacterState> mapEventToState(CharacterEvent event) async* {
     final s = await event.when(
       loadFromKey: (key) async {
-        final char = _genshinService.getCharacter(key);
-        final translation = _genshinService.getCharacterTranslation(key);
+        final char = _genshinService.characters.getCharacter(key);
+        final translation = _genshinService.translations.getCharacterTranslation(key);
 
         await _telemetryService.trackCharacterLoaded(key);
         return _buildInitialState(char, translation);
@@ -60,7 +60,7 @@ class CharacterBloc extends Bloc<CharacterEvent, CharacterState> {
   }
 
   ItemAscensionMaterialModel _mapToItemAscensionModel(ItemAscensionMaterialFileModel m) {
-    final img = _genshinService.getMaterial(m.key).fullImagePath;
+    final img = _genshinService.materials.getMaterial(m.key).fullImagePath;
     return ItemAscensionMaterialModel(key: m.key, type: m.type, quantity: m.quantity, image: img);
   }
 
@@ -93,15 +93,15 @@ class CharacterBloc extends Bloc<CharacterEvent, CharacterState> {
         subType: build.subType,
         skillPriorities: build.skillPriorities,
         subStatsToFocus: build.subStatsToFocus,
-        weapons: build.weaponKeys.map((e) => _genshinService.getWeaponForCard(e)).toList(),
+        weapons: build.weaponKeys.map((e) => _genshinService.weapons.getWeaponForCard(e)).toList(),
         artifacts: build.artifacts.map(
           (e) {
-            final one = e.oneKey != null ? _genshinService.getArtifactForCard(e.oneKey!) : null;
+            final one = e.oneKey != null ? _genshinService.artifacts.getArtifactForCard(e.oneKey!) : null;
             final multiples = e.multiples
                 .map(
                   (m) => CharacterBuildMultipleArtifactModel(
                     quantity: m.quantity,
-                    artifact: _genshinService.getArtifactForCard(m.key),
+                    artifact: _genshinService.artifacts.getArtifactForCard(m.key),
                   ),
                 )
                 .toList();
@@ -148,7 +148,7 @@ class CharacterBloc extends Bloc<CharacterEvent, CharacterState> {
             secondDescription: a.secondDescription,
           );
         }).toList();
-        final stats = _genshinService.getCharacterSkillStats(skill.stats, e.stats);
+        final stats = _genshinService.characters.getCharacterSkillStats(skill.stats, e.stats);
         return CharacterSkillCardModel(
           image: skill.fullImagePath,
           stats: stats,

lib/application/characters/characters_bloc.dart

@@ -103,7 +103,7 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
     RegionType? regionType,
   }) {
     final isLoaded = state is _LoadedState;
-    var characters = _genshinService.getCharactersForCard();
+    var characters = _genshinService.characters.getCharactersForCard();
     if (excludeKeys.isNotEmpty) {
       characters = characters.where((el) => !excludeKeys.contains(el.key)).toList();
     }

lib/application/characters_birthdays_per_month/characters_birthdays_per_month_bloc.dart

@@ -24,7 +24,7 @@ class CharactersBirthdaysPerMonthBloc extends Bloc<CharactersBirthdaysPerMonthEv
 
   Future<CharactersBirthdaysPerMonthState> _init(int month) async {
     await _telemetryService.trackBirthdaysPerMonthOpened(month);
-    final characters = _genshinService.getCharacterBirthdays(month: month);
+    final characters = _genshinService.characters.getCharacterBirthdays(month: month);
     return CharactersBirthdaysPerMonthState.loaded(month: month, characters: characters);
   }
 }

lib/application/characters_per_region/characters_per_region_bloc.dart

@@ -22,7 +22,7 @@ class CharactersPerRegionBloc extends Bloc<CharactersPerRegionEvent, CharactersP
   }
 
   CharactersPerRegionState _init(RegionType type) {
-    final characters = _genshinService.getCharactersForItemsByRegion(type);
+    final characters = _genshinService.characters.getCharactersForItemsByRegion(type);
     return CharactersPerRegionState.loaded(regionType: type, items: characters);
   }
 }

lib/application/characters_per_region_gender/characters_per_region_gender_bloc.dart

@@ -22,7 +22,7 @@ class CharactersPerRegionGenderBloc extends Bloc<CharactersPerRegionGenderEvent,
   }
 
   CharactersPerRegionGenderState _init(RegionType regionType, bool onlyFemales) {
-    final characters = _genshinService.getCharactersForItemsByRegionAndGender(regionType, onlyFemales);
+    final characters = _genshinService.characters.getCharactersForItemsByRegionAndGender(regionType, onlyFemales);
     return CharactersPerRegionGenderState.loaded(regionType: regionType, onlyFemales: onlyFemales, items: characters);
   }
 }

lib/application/charts/birthdays/chart_birthdays_bloc.dart

@@ -22,7 +22,7 @@ class ChartBirthdaysBloc extends Bloc<ChartBirthdaysEvent, ChartBirthdaysState>
   }
 
   Future<ChartBirthdaysState> _init() async {
-    final birthdays = _genshinService.getCharacterBirthdaysForCharts();
+    final birthdays = _genshinService.characters.getCharacterBirthdaysForCharts();
     return ChartBirthdaysState.loaded(birthdays: birthdays);
   }
 }

lib/application/charts/elements/chart_elements_bloc.dart

@@ -15,7 +15,7 @@ class ChartElementsBloc extends Bloc<ChartElementsEvent, ChartElementsState> {
   final List<double> versions;
 
   ChartElementsBloc(this._genshinService)
-      : versions = _genshinService.getBannerHistoryVersions(SortDirectionType.asc),
+      : versions = _genshinService.bannerHistory.getBannerHistoryVersions(SortDirectionType.asc),
         super(const ChartElementsState.loading());
 
   @override
@@ -63,7 +63,7 @@ class ChartElementsBloc extends Bloc<ChartElementsEvent, ChartElementsState> {
       lastVersion = versions.last;
     }
 
-    final elements = _genshinService.getElementsForCharts(firstVersion, lastVersion);
+    final elements = _genshinService.bannerHistory.getElementsForCharts(firstVersion, lastVersion);
     return ChartElementsState.loaded(
       maxNumberOfColumns: maxNumberOfColumns,
       firstVersion: firstVersion,
@@ -140,7 +140,7 @@ class ChartElementsBloc extends Bloc<ChartElementsEvent, ChartElementsState> {
 
     assert(newFirstVersion != newLastVersion, 'New and last version cannot be equal');
 
-    final elements = _genshinService.getElementsForCharts(newFirstVersion, newLastVersion);
+    final elements = _genshinService.bannerHistory.getElementsForCharts(newFirstVersion, newLastVersion);
     return state.copyWith(
       elements: elements,
       filteredElements: _getFilteredElements(elements, state.selectedElementTypes),

lib/application/charts/genders/chart_genders_bloc.dart

@@ -24,7 +24,7 @@ class ChartGendersBloc extends Bloc<ChartGendersEvent, ChartGendersState> {
   }
 
   ChartGendersState _init() {
-    final items = _genshinService.getCharacterGendersForCharts();
+    final items = _genshinService.characters.getCharacterGendersForCharts();
     final maxCount = max<int>(items.map((e) => e.femaleCount).reduce(max), items.map((e) => e.maleCount).reduce(max));
     return ChartGendersState.loaded(genders: items, maxCount: maxCount);
   }

lib/application/charts/regions/chart_regions_bloc.dart

@@ -24,7 +24,7 @@ class ChartRegionsBloc extends Bloc<ChartRegionsEvent, ChartRegionsState> {
   }
 
   ChartRegionsState _init() {
-    final items = _genshinService.getCharacterRegionsForCharts();
+    final items = _genshinService.characters.getCharacterRegionsForCharts();
     final maxCount = items.map((e) => e.quantity).reduce(max);
     return ChartRegionsState.loaded(maxCount: maxCount, items: items);
   }

lib/application/custom_build/custom_build_bloc.dart

@@ -174,12 +174,12 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
         skillPriorities: build.skillPriorities,
         artifacts: build.artifacts..sort((x, y) => x.type.index.compareTo(y.type.index)),
         teamCharacters: build.teamCharacters,
-        subStatsSummary: _genshinService.generateSubStatSummary(build.artifacts),
+        subStatsSummary: _genshinService.artifacts.generateSubStatSummary(build.artifacts),
         readyForScreenshot: false,
       );
     }
 
-    final character = _genshinService.getCharactersForCard().first;
+    final character = _genshinService.characters.getCharactersForCard().first;
     return CustomBuildState.loaded(
       title: initialTitle,
       type: CharacterRoleType.dps,
@@ -239,7 +239,7 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
     if (state.character.key == e.newKey) {
       return state;
     }
-    final newCharacter = _genshinService.getCharacterForCard(e.newKey);
+    final newCharacter = _genshinService.characters.getCharacterForCard(e.newKey);
     _LoadedState updatedState = state.copyWith.call(character: newCharacter, readyForScreenshot: false);
     if (newCharacter.weaponType != state.character.weaponType) {
       updatedState = updatedState.copyWith.call(weapons: []);
@@ -261,8 +261,8 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
       throw Exception('Cannot add more than = $maxNumberOfWeapons weapons to the state');
     }
 
-    final weapon = _genshinService.getWeapon(e.key);
-    final translation = _genshinService.getWeaponTranslation(e.key);
+    final weapon = _genshinService.weapons.getWeapon(e.key);
+    final translation = _genshinService.translations.getWeaponTranslation(e.key);
     if (state.character.weaponType != weapon.type) {
       throw Exception('Type = ${weapon.type} is not valid for character = ${state.character.key}');
     }
@@ -359,9 +359,9 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
       throw Exception('Cannot add more than = ${ArtifactType.values.length} artifacts to the state');
     }
 
-    final fullArtifact = _genshinService.getArtifact(e.key);
-    final translation = _genshinService.getArtifactTranslation(e.key);
-    final img = _genshinService.getArtifactRelatedPart(fullArtifact.fullImagePath, fullArtifact.image, translation.bonus.length, e.type);
+    final fullArtifact = _genshinService.artifacts.getArtifact(e.key);
+    final translation = _genshinService.translations.getArtifactTranslation(e.key);
+    final img = _genshinService.artifacts.getArtifactRelatedPart(fullArtifact.fullImagePath, fullArtifact.image, translation.bonus.length, e.type);
 
     final updatedArtifacts = [...state.artifacts];
     final old = state.artifacts.firstWhereOrNull((el) => el.type == e.type);
@@ -409,7 +409,11 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
     final artifacts = [...state.artifacts];
     artifacts.removeAt(index);
     artifacts.insert(index, updated);
-    return state.copyWith.call(artifacts: artifacts, subStatsSummary: _genshinService.generateSubStatSummary(artifacts), readyForScreenshot: false);
+    return state.copyWith.call(
+      artifacts: artifacts,
+      subStatsSummary: _genshinService.artifacts.generateSubStatSummary(artifacts),
+      readyForScreenshot: false,
+    );
   }
 
   CustomBuildState _deleteArtifact(_DeleteArtifact e, _LoadedState state) {
@@ -419,7 +423,11 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
 
     final updated = [...state.artifacts];
     updated.removeWhere((el) => el.type == e.type);
-    return state.copyWith.call(artifacts: updated, subStatsSummary: _genshinService.generateSubStatSummary(updated), readyForScreenshot: false);
+    return state.copyWith.call(
+      artifacts: updated,
+      subStatsSummary: _genshinService.artifacts.generateSubStatSummary(updated),
+      readyForScreenshot: false,
+    );
   }
 
   CustomBuildState _addTeamCharacter(_AddTeamCharacter e, _LoadedState state) {
@@ -431,7 +439,7 @@ class CustomBuildBloc extends Bloc<CustomBuildEvent, CustomBuildState> {
       throw Exception('The selected character cannot be in the team characters');
     }
 
-    final char = _genshinService.getCharacterForCard(e.key);
+    final char = _genshinService.characters.getCharacterForCard(e.key);
     final updatedTeamCharacters = [...state.teamCharacters];
     final old = updatedTeamCharacters.firstWhereOrNull((el) => el.key == e.key);
     if (old != null) {

lib/application/elements/elements_bloc.dart

@@ -20,9 +20,9 @@ class ElementsBloc extends Bloc<ElementsEvent, ElementsState> {
   ) async* {
     final s = event.when(
       init: () {
-        final debuffs = _genshinService.getElementDebuffs();
-        final reactions = _genshinService.getElementReactions();
-        final resonances = _genshinService.getElementResonances();
+        final debuffs = _genshinService.elements.getElementDebuffs();
+        final reactions = _genshinService.elements.getElementReactions();
+        final resonances = _genshinService.elements.getElementResonances();
 
         return ElementsState.loaded(debuffs: debuffs, reactions: reactions, resonances: resonances);
       },