From ae8d3f02f8a4c0b9559b2835dac214ec2072ea18 Mon Sep 17 00:00:00 2001 From: arturplaczek Date: Mon, 2 May 2022 13:14:25 +0200 Subject: [PATCH] fix: remove duplicated PinballButton --- .../select_character/pinball_button.png | Bin 1602 -> 0 bytes lib/game/view/widgets/pinball_button.dart | 46 ------------------ lib/game/view/widgets/widgets.dart | 1 - lib/gen/assets.gen.dart | 4 -- .../widgets/selected_character.dart | 6 +-- .../view/widgets/pinball_button_test.dart | 39 --------------- 6 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 assets/images/select_character/pinball_button.png delete mode 100644 lib/game/view/widgets/pinball_button.dart delete mode 100644 test/game/view/widgets/pinball_button_test.dart diff --git a/assets/images/select_character/pinball_button.png b/assets/images/select_character/pinball_button.png deleted file mode 100644 index 62373b857648faaf527a761891db0916811b6498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1602 zcmX9;c~p{F6n|fonWAM@npPG)23F>}Ne@>ph=nr-gOc+`VinmRV3$Z48vaj7Y@ zQiLL^DY9@!WHCpWQZds$H5Y0eS7fXVQ52XD`{TX$yT9{$_n!OSz4vmUzmI{QnH~VZ z!1u6s5CBjTg2}o%$lh6fxClAcr5z5*06^bZyC874!W1E)j36H`P$k|rg&3<74jerI z0INiQIc5z2Yx;b>51cp$$%eUSA`&bFpCxrxgXxho{r-a+Xk=f))eEcj(U+j@lVGEt zU!k?>!ukzfg=jzP?M~KC*5B6~qGJjmqst7V%}43YH*v;GnDpeG#j{*LmODkneKg_O zm4&5FU9a4MkK|!6itNgstFQCMm+1K}GR2nBF)%48=TFP;Z`@_q@a4#yx+57>oO>tA zk&lr^NoQVc1Un<-tV;KW;YMr?f7^;R!fohp#AY}ef3tE&*+NyMTm#{V?;fQ}C7nxL zXDIETlUCA}8{>J|u%O_;g!2UlRrFW-L)GHk=W=k{iykxMB8yszo6XF{VfYRaMES5# zwdmZnR&e6(huzK;QO@Fx(`JeZ6P^h;P8hfTfiV}{C3ca7DB=%6j-_u`2yEkUZl-8? zSH@ex&AWF>e5dxqsw7F`Pyilsq+Gng8JJOvm8a&^L!rR$(JPPY|2$##@y|Jx=Rr^6 zc~zpvxi5>$DO629B(tfThmcvI` zI+LN&;4|Ut0S3mv9CHXK3KivuKWYFaNhMgk%6CjKa4c>iE#D((rUQrtqCe^pml5lM zFl|F$abAivm>RlID~ZXG_V?8n%SQ_g6~I*VDKA(4G>hpfF$6-#e$7kP^AroIx(Gz0 z>9SF((J%&Ha)$(_hXzIb`Yfi&X%yKBJt8{YQk?-usq5Sl$s5(mQTkj}O*T9cg$8=< zLX7=wx{j^Axs*a2e+(UI7v_vEIP`-z*OQr6Lxx&K&g69$T>3yTm17Dv-J;Z}r)N7t zP&Z%XDXgf(da)!V-}@96;cfypIch4^@v+>QUJvqj^YJAx_qirL^BSA957^pKc-IK> zzxV3m2vbw3<2J%$^EN&Jb4%&Ee+)d1c;C@^jDrN+<3YN{_F_U;@cQ^WyZnZesS>;csKb}{p~$Zp>P|pAJM|$Q1hO;7*$5`c&T6rGlox3j z$muQLoJ4-l@X@#=7zA=MvDw~spp7BZtOliX=+)7B4;UpnpcHQssR!)J#JmreP9W-* z9<9$7d%n}E-aRR|Yjhq*z8}y<1mjz@Axi_0+xVwcLtxj}9`T97M_1g_3lv1FJNekK zM?-A^^)()AX{c55S&7`D`oMX?bzbS(KV4rLJ9a4O3W>3t`qs zv*k*=DU{z@Nu3Pduwa(9WiYTOOx0UyH2sN-5Uv43^)#Agb zC9Ycvt?-#UpW9oTFW-r6Ha8AZO{C89H-m#Sl7%C^_m#oe+@0V`KTna^`?4<;dWe%} z!}zjQv`ZgJb86M?is{%Ce{)+K`$)nN^E5YXCLe0Q^+1LFu - const AssetGenImage('assets/images/select_character/pinball_button.png'); - /// File path: assets/images/select_character/star_a.png AssetGenImage get starA => const AssetGenImage('assets/images/select_character/star_a.png'); diff --git a/lib/select_character/widgets/selected_character.dart b/lib/select_character/widgets/selected_character.dart index 2f0cb94f..2ff3e168 100644 --- a/lib/select_character/widgets/selected_character.dart +++ b/lib/select_character/widgets/selected_character.dart @@ -3,9 +3,9 @@ import 'package:flame/sprite.dart'; import 'package:flutter/material.dart' hide Image; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:pinball/select_character/select_character.dart'; -import 'package:pinball/theme/theme.dart'; import 'package:pinball_flame/pinball_flame.dart'; import 'package:pinball_theme/pinball_theme.dart'; +import 'package:pinball_ui/pinball_ui.dart'; /// {@template selected_character} /// Widget to display the selected character based on the [CharacterThemeCubit] @@ -91,8 +91,8 @@ class _SelectedCharacterState extends State children: [ Text( currentCharacter.name, - style: AppTextStyle.headline2.copyWith( - color: AppColors.white, + style: PinballTextStyle.headline2.copyWith( + color: PinballColors.white, ), textAlign: TextAlign.center, ), diff --git a/test/game/view/widgets/pinball_button_test.dart b/test/game/view/widgets/pinball_button_test.dart deleted file mode 100644 index 50566dde..00000000 --- a/test/game/view/widgets/pinball_button_test.dart +++ /dev/null @@ -1,39 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:pinball/game/game.dart'; - -import '../../../helpers/helpers.dart'; - -void main() { - const buttonText = 'this is the button text'; - - testWidgets('displays button', (tester) async { - await tester.pumpApp( - const Material( - child: PinballButton( - child: Text(buttonText), - ), - ), - ); - - expect(find.text(buttonText), findsOneWidget); - }); - - testWidgets('on tap calls onPressed callback', (tester) async { - var isTapped = false; - - await tester.pumpApp( - Material( - child: PinballButton( - child: const Text(buttonText), - onPressed: () { - isTapped = true; - }, - ), - ), - ); - await tester.tap(find.text(buttonText)); - - expect(isTapped, isTrue); - }); -}