[Application] Data in bloc were not being reloaded after changing the…

… app lang
Wolfteam · Dec 19, 2022 · 37edcd5 · 37edcd5
1 parent 84c2ab1
commit 37edcd5
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 13 deletions.
diff --git a/lib/application/artifacts/artifacts_bloc.dart b/lib/application/artifacts/artifacts_bloc.dart
@@ -22,7 +22,8 @@ class ArtifactsBloc extends Bloc<ArtifactsEvent, ArtifactsState> {
   Stream<ArtifactsState> mapEventToState(ArtifactsEvent event) async* {
     final s = event.map(
       init: (e) {
-        if (_allArtifacts.isEmpty) {
+        if (_allArtifacts.isEmpty || e.force) {
+          _allArtifacts.clear();
           _allArtifacts.addAll(_genshinService.artifacts.getArtifactsForCard());
         }
 

diff --git a/lib/application/artifacts/artifacts_event.dart b/lib/application/artifacts/artifacts_event.dart
@@ -3,6 +3,7 @@ part of 'artifacts_bloc.dart';
 @freezed
 class ArtifactsEvent with _$ArtifactsEvent {
   const factory ArtifactsEvent.init({
+    @Default(false) bool force,
     @Default(<String>[]) List<String> excludeKeys,
     ArtifactType? type,
   }) = _Init;

diff --git a/lib/application/characters/characters_bloc.dart b/lib/application/characters/characters_bloc.dart
@@ -24,7 +24,8 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
   Stream<CharactersState> mapEventToState(CharactersEvent event) async* {
     final s = event.map(
       init: (e) {
-        if (_allCharacters.isEmpty) {
+        if (_allCharacters.isEmpty || e.force) {
+          _allCharacters.clear();
           _allCharacters.addAll(_genshinService.characters.getCharactersForCard());
         }
 

diff --git a/lib/application/characters/characters_event.dart b/lib/application/characters/characters_event.dart
@@ -3,6 +3,7 @@ part of 'characters_bloc.dart';
 @freezed
 class CharactersEvent with _$CharactersEvent {
   const factory CharactersEvent.init({
+    @Default(false) bool force,
     @Default(<String>[]) List<String> excludeKeys,
   }) = _Init;
 

diff --git a/lib/application/main/main_bloc.dart b/lib/application/main/main_bloc.dart
@@ -70,10 +70,10 @@ class MainBloc extends Bloc<MainEvent, MainState> {
 
     if (languageChanged) {
       _logger.info(runtimeType, '_init: Language changed, reloading all the required blocs...');
-      _charactersBloc.add(const CharactersEvent.init());
-      _weaponsBloc.add(const WeaponsEvent.init());
+      _charactersBloc.add(const CharactersEvent.init(force: true));
+      _weaponsBloc.add(const WeaponsEvent.init(force: true));
       _homeBloc.add(const HomeEvent.init());
-      _artifactsBloc.add(const ArtifactsEvent.init());
+      _artifactsBloc.add(const ArtifactsEvent.init(force: true));
     }
 
     final settings = _settingsService.appSettings;

diff --git a/lib/application/materials/materials_bloc.dart b/lib/application/materials/materials_bloc.dart
@@ -24,7 +24,8 @@ class MaterialsBloc extends Bloc<MaterialsEvent, MaterialsState> {
   Stream<MaterialsState> mapEventToState(MaterialsEvent event) async* {
     final s = event.map(
       init: (e) {
-        if (_allMaterials.isEmpty) {
+        if (_allMaterials.isEmpty || e.force) {
+          _allMaterials.clear();
           _allMaterials.addAll(_genshinService.materials.getAllMaterialsForCard());
         }
 

diff --git a/lib/application/materials/materials_event.dart b/lib/application/materials/materials_event.dart
@@ -2,7 +2,10 @@ part of 'materials_bloc.dart';
 
 @freezed
 class MaterialsEvent with _$MaterialsEvent {
-  const factory MaterialsEvent.init({@Default(<String>[]) List<String> excludeKeys}) = _Init;
+  const factory MaterialsEvent.init({
+    @Default(false) bool force,
+    @Default(<String>[]) List<String> excludeKeys,
+  }) = _Init;
 
   const factory MaterialsEvent.searchChanged({
     required String search,

diff --git a/lib/application/monsters/monsters_bloc.dart b/lib/application/monsters/monsters_bloc.dart
@@ -23,7 +23,8 @@ class MonstersBloc extends Bloc<MonstersEvent, MonstersState> {
   Stream<MonstersState> mapEventToState(MonstersEvent event) async* {
     final s = event.map(
       init: (e) {
-        if (_allMonsters.isEmpty) {
+        if (_allMonsters.isEmpty || e.force) {
+          _allMonsters.clear();
           _allMonsters.addAll(_genshinService.monsters.getAllMonstersForCard());
         }
 

diff --git a/lib/application/monsters/monsters_event.dart b/lib/application/monsters/monsters_event.dart
@@ -2,7 +2,10 @@ part of 'monsters_bloc.dart';
 
 @freezed
 class MonstersEvent with _$MonstersEvent {
-  const factory MonstersEvent.init({@Default(<String>[]) List<String> excludeKeys}) = _Init;
+  const factory MonstersEvent.init({
+    @Default(false) bool force,
+    @Default(<String>[]) List<String> excludeKeys,
+  }) = _Init;
 
   const factory MonstersEvent.searchChanged({
     required String search,

diff --git a/lib/application/weapons/weapons_bloc.dart b/lib/application/weapons/weapons_bloc.dart
@@ -24,7 +24,8 @@ class WeaponsBloc extends Bloc<WeaponsEvent, WeaponsState> {
   Stream<WeaponsState> mapEventToState(WeaponsEvent event) async* {
     final s = event.map(
       init: (e) {
-        if (_allWeapons.isEmpty) {
+        if (_allWeapons.isEmpty || e.force) {
+          _allWeapons.clear();
           _allWeapons.addAll(_genshinService.weapons.getWeaponsForCard());
         }
 

diff --git a/lib/application/weapons/weapons_event.dart b/lib/application/weapons/weapons_event.dart
@@ -3,6 +3,7 @@ part of 'weapons_bloc.dart';
 @freezed
 class WeaponsEvent with _$WeaponsEvent {
   const factory WeaponsEvent.init({
+    @Default(false) bool force,
     @Default(<String>[]) List<String> excludeKeys,
     @Default(<WeaponType>[]) List<WeaponType> weaponTypes,
     @Default(true) bool areWeaponTypesEnabled,

diff --git a/lib/presentation/main_tab_page.dart b/lib/presentation/main_tab_page.dart
@@ -48,9 +48,9 @@ class _MainTabPageState extends State<MainTabPage> with SingleTickerProviderStat
     if (_didChangeDependencies) return;
     _didChangeDependencies = true;
     context.read<HomeBloc>().add(const HomeEvent.init());
-    context.read<CharactersBloc>().add(const CharactersEvent.init());
-    context.read<WeaponsBloc>().add(const WeaponsEvent.init());
-    context.read<ArtifactsBloc>().add(const ArtifactsEvent.init());
+    context.read<CharactersBloc>().add(const CharactersEvent.init(force: true));
+    context.read<WeaponsBloc>().add(const WeaponsEvent.init(force: true));
+    context.read<ArtifactsBloc>().add(const ArtifactsEvent.init(force: true));
     context.read<SettingsBloc>().add(const SettingsEvent.init());
 
     if (widget.showChangelog) {