Merge branch 'main' into feat/info-screen

pull/359/head
RuiAlonso 3 years ago
commit 5a2e7dd48d

@ -17,9 +17,10 @@ class ScoreView extends StatelessWidget {
context.select((GameBloc bloc) => bloc.state.status.isGameOver); context.select((GameBloc bloc) => bloc.state.status.isGameOver);
return Padding( return Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.only(
horizontal: 16, left: 12,
vertical: 2, top: 2,
bottom: 2,
), ),
child: AnimatedSwitcher( child: AnimatedSwitcher(
duration: kThemeAnimationDuration, duration: kThemeAnimationDuration,
@ -50,7 +51,9 @@ class _ScoreDisplay extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final l10n = context.l10n; final l10n = context.l10n;
return FittedBox( return Row(
children: [
FittedBox(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@ -63,6 +66,8 @@ class _ScoreDisplay extends StatelessWidget {
const RoundCountDisplay(), const RoundCountDisplay(),
], ],
), ),
),
],
); );
} }
} }

@ -91,7 +91,7 @@ class _SelectedCharacterState extends State<SelectedCharacter>
); );
final animation = spriteSheet.createAnimation( final animation = spriteSheet.createAnimation(
row: 0, row: 0,
stepTime: 1 / 24, stepTime: 1 / 12,
to: spriteSheet.rows * spriteSheet.columns, to: spriteSheet.rows * spriteSheet.columns,
); );
if (_controller != null) _controller?.dispose(); if (_controller != null) _controller?.dispose();

Loading…
Cancel
Save