From 6bea60b091e6e9742dbf543f4229e568dad7b6f3 Mon Sep 17 00:00:00 2001
From: Miguel Beltran <m@beltran.work>
Date: Tue, 31 Jan 2023 22:14:32 +0100
Subject: [PATCH] Migrate game_template to Material 3 (#1613)

---
 game_template/lib/main.dart                       |  1 +
 .../level_selection/level_selection_screen.dart   |  2 +-
 .../lib/src/main_menu/main_menu_screen.dart       |  8 ++++----
 .../lib/src/play_session/play_session_screen.dart |  2 +-
 .../lib/src/settings/settings_screen.dart         | 15 ++++++++++-----
 .../lib/src/win_game/win_game_screen.dart         |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/game_template/lib/main.dart b/game_template/lib/main.dart
index 8b793aa0b..1e15893c0 100644
--- a/game_template/lib/main.dart
+++ b/game_template/lib/main.dart
@@ -255,6 +255,7 @@ class MyApp extends StatelessWidget {
                   color: palette.ink,
                 ),
               ),
+              useMaterial3: true,
             ),
             routeInformationProvider: _router.routeInformationProvider,
             routeInformationParser: _router.routeInformationParser,
diff --git a/game_template/lib/src/level_selection/level_selection_screen.dart b/game_template/lib/src/level_selection/level_selection_screen.dart
index ec1ace081..c5118872b 100644
--- a/game_template/lib/src/level_selection/level_selection_screen.dart
+++ b/game_template/lib/src/level_selection/level_selection_screen.dart
@@ -59,7 +59,7 @@ class LevelSelectionScreen extends StatelessWidget {
             ),
           ],
         ),
-        rectangularMenuArea: ElevatedButton(
+        rectangularMenuArea: FilledButton(
           onPressed: () {
             GoRouter.of(context).go('/');
           },
diff --git a/game_template/lib/src/main_menu/main_menu_screen.dart b/game_template/lib/src/main_menu/main_menu_screen.dart
index aef2c6774..f390b8c98 100644
--- a/game_template/lib/src/main_menu/main_menu_screen.dart
+++ b/game_template/lib/src/main_menu/main_menu_screen.dart
@@ -44,7 +44,7 @@ class MainMenuScreen extends StatelessWidget {
         rectangularMenuArea: Column(
           mainAxisAlignment: MainAxisAlignment.end,
           children: [
-            ElevatedButton(
+            FilledButton(
               onPressed: () {
                 audioController.playSfx(SfxType.buttonTap);
                 GoRouter.of(context).go('/play');
@@ -55,7 +55,7 @@ class MainMenuScreen extends StatelessWidget {
             if (gamesServicesController != null) ...[
               _hideUntilReady(
                 ready: gamesServicesController.signedIn,
-                child: ElevatedButton(
+                child: FilledButton(
                   onPressed: () => gamesServicesController.showAchievements(),
                   child: const Text('Achievements'),
                 ),
@@ -63,14 +63,14 @@ class MainMenuScreen extends StatelessWidget {
               _gap,
               _hideUntilReady(
                 ready: gamesServicesController.signedIn,
-                child: ElevatedButton(
+                child: FilledButton(
                   onPressed: () => gamesServicesController.showLeaderboard(),
                   child: const Text('Leaderboard'),
                 ),
               ),
               _gap,
             ],
-            ElevatedButton(
+            FilledButton(
               onPressed: () => GoRouter.of(context).push('/settings'),
               child: const Text('Settings'),
             ),
diff --git a/game_template/lib/src/play_session/play_session_screen.dart b/game_template/lib/src/play_session/play_session_screen.dart
index 0b4cddad4..a693e430c 100644
--- a/game_template/lib/src/play_session/play_session_screen.dart
+++ b/game_template/lib/src/play_session/play_session_screen.dart
@@ -93,7 +93,7 @@ class _PlaySessionScreenState extends State<PlaySessionScreen> {
                       padding: const EdgeInsets.all(8.0),
                       child: SizedBox(
                         width: double.infinity,
-                        child: ElevatedButton(
+                        child: FilledButton(
                           onPressed: () => GoRouter.of(context).go('/play'),
                           child: const Text('Back'),
                         ),
diff --git a/game_template/lib/src/settings/settings_screen.dart b/game_template/lib/src/settings/settings_screen.dart
index 3ef3e0489..c9fb6a777 100644
--- a/game_template/lib/src/settings/settings_screen.dart
+++ b/game_template/lib/src/settings/settings_screen.dart
@@ -101,7 +101,7 @@ class SettingsScreen extends StatelessWidget {
             _gap,
           ],
         ),
-        rectangularMenuArea: ElevatedButton(
+        rectangularMenuArea: FilledButton(
           onPressed: () {
             GoRouter.of(context).pop();
           },
@@ -169,14 +169,19 @@ class _SettingsLine extends StatelessWidget {
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 8),
         child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.start,
           children: [
-            Text(title,
+            Expanded(
+              child: Text(
+                title,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
                 style: const TextStyle(
                   fontFamily: 'Permanent Marker',
                   fontSize: 30,
-                )),
-            const Spacer(),
+                ),
+              ),
+            ),
             icon,
           ],
         ),
diff --git a/game_template/lib/src/win_game/win_game_screen.dart b/game_template/lib/src/win_game/win_game_screen.dart
index b78cea05d..5569cd6a4 100644
--- a/game_template/lib/src/win_game/win_game_screen.dart
+++ b/game_template/lib/src/win_game/win_game_screen.dart
@@ -61,7 +61,7 @@ class WinGameScreen extends StatelessWidget {
             ),
           ],
         ),
-        rectangularMenuArea: ElevatedButton(
+        rectangularMenuArea: FilledButton(
           onPressed: () {
             GoRouter.of(context).go('/play');
           },