Merge branch 'main' into feat/info-screen

lib/game/view/widgets/score_view.dart

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

lib/select_character/view/selected_character.dart

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