From edf427513a3dc1041c7575522c406e5cb072857a Mon Sep 17 00:00:00 2001 From: Alejandro Santiago Date: Mon, 2 May 2022 19:20:00 +0100 Subject: [PATCH 1/4] fix: slightly increased Kicker's strength (#295) --- .../pinball_components/lib/src/components/kicker/kicker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pinball_components/lib/src/components/kicker/kicker.dart b/packages/pinball_components/lib/src/components/kicker/kicker.dart index 570f2990..1a45ad60 100644 --- a/packages/pinball_components/lib/src/components/kicker/kicker.dart +++ b/packages/pinball_components/lib/src/components/kicker/kicker.dart @@ -36,7 +36,7 @@ class Kicker extends BodyComponent with InitialPosition { }) : _side = side, super( children: [ - BumpingBehavior(strength: 20)..applyTo(['bouncy_edge']), + BumpingBehavior(strength: 25)..applyTo(['bouncy_edge']), KickerBallContactBehavior()..applyTo(['bouncy_edge']), KickerBlinkingBehavior(), _KickerSpriteGroupComponent( From e7717643fdfac7249bc21147f7d20bfe5b02ee9c Mon Sep 17 00:00:00 2001 From: arturplaczek <33895544+arturplaczek@users.noreply.github.com> Date: Mon, 2 May 2022 20:41:41 +0200 Subject: [PATCH 2/4] feat: use PinballButton to start the game (#288) --- .../view/widgets/play_button_overlay.dart | 15 ++++--- .../lib/src/widgets/pinball_button.dart | 41 ++++++++++--------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/game/view/widgets/play_button_overlay.dart b/lib/game/view/widgets/play_button_overlay.dart index c855f776..1d4a10fb 100644 --- a/lib/game/view/widgets/play_button_overlay.dart +++ b/lib/game/view/widgets/play_button_overlay.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:pinball/game/pinball_game.dart'; import 'package:pinball/l10n/l10n.dart'; import 'package:pinball/select_character/select_character.dart'; +import 'package:pinball_ui/pinball_ui.dart'; /// {@template play_button_overlay} /// [Widget] that renders the button responsible to starting the game @@ -20,14 +21,12 @@ class PlayButtonOverlay extends StatelessWidget { Widget build(BuildContext context) { final l10n = context.l10n; - return Center( - child: ElevatedButton( - onPressed: () async { - _game.gameFlowController.start(); - await showCharacterSelectionDialog(context); - }, - child: Text(l10n.play), - ), + return PinballButton( + text: l10n.play, + onTap: () async { + _game.gameFlowController.start(); + await showCharacterSelectionDialog(context); + }, ); } } diff --git a/packages/pinball_ui/lib/src/widgets/pinball_button.dart b/packages/pinball_ui/lib/src/widgets/pinball_button.dart index 585a8d54..dd4685c1 100644 --- a/packages/pinball_ui/lib/src/widgets/pinball_button.dart +++ b/packages/pinball_ui/lib/src/widgets/pinball_button.dart @@ -21,26 +21,29 @@ class PinballButton extends StatelessWidget { @override Widget build(BuildContext context) { - return DecoratedBox( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage(Assets.images.button.pinballButton.keyName), + return Material( + color: PinballColors.transparent, + child: DecoratedBox( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(Assets.images.button.pinballButton.keyName), + ), ), - ), - child: Center( - child: InkWell( - onTap: onTap, - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 32, - vertical: 16, - ), - child: Text( - text, - style: Theme.of(context) - .textTheme - .headline3! - .copyWith(color: PinballColors.white), + child: Center( + child: InkWell( + onTap: onTap, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 32, + vertical: 16, + ), + child: Text( + text, + style: Theme.of(context) + .textTheme + .headline3! + .copyWith(color: PinballColors.white), + ), ), ), ), From a1fc5077e8b986b9eceff2a740e7d0dc1f979777 Mon Sep 17 00:00:00 2001 From: Tom Arra Date: Mon, 2 May 2022 14:25:52 -0500 Subject: [PATCH 3/4] fix: update favicon --- web/favicon.png | Bin 1091 -> 917 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/favicon.png b/web/favicon.png index 66a69cb1850861f675e7ae3e8a650aca116a62a1..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 100644 GIT binary patch delta 538 zcmV+#0_FX~2$ctrF%k)INLh0L04^f{04^f|c%?sfk<(NIH7+!>Dgg=se@wzBSpWb5 z)k#D_R5%fRQ$0@`K@fd=cRqteVhX~CfFejq;UFXnBTA^KagFHm0}xFrnxu`CCaJ;? zNSQiC0yYRokkGh5vJg_F*m7YkLUG96z0J&>*Iu6!Z*jXjyYIc3w{t?%z=&a=3Nd`q z8xHj&3{HZQvHuc;1a?UAf1;uA^EL$Ur_#Xo(-b^A6D}b+R2WCfHL2H*1MPhcbm8Pd z*X~tx5O&XbBly!#8j%t!m+K1q)ebVWc}~i&SA1mBqIYgEj#=<*(*ACN7gNB&at!W- zaalH|mw_>d!F!}UNy_sCewXv{$hV8O;bbzGV8Er{60fdh1fC^(f8VeAkfd5^Dx_Tj zNyX-#IPht0#y|;d#+d>*?GJe$ZCbzl(Z<%5M849AN@TF@TCW7dSguPvn{?q)V6zxt zdfY+AcX6;Jurlp|Mf&>P5)9aw_&~Y7_!8hwxM(Vcqil$cr3rLYh?F~!GzND3d`vP% zopPA<(QHfVq*HwQbod#qKS2bh9x!_G9GjTqvQS&x?N&#JR;pwqYEnE{=%Josk3vU`Ryr c*Q5)70RS={HmF&bi~s-t07*qoM6N<$f+UXhivR!s delta 713 zcmbQrewbr|VSP(#glC$sFM}2X0|N&GE29ttGmymygba*Q46I-_1A`Z%G@Kp8r~y^O z#K6#=$-n|t69uF}zypYZx}h}l0!D<13z*=l1r{)a*vep~0w8_I^JP8)Db50q$YKTt zZeb8+WSBKaVxn^hvzea3##vm9^^$Q9*@4D?_H=O!u@GDuyt6ASP+-mLE~Bm;j~47m z;ZtjpUe>hi-|YVjIhqoZG88zPG}x?G7&LJ=vAsLDxyr)mvqan{sXg;f&tD+s0;9(Q&bO~4)5>UVXx?uOwc`9D5jYfXUg}+qo-H>l4 zt+?pR!-9^-A3J>1l;t+`#hrOxyl3COQxc07+PrYU+a4f?d6%W~TF*HbSZd%RJ?+v)AcA5U!Foa@ao>pqy! za5AN7`gHLlkLwF}+|4tbX*&HhtKEG5Mu!L4EKMhmBnLhJ_w5_o?z?(f9BDuP*6oy6 z2~0?ufBb~_y&Y+rHRoo=EesGa=+7~cT6q6`xBM3m*~g#NR