fix: back button fix

ProjectAJ14 · Jun 30, 2024 · 7e7f8a7 · 7e7f8a7
1 parent 5d4c6fe
commit 7e7f8a7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/lib/ui/screens/game/game_controller.dart b/lib/ui/screens/game/game_controller.dart
@@ -57,11 +57,7 @@ class GameController extends GetxController {
   void _gameListener(event) {
     int score = _calculateScore();
     if (score <= 0 && !isGameEnded && isGameStarted) {
-      endGame(
-        reason: 'You ran out of time!',
-      );
-    } else {
-      developer.log("score: $score");
+      endGame(reason: 'You ran out of time!');
     }
   }
 

diff --git a/lib/ui/screens/home/widgets/footer.dart b/lib/ui/screens/home/widgets/footer.dart
@@ -10,8 +10,9 @@ class Footer extends StatelessWidget {
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       child: Row(
         children: [
-          const Text(
+          Text(
             'Made with Flutter',
+            style: Theme.of(context).textTheme.bodySmall,
           ),
           const Icon(
             Icons.favorite,

diff --git a/lib/ui/screens/leaderboard/leaderboard_screen.dart b/lib/ui/screens/leaderboard/leaderboard_screen.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:nes_ui/nes_ui.dart';
 
 import '../../../app/repo/repos.dart';
+import '../../routes/route_constants.dart';
 import 'widgets/user_table_widget.dart';
 
 class LeaderboardScreen extends StatelessWidget {
@@ -26,13 +28,16 @@ class LeaderboardScreen extends StatelessWidget {
           ],
         ),
         centerTitle: true,
-        leading: const CloseButton(),
+        leading: CloseButton(
+          onPressed: () {
+            Get.offAllNamed(RouteConstants.home);
+          },
+        ),
       ),
       body: SingleChildScrollView(
-        child: Container(
+        child: SizedBox(
           height: height * 1.5,
           width: width,
-          color: Colors.blue.shade100,
           child: Center(
             child: StreamBuilder(
               stream: fireStoreRepo.leaderboardStream(),
@@ -57,6 +62,10 @@ class LeaderboardScreen extends StatelessWidget {
                             Icons.emoji_events,
                             size: MediaQuery.of(context).size.width * 0.1,
                           ),
+                          Text(
+                            highestScorer.score.toString(),
+                            style: Theme.of(context).textTheme.headlineMedium,
+                          ),
                           Text(
                             highestScorer.displayName,
                             style: Theme.of(context).textTheme.headlineLarge,
@@ -65,12 +74,10 @@ class LeaderboardScreen extends StatelessWidget {
                             highestScorer.email,
                             style: Theme.of(context).textTheme.bodySmall,
                           ),
-                          Text(
-                            highestScorer.score.toString(),
-                            style: Theme.of(context).textTheme.headlineMedium,
-                          ),
                           const SizedBox(height: 16),
-                          const Divider(),
+                          const Divider(
+                            indent: 10,
+                          ),
                         ],
                         Flexible(child: UserTableWidget(users: users)),
                       ],