Skip to content

Commit

Permalink
[Application] Migrate to null safety
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfteam committed Jun 19, 2021
1 parent 292ea1b commit c76c2c2
Show file tree
Hide file tree
Showing 72 changed files with 462 additions and 462 deletions.
2 changes: 1 addition & 1 deletion lib/application/artifact/artifact_bloc.dart
Expand Up @@ -19,7 +19,7 @@ class ArtifactBloc extends PopBloc<ArtifactEvent, ArtifactState> {
ArtifactBloc(this._genshinService, this._telemetryService) : super(const ArtifactState.loading());

@override
ArtifactEvent getEventForPop(String key) => ArtifactEvent.loadArtifact(key: key, addToQueue: false);
ArtifactEvent getEventForPop(String? key) => ArtifactEvent.loadArtifact(key: key!, addToQueue: false);

@override
Stream<ArtifactState> mapEventToState(
Expand Down
4 changes: 2 additions & 2 deletions lib/application/artifact/artifact_event.dart
@@ -1,9 +1,9 @@
part of 'artifact_bloc.dart';

@freezed
abstract class ArtifactEvent with _$ArtifactEvent {
class ArtifactEvent with _$ArtifactEvent {
const factory ArtifactEvent.loadArtifact({
@required String key,
required String key,
@Default(true) bool addToQueue,
}) = _LoadArtifact;
}
18 changes: 9 additions & 9 deletions lib/application/artifact/artifact_state.dart
@@ -1,17 +1,17 @@
part of 'artifact_bloc.dart';

@freezed
abstract class ArtifactState with _$ArtifactState {
class ArtifactState with _$ArtifactState {
const factory ArtifactState.loading() = _LoadingState;

const factory ArtifactState.loaded({
@required String name,
@required String image,
@required int rarityMin,
@required int rarityMax,
@required List<ArtifactCardBonusModel> bonus,
@required List<String> images,
@required List<String> charImages,
@required List<String> droppedBy,
required String name,
required String image,
required int rarityMin,
required int rarityMax,
required List<ArtifactCardBonusModel> bonus,
required List<String> images,
required List<String> charImages,
required List<String> droppedBy,
}) = _LoadedState;
}
2 changes: 1 addition & 1 deletion lib/application/artifacts/artifacts_bloc.dart
Expand Up @@ -50,7 +50,7 @@ class ArtifactsBloc extends Bloc<ArtifactsEvent, ArtifactsState> {
}

ArtifactsState _buildInitialState({
String search,
String? search,
List<String> excludeKeys = const [],
int rarity = 0,
ArtifactFilterType artifactFilterType = ArtifactFilterType.name,
Expand Down
6 changes: 3 additions & 3 deletions lib/application/artifacts/artifacts_event.dart
@@ -1,13 +1,13 @@
part of 'artifacts_bloc.dart';

@freezed
abstract class ArtifactsEvent with _$ArtifactsEvent {
class ArtifactsEvent with _$ArtifactsEvent {
const factory ArtifactsEvent.init({@Default(<String>[]) List<String> excludeKeys}) = _Init;

const factory ArtifactsEvent.collapseNotes({@required bool collapse}) = _CollapseNotesChanged;
const factory ArtifactsEvent.collapseNotes({required bool collapse}) = _CollapseNotesChanged;

const factory ArtifactsEvent.searchChanged({
@required String search,
required String search,
}) = _SearchChanged;

const factory ArtifactsEvent.rarityChanged(int rarity) = _RarityChanged;
Expand Down
20 changes: 10 additions & 10 deletions lib/application/artifacts/artifacts_state.dart
@@ -1,18 +1,18 @@
part of 'artifacts_bloc.dart';

@freezed
abstract class ArtifactsState with _$ArtifactsState {
class ArtifactsState with _$ArtifactsState {
const factory ArtifactsState.loading() = _LoadingState;
const factory ArtifactsState.loaded({
@required List<ArtifactCardModel> artifacts,
@required bool collapseNotes,
String search,
@required int rarity,
@required int tempRarity,
@required ArtifactFilterType artifactFilterType,
@required ArtifactFilterType tempArtifactFilterType,
@required SortDirectionType sortDirectionType,
@required SortDirectionType tempSortDirectionType,
required List<ArtifactCardModel> artifacts,
required bool collapseNotes,
String? search,
required int rarity,
required int tempRarity,
required ArtifactFilterType artifactFilterType,
required ArtifactFilterType tempArtifactFilterType,
required SortDirectionType sortDirectionType,
required SortDirectionType tempSortDirectionType,
@Default(<String>[]) List<String> excludeKeys,
}) = _LoadedState;
}
@@ -1,58 +1,58 @@
part of 'calculator_asc_materials_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsEvent with _$CalculatorAscMaterialsEvent {
class CalculatorAscMaterialsEvent with _$CalculatorAscMaterialsEvent {
const factory CalculatorAscMaterialsEvent.init({
@required int sessionKey,
required int sessionKey,
}) = _Init;

const factory CalculatorAscMaterialsEvent.addCharacter({
@required int sessionKey,
@required String key,
@required int currentLevel,
@required int desiredLevel,
@required int currentAscensionLevel,
@required int desiredAscensionLevel,
@required List<CharacterSkill> skills,
@required bool useMaterialsFromInventory,
required int sessionKey,
required String key,
required int currentLevel,
required int desiredLevel,
required int currentAscensionLevel,
required int desiredAscensionLevel,
required List<CharacterSkill> skills,
required bool useMaterialsFromInventory,
}) = _AddCharacter;

const factory CalculatorAscMaterialsEvent.updateCharacter({
@required int sessionKey,
@required int index,
@required int currentLevel,
@required int desiredLevel,
@required int currentAscensionLevel,
@required int desiredAscensionLevel,
@required List<CharacterSkill> skills,
@required bool isActive,
@required bool useMaterialsFromInventory,
required int sessionKey,
required int index,
required int currentLevel,
required int desiredLevel,
required int currentAscensionLevel,
required int desiredAscensionLevel,
required List<CharacterSkill> skills,
required bool isActive,
required bool useMaterialsFromInventory,
}) = _UpdateCharacter;

const factory CalculatorAscMaterialsEvent.addWeapon({
@required int sessionKey,
@required String key,
@required int currentLevel,
@required int desiredLevel,
@required int currentAscensionLevel,
@required int desiredAscensionLevel,
@required bool useMaterialsFromInventory,
required int sessionKey,
required String key,
required int currentLevel,
required int desiredLevel,
required int currentAscensionLevel,
required int desiredAscensionLevel,
required bool useMaterialsFromInventory,
}) = _AddWeapon;

const factory CalculatorAscMaterialsEvent.updateWeapon({
@required int sessionKey,
@required int index,
@required int currentLevel,
@required int desiredLevel,
@required int currentAscensionLevel,
@required int desiredAscensionLevel,
@required bool isActive,
@required bool useMaterialsFromInventory,
required int sessionKey,
required int index,
required int currentLevel,
required int desiredLevel,
required int currentAscensionLevel,
required int desiredAscensionLevel,
required bool isActive,
required bool useMaterialsFromInventory,
}) = _UpdateWeapon;

const factory CalculatorAscMaterialsEvent.removeItem({
@required int sessionKey,
@required int index,
required int sessionKey,
required int index,
}) = _RemoveItem;

const factory CalculatorAscMaterialsEvent.close() = _Close;
Expand Down
@@ -1,9 +1,9 @@
part of 'calculator_asc_materials_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsState with _$CalculatorAscMaterialsState {
class CalculatorAscMaterialsState with _$CalculatorAscMaterialsState {
const factory CalculatorAscMaterialsState.initial({
@required List<ItemAscensionMaterials> items,
@required List<AscensionMaterialsSummary> summary,
required List<ItemAscensionMaterials> items,
required List<AscensionMaterialsSummary> summary,
}) = _InitialState;
}
@@ -1,50 +1,50 @@
part of 'calculator_asc_materials_item_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsItemEvent with _$CalculatorAscMaterialsItemEvent {
class CalculatorAscMaterialsItemEvent with _$CalculatorAscMaterialsItemEvent {
const factory CalculatorAscMaterialsItemEvent.load({
@required String key,
@required bool isCharacter,
required String key,
required bool isCharacter,
}) = _Init;

const factory CalculatorAscMaterialsItemEvent.loadWith({
@required String key,
@required bool isCharacter,
@required int currentLevel,
@required int desiredLevel,
@required int currentAscensionLevel,
@required int desiredAscensionLevel,
@required bool useMaterialsFromInventory,
@required List<CharacterSkill> skills,
required String key,
required bool isCharacter,
required int currentLevel,
required int desiredLevel,
required int currentAscensionLevel,
required int desiredAscensionLevel,
required bool useMaterialsFromInventory,
required List<CharacterSkill> skills,
}) = _LoadWith;

const factory CalculatorAscMaterialsItemEvent.currentLevelChanged({
@required int newValue,
required int newValue,
}) = _CurrentLevelChanged;

const factory CalculatorAscMaterialsItemEvent.desiredLevelChanged({
@required int newValue,
required int newValue,
}) = _DesiredLevelChanged;

const factory CalculatorAscMaterialsItemEvent.currentAscensionLevelChanged({
@required int newValue,
required int newValue,
}) = _CurrentAscensionLevelChanged;

const factory CalculatorAscMaterialsItemEvent.desiredAscensionLevelChanged({
@required int newValue,
required int newValue,
}) = _DesiredAscensionLevelChanged;

const factory CalculatorAscMaterialsItemEvent.skillCurrentLevelChanged({
@required int index,
@required int newValue,
required int index,
required int newValue,
}) = _SkillCurrentLevelChanged;

const factory CalculatorAscMaterialsItemEvent.skillDesiredLevelChanged({
@required int index,
@required int newValue,
required int index,
required int newValue,
}) = _SkillDesiredLevelChanged;

const factory CalculatorAscMaterialsItemEvent.useMaterialsFromInventoryChanged({
@required bool useThem,
required bool useThem,
}) = _UseMaterialsFromInventoryChanged;
}
@@ -1,17 +1,17 @@
part of 'calculator_asc_materials_item_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsItemState with _$CalculatorAscMaterialsItemState {
class CalculatorAscMaterialsItemState with _$CalculatorAscMaterialsItemState {
const factory CalculatorAscMaterialsItemState.loading() = _LoadingState;

const factory CalculatorAscMaterialsItemState.loaded({
@required String name,
@required String imageFullPath,
@required int currentLevel,
@required int desiredLevel,
@required int currentAscensionLevel,
@required int desiredAscensionLevel,
@required bool useMaterialsFromInventory,
required String name,
required String imageFullPath,
required int currentLevel,
required int desiredLevel,
required int currentAscensionLevel,
required int desiredAscensionLevel,
required bool useMaterialsFromInventory,
@Default([]) List<CharacterSkill> skills,
}) = _LoadedState;
}
@@ -1,15 +1,15 @@
part of 'calculator_asc_materials_order_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsOrderEvent implements _$CalculatorAscMaterialsOrderEvent {
class CalculatorAscMaterialsOrderEvent with _$CalculatorAscMaterialsOrderEvent {
const factory CalculatorAscMaterialsOrderEvent.init({
@required int sessionKey,
@required List<ItemAscensionMaterials> items,
required int sessionKey,
required List<ItemAscensionMaterials> items,
}) = _Init;

const factory CalculatorAscMaterialsOrderEvent.positionChanged({
@required int oldIndex,
@required int newIndex,
required int oldIndex,
required int newIndex,
}) = _PositionChanged;

const factory CalculatorAscMaterialsOrderEvent.applyChanges() = _ApplyChanges;
Expand Down
@@ -1,9 +1,9 @@
part of 'calculator_asc_materials_order_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsOrderState implements _$CalculatorAscMaterialsOrderState {
class CalculatorAscMaterialsOrderState with _$CalculatorAscMaterialsOrderState {
const factory CalculatorAscMaterialsOrderState.initial({
@required int sessionKey,
@required List<ItemAscensionMaterials> items,
required int sessionKey,
required List<ItemAscensionMaterials> items,
}) = _InitialState;
}
@@ -1,9 +1,9 @@
part of 'calculator_asc_materials_session_form_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsSessionFormEvent implements _$CalculatorAscMaterialsSessionFormEvent {
class CalculatorAscMaterialsSessionFormEvent with _$CalculatorAscMaterialsSessionFormEvent {
const factory CalculatorAscMaterialsSessionFormEvent.nameChanged({
@required String name,
required String name,
}) = _NameChanged;

const factory CalculatorAscMaterialsSessionFormEvent.close() = _Close;
Expand Down
@@ -1,10 +1,10 @@
part of 'calculator_asc_materials_session_form_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsSessionFormState implements _$CalculatorAscMaterialsSessionFormState {
class CalculatorAscMaterialsSessionFormState with _$CalculatorAscMaterialsSessionFormState {
const factory CalculatorAscMaterialsSessionFormState.loaded({
@required String name,
@required bool isNameDirty,
@required bool isNameValid,
required String name,
required bool isNameDirty,
required bool isNameValid,
}) = _LoadedState;
}
@@ -1,20 +1,20 @@
part of 'calculator_asc_materials_sessions_bloc.dart';

@freezed
abstract class CalculatorAscMaterialsSessionsEvent implements _$CalculatorAscMaterialsSessionsEvent {
class CalculatorAscMaterialsSessionsEvent with _$CalculatorAscMaterialsSessionsEvent {
const factory CalculatorAscMaterialsSessionsEvent.init() = _Init;

const factory CalculatorAscMaterialsSessionsEvent.createSession({
@required String name,
required String name,
}) = _CreateSession;

const factory CalculatorAscMaterialsSessionsEvent.updateSession({
@required int key,
@required String name,
required int key,
required String name,
}) = _UpdateSession;

const factory CalculatorAscMaterialsSessionsEvent.deleteSession({
@required int key,
required int key,
}) = _DeleteSession;

const factory CalculatorAscMaterialsSessionsEvent.close() = _Close;
Expand Down

0 comments on commit c76c2c2

Please sign in to comment.