From b59ec904e465640af4fd30998564dcec3eb76f0e Mon Sep 17 00:00:00 2001 From: RuiAlonso Date: Fri, 29 Apr 2022 23:41:22 +0200 Subject: [PATCH] refactor: moved extension for multiplier value --- .../multiplier/cubit/multiplier_cubit.dart | 19 +------------------ .../multiplier/cubit/multiplier_state.dart | 17 +++++++++++++++++ .../pinball_components/sandbox/pubspec.lock | 19 +++++++++++++------ 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_cubit.dart b/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_cubit.dart index 65d59d91..1a679169 100644 --- a/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_cubit.dart +++ b/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_cubit.dart @@ -12,7 +12,7 @@ class MultiplierCubit extends Cubit { /// Event added when the game's current multiplier changes. void next(int multiplier) { - if (state.equalsTo(multiplier)) { + if (state.value.equalsTo(multiplier)) { if (state.spriteState == MultiplierSpriteState.dimmed) { emit(state.copyWith(spriteState: MultiplierSpriteState.lit)); } @@ -23,20 +23,3 @@ class MultiplierCubit extends Cubit { } } } - -extension on MultiplierState { - bool equalsTo(int value) { - switch (this.value) { - case MultiplierValue.x2: - return value == 2; - case MultiplierValue.x3: - return value == 3; - case MultiplierValue.x4: - return value == 4; - case MultiplierValue.x5: - return value == 5; - case MultiplierValue.x6: - return value == 6; - } - } -} diff --git a/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_state.dart b/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_state.dart index f6010f4d..b3be1204 100644 --- a/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_state.dart +++ b/packages/pinball_components/lib/src/components/multiplier/cubit/multiplier_state.dart @@ -37,3 +37,20 @@ class MultiplierState extends Equatable { @override List get props => [value, spriteState]; } + +extension MultiplierValueX on MultiplierValue { + bool equalsTo(int value) { + switch (this) { + case MultiplierValue.x2: + return value == 2; + case MultiplierValue.x3: + return value == 3; + case MultiplierValue.x4: + return value == 4; + case MultiplierValue.x5: + return value == 5; + case MultiplierValue.x6: + return value == 6; + } + } +} diff --git a/packages/pinball_components/sandbox/pubspec.lock b/packages/pinball_components/sandbox/pubspec.lock index 8d61da32..d2500fbe 100644 --- a/packages/pinball_components/sandbox/pubspec.lock +++ b/packages/pinball_components/sandbox/pubspec.lock @@ -15,6 +15,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.8.2" + bloc: + dependency: transitive + description: + name: bloc + url: "https://pub.dartlang.org" + source: hosted + version: "8.0.3" boolean_selector: dependency: transitive description: @@ -171,7 +178,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" json_annotation: dependency: transitive description: @@ -199,7 +206,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -220,7 +227,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" path_provider_linux: dependency: transitive description: @@ -351,7 +358,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -386,7 +393,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" typed_data: dependency: transitive description: @@ -456,7 +463,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" very_good_analysis: dependency: "direct dev" description: