[Application] Added a region filter to the characters page

Wolfteam · Jul 10, 2021 · 2d5a107 · 2d5a107
1 parent 95edf9c
commit 2d5a107
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/lib/application/characters/characters_bloc.dart b/lib/application/characters/characters_bloc.dart
@@ -69,6 +69,7 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
         weaponTypes: currentState.tempWeaponTypes,
         roleType: currentState.tempRoleType,
         excludeKeys: currentState.excludeKeys,
+        regionType: currentState.tempRegionType,
       ),
       cancelChanges: (_) => currentState.copyWith.call(
         tempCharacterFilterType: currentState.characterFilterType,
@@ -79,6 +80,13 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
         tempWeaponTypes: currentState.weaponTypes,
         tempRoleType: currentState.roleType,
         excludeKeys: currentState.excludeKeys,
+        tempRegionType: currentState.regionType,
+      ),
+      regionTypeChanged: (e) => currentState.copyWith.call(tempRegionType: e.regionType),
+      resetFilters: (_) => _buildInitialState(
+        excludeKeys: state.maybeMap(loaded: (state) => state.excludeKeys, orElse: () => []),
+        elementTypes: ElementType.values,
+        weaponTypes: WeaponType.values,
       ),
     );
     yield s;
@@ -94,6 +102,7 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
     CharacterFilterType characterFilterType = CharacterFilterType.name,
     SortDirectionType sortDirectionType = SortDirectionType.asc,
     CharacterRoleType roleType = CharacterRoleType.all,
+    RegionType? regionType,
   }) {
     final isLoaded = state is _LoadedState;
     var characters = _genshinService.getCharactersForCard();
@@ -124,6 +133,8 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
         roleType: roleType,
         tempRoleType: roleType,
         excludeKeys: excludeKeys,
+        regionType: regionType,
+        tempRegionType: regionType,
       );
     }
 
@@ -147,6 +158,10 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
       characters = characters.where((el) => el.roleType == roleType).toList();
     }
 
+    if (regionType != null) {
+      characters = characters.where((el) => el.regionType == regionType).toList();
+    }
+
     switch (statusType) {
       case ItemStatusType.released:
         characters = characters.where((el) => !el.isComingSoon).toList();
@@ -179,6 +194,10 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
       sortDirectionType: sortDirectionType,
       tempSortDirectionType: sortDirectionType,
       excludeKeys: excludeKeys,
+      roleType: roleType,
+      tempRoleType: roleType,
+      regionType: regionType,
+      tempRegionType: regionType,
     );
     return s;
   }

diff --git a/lib/application/characters/characters_event.dart b/lib/application/characters/characters_event.dart
@@ -24,7 +24,11 @@ class CharactersEvent with _$CharactersEvent {
 
   const factory CharactersEvent.roleTypeChanged(CharacterRoleType roleType) = _CharacterTypeChanged;
 
+  const factory CharactersEvent.regionTypeChanged(RegionType? regionType) = _RegionTypeChanged;
+
   const factory CharactersEvent.applyFilterChanges() = _ApplyFilterChanges;
 
   const factory CharactersEvent.cancelChanges() = _CancelChanges;
+
+  const factory CharactersEvent.resetFilters() = _ResetFilters;
 }
diff --git a/lib/application/characters/characters_state.dart b/lib/application/characters/characters_state.dart
@@ -22,6 +22,8 @@ class CharactersState with _$CharactersState {
     required SortDirectionType tempSortDirectionType,
     required CharacterRoleType roleType,
     required CharacterRoleType tempRoleType,
+    RegionType? regionType,
+    RegionType? tempRegionType,
     @Default(<String>[]) List<String> excludeKeys,
   }) = _LoadedState;
 }
diff --git a/lib/domain/models/characters/character_card_model.dart b/lib/domain/models/characters/character_card_model.dart
@@ -11,6 +11,7 @@ class CharacterCardModel {
   final bool isComingSoon;
   final List<String> materials;
   final CharacterRoleType roleType;
+  final RegionType regionType;
 
   const CharacterCardModel({
     required this.key,
@@ -21,6 +22,7 @@ class CharacterCardModel {
     required this.elementType,
     required this.materials,
     required this.roleType,
+    required this.regionType,
     this.isNew = false,
     this.isComingSoon = false,
   });

diff --git a/lib/infrastructure/genshin_service.dart b/lib/infrastructure/genshin_service.dart
@@ -791,6 +791,7 @@ class GenshinServiceImpl implements GenshinService {
       isComingSoon: character.isComingSoon,
       isNew: character.isNew,
       roleType: character.role,
+      regionType: character.region,
     );
   }