mapa de calor ?

lib/controllers/placar_controller.dart

@@ -3,9 +3,17 @@ import 'package:flutter/material.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 class ShotRecord {
-  final Offset position;
+  final double relativeX;
+  final double relativeY;
   final bool isMake;
-  ShotRecord(this.position, this.isMake);
+  final String playerName; // Bónus: Agora guardamos quem foi o jogador!
+
+  ShotRecord({
+    required this.relativeX, 
+    required this.relativeY, 
+    required this.isMake, 
+    required this.playerName
+  });
 }
 
 class PlacarController {
@@ -261,7 +269,7 @@ class PlacarController {
     onUpdate();
   }
 
-  void registerShotLocation(BuildContext context, Offset position, Size size) {
+void registerShotLocation(BuildContext context, Offset position, Size size) {
     if (pendingAction == null || pendingPlayer == null) return;
     bool is3Pt = pendingAction!.contains("_3");
     bool is2Pt = pendingAction!.contains("_2");
@@ -269,13 +277,28 @@ class PlacarController {
     if (is3Pt || is2Pt) {
       bool isValid = _validateShotZone(position, size, is3Pt);
       if (!isValid) {
-        ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('🛑 Local de lançamento incompatível com a pontuação.'), backgroundColor: Colors.red, duration: Duration(seconds: 2)));
+        ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('🛑 Local incompatível com a pontuação.'), backgroundColor: Colors.red, duration: Duration(seconds: 2)));
         return; 
       }
     }
 
     bool isMake = pendingAction!.startsWith("add_pts_");
-    matchShots.add(ShotRecord(position, isMake));
+    
+    // 👇 A MÁGICA DAS COORDENADAS RELATIVAS (0.0 a 1.0) 👇
+    double relX = position.dx / size.width;
+    double relY = position.dy / size.height;
+    
+    // Extrai só o nome do jogador
+    String name = pendingPlayer!.replaceAll("player_my_", "").replaceAll("player_opp_", "");
+
+    // Guarda na lista!
+    matchShots.add(ShotRecord(
+      relativeX: relX, 
+      relativeY: relY, 
+      isMake: isMake, 
+      playerName: name
+    ));
+    
     commitStat(pendingAction!, pendingPlayer!);
     
     isSelectingShotLocation = false;

lib/controllers/team_controller.dart

@@ -1,19 +1,24 @@
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 class TeamController {
-  // Instância do cliente Supabase
   final _supabase = Supabase.instance.client;
 
-  // 1. STREAM (Realtime)
+  // 1. Variável fixa para guardar o Stream principal
-  Stream<List<Map<String, dynamic>>> get teamsStream {
+  late final Stream<List<Map<String, dynamic>>> teamsStream;
-    return _supabase
+
+  // 2. Dicionário (Cache) para não recriar Streams de contagem repetidos
+  final Map<String, Stream<int>> _playerCountStreams = {};
+
+  TeamController() {
+    // INICIALIZAÇÃO: O stream é criado APENAS UMA VEZ quando abres a página!
+    teamsStream = _supabase
         .from('teams')
         .stream(primaryKey: ['id'])
         .order('name', ascending: true)
         .map((data) => List<Map<String, dynamic>>.from(data));
   }
 
-  // 2. CRIAR
+  // CRIAR
   Future<void> createTeam(String name, String season, String? imageUrl) async {
     try {
       await _supabase.from('teams').insert({
@@ -28,35 +33,50 @@ class TeamController {
     }
   }
 
-  // 3. ELIMINAR
+  // ELIMINAR
   Future<void> deleteTeam(String id) async {
     try {
       await _supabase.from('teams').delete().eq('id', id);
+      // Limpa o cache deste teamId se a equipa for apagada
+      _playerCountStreams.remove(id);
     } catch (e) {
       print("❌ Erro ao eliminar: $e");
     }
   }
 
-  // 4. FAVORITAR
+  // FAVORITAR
   Future<void> toggleFavorite(String teamId, bool currentStatus) async {
     try {
       await _supabase
           .from('teams')
-          .update({'is_favorite': !currentStatus}) // Inverte o valor
+          .update({'is_favorite': !currentStatus})
           .eq('id', teamId);
     } catch (e) {
       print("❌ Erro ao favoritar: $e");
     }
   }
 
-  // 5. CONTAR JOGADORES (AGORA EM TEMPO REAL COM STREAM!)
+  // CONTAR JOGADORES (AGORA COM CACHE DE MEMÓRIA!)
   Stream<int> getPlayerCountStream(String teamId) {
-    return _supabase
+    // Se já criámos um "Tubo de ligação" para esta equipa, REUTILIZA-O!
+    if (_playerCountStreams.containsKey(teamId)) {
+      return _playerCountStreams[teamId]!;
+    }
+
+    // Se é a primeira vez que pede esta equipa, cria a ligação e guarda na memória
+    final newStream = _supabase
         .from('members')
         .stream(primaryKey: ['id'])
         .eq('team_id', teamId)
-        .map((data) => data.length); // O tamanho da lista é o número de jogadores
+        .map((data) => data.length);
+        
+    _playerCountStreams[teamId] = newStream; // Guarda no dicionário
+    return newStream;
   }
 
-  void dispose() {}
+  // LIMPEZA FINAL QUANDO SAÍMOS DA PÁGINA
+  void dispose() {
+    // Limpamos o dicionário de streams para libertar memória RAM
+    _playerCountStreams.clear();
+  }
 }

lib/pages/PlacarPage.dart

@@ -1,586 +1,325 @@
-import 'package:flutter/material.dart';
+  import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+  import 'package:flutter/services.dart';
-import 'package:playmaker/controllers/placar_controller.dart';
+  import 'package:playmaker/controllers/placar_controller.dart';
-import '../utils/size_extension.dart'; // 👇 EXTENSÃO IMPORTADA
+import 'package:playmaker/utils/size_extension.dart';
+  import 'package:playmaker/widgets/placar_widgets.dart';
+  import 'dart:math' as math;
 
-class PlacarPage extends StatefulWidget {
+  class PlacarPage extends StatefulWidget {
-  final String gameId, myTeam, opponentTeam;
+    final String gameId, myTeam, opponentTeam;
-  const PlacarPage({super.key, required this.gameId, required this.myTeam, required this.opponentTeam});
+    const PlacarPage({super.key, required this.gameId, required this.myTeam, required this.opponentTeam});
 
-  @override
+    @override
-  State<PlacarPage> createState() => _PlacarPageState();
+    State<PlacarPage> createState() => _PlacarPageState();
-}
-
-class _PlacarPageState extends State<PlacarPage> {
-  late PlacarController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    SystemChrome.setPreferredOrientations([
-      DeviceOrientation.landscapeRight,
-      DeviceOrientation.landscapeLeft,
-    ]);
-    
-    _controller = PlacarController(
-      gameId: widget.gameId,
-      myTeam: widget.myTeam, 
-      opponentTeam: widget.opponentTeam,
-      onUpdate: () {
-        if (mounted) setState(() {});
-      }
-    );
-    _controller.loadPlayers();
   }
 
-  @override
+  class _PlacarPageState extends State<PlacarPage> {
-  void dispose() {
+    late PlacarController _controller;
-    _controller.dispose();
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    super.dispose();
-  }
 
-  // --- BOTÕES FLUTUANTES DE FALTA ---
+    @override
-  Widget _buildFloatingFoulBtn(String label, Color color, String action, IconData icon, double left, double right, double top) {
+    void initState() {
-    return Positioned(
+      super.initState();
-      top: top, left: left > 0 ? left : null, right: right > 0 ? right : null,
+      SystemChrome.setPreferredOrientations([
-      child: Draggable<String>(
+        DeviceOrientation.landscapeRight,
-        data: action,
+        DeviceOrientation.landscapeLeft,
-        feedback: Material(
+      ]);
-          color: Colors.transparent,
+      
-          child: CircleAvatar(radius: 30 * context.sf, backgroundColor: color.withOpacity(0.8), child: Icon(icon, color: Colors.white, size: 30 * context.sf)),
+      _controller = PlacarController(
-        ),
+        gameId: widget.gameId,
-        child: Column(
+        myTeam: widget.myTeam, 
-          children: [
+        opponentTeam: widget.opponentTeam,
-            CircleAvatar(radius: 27 * context.sf, backgroundColor: color, child: Icon(icon, color: Colors.white, size: 28 * context.sf)),
+        onUpdate: () {
-            SizedBox(height: 5 * context.sf), 
+          if (mounted) setState(() {});
-            Text(label, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 12 * context.sf)), 
+        }
-          ],
+      );
-        ),
+      _controller.loadPlayers();
-      ),
+    }
-    );
-  }
 
-  // --- BOTÕES LATERAIS QUADRADOS ---
+    @override
-  Widget _buildCornerBtn({required String heroTag, required IconData icon, required Color color, required VoidCallback onTap, required double size, bool isLoading = false}) {
+    void dispose() {
-    return SizedBox(
+      _controller.dispose();
-      width: size, height: size,
+      SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-      child: FloatingActionButton(
+      super.dispose();
-        heroTag: heroTag, backgroundColor: color,
+    }
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * (size / 50))), 
-        elevation: 5, onPressed: isLoading ? null : onTap,
-        child: isLoading 
-            ? SizedBox(width: size*0.45, height: size*0.45, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2.5)) 
-            : Icon(icon, color: Colors.white, size: size * 0.55), 
-      ),
-    );
-  }
 
-  @override
+    // --- BOTÕES FLUTUANTES DE FALTA ---
-  Widget build(BuildContext context) {
+    Widget _buildFloatingFoulBtn(String label, Color color, String action, IconData icon, double left, double right, double top, double sf) {
-    final double wScreen = MediaQuery.of(context).size.width;
+      return Positioned(
-    final double hScreen = MediaQuery.of(context).size.height;
+        top: top,
-    
+        left: left > 0 ? left : null,
-    final double cornerBtnSize = 48 * context.sf; 
+        right: right > 0 ? right : null,
-
+        child: Draggable<String>(
-    if (_controller.isLoading) {
+          data: action,
-      return Scaffold(
+          feedback: Material(
-        backgroundColor: const Color(0xFF16202C),
+            color: Colors.transparent,
-        body: Center(
+            child: CircleAvatar(
+              radius: 30 * sf, 
+              backgroundColor: color.withOpacity(0.8), 
+              child: Icon(icon, color: Colors.white, size: 30 * sf) 
+            ),
+          ),
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Text("PREPARANDO O PAVILHÃO", style: TextStyle(color: Colors.white24, fontSize: 45 * context.sf, fontWeight: FontWeight.bold, letterSpacing: 2)), 
+              CircleAvatar(
-              SizedBox(height: 35 * context.sf), 
+                radius: 27 * sf, 
-              StreamBuilder(
+                backgroundColor: color,
-                stream: Stream.periodic(const Duration(seconds: 3)),
+                child: Icon(icon, color: Colors.white, size: 28 * sf), 
-                builder: (context, snapshot) {
-                  List<String> frases = [
-                    "O Treinador está a desenhar a tática...", "A encher as bolas com ar de campeão...",
-                    "O árbitro está a testar o apito...", "A verificar se o cesto está nivelado...",
-                    "Os jogadores estão a terminar o aquecimento..."
-                  ];
-                  String frase = frases[DateTime.now().second % frases.length];
-                  return Text(frase, style: TextStyle(color: Colors.orange.withOpacity(0.7), fontSize: 26 * context.sf, fontStyle: FontStyle.italic)); 
-                },
               ),
+              SizedBox(height: 5 * sf), 
+              Text(label, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 12 * sf)), 
             ],
           ),
         ),
       );
     }
 
-    return Scaffold(
+    // --- BOTÕES LATERAIS QUADRADOS ---
-      backgroundColor: const Color(0xFF266174),
+    Widget _buildCornerBtn({required String heroTag, required IconData icon, required Color color, required VoidCallback onTap, required double size, bool isLoading = false}) {
-      body: SafeArea(
+      return SizedBox(
-        top: false, bottom: false, 
+        width: size, 
-        child: Stack(
+        height: size,
-          children: [
+        child: FloatingActionButton(
-            // --- O CAMPO ---
+          heroTag: heroTag, 
-            Container(
+          backgroundColor: color,
-              margin: EdgeInsets.only(left: 65 * context.sf, right: 65 * context.sf, bottom: 55 * context.sf), 
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * (size / 50))), 
-              decoration: BoxDecoration(border: Border.all(color: Colors.white, width: 2.5)), 
+          elevation: 5, 
-              child: LayoutBuilder(
+          onPressed: isLoading ? null : onTap,
-                builder: (context, constraints) {
+          child: isLoading 
-                  final w = constraints.maxWidth;
+              ? SizedBox(width: size*0.45, height: size*0.45, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2.5)) 
-                  final h = constraints.maxHeight;
+              : Icon(icon, color: Colors.white, size: size * 0.55), 
+        ),
+      );
+    }
 
-                  return Stack(
+    @override
-                    children: [
+    Widget build(BuildContext context) {
-                      GestureDetector(
+      final double wScreen = MediaQuery.of(context).size.width;
-                        onTapDown: (details) {
+      final double hScreen = MediaQuery.of(context).size.height;
-                          if (_controller.isSelectingShotLocation) {
+      
-                            _controller.registerShotLocation(context, details.localPosition, Size(w, h));
+      // 👇 CÁLCULO MANUAL DO SF 👇
-                          }
+      final double sf = math.min(wScreen / 1150, hScreen / 720); 
-                        },
+
-                        child: Container(
+      final double cornerBtnSize = 48 * sf; // Tamanho ideal (Nem 38 nem 55)
-                          decoration: const BoxDecoration(
+
-                            image: DecorationImage(image: AssetImage('assets/campo.png'), fit: BoxFit.fill),
+      if (_controller.isLoading) {
-                          ),
+        return Scaffold(
-                          child: Stack(
+          backgroundColor: const Color(0xFF16202C),
+          body: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Text("PREPARANDO O PAVILHÃO", style: TextStyle(color: Colors.white24, fontSize: 45 * sf, fontWeight: FontWeight.bold, letterSpacing: 2)), 
+                SizedBox(height: 35 * sf), 
+                StreamBuilder(
+                  stream: Stream.periodic(const Duration(seconds: 3)),
+                  builder: (context, snapshot) {
+                    List<String> frases = [
+                      "O Treinador está a desenhar a tática...",
+                      "A encher as bolas com ar de campeão...",
+                      "O árbitro está a testar o apito...",
+                      "A verificar se o cesto está nivelado...",
+                      "Os jogadores estão a terminar o aquecimento..."
+                    ];
+                    String frase = frases[DateTime.now().second % frases.length];
+                    return Text(frase, style: TextStyle(color: Colors.orange.withOpacity(0.7), fontSize: 26 * sf, fontStyle: FontStyle.italic)); 
+                  },
+                ),
+              ],
+            ),
+          ),
+        );
+      }
+
+      return Scaffold(
+        backgroundColor: const Color(0xFF266174),
+        body: SafeArea(
+          top: false,    
+          bottom: false, 
+          // 👇 A MÁGICA DO IGNORE POINTER COMEÇA AQUI 👇
+          child: IgnorePointer(
+            ignoring: _controller.isSaving, // Se estiver a gravar, ignora os toques!
+            child: Stack(
+              children: [
+                // --- O CAMPO ---
+                Container(
+                  margin: EdgeInsets.only(left: 65 * sf, right: 65 * sf, bottom: 55 * sf), 
+                  decoration: BoxDecoration(border: Border.all(color: Colors.white, width: 2.5)), 
+                  child: LayoutBuilder(
+                    builder: (context, constraints) {
+                      final w = constraints.maxWidth;
+                      final h = constraints.maxHeight;
+
+                      return Stack(
+                        children: [
+                          GestureDetector(
+                            onTapDown: (details) {
+                              if (_controller.isSelectingShotLocation) {
+                                _controller.registerShotLocation(context, details.localPosition, Size(w, h));
+                              }
+                            },
+                            child: Container(
+                              decoration: const BoxDecoration(
+                                image: DecorationImage(
+                                  image: AssetImage('assets/campo.png'), 
+                                  fit: BoxFit.fill, 
+                                ),                          
+                              ),
+child: Stack(
                             children: _controller.matchShots.map((shot) => Positioned(
-                              left: shot.position.dx - (9 * context.sf), top: shot.position.dy - (9 * context.sf), 
+                              // Agora usamos relativeX e relativeY multiplicados pela largura(w) e altura(h)
-                              child: CircleAvatar(radius: 9 * context.sf, backgroundColor: shot.isMake ? Colors.green : Colors.red, child: Icon(shot.isMake ? Icons.check : Icons.close, size: 11 * context.sf, color: Colors.white)), 
+                              left: (shot.relativeX * w) - (9 * context.sf), 
+                              top: (shot.relativeY * h) - (9 * context.sf), 
+                              child: CircleAvatar(
+                                radius: 9 * context.sf, 
+                                backgroundColor: shot.isMake ? Colors.green : Colors.red, 
+                                child: Icon(shot.isMake ? Icons.check : Icons.close, size: 11 * context.sf, color: Colors.white)
+                              ), 
                             )).toList(),
                           ),
-                        ),
-                      ),
-
-                      // --- JOGADORES ---
-                      if (!_controller.isSelectingShotLocation) ...[
-                        Positioned(top: h * 0.25, left: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[0], isOpponent: false)),
-                        Positioned(top: h * 0.68, left: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[1], isOpponent: false)),
-                        Positioned(top: h * 0.45, left: w * 0.25, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[2], isOpponent: false)),
-                        Positioned(top: h * 0.15, left: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[3], isOpponent: false)),
-                        Positioned(top: h * 0.80, left: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[4], isOpponent: false)),
-                        
-                        Positioned(top: h * 0.25, right: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[0], isOpponent: true)), 
-                        Positioned(top: h * 0.68, right: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[1], isOpponent: true)), 
-                        Positioned(top: h * 0.45, right: w * 0.25, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[2], isOpponent: true)), 
-                        Positioned(top: h * 0.15, right: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[3], isOpponent: true)), 
-                        Positioned(top: h * 0.80, right: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[4], isOpponent: true)), 
-                      ],
-
-                      // --- BOTÕES DE FALTAS ---
-                      if (!_controller.isSelectingShotLocation) ...[
-                        _buildFloatingFoulBtn("FALTA +", Colors.orange, "add_foul", Icons.sports, w * 0.39, 0.0, h * 0.31),
-                        _buildFloatingFoulBtn("FALTA -", Colors.redAccent, "sub_foul", Icons.block, 0.0, w * 0.39, h * 0.31),
-                      ],
-
-                      // --- BOTÃO PLAY/PAUSE ---
-                      if (!_controller.isSelectingShotLocation)
-                        Positioned(
-                          top: (h * 0.32) + (40 * context.sf), 
-                          left: 0, right: 0, 
-                          child: Center(
-                            child: GestureDetector(
-                              onTap: () => _controller.toggleTimer(context),
-                              child: CircleAvatar(
-                                radius: 68 * context.sf, 
-                                backgroundColor: Colors.grey.withOpacity(0.5), 
-                                child: Icon(_controller.isRunning ? Icons.pause : Icons.play_arrow, color: Colors.white, size: 58 * context.sf)
-                              ), 
                             ),
                           ),
-                        ),
 
-                      // --- PLACAR NO TOPO ---
+                          // --- JOGADORES ---
-                      Positioned(top: 0, left: 0, right: 0, child: Center(child: TopScoreboard(controller: _controller))),
+                          if (!_controller.isSelectingShotLocation) ...[
-                      
+                            Positioned(top: h * 0.25, left: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[0], isOpponent: false, sf: sf)),
-                      // --- BOTÕES DE AÇÃO ---
+                            Positioned(top: h * 0.68, left: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[1], isOpponent: false, sf: sf)),
-                      if (!_controller.isSelectingShotLocation) Positioned(bottom: -10 * context.sf, left: 0, right: 0, child: ActionButtonsPanel(controller: _controller)),
+                            Positioned(top: h * 0.45, left: w * 0.25, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[2], isOpponent: false, sf: sf)),
+                            Positioned(top: h * 0.15, left: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[3], isOpponent: false, sf: sf)),
+                            Positioned(top: h * 0.80, left: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.myCourt[4], isOpponent: false, sf: sf)),
+                            
+                            Positioned(top: h * 0.25, right: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[0], isOpponent: true, sf: sf)), 
+                            Positioned(top: h * 0.68, right: w * 0.02, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[1], isOpponent: true, sf: sf)), 
+                            Positioned(top: h * 0.45, right: w * 0.25, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[2], isOpponent: true, sf: sf)), 
+                            Positioned(top: h * 0.15, right: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[3], isOpponent: true, sf: sf)), 
+                            Positioned(top: h * 0.80, right: w * 0.20, child: PlayerCourtCard(controller: _controller, name: _controller.oppCourt[4], isOpponent: true, sf: sf)), 
+                          ],
 
-                      // --- OVERLAY LANÇAMENTO ---
+                          // --- BOTÕES DE FALTAS ---
-                      if (_controller.isSelectingShotLocation)
+                          if (!_controller.isSelectingShotLocation) ...[
-                        Positioned(
+                            _buildFloatingFoulBtn("FALTA +", Colors.orange, "add_foul", Icons.sports, w * 0.39, 0.0, h * 0.31, sf),
-                          top: h * 0.4, left: 0, right: 0,
+                            _buildFloatingFoulBtn("FALTA -", Colors.redAccent, "sub_foul", Icons.block, 0.0, w * 0.39, h * 0.31, sf),
-                          child: Center(
+                          ],
-                            child: Container(
+
-                              padding: EdgeInsets.symmetric(horizontal: 35 * context.sf, vertical: 18 * context.sf), 
+                          // --- BOTÃO PLAY/PAUSE ---
-                              decoration: BoxDecoration(color: Colors.black87, borderRadius: BorderRadius.circular(11 * context.sf), border: Border.all(color: Colors.white, width: 1.5 * context.sf)), 
+                        if (!_controller.isSelectingShotLocation)
-                              child: Text("TOQUE NO CAMPO PARA MARCAR O LOCAL DO LANÇAMENTO", style: TextStyle(color: Colors.white, fontSize: 27 * context.sf, fontWeight: FontWeight.bold)), 
+                            Positioned(
+                              top: (h * 0.32) + (40 * sf), 
+                              left: 0, right: 0, 
+                              child: Center(
+                                child: GestureDetector(
+                                  onTap: () => _controller.toggleTimer(context),
+                                  child: CircleAvatar(
+                                    radius: 68 * sf, 
+                                    backgroundColor: Colors.grey.withOpacity(0.5), 
+                                    child: Icon(_controller.isRunning ? Icons.pause : Icons.play_arrow, color: Colors.white, size: 58 * sf)
+                                  ), 
+                                ),
+                              ),
                             ),
-                          ),
+                          // --- PLACAR NO TOPO ---
-                        ),
+                          Positioned(top: 0, left: 0, right: 0, child: Center(child: TopScoreboard(controller: _controller, sf: sf))),
-                    ],
+                          
-                  );
+                          // --- BOTÕES DE AÇÃO ---
-                },
+                          if (!_controller.isSelectingShotLocation) Positioned(bottom: -10 * sf, left: 0, right: 0, child: ActionButtonsPanel(controller: _controller, sf: sf)),
-              ),
-            ),
 
-            // --- BOTÕES LATERAIS ---
+                          // --- OVERLAY LANÇAMENTO ---
-            Positioned(
+                          if (_controller.isSelectingShotLocation)
-              top: 50 * context.sf, left: 12 * context.sf, 
+                            Positioned(
-              child: _buildCornerBtn(
+                              top: h * 0.4, left: 0, right: 0,
-                heroTag: 'btn_save_exit', icon: Icons.save_alt, color: const Color(0xFFD92C2C), size: cornerBtnSize, isLoading: _controller.isSaving, 
+                              child: Center(
-                onTap: () async {
+                                child: Container(
-                  await _controller.saveGameStats(context);
+                                  padding: EdgeInsets.symmetric(horizontal: 35 * sf, vertical: 18 * sf), 
-                  if (context.mounted) Navigator.pop(context);
+                                  decoration: BoxDecoration(color: Colors.black87, borderRadius: BorderRadius.circular(11 * sf), border: Border.all(color: Colors.white, width: 1.5 * sf)), 
-                }
+                                  child: Text("TOQUE NO CAMPO PARA MARCAR O LOCAL DO LANÇAMENTO", style: TextStyle(color: Colors.white, fontSize: 27 * sf, fontWeight: FontWeight.bold)), 
-              ),
+                                ),
-            ),
+                              ),
-
+                            ),
-            // Base Esquerda: Banco Casa + TIMEOUT DA CASA
+                        ],
-            Positioned(
+                      );
-              bottom: 55 * context.sf, left: 12 * context.sf, 
+                    },
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  if (_controller.showMyBench) BenchPlayersList(controller: _controller, isOpponent: false),
-                  SizedBox(height: 12 * context.sf), 
-                  _buildCornerBtn(heroTag: 'btn_sub_home', icon: Icons.swap_horiz, color: const Color(0xFF1E5BB2), size: cornerBtnSize, onTap: () { _controller.showMyBench = !_controller.showMyBench; _controller.onUpdate(); }),
-                  SizedBox(height: 12 * context.sf), 
-                  _buildCornerBtn(
-                    heroTag: 'btn_to_home', icon: Icons.timer, color: _controller.myTimeoutsUsed >= 3 ? Colors.grey : const Color(0xFF1E5BB2), size: cornerBtnSize, 
-                    onTap: _controller.myTimeoutsUsed >= 3 ? () => ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('🛑 A equipa da casa já usou os 3 Timeouts deste período!'), backgroundColor: Colors.red)) : () => _controller.useTimeout(false)
                   ),
-                ],
-              ),
-            ),
-
-            // Base Direita: Banco Visitante + TIMEOUT DO VISITANTE
-            Positioned(
-              bottom: 55 * context.sf, right: 12 * context.sf, 
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  if (_controller.showOppBench) BenchPlayersList(controller: _controller, isOpponent: true),
-                  SizedBox(height: 12 * context.sf), 
-                  _buildCornerBtn(heroTag: 'btn_sub_away', icon: Icons.swap_horiz, color: const Color(0xFFD92C2C), size: cornerBtnSize, onTap: () { _controller.showOppBench = !_controller.showOppBench; _controller.onUpdate(); }),
-                  SizedBox(height: 12 * context.sf), 
-                  _buildCornerBtn(
-                    heroTag: 'btn_to_away', icon: Icons.timer, color: _controller.opponentTimeoutsUsed >= 3 ? Colors.grey : const Color(0xFFD92C2C), size: cornerBtnSize, 
-                    onTap: _controller.opponentTimeoutsUsed >= 3 ? () => ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('🛑 A equipa visitante já usou os 3 Timeouts deste período!'), backgroundColor: Colors.red)) : () => _controller.useTimeout(true)
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-// ==========================================
-// WIDGETS DO PLACAR (Sem receber o `sf`)
-// ==========================================
-
-class TopScoreboard extends StatelessWidget {
-  final PlacarController controller;
-  const TopScoreboard({super.key, required this.controller});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: EdgeInsets.symmetric(vertical: 10 * context.sf, horizontal: 35 * context.sf),
-      decoration: BoxDecoration(
-        color: const Color(0xFF16202C), 
-        borderRadius: BorderRadius.only(bottomLeft: Radius.circular(22 * context.sf), bottomRight: Radius.circular(22 * context.sf)), 
-        border: Border.all(color: Colors.white, width: 2.5 * context.sf), 
-      ),
-      child: Row(
-        mainAxisSize: MainAxisSize.min, 
-        children: [
-          _buildTeamSection(context, controller.myTeam, controller.myScore, controller.myFouls, controller.myTimeoutsUsed, const Color(0xFF1E5BB2), false),
-          SizedBox(width: 30 * context.sf),
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Container(
-                padding: EdgeInsets.symmetric(horizontal: 18 * context.sf, vertical: 5 * context.sf),
-                decoration: BoxDecoration(color: const Color(0xFF2C3E50), borderRadius: BorderRadius.circular(9 * context.sf)),
-                child: Text(controller.formatTime(), style: TextStyle(color: Colors.white, fontSize: 28 * context.sf, fontWeight: FontWeight.w900, fontFamily: 'monospace', letterSpacing: 2 * context.sf)),
-              ),
-              SizedBox(height: 5 * context.sf),
-              Text("PERÍODO ${controller.currentQuarter}", style: TextStyle(color: Colors.orangeAccent, fontSize: 14 * context.sf, fontWeight: FontWeight.w900)),
-            ],
-          ),
-          SizedBox(width: 30 * context.sf),
-          _buildTeamSection(context, controller.opponentTeam, controller.opponentScore, controller.opponentFouls, controller.opponentTimeoutsUsed, const Color(0xFFD92C2C), true),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildTeamSection(BuildContext context, String name, int score, int fouls, int timeouts, Color color, bool isOpp) {
-    int displayFouls = fouls > 5 ? 5 : fouls;
-    final timeoutIndicators = Row(
-      mainAxisSize: MainAxisSize.min,
-      children: List.generate(3, (index) => Container(
-        margin: EdgeInsets.symmetric(horizontal: 3.5 * context.sf),
-        width: 12 * context.sf, height: 12 * context.sf,
-        decoration: BoxDecoration(shape: BoxShape.circle, color: index < timeouts ? Colors.yellow : Colors.grey.shade600, border: Border.all(color: Colors.white54, width: 1.5 * context.sf)),
-      )),
-    );
-    
-    List<Widget> content = [
-      Column(children: [_scoreBox(context, score, color), SizedBox(height: 7 * context.sf), timeoutIndicators]),
-      SizedBox(width: 18 * context.sf),
-      Column(
-        crossAxisAlignment: isOpp ? CrossAxisAlignment.start : CrossAxisAlignment.end,
-        children: [
-          Text(name.toUpperCase(), style: TextStyle(color: Colors.white, fontSize: 20 * context.sf, fontWeight: FontWeight.w900, letterSpacing: 1.2 * context.sf)),
-          SizedBox(height: 5 * context.sf),
-          Text("FALTAS: $displayFouls", style: TextStyle(color: displayFouls >= 5 ? Colors.redAccent : Colors.yellowAccent, fontSize: 13 * context.sf, fontWeight: FontWeight.bold)),
-        ],
-      )
-    ];
-
-    return Row(crossAxisAlignment: CrossAxisAlignment.center, children: isOpp ? content : content.reversed.toList());
-  }
-
-  Widget _scoreBox(BuildContext context, int score, Color color) => Container(
-    width: 58 * context.sf, height: 45 * context.sf, alignment: Alignment.center,
-    decoration: BoxDecoration(color: color, borderRadius: BorderRadius.circular(7 * context.sf)),
-    child: Text(score.toString(), style: TextStyle(color: Colors.white, fontSize: 26 * context.sf, fontWeight: FontWeight.w900)),
-  );
-}
-
-class BenchPlayersList extends StatelessWidget {
-  final PlacarController controller;
-  final bool isOpponent;
-  const BenchPlayersList({super.key, required this.controller, required this.isOpponent});
-
-  @override
-  Widget build(BuildContext context) {
-    final bench = isOpponent ? controller.oppBench : controller.myBench;
-    final teamColor = isOpponent ? const Color(0xFFD92C2C) : const Color(0xFF1E5BB2);
-    final prefix = isOpponent ? "bench_opp_" : "bench_my_";
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: bench.map((playerName) {
-        final num = controller.playerNumbers[playerName] ?? "0";
-        final int fouls = controller.playerStats[playerName]?["fls"] ?? 0;
-        final bool isFouledOut = fouls >= 5; 
-
-        Widget avatarUI = Container(
-          margin: EdgeInsets.only(bottom: 7 * context.sf),
-          decoration: BoxDecoration(shape: BoxShape.circle, border: Border.all(color: Colors.white, width: 1.8 * context.sf), boxShadow: [BoxShadow(color: Colors.black45, blurRadius: 5 * context.sf, offset: Offset(0, 2.5 * context.sf))]),
-          child: CircleAvatar(
-            radius: 22 * context.sf, backgroundColor: isFouledOut ? Colors.grey.shade800 : teamColor, 
-            child: Text(num, style: TextStyle(color: isFouledOut ? Colors.red.shade300 : Colors.white, fontSize: 16 * context.sf, fontWeight: FontWeight.bold, decoration: isFouledOut ? TextDecoration.lineThrough : TextDecoration.none)),
-          ),
-        );
-
-        if (isFouledOut) {
-          return GestureDetector(onTap: () => ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('🛑 $playerName não pode voltar (Expulso).'), backgroundColor: Colors.red)), child: avatarUI);
-        }
-
-        return Draggable<String>(
-          data: "$prefix$playerName", 
-          feedback: Material(color: Colors.transparent, child: CircleAvatar(radius: 28 * context.sf, backgroundColor: teamColor, child: Text(num, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 18 * context.sf)))),
-          childWhenDragging: Opacity(opacity: 0.5, child: SizedBox(width: 45 * context.sf, height: 45 * context.sf)),
-          child: avatarUI,
-        );
-      }).toList(),
-    );
-  }
-}
-
-class PlayerCourtCard extends StatelessWidget {
-  final PlacarController controller;
-  final String name;
-  final bool isOpponent;
-  const PlayerCourtCard({super.key, required this.controller, required this.name, required this.isOpponent});
-
-  @override
-  Widget build(BuildContext context) {
-    final teamColor = isOpponent ? const Color(0xFFD92C2C) : const Color(0xFF1E5BB2);
-    final stats = controller.playerStats[name]!;
-    final number = controller.playerNumbers[name]!;
-    final prefix = isOpponent ? "player_opp_" : "player_my_";
-
-    return Draggable<String>(
-      data: "$prefix$name", 
-      feedback: Material(
-        color: Colors.transparent,
-        child: Container(
-          padding: EdgeInsets.symmetric(horizontal: 18 * context.sf, vertical: 11 * context.sf),
-          decoration: BoxDecoration(color: teamColor.withOpacity(0.9), borderRadius: BorderRadius.circular(9 * context.sf)),
-          child: Text(name, style: TextStyle(color: Colors.white, fontSize: 20 * context.sf, fontWeight: FontWeight.bold)),
-        ),
-      ),
-      childWhenDragging: Opacity(opacity: 0.5, child: _playerCardUI(context, number, name, stats, teamColor, false, false)),
-      child: DragTarget<String>(
-        onAcceptWithDetails: (details) {
-          final action = details.data; 
-          if (action.startsWith("add_") || action.startsWith("sub_") || action.startsWith("miss_")) controller.handleActionDrag(context, action, "$prefix$name"); 
-          else if (action.startsWith("bench_")) controller.handleSubbing(context, action, name, isOpponent);
-        },
-        builder: (context, candidateData, rejectedData) {
-          bool isSubbing = candidateData.any((data) => data != null && (data.startsWith("bench_my_") || data.startsWith("bench_opp_")));
-          bool isActionHover = candidateData.any((data) => data != null && (data.startsWith("add_") || data.startsWith("sub_") || data.startsWith("miss_")));
-          return _playerCardUI(context, number, name, stats, teamColor, isSubbing, isActionHover);
-        },
-      ),
-    );
-  }
-
-  Widget _playerCardUI(BuildContext context, String number, String name, Map<String, int> stats, Color teamColor, bool isSubbing, bool isActionHover) {
-    bool isFouledOut = stats["fls"]! >= 5; 
-    Color bgColor = isFouledOut ? Colors.red.shade50 : Colors.white;
-    Color borderColor = isFouledOut ? Colors.redAccent : Colors.transparent;
-    
-    if (isSubbing) { bgColor = Colors.blue.shade50; borderColor = Colors.blue; } 
-    else if (isActionHover && !isFouledOut) { bgColor = Colors.orange.shade50; borderColor = Colors.orange; }
-
-    int fgm = stats["fgm"]!; int fga = stats["fga"]!;
-    String fgPercent = fga > 0 ? ((fgm / fga) * 100).toStringAsFixed(0) : "0";
-    String displayName = name.length > 12 ? "${name.substring(0, 10)}..." : name;
-
-    return Container(
-      decoration: BoxDecoration(
-        color: bgColor, borderRadius: BorderRadius.circular(11 * context.sf),
-        border: Border.all(color: borderColor, width: 1.8 * context.sf),
-        boxShadow: [BoxShadow(color: Colors.black26, blurRadius: 5 * context.sf, offset: Offset(2 * context.sf, 3.5 * context.sf))],
-      ),
-      child: ClipRRect(
-        borderRadius: BorderRadius.circular(9 * context.sf),
-        child: IntrinsicHeight( 
-          child: Row(
-            mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, 
-            children: [
-              Container(
-                padding: EdgeInsets.symmetric(horizontal: 16 * context.sf), color: isFouledOut ? Colors.grey[700] : teamColor,
-                alignment: Alignment.center, child: Text(number, style: TextStyle(color: Colors.white, fontSize: 22 * context.sf, fontWeight: FontWeight.bold)),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12 * context.sf, vertical: 7 * context.sf),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(displayName, style: TextStyle(fontSize: 16 * context.sf, fontWeight: FontWeight.bold, color: isFouledOut ? Colors.red : Colors.black87, decoration: isFouledOut ? TextDecoration.lineThrough : TextDecoration.none)),
-                    SizedBox(height: 2.5 * context.sf),
-                    Text("${stats["pts"]} Pts | FG: $fgm/$fga ($fgPercent%)", style: TextStyle(fontSize: 12 * context.sf, color: isFouledOut ? Colors.red : Colors.grey[700], fontWeight: FontWeight.w600)),
-                    Text("${stats["ast"]} Ast | ${stats["orb"]! + stats["drb"]!} Rbs | ${stats["fls"]} Fls", style: TextStyle(fontSize: 12 * context.sf, color: isFouledOut ? Colors.red : Colors.grey[500], fontWeight: FontWeight.w600)),
-                  ],
                 ),
-              ),
+
-            ],
+                // --- BOTÕES LATERAIS ---
+                // Topo Esquerdo: Guardar e Sair (Botão Único)
+                Positioned(
+                  top: 50 * sf, left: 12 * sf, 
+                  child: _buildCornerBtn(
+                    heroTag: 'btn_save_exit', 
+                    icon: Icons.save_alt, 
+                    color: const Color(0xFFD92C2C), 
+                    size: cornerBtnSize, 
+                    isLoading: _controller.isSaving, 
+                    onTap: () async {
+                      // 1. Primeiro obriga a guardar os dados na BD
+                      await _controller.saveGameStats(context);
+                      
+                      // 2. Só depois de acabar de guardar é que volta para trás
+                      if (context.mounted) {
+                        Navigator.pop(context);
+                      }
+                    }
+                  ),
+                ),
+
+                // Base Esquerda: Banco Casa + TIMEOUT DA CASA
+                Positioned(
+                  bottom: 55 * sf, left: 12 * sf, 
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      if (_controller.showMyBench) BenchPlayersList(controller: _controller, isOpponent: false, sf: sf),
+                      SizedBox(height: 12 * sf), 
+                      _buildCornerBtn(heroTag: 'btn_sub_home', icon: Icons.swap_horiz, color: const Color(0xFF1E5BB2), size: cornerBtnSize, onTap: () { _controller.showMyBench = !_controller.showMyBench; _controller.onUpdate(); }),
+                      SizedBox(height: 12 * sf), 
+                      _buildCornerBtn(
+                        heroTag: 'btn_to_home', 
+                        icon: Icons.timer, 
+                        color: _controller.myTimeoutsUsed >= 3 ? Colors.grey : const Color(0xFF1E5BB2), 
+                        size: cornerBtnSize, 
+                        onTap: _controller.myTimeoutsUsed >= 3 
+                          ? () => ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('🛑 A equipa da casa já usou os 3 Timeouts deste período!'), backgroundColor: Colors.red))
+                          : () => _controller.useTimeout(false)
+                      ),
+                    ],
+                  ),
+                ),
+
+                // Base Direita: Banco Visitante + TIMEOUT DO VISITANTE
+                Positioned(
+                  bottom: 55 * sf, right: 12 * sf, 
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      if (_controller.showOppBench) BenchPlayersList(controller: _controller, isOpponent: true, sf: sf),
+                      SizedBox(height: 12 * sf), 
+                      _buildCornerBtn(heroTag: 'btn_sub_away', icon: Icons.swap_horiz, color: const Color(0xFFD92C2C), size: cornerBtnSize, onTap: () { _controller.showOppBench = !_controller.showOppBench; _controller.onUpdate(); }),
+                      SizedBox(height: 12 * sf), 
+                      _buildCornerBtn(
+                        heroTag: 'btn_to_away', 
+                        icon: Icons.timer, 
+                        color: _controller.opponentTimeoutsUsed >= 3 ? Colors.grey : const Color(0xFFD92C2C), 
+                        size: cornerBtnSize, 
+                        onTap: _controller.opponentTimeoutsUsed >= 3 
+                          ? () => ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('🛑 A equipa visitante já usou os 3 Timeouts deste período!'), backgroundColor: Colors.red))
+                          : () => _controller.useTimeout(true)
+                      ),
+                    ],
+                  ),
+                ),
+
+                // 👇 EFEITO VISUAL (Ecrã escurece para mostrar que está a carregar) 👇
+                if (_controller.isSaving)
+                  Positioned.fill(
+                    child: Container(
+                      color: Colors.black.withOpacity(0.4), 
+                    ),
+                  ),
+
+              ],
+            ),
           ),
         ),
-      ),
-    );
-  }
-}
-
-class ActionButtonsPanel extends StatelessWidget {
-  final PlacarController controller;
-  const ActionButtonsPanel({super.key, required this.controller});
-
-  @override
-  Widget build(BuildContext context) {
-    final double baseSize = 65 * context.sf; 
-    final double feedSize = 82 * context.sf; 
-    final double gap = 7 * context.sf; 
-
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.end,
-      children: [
-        _columnBtn([
-          _dragAndTargetBtn(context, "M1", Colors.redAccent, "miss_1", baseSize, feedSize),
-          _dragAndTargetBtn(context, "1", Colors.orange, "add_pts_1", baseSize, feedSize),
-          _dragAndTargetBtn(context, "1", Colors.orange, "sub_pts_1", baseSize, feedSize, isX: true),
-          _dragAndTargetBtn(context, "STL", Colors.green, "add_stl", baseSize, feedSize),
-        ], gap),
-        SizedBox(width: gap * 1),
-        _columnBtn([
-          _dragAndTargetBtn(context, "M2", Colors.redAccent, "miss_2", baseSize, feedSize),            
-          _dragAndTargetBtn(context, "2", Colors.orange, "add_pts_2", baseSize, feedSize),             
-          _dragAndTargetBtn(context, "2", Colors.orange, "sub_pts_2", baseSize, feedSize, isX: true),  
-          _dragAndTargetBtn(context, "AST", Colors.blueGrey, "add_ast", baseSize, feedSize),
-        ], gap),
-        SizedBox(width: gap * 1),
-        _columnBtn([
-          _dragAndTargetBtn(context, "M3", Colors.redAccent, "miss_3", baseSize, feedSize),            
-          _dragAndTargetBtn(context, "3", Colors.orange, "add_pts_3", baseSize, feedSize),             
-          _dragAndTargetBtn(context, "3", Colors.orange, "sub_pts_3", baseSize, feedSize, isX: true),  
-          _dragAndTargetBtn(context, "TOV", Colors.redAccent, "add_tov", baseSize, feedSize),
-        ], gap),
-        SizedBox(width: gap * 1),
-        _columnBtn([
-          _dragAndTargetBtn(context, "ORB", const Color(0xFF1E2A38), "add_orb", baseSize, feedSize, icon: Icons.sports_basketball),
-          _dragAndTargetBtn(context, "DRB", const Color(0xFF1E2A38), "add_drb", baseSize, feedSize, icon: Icons.sports_basketball),
-          _dragAndTargetBtn(context, "BLK", Colors.deepPurple, "add_blk", baseSize, feedSize, icon: Icons.front_hand),
-        ], gap),
-      ],
-    );
-  }
-
-  Widget _columnBtn(List<Widget> children, double gap) {
-    return Column(mainAxisSize: MainAxisSize.min, children: children.map((c) => Padding(padding: EdgeInsets.only(bottom: gap), child: c)).toList());
-  }
-
-  Widget _dragAndTargetBtn(BuildContext context, String label, Color color, String actionData, double baseSize, double feedSize, {IconData? icon, bool isX = false}) {
-    return Draggable<String>(
-      data: actionData, 
-      feedback: _circle(context, label, color, icon, true, baseSize, feedSize, isX: isX),
-      childWhenDragging: Opacity(opacity: 0.5, child: _circle(context, label, color, icon, false, baseSize, feedSize, isX: isX)),
-      child: DragTarget<String>(
-        onAcceptWithDetails: (details) {},
-        builder: (context, candidateData, rejectedData) {
-          bool isHovered = candidateData.any((data) => data != null && data.startsWith("player_"));
-          return Transform.scale(
-            scale: isHovered ? 1.15 : 1.0, 
-            child: Container(decoration: isHovered ? BoxDecoration(shape: BoxShape.circle, boxShadow: [BoxShadow(color: Colors.white, blurRadius: 10 * context.sf, spreadRadius: 3 * context.sf)]) : null, child: _circle(context, label, color, icon, false, baseSize, feedSize, isX: isX)),
-          );
-        }
-      ),
-    );
-  }
-
-  Widget _circle(BuildContext context, String label, Color color, IconData? icon, bool isFeed, double baseSize, double feedSize, {bool isX = false}) {
-    double size = isFeed ? feedSize : baseSize;
-    Widget content;
-    bool isPointBtn = label == "1" || label == "2" || label == "3" || label == "M1" || label == "M2" || label == "M3";
-    bool isBlkBtn = label == "BLK";
-
-    if (isPointBtn) {
-      content = Stack(
-        alignment: Alignment.center,
-        children: [
-          Container(width: size * 0.75, height: size * 0.75, decoration: const BoxDecoration(color: Colors.black, shape: BoxShape.circle)),
-          Icon(Icons.sports_basketball, color: color, size: size * 0.9),
-          Stack(
-            children: [
-              Text(label, style: TextStyle(fontSize: size * 0.38, fontWeight: FontWeight.w900, foreground: Paint()..style = PaintingStyle.stroke..strokeWidth = size * 0.05..color = Colors.white, decoration: TextDecoration.none)),
-              Text(label, style: TextStyle(fontSize: size * 0.38, fontWeight: FontWeight.w900, color: Colors.black, decoration: TextDecoration.none)),
-            ],
-          ),
-        ],
       );
-    } else if (isBlkBtn) {
-      content = Stack(
-        alignment: Alignment.center,
-        children: [
-          Icon(Icons.front_hand, color: const Color.fromARGB(207, 56, 52, 52), size: size * 0.75),
-          Stack(
-            alignment: Alignment.center,
-            children: [
-              Text(label, style: TextStyle(fontSize: size * 0.28, fontWeight: FontWeight.w900, foreground: Paint()..style = PaintingStyle.stroke..strokeWidth = size * 0.05..color = Colors.black, decoration: TextDecoration.none)),
-              Text(label, style: TextStyle(fontSize: size * 0.28, fontWeight: FontWeight.w900, color: Colors.white, decoration: TextDecoration.none)),
-            ],
-          ),
-        ],
-      );
-    } else if (icon != null) {
-      content = Icon(icon, color: Colors.white, size: size * 0.5);
-    } else {
-      content = Text(label, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: size * 0.35, decoration: TextDecoration.none));
     }
-
+  }
-    return Stack(
-      clipBehavior: Clip.none, alignment: Alignment.bottomRight,
-      children: [
-        Container(
-          width: size, height: size,
-          decoration: (isPointBtn || isBlkBtn) ? const BoxDecoration(color: Colors.transparent) : BoxDecoration(gradient: RadialGradient(colors: [color.withOpacity(0.7), color], radius: 0.8), shape: BoxShape.circle, boxShadow: [BoxShadow(color: Colors.black38, blurRadius: 6 * context.sf, offset: Offset(0, 3 * context.sf))]),
-          alignment: Alignment.center, child: content,
-        ),
-        if (isX) Positioned(top: 0, right: 0, child: Container(decoration: const BoxDecoration(color: Colors.white, shape: BoxShape.circle), child: Icon(Icons.cancel, color: Colors.red, size: size * 0.4))),
-      ],
-    );
-  }
-}

lib/pages/gamePage.dart

@@ -257,6 +257,7 @@ class _GamePageState extends State<GamePage> {
         },
       ),
       floatingActionButton: FloatingActionButton(
+        heroTag: 'add_game_btn', // 👇 A MÁGICA ESTÁ AQUI TAMBÉM!
         backgroundColor: const Color(0xFFE74C3C),
         child: Icon(Icons.add, color: Colors.white, size: 24 * context.sf),
         onPressed: () => showDialog(context: context, builder: (context) => CreateGameDialogManual(teamController: teamController, gameController: gameController)),

lib/pages/heatmap_page.dart

@@ -0,0 +1,92 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import '../controllers/placar_controller.dart'; // Ajusta o caminho se for preciso
+
+class HeatmapPage extends StatefulWidget {
+  final List<ShotRecord> shots;
+  final String teamName;
+
+  const HeatmapPage({super.key, required this.shots, required this.teamName});
+
+  @override
+  State<HeatmapPage> createState() => _HeatmapPageState();
+}
+
+class _HeatmapPageState extends State<HeatmapPage> {
+  
+  @override
+  void initState() {
+    super.initState();
+    // Força o ecrã a ficar deitado para vermos bem o campo
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.landscapeRight,
+      DeviceOrientation.landscapeLeft,
+    ]);
+  }
+
+  @override
+  void dispose() {
+    // Volta ao normal quando saímos
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: const Color(0xFF16202C),
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        elevation: 0,
+        title: Text("Mapa de Lançamentos - ${widget.teamName}", style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold)),
+        iconTheme: const IconThemeData(color: Colors.white),
+      ),
+      body: Center(
+        child: AspectRatio(
+          aspectRatio: 1150 / 720, // Mantém o campo proporcional
+          child: Container(
+            margin: const EdgeInsets.only(bottom: 20, left: 20, right: 20),
+            decoration: BoxDecoration(
+              border: Border.all(color: Colors.white, width: 3),
+              image: const DecorationImage(
+                image: AssetImage('assets/campo.png'),
+                fit: BoxFit.fill,
+              ),
+            ),
+            child: LayoutBuilder(
+              builder: (context, constraints) {
+                final double w = constraints.maxWidth;
+                final double h = constraints.maxHeight;
+
+                return Stack(
+                  children: widget.shots.map((shot) {
+                    // 👇 Converte de volta de % para Pixels reais do ecrã atual
+                    double pixelX = shot.relativeX * w;
+                    double pixelY = shot.relativeY * h;
+
+                    return Positioned(
+                      left: pixelX - 12, // -12 para centrar a bolinha
+                      top: pixelY - 12,
+                      child: Tooltip(
+                        message: "${shot.playerName}\n${shot.isMake ? 'Cesto' : 'Falha'}",
+                        child: CircleAvatar(
+                          radius: 12,
+                          backgroundColor: shot.isMake ? Colors.green.withOpacity(0.85) : Colors.red.withOpacity(0.85),
+                          child: Icon(
+                            shot.isMake ? Icons.check : Icons.close,
+                            size: 14,
+                            color: Colors.white,
+                          ),
+                        ),
+                      ),
+                    );
+                  }).toList(),
+                );
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/teamPage.dart

@@ -142,6 +142,7 @@ class _TeamsPageState extends State<TeamsPage> {
         ],
       ),
       floatingActionButton: FloatingActionButton(
+        heroTag: 'add_team_btn', // 👇 A MÁGICA ESTÁ AQUI!
         backgroundColor: const Color(0xFFE74C3C),
         child: Icon(Icons.add, color: Colors.white, size: 24 * context.sf),
         onPressed: () => _showCreateDialog(context),

lib/widgets/login_widgets.dart

@@ -11,10 +11,10 @@ class BasketTrackHeader extends StatelessWidget {
     return Column(
       children: [
         SizedBox(
-          width: 300 * context.sf, // Ajusta o tamanho da imagem suavemente
+          width: 200 * context.sf, // Ajusta o tamanho da imagem suavemente
-          height: 300 * context.sf,
+          height: 200 * context.sf,
           child: Image.asset(
-            'assets/playmaker-logo.png',
+            'assets/playmaker-logos.png',
             fit: BoxFit.contain,
           ),
         ),