sabado

android/app/build.gradle.kts

@@ -9,7 +9,6 @@ android {
     namespace = "com.example.playmaker"
     compileSdk = flutter.compileSdkVersion
     //ndkVersion = flutter.ndkVersion
-ndkVersion = "27.0.12077973"
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:label="playmaker"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

ios/Runner/Info.plist

@@ -45,5 +45,12 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+
+	<key>NSPhotoLibraryUsageDescription</key>
+    <string>A PlayMaker precisa de aceder à tua galeria para poderes escolher uma foto de perfil.</string>
+    <key>NSCameraUsageDescription</key>
+    <string>A PlayMaker precisa de aceder à câmara para poderes tirar uma foto de perfil.</string>
+    </dict>
+	
 </dict>
 </plist>

lib/classe/theme.dart

@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  static const Color primaryRed = Color(0xFFE74C3C);
+  static const Color backgroundLight = Color(0xFFF5F7FA);
+  static const Color surfaceWhite = Colors.white;
+  static const Color successGreen = Color(0xFF00C853);
+  static const Color warningAmber = Colors.amber;
+
+  static const Color placarBackground = Color(0xFF266174);
+  static const Color placarDarkSurface = Color(0xFF16202C);
+  static const Color placarTimerBg = Color(0xFF2C3E50);
+  static const Color placarListCard = Color(0xFF263238);
+
+  static const Color myTeamBlue = Color(0xFF1E5BB2);
+  static const Color oppTeamRed = Color(0xFFD92C2C);
+
+  static const Color actionPoints = Colors.orange;
+  static const Color actionMiss = Colors.redAccent;
+  static const Color actionSteal = Colors.green;
+  static const Color actionAssist = Colors.blueGrey;
+  static const Color actionRebound = Color(0xFF1E2A38);
+  static const Color actionBlock = Colors.deepPurple;
+
+  static const Color statPtsBg = Color(0xFF1565C0);
+  static const Color statAstBg = Color(0xFF2E7D32);
+  static const Color statRebBg = Color(0xFF6A1B9A);
+  static const Color statPieBg = Color.fromARGB(255, 22, 32, 44);
+  static const Color coachBg = Color(0xFFFFF9C4);
+
+  // =========================================================
+  // ☀️ TEMA CLARO
+  // =========================================================
+  static ThemeData get lightTheme {
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: primaryRed,
+        brightness: Brightness.light,
+        primary: primaryRed,
+        surface: backgroundLight,
+      ),
+      appBarTheme: const AppBarTheme(
+        backgroundColor: backgroundLight,
+        foregroundColor: Colors.black87,
+        centerTitle: true,
+        elevation: 0.0,
+      ),
+      
+      // 👇 CORRETO: Classe CardThemeData
+      cardTheme: const CardThemeData(
+        color: surfaceWhite,
+        surfaceTintColor: Colors.transparent, // Evita o tom rosado do Material 3
+        elevation: 3.0,
+        margin: EdgeInsets.only(bottom: 12.0),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(15.0)),
+          side: BorderSide(color: Color(0xFFEEEEEE), width: 1.0),
+        ),
+      ),
+
+      inputDecorationTheme: InputDecorationTheme(
+        filled: true,
+        fillColor: surfaceWhite,
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12.0),
+          borderSide: const BorderSide(color: Color(0xFFE0E0E0)),
+        ),
+      ),
+    );
+  }
+
+  // =========================================================
+  // 🌙 MODO ESCURO
+  // =========================================================
+  static ThemeData get darkTheme {
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: primaryRed,
+        brightness: Brightness.dark,
+        primary: primaryRed,
+        surface: const Color(0xFF1E1E1E),
+      ),
+      scaffoldBackgroundColor: const Color(0xFF121212),
+      appBarTheme: const AppBarTheme(
+        backgroundColor: Color(0xFF121212),
+        foregroundColor: Colors.white,
+        centerTitle: true,
+        elevation: 0.0,
+      ),
+
+      // 👇 CORRETO: Classe CardThemeData
+      cardTheme: const CardThemeData(
+        color: Color(0xFF1E1E1E),
+        surfaceTintColor: Colors.transparent,
+        elevation: 3.0,
+        margin: EdgeInsets.only(bottom: 12.0),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(15.0)),
+          side: BorderSide(color: Color(0xFF2C2C2C), width: 1.0),
+        ),
+      ),
+
+      inputDecorationTheme: InputDecorationTheme(
+        filled: true,
+        fillColor: const Color(0xFF1E1E1E),
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12.0),
+          borderSide: const BorderSide(color: Color(0xFF2C2C2C)),
+        ),
+      ),
+    );
+  }
+}

lib/controllers/game_controller.dart

@@ -4,37 +4,57 @@ import '../models/game_model.dart';
 class GameController {
   final _supabase = Supabase.instance.client;
 
-  // 1. LER JOGOS (Com Filtros Opcionais)
+  String get myUserId => _supabase.auth.currentUser?.id ?? '';
-  Stream<List<Game>> getFilteredGames({String? teamFilter, String? seasonFilter}) {
+
+  // LER JOGOS
+  Stream<List<Game>> get gamesStream {
     return _supabase
         .from('games')
         .stream(primaryKey: ['id'])
+        .eq('user_id', myUserId)
         .asyncMap((event) async {
+          final data = await _supabase
+              .from('games')
+              .select()
+              .eq('user_id', myUserId)
+              .order('game_date', ascending: false);
               
-          // 👇 A CORREÇÃO ESTÁ AQUI: Lê diretamente da tabela 'games'
+          // O Game.fromMap agora faz o trabalho sujo todo!
-          var query = _supabase.from('games').select();
+          return data.map((json) => Game.fromMap(json)).toList();
-
-          // Aplica o filtro de Temporada
-          if (seasonFilter != null && seasonFilter.isNotEmpty && seasonFilter != 'Todas') {
-            query = query.eq('season', seasonFilter);
-          }
-
-          // Aplica o filtro de Equipa (Procura em casa ou fora)
-          if (teamFilter != null && teamFilter.isNotEmpty && teamFilter != 'Todas') {
-            query = query.or('my_team.eq.$teamFilter,opponent_team.eq.$teamFilter');
-          }
-
-          // Executa a query com a ordenação por data
-          final viewData = await query.order('game_date', ascending: false);
-              
-          return viewData.map((json) => Game.fromMap(json)).toList();
         });
   }
 
-  // 2. CRIAR JOGO
+  // LER JOGOS COM FILTROS
+  Stream<List<Game>> getFilteredGames({required String teamFilter, required String seasonFilter}) {
+    return _supabase
+        .from('games') 
+        .stream(primaryKey: ['id'])
+        .eq('user_id', myUserId)
+        .asyncMap((event) async {
+          
+          var query = _supabase.from('games').select().eq('user_id', myUserId);
+
+          if (seasonFilter != 'Todas') {
+            query = query.eq('season', seasonFilter);
+          }
+
+          final data = await query.order('game_date', ascending: false);
+          
+          List<Game> games = data.map((json) => Game.fromMap(json)).toList();
+
+          if (teamFilter != 'Todas') {
+            games = games.where((g) => g.myTeam == teamFilter || g.opponentTeam == teamFilter).toList();
+          }
+
+          return games;
+        });
+  }   
+
+  // CRIAR JOGO
   Future<String?> createGame(String myTeam, String opponent, String season) async {
     try {
       final response = await _supabase.from('games').insert({
+        'user_id': myUserId,
         'my_team': myTeam,
         'opponent_team': opponent,
         'season': season,
@@ -42,14 +62,36 @@ class GameController {
         'opponent_score': 0,
         'status': 'Decorrer', 
         'game_date': DateTime.now().toIso8601String(),
+        // 👇 Preenchemos logo com os valores iniciais da tua Base de Dados
+        'remaining_seconds': 600, // Assume 10 minutos (600s)
+        'my_timeouts': 0,
+        'opp_timeouts': 0,
+        'current_quarter': 1,
+        'top_pts_name': '---',
+        'top_ast_name': '---',
+        'top_rbs_name': '---',
+        'top_def_name': '---',
+        'mvp_name': '---',
       }).select().single(); 
 
-      return response['id']; 
+      return response['id']?.toString();
     } catch (e) {
       print("Erro ao criar jogo: $e");
       return null;
     }
-  }
     
+  }
+// ELIMINAR JOGO
+  Future<bool> deleteGame(String gameId) async {
+    try {
+      await _supabase.from('games').delete().eq('id', gameId);
+      // Como o Supabase tem Cascade Delete (se configurado), vai apagar também 
+      // as stats e shot_locations associadas a este game_id automaticamente.
+      return true;
+    } catch (e) {
+      print("Erro ao eliminar jogo: $e");
+      return false;
+    }
+  }
   void dispose() {}
 }

lib/controllers/home_controller.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 
 class HomeController extends ChangeNotifier {
-  // Se precisar de estado para a home screen
   int _selectedCardIndex = 0;
   
   int get selectedCardIndex => _selectedCardIndex;
@@ -11,10 +10,8 @@ class HomeController extends ChangeNotifier {
     notifyListeners();
   }
   
-  // Métodos adicionais para lógica da home
   void navigateToDetails(String playerName) {
     print('Navegando para detalhes de $playerName');
-    // Implementar navegação
   }
   
   void refreshData() {

lib/controllers/placar_controller.dart

@@ -1,33 +1,49 @@
 import 'dart:async';
 import 'dart:math' as math;
+import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class ShotRecord {
   final double relativeX;
   final double relativeY;
   final bool isMake;
+  final String playerId; 
   final String playerName; 
+  final String? zone;
+  final int? points;
 
   ShotRecord({
     required this.relativeX, 
     required this.relativeY, 
     required this.isMake, 
-    required this.playerName
+    required this.playerId,
+    required this.playerName,
+    this.zone,
+    this.points,
   });
+
+  Map<String, dynamic> toJson() => {
+    'relativeX': relativeX, 'relativeY': relativeY, 'isMake': isMake,
+    'playerId': playerId, 'playerName': playerName, 'zone': zone, 'points': points,
+  };
+
+  factory ShotRecord.fromJson(Map<String, dynamic> json) => ShotRecord(
+    relativeX: json['relativeX'], relativeY: json['relativeY'], isMake: json['isMake'],
+    playerId: json['playerId'], playerName: json['playerName'], zone: json['zone'], points: json['points'],
+  );
 }
 
-class PlacarController {
+class PlacarController extends ChangeNotifier {
   final String gameId;
   final String myTeam;
   final String opponentTeam;
-  final VoidCallback onUpdate;
 
   PlacarController({
     required this.gameId, 
     required this.myTeam, 
     required this.opponentTeam, 
-    required this.onUpdate
   });
 
   bool isLoading = true;
@@ -50,27 +66,28 @@ class PlacarController {
   List<String> oppCourt = [];
   List<String> oppBench = [];
 
+  Map<String, String> playerNames = {}; 
   Map<String, String> playerNumbers = {};
   Map<String, Map<String, int>> playerStats = {};
-  Map<String, String> playerDbIds = {};
 
   bool showMyBench = false;
   bool showOppBench = false;
 
   bool isSelectingShotLocation = false;
   String? pendingAction;
-  String? pendingPlayer;
+  String? pendingPlayerId; 
   List<ShotRecord> matchShots = [];
   
-  Duration duration = const Duration(minutes: 10);
+  List<String> playByPlay = [];
+
+  ValueNotifier<Duration> durationNotifier = ValueNotifier(const Duration(minutes: 10));
   Timer? timer;
   bool isRunning = false;
 
-  // OS TEUS NÚMEROS DE OURO DO TABLET
   bool isCalibrating = false; 
-  double hoopBaseX = 0.000;    
+  double hoopBaseX = 0.088;    
-  double arcRadius = 0.500;    
+  double arcRadius = 0.459;    
-  double cornerY = 0.443;      
+  double cornerY = 0.440;      
 
   Future<void> loadPlayers() async {
     final supabase = Supabase.instance.client;
@@ -78,21 +95,29 @@ class PlacarController {
       await Future.delayed(const Duration(milliseconds: 1500)); 
 
       myCourt.clear(); myBench.clear(); oppCourt.clear(); oppBench.clear();
-      playerStats.clear(); playerNumbers.clear(); playerDbIds.clear();
+      playerNames.clear(); playerStats.clear(); playerNumbers.clear();
-      myFouls = 0; opponentFouls = 0;
+      matchShots.clear(); playByPlay.clear(); myFouls = 0; opponentFouls = 0;
 
       final gameResponse = await supabase.from('games').select().eq('id', gameId).single();
       
       myScore = int.tryParse(gameResponse['my_score']?.toString() ?? '0') ?? 0;
       opponentScore = int.tryParse(gameResponse['opponent_score']?.toString() ?? '0') ?? 0;
+      
       int totalSeconds = int.tryParse(gameResponse['remaining_seconds']?.toString() ?? '600') ?? 600;
-      duration = Duration(seconds: totalSeconds);
+      durationNotifier.value = Duration(seconds: totalSeconds);
+      
       myTimeoutsUsed = int.tryParse(gameResponse['my_timeouts']?.toString() ?? '0') ?? 0;
       opponentTimeoutsUsed = int.tryParse(gameResponse['opp_timeouts']?.toString() ?? '0') ?? 0;
       currentQuarter = int.tryParse(gameResponse['current_quarter']?.toString() ?? '1') ?? 1;
       
       gameWasAlreadyFinished = gameResponse['status'] == 'Terminado'; 
 
+      if (gameResponse['play_by_play'] != null) {
+        playByPlay = List<String>.from(gameResponse['play_by_play']);
+      } else {
+        playByPlay = [];
+      }
+
       final teamsResponse = await supabase.from('teams').select('id, name').inFilter('name', [myTeam, opponentTeam]);
       for (var t in teamsResponse) {
         if (t['name'] == myTeam) myTeamDbId = t['id'];
@@ -110,10 +135,12 @@ class PlacarController {
       for (int i = 0; i < myPlayers.length; i++) {
         String dbId = myPlayers[i]['id'].toString();
         String name = myPlayers[i]['name'].toString();
+        
         _registerPlayer(name: name, number: myPlayers[i]['number']?.toString() ?? "0", dbId: dbId, isMyTeam: true, isCourt: i < 5);
+
         if (savedStats.containsKey(dbId)) {
           var s = savedStats[dbId];
-          playerStats[name] = { "pts": s['pts'] ?? 0, "rbs": s['rbs'] ?? 0, "ast": s['ast'] ?? 0, "stl": s['stl'] ?? 0, "tov": s['tov'] ?? 0, "blk": s['blk'] ?? 0, "fls": s['fls'] ?? 0, "fgm": s['fgm'] ?? 0, "fga": s['fga'] ?? 0, "ftm": s['ftm'] ?? 0, "fta": s['fta'] ?? 0, "orb": s['orb'] ?? 0, "drb": s['drb'] ?? 0 };
+          _loadSavedPlayerStats(dbId, s);
           myFouls += (s['fls'] as int? ?? 0); 
         }
       }
@@ -122,40 +149,74 @@ class PlacarController {
       for (int i = 0; i < oppPlayers.length; i++) {
         String dbId = oppPlayers[i]['id'].toString();
         String name = oppPlayers[i]['name'].toString();
+        
         _registerPlayer(name: name, number: oppPlayers[i]['number']?.toString() ?? "0", dbId: dbId, isMyTeam: false, isCourt: i < 5);
+
         if (savedStats.containsKey(dbId)) {
           var s = savedStats[dbId];
-          playerStats[name] = { "pts": s['pts'] ?? 0, "rbs": s['rbs'] ?? 0, "ast": s['ast'] ?? 0, "stl": s['stl'] ?? 0, "tov": s['tov'] ?? 0, "blk": s['blk'] ?? 0, "fls": s['fls'] ?? 0, "fgm": s['fgm'] ?? 0, "fga": s['fga'] ?? 0, "ftm": s['ftm'] ?? 0, "fta": s['fta'] ?? 0, "orb": s['orb'] ?? 0, "drb": s['drb'] ?? 0 };
+          _loadSavedPlayerStats(dbId, s);
           opponentFouls += (s['fls'] as int? ?? 0);
         }
       }
       _padTeam(oppCourt, oppBench, "Adversário", isMyTeam: false);
 
-      // Carregar Shots salvos para o HeatMap
+      final shotsResponse = await supabase.from('shot_locations').select().eq('game_id', gameId);
-      final shotsResponse = await supabase.from('game_shots').select().eq('game_id', gameId);
+      for (var shotData in shotsResponse) {
-      matchShots = (shotsResponse as List).map((s) => ShotRecord(
+        matchShots.add(ShotRecord(
-        relativeX: (s['relative_x'] as num).toDouble(),
+          relativeX: double.parse(shotData['relative_x'].toString()),
-        relativeY: (s['relative_y'] as num).toDouble(),
+          relativeY: double.parse(shotData['relative_y'].toString()),
-        isMake: s['is_make'] as bool,
+          isMake: shotData['is_make'] == true,
-        playerName: s['player_name'],
+          playerId: shotData['member_id'].toString(),
-      )).toList();
+          playerName: shotData['player_name'].toString(),
+          zone: shotData['zone']?.toString(),
+          points: shotData['points'] != null ? int.parse(shotData['points'].toString()) : null,
+        ));
+      }
+
+      await _loadLocalBackup();
 
       isLoading = false;
-      onUpdate();
+      notifyListeners(); 
     } catch (e) {
       debugPrint("Erro ao retomar jogo: $e");
       isLoading = false;
-      onUpdate();
+      notifyListeners();
     }
   }
 
+  void _loadSavedPlayerStats(String dbId, Map<String, dynamic> s) {
+    playerStats[dbId] = {
+      "pts": s['pts'] ?? 0, "rbs": s['rbs'] ?? 0, "ast": s['ast'] ?? 0,
+      "stl": s['stl'] ?? 0, "tov": s['tov'] ?? 0, "blk": s['blk'] ?? 0,
+      "fls": s['fls'] ?? 0, "fgm": s['fgm'] ?? 0, "fga": s['fga'] ?? 0,
+      "ftm": s['ftm'] ?? 0, "fta": s['fta'] ?? 0, "orb": s['orb'] ?? 0, "drb": s['drb'] ?? 0,
+      "p2m": s['p2m'] ?? 0, "p2a": s['p2a'] ?? 0, "p3m": s['p3m'] ?? 0, "p3a": s['p3a'] ?? 0,
+      "so": s['so'] ?? 0, "il": s['il'] ?? 0, "li": s['li'] ?? 0,
+      "pa": s['pa'] ?? 0, "tres_s": s['tres_seg'] ?? 0, "dr": s['dr'] ?? 0, 
+      "min": s['minutos_jogados'] ?? 0,
+      "sec": (s['minutos_jogados'] ?? 0) * 60,
+    };
+  }
+
   void _registerPlayer({required String name, required String number, String? dbId, required bool isMyTeam, required bool isCourt}) {
-    if (playerNumbers.containsKey(name)) name = "$name (Opp)"; 
+    String id = dbId ?? "fake_${DateTime.now().millisecondsSinceEpoch}_${math.Random().nextInt(9999)}";
-    playerNumbers[name] = number;
+    
-    if (dbId != null) playerDbIds[name] = dbId; 
+    playerNames[id] = name;
-    playerStats[name] = { "pts": 0, "rbs": 0, "ast": 0, "stl": 0, "tov": 0, "blk": 0, "fls": 0, "fgm": 0, "fga": 0, "ftm": 0, "fta": 0, "orb": 0, "drb": 0 };
+    playerNumbers[id] = number;
-    if (isMyTeam) { if (isCourt) myCourt.add(name); else myBench.add(name); } 
+    
-    else { if (isCourt) oppCourt.add(name); else oppBench.add(name); }
+    playerStats[id] = {
+      "pts": 0, "rbs": 0, "ast": 0, "stl": 0, "tov": 0, "blk": 0, 
+      "fls": 0, "fgm": 0, "fga": 0, "ftm": 0, "fta": 0, "orb": 0, "drb": 0,
+      "p2m": 0, "p2a": 0, "p3m": 0, "p3a": 0,
+      "so": 0, "il": 0, "li": 0, "pa": 0, "tres_s": 0, "dr": 0, 
+      "min": 0, "sec": 0 
+    };
+
+    if (isMyTeam) {
+      if (isCourt) myCourt.add(id); else myBench.add(id);
+    } else {
+      if (isCourt) oppCourt.add(id); else oppBench.add(id);
+    }
   }
 
   void _padTeam(List<String> court, List<String> bench, String prefix, {required bool isMyTeam}) {
@@ -164,43 +225,111 @@ class PlacarController {
     }
   }
 
+  Future<void> _saveLocalBackup() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final backupData = {
+        'myScore': myScore, 'opponentScore': opponentScore,
+        'myFouls': myFouls, 'opponentFouls': opponentFouls,
+        'currentQuarter': currentQuarter, 'duration': durationNotifier.value.inSeconds,
+        'myTimeoutsUsed': myTimeoutsUsed, 'opponentTimeoutsUsed': opponentTimeoutsUsed,
+        'playerStats': playerStats,
+        'myCourt': myCourt, 'myBench': myBench, 'oppCourt': oppCourt, 'oppBench': oppBench,
+        'matchShots': matchShots.map((s) => s.toJson()).toList(),
+        'playByPlay': playByPlay, 
+      };
+      await prefs.setString('backup_$gameId', jsonEncode(backupData));
+    } catch (e) {
+      debugPrint("Erro no Auto-Save: $e");
+    }
+  }
+
+  Future<void> _loadLocalBackup() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final String? backupString = prefs.getString('backup_$gameId');
+      
+      if (backupString != null) {
+        final data = jsonDecode(backupString);
+        
+        myScore = data['myScore']; opponentScore = data['opponentScore'];
+        myFouls = data['myFouls']; opponentFouls = data['opponentFouls'];
+        currentQuarter = data['currentQuarter']; durationNotifier.value = Duration(seconds: data['duration']);
+        myTimeoutsUsed = data['myTimeoutsUsed']; opponentTimeoutsUsed = data['opponentTimeoutsUsed'];
+        
+        myCourt = List<String>.from(data['myCourt']); myBench = List<String>.from(data['myBench']);
+        oppCourt = List<String>.from(data['oppCourt']); oppBench = List<String>.from(data['oppBench']);
+        
+        Map<String, dynamic> decodedStats = data['playerStats'];
+        playerStats = decodedStats.map((k, v) => MapEntry(k, Map<String, int>.from(v)));
+        
+        List<dynamic> decodedShots = data['matchShots'];
+        matchShots = decodedShots.map((s) => ShotRecord.fromJson(s)).toList();
+        
+        playByPlay = List<String>.from(data['playByPlay'] ?? []); 
+      }
+    } catch (e) {
+      debugPrint("Erro ao carregar Auto-Save: $e");
+    }
+  }
+
   void toggleTimer(BuildContext context) {
     if (isRunning) {
       timer?.cancel();
+      _saveLocalBackup(); 
     } else {
       timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-        if (duration.inSeconds > 0) {
+        if (durationNotifier.value.inSeconds > 0) {
-          duration -= const Duration(seconds: 1);
+          durationNotifier.value -= const Duration(seconds: 1); 
+
+          void addTimeToCourt(List<String> court) {
+            for (String id in court) {
+              if (playerStats.containsKey(id)) {
+                int currentSec = playerStats[id]!["sec"] ?? 0;
+                playerStats[id]!["sec"] = currentSec + 1;
+                playerStats[id]!["min"] = (currentSec + 1) ~/ 60;
+              }
+            }
+          }
+          addTimeToCourt(myCourt);
+          addTimeToCourt(oppCourt);
+
+          notifyListeners(); 
+
         } else {
           timer.cancel();
           isRunning = false;
          if (currentQuarter < 4) {
            currentQuarter++; 
-            duration = const Duration(minutes: 10); 
+           durationNotifier.value = const Duration(minutes: 10); 
-            myFouls = 0; opponentFouls = 0; myTimeoutsUsed = 0; opponentTimeoutsUsed = 0; 
+           myFouls = 0; opponentFouls = 0;
-            onUpdate();
+           myTimeoutsUsed = 0; opponentTimeoutsUsed = 0; 
+           _saveLocalBackup(); 
          } 
+         notifyListeners(); 
         }
-        onUpdate();
       });
     }
     isRunning = !isRunning;
-    onUpdate();
+    notifyListeners(); 
   }
 
   void useTimeout(bool isOpponent) {
-    if (isOpponent) { if (opponentTimeoutsUsed < 3) opponentTimeoutsUsed++; } 
+    if (isOpponent) {
-    else { if (myTimeoutsUsed < 3) myTimeoutsUsed++; }
+      if (opponentTimeoutsUsed < 3) opponentTimeoutsUsed++;
+    } else {
+      if (myTimeoutsUsed < 3) myTimeoutsUsed++;
+    }
     isRunning = false;
     timer?.cancel();
-    onUpdate();
+    _saveLocalBackup();
+    notifyListeners();
   }
 
-  String formatTime() => "${duration.inMinutes.toString().padLeft(2, '0')}:${duration.inSeconds.remainder(60).toString().padLeft(2, '0')}";
-
   void handleActionDrag(BuildContext context, String action, String playerData) {
-    String name = playerData.replaceAll("player_my_", "").replaceAll("player_opp_", "");
+    String playerId = playerData.replaceAll("player_my_", "").replaceAll("player_opp_", "");
-    final stats = playerStats[name]!;
+    final stats = playerStats[playerId]!;
+    final name = playerNames[playerId]!;
 
     if (stats["fls"]! >= 5 && action != "sub_foul") {
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('🛑 $name atingiu 5 faltas e está expulso!'), backgroundColor: Colors.red));
@@ -209,251 +338,312 @@ class PlacarController {
 
     if (action == "add_pts_2" || action == "add_pts_3" || action == "miss_2" || action == "miss_3") {
       pendingAction = action;
-      pendingPlayer = playerData;
+      pendingPlayerId = playerData;
       isSelectingShotLocation = true;
     } else {
       commitStat(action, playerData);
     }
-    onUpdate();
+    notifyListeners();
   }
 
-  void handleSubbing(BuildContext context, String action, String courtPlayerName, bool isOpponent) {
+  void handleSubbing(BuildContext context, String action, String courtPlayerId, bool isOpponent) {
     if (action.startsWith("bench_my_") && !isOpponent) {
-      String benchPlayer = action.replaceAll("bench_my_", "");
+      String benchPlayerId = action.replaceAll("bench_my_", "");
-      if (playerStats[benchPlayer]!["fls"]! >= 5) return; 
+      if (playerStats[benchPlayerId]!["fls"]! >= 5) return; 
-      int courtIndex = myCourt.indexOf(courtPlayerName);
+      int courtIndex = myCourt.indexOf(courtPlayerId);
-      int benchIndex = myBench.indexOf(benchPlayer);
+      int benchIndex = myBench.indexOf(benchPlayerId);
-      myCourt[courtIndex] = benchPlayer;
+      myCourt[courtIndex] = benchPlayerId;
-      myBench[benchIndex] = courtPlayerName;
+      myBench[benchIndex] = courtPlayerId;
       showMyBench = false;
     }
     if (action.startsWith("bench_opp_") && isOpponent) {
-      String benchPlayer = action.replaceAll("bench_opp_", "");
+      String benchPlayerId = action.replaceAll("bench_opp_", "");
-      if (playerStats[benchPlayer]!["fls"]! >= 5) return;
+      if (playerStats[benchPlayerId]!["fls"]! >= 5) return;
-      int courtIndex = oppCourt.indexOf(courtPlayerName);
+      int courtIndex = oppCourt.indexOf(courtPlayerId);
-      int benchIndex = oppBench.indexOf(benchPlayer);
+      int benchIndex = oppBench.indexOf(benchPlayerId);
-      oppCourt[courtIndex] = benchPlayer;
+      oppCourt[courtIndex] = benchPlayerId;
-      oppBench[benchIndex] = courtPlayerName;
+      oppBench[benchIndex] = courtPlayerId;
       showOppBench = false;
     }
-    onUpdate();
+    _saveLocalBackup();
+    notifyListeners();
   }
 
-  // ==============================================================
+  void registerShotFromPopup(BuildContext context, String action, String targetPlayer, String zone, int points, double relativeX, double relativeY) {
-  // 🎯 REGISTO DO TOQUE (INTELIGENTE E SILENCIOSO)
+    String playerId = targetPlayer.replaceAll("player_my_", "").replaceAll("player_opp_", "");
-  // ==============================================================
+    bool isMake = action.startsWith("add_");
-  void registerShotLocation(BuildContext context, Offset position, Size size) {
+    String name = playerNames[playerId] ?? "Jogador";
-    if (pendingAction == null || pendingPlayer == null) return;
+
+    matchShots.add(ShotRecord(
+      relativeX: relativeX, relativeY: relativeY, isMake: isMake, 
+      playerId: playerId, playerName: name, zone: zone, points: points
+    ));
+
+    String finalAction = isMake ? "add_pts_$points" : "miss_$points";
+    commitStat(finalAction, targetPlayer);
+    notifyListeners();
+  }
+
+  void registerShotLocation(BuildContext context, Offset position, Size size) {
+    if (pendingAction == null || pendingPlayerId == null) return;
     
-    bool isOpponent = pendingPlayer!.startsWith("player_opp_");
     bool is3Pt = pendingAction!.contains("_3");
     bool is2Pt = pendingAction!.contains("_2");
 
     if (is3Pt || is2Pt) {
-      bool isInside2Pts = _validateShotZone(position, size, isOpponent);
+      bool isValid = _validateShotZone(position, size, is3Pt);
-      
+      if (!isValid) return; 
-      // Bloqueio silencioso (sem notificações chamas)
-      if ((is2Pt && !isInside2Pts) || (is3Pt && isInside2Pts)) {
-        cancelShotLocation(); 
-        return; 
-      }
     }
 
     bool isMake = pendingAction!.startsWith("add_pts_");
     double relX = position.dx / size.width;
     double relY = position.dy / size.height;
-    String name = pendingPlayer!.replaceAll("player_my_", "").replaceAll("player_opp_", "");
+    String pId = pendingPlayerId!.replaceAll("player_my_", "").replaceAll("player_opp_", "");
 
-    matchShots.add(ShotRecord(relativeX: relX, relativeY: relY, isMake: isMake, playerName: name));
+    matchShots.add(ShotRecord(relativeX: relX, relativeY: relY, isMake: isMake, playerId: pId, playerName: playerNames[pId]!));
-    commitStat(pendingAction!, pendingPlayer!);
     
-    isSelectingShotLocation = false;
+    commitStat(pendingAction!, pendingPlayerId!);
-    pendingAction = null;
+    
-    pendingPlayer = null;
+    isSelectingShotLocation = false; pendingAction = null; pendingPlayerId = null;
-    onUpdate();
+    _saveLocalBackup(); 
+    notifyListeners();
   }
 
-  // ==============================================================
+  bool _validateShotZone(Offset position, Size size, bool is3Pt) {
-  // 📐 MATEMÁTICA PURA: LÓGICA DE MEIO-CAMPO ATACANTE (SOLUÇÃO DIVIDIDA)
-  // ==============================================================
-  bool _validateShotZone(Offset position, Size size, bool isOpponent) {
     double relX = position.dx / size.width;
     double relY = position.dy / size.height;
 
-    double hX = hoopBaseX;
+    bool isLeftHalf = relX < 0.5;
-    double radius = arcRadius;
+    double hoopX = isLeftHalf ? hoopBaseX : (1.0 - hoopBaseX);
-    double cY = cornerY;
-
-    // A Minha Equipa defende na Esquerda (0.0), logo ataca o cesto da Direita (1.0)
-    // O Adversário defende na Direita (1.0), logo ataca o cesto da Esquerda (0.0)
-    double hoopX = isOpponent ? hX : (1.0 - hX);
     double hoopY = 0.50; 
 
     double aspectRatio = size.width / size.height;
     double distFromCenterY = (relY - hoopY).abs(); 
 
-    // Descobre se o toque foi feito na metade atacante daquela equipa
+    bool isInside2Pts;
-    bool isAttackingHalf = isOpponent ? (relX < 0.5) : (relX > 0.5);
 
-    if (isAttackingHalf && distFromCenterY > cY) {
+    if (distFromCenterY > cornerY) {
-      return false; // É 3 pontos (Zona dos Cantos)
+      double distToBaseline = isLeftHalf ? relX : (1.0 - relX);
+      isInside2Pts = distToBaseline <= hoopBaseX; 
     } else {
       double dx = (relX - hoopX) * aspectRatio;
       double dy = (relY - hoopY);
       double distanceToHoop = math.sqrt((dx * dx) + (dy * dy));
-      return distanceToHoop <= radius;
+      isInside2Pts = distanceToHoop < arcRadius;
     }
+
+    if (is3Pt) return !isInside2Pts;
+    return isInside2Pts;            
   }
 
   void cancelShotLocation() {
-    isSelectingShotLocation = false; pendingAction = null; pendingPlayer = null; onUpdate();
+    isSelectingShotLocation = false; pendingAction = null; pendingPlayerId = null; notifyListeners();
+  }
+
+  void registerFoul(String committerData, String foulType, String victimData) {
+    bool isOpponent = committerData.startsWith("player_opp_");
+    String committerId = committerData.replaceAll("player_my_", "").replaceAll("player_opp_", "");
+    final committerStats = playerStats[committerId]!;
+    final committerName = playerNames[committerId] ?? "Jogador";
+
+    committerStats["fls"] = committerStats["fls"]! + 1;
+    if (isOpponent) opponentFouls++; else myFouls++;
+
+    if (foulType == "Desqualificante") {
+      committerStats["fls"] = 5; 
+    }
+
+    String logText = "cometeu Falta $foulType";
+
+    if (victimData.isNotEmpty) {
+      String victimId = victimData.replaceAll("player_my_", "").replaceAll("player_opp_", "");
+      final victimStats = playerStats[victimId]!;
+      final victimName = playerNames[victimId] ?? "Jogador";
+
+      victimStats["so"] = victimStats["so"]! + 1;
+      logText += " sobre $victimName ⚠️";
+    } else {
+      logText += " (Equipa/Banco) ⚠️";
+    }
+
+    String time = "${durationNotifier.value.inMinutes.toString().padLeft(2, '0')}:${durationNotifier.value.inSeconds.remainder(60).toString().padLeft(2, '0')}";
+    playByPlay.insert(0, "P$currentQuarter - $time: $committerName $logText");
+
+    _saveLocalBackup();
+    notifyListeners();
   }
 
   void commitStat(String action, String playerData) {
     bool isOpponent = playerData.startsWith("player_opp_");
-    String name = playerData.replaceAll("player_my_", "").replaceAll("player_opp_", "");
+    String playerId = playerData.replaceAll("player_my_", "").replaceAll("player_opp_", "");
-    final stats = playerStats[name]!;
+    final stats = playerStats[playerId]!;
+    final name = playerNames[playerId] ?? "Jogador"; 
+
+    String logText = ""; 
 
     if (action.startsWith("add_pts_")) {
       int pts = int.parse(action.split("_").last);
       if (isOpponent) opponentScore += pts; else myScore += pts;
       stats["pts"] = stats["pts"]! + pts;
-      if (pts == 2 || pts == 3) { stats["fgm"] = stats["fgm"]! + 1; stats["fga"] = stats["fga"]! + 1; }
+      if (pts == 2) { stats["fgm"] = stats["fgm"]! + 1; stats["fga"] = stats["fga"]! + 1; stats["p2m"] = stats["p2m"]! + 1; stats["p2a"] = stats["p2a"]! + 1; }
+      if (pts == 3) { stats["fgm"] = stats["fgm"]! + 1; stats["fga"] = stats["fga"]! + 1; stats["p3m"] = stats["p3m"]! + 1; stats["p3a"] = stats["p3a"]! + 1; }
       if (pts == 1) { stats["ftm"] = stats["ftm"]! + 1; stats["fta"] = stats["fta"]! + 1; } 
+      logText = "marcou $pts pontos 🏀";
     } 
     else if (action.startsWith("sub_pts_")) {
-      int pts = int.parse(action.split("_").last);
+      int ptsToAnul = int.parse(action.split("_").last);
-      if (isOpponent) { opponentScore = (opponentScore - pts < 0) ? 0 : opponentScore - pts; } 
+      
-      else { myScore = (myScore - pts < 0) ? 0 : myScore - pts; }
+      int lastShotIndex = matchShots.lastIndexWhere((s) => 
-      stats["pts"] = (stats["pts"]! - pts < 0) ? 0 : stats["pts"]! - pts;
+        s.playerId == playerId && 
-      if (pts == 2 || pts == 3) {
+        s.isMake == true && 
-        if (stats["fgm"]! > 0) stats["fgm"] = stats["fgm"]! - 1;
+        s.points == ptsToAnul
-        if (stats["fga"]! > 0) stats["fga"] = stats["fga"]! - 1;
+      );
+
+      if (lastShotIndex != -1) {
+        matchShots.removeAt(lastShotIndex);
+
+        if (isOpponent) opponentScore -= ptsToAnul; else myScore -= ptsToAnul;
+        stats["pts"] = stats["pts"]! - ptsToAnul;
+        
+        if (ptsToAnul == 2) {
+          if(stats["fgm"]! > 0) stats["fgm"] = stats["fgm"]! - 1; 
+          if(stats["fga"]! > 0) stats["fga"] = stats["fga"]! - 1; 
+          if(stats["p2m"]! > 0) stats["p2m"] = stats["p2m"]! - 1;
+          if(stats["p2a"]! > 0) stats["p2a"] = stats["p2a"]! - 1;
+        } else if (ptsToAnul == 3) {
+          if(stats["fgm"]! > 0) stats["fgm"] = stats["fgm"]! - 1; 
+          if(stats["fga"]! > 0) stats["fga"] = stats["fga"]! - 1; 
+          if(stats["p3m"]! > 0) stats["p3m"] = stats["p3m"]! - 1;
+          if(stats["p3a"]! > 0) stats["p3a"] = stats["p3a"]! - 1;
+        } else if (ptsToAnul == 1) {
+          if(stats["ftm"]! > 0) stats["ftm"] = stats["ftm"]! - 1;
+          if(stats["fta"]! > 0) stats["fta"] = stats["fta"]! - 1;
         }
-      if (pts == 1) { 
+        logText = "anulou cesto de $ptsToAnul pts ⏪";
-        if (stats["ftm"]! > 0) stats["ftm"] = stats["ftm"]! - 1;
+      } else {
-        if (stats["fta"]! > 0) stats["fta"] = stats["fta"]! - 1;
+        return; 
       }
     }
-    else if (action == "miss_1") { stats["fta"] = stats["fta"]! + 1; } 
+    else if (action == "miss_1") { stats["fta"] = stats["fta"]! + 1; logText = "falhou lance livre ❌"; } 
-    else if (action == "miss_2" || action == "miss_3") { stats["fga"] = stats["fga"]! + 1; }
+    else if (action == "miss_2") { stats["fga"] = stats["fga"]! + 1; stats["p2a"] = stats["p2a"]! + 1; logText = "falhou lançamento de 2 ❌"; } 
-    else if (action == "add_orb") { stats["orb"] = stats["orb"]! + 1; stats["rbs"] = stats["rbs"]! + 1; } 
+    else if (action == "miss_3") { stats["fga"] = stats["fga"]! + 1; stats["p3a"] = stats["p3a"]! + 1; logText = "falhou lançamento de 3 ❌"; }
-    else if (action == "add_drb") { stats["drb"] = stats["drb"]! + 1; stats["rbs"] = stats["rbs"]! + 1; } 
+    else if (action == "add_orb") { stats["orb"] = stats["orb"]! + 1; stats["rbs"] = stats["rbs"]! + 1; logText = "ganhou ressalto ofensivo 🔄"; } 
-    else if (action == "add_ast") { stats["ast"] = stats["ast"]! + 1; }
+    else if (action == "add_drb") { stats["drb"] = stats["drb"]! + 1; stats["rbs"] = stats["rbs"]! + 1; logText = "ganhou ressalto defensivo 🛡️"; } 
-    else if (action == "add_stl") { stats["stl"] = stats["stl"]! + 1; }
+    else if (action == "add_ast") { stats["ast"] = stats["ast"]! + 1; logText = "fez uma assistência 🤝"; }
-    else if (action == "add_tov") { stats["tov"] = stats["tov"]! + 1; }
+    else if (action == "add_stl") { stats["stl"] = stats["stl"]! + 1; logText = "roubou a bola 🥷"; }
-    else if (action == "add_blk") { stats["blk"] = stats["blk"]! + 1; }
+    else if (action == "add_blk") { stats["blk"] = stats["blk"]! + 1; logText = "fez um desarme (bloco) ✋"; }
-    else if (action == "add_foul") { 
+    
-      stats["fls"] = stats["fls"]! + 1; 
+    else if (action == "add_so") { stats["so"] = stats["so"]! + 1; logText = "sofreu uma falta 🤕"; }
-      if (isOpponent) { opponentFouls++; } else { myFouls++; }
+    else if (action == "add_il") { stats["il"] = stats["il"]! + 1; logText = "intercetou um lançamento 🛑"; }
-    }
+    else if (action == "add_li") { stats["li"] = stats["li"]! + 1; logText = "teve o lançamento intercetado 🚫"; }
+    
+    else if (action == "add_tov") { stats["tov"] = stats["tov"]! + 1; logText = "fez um passe ruim 🤦"; }
+    else if (action == "add_pa") { stats["pa"] = stats["pa"]! + 1; stats["tov"] = stats["tov"]! + 1; logText = "cometeu passos 🚶"; }
+    else if (action == "add_3s") { stats["tres_s"] = stats["tres_s"]! + 1; stats["tov"] = stats["tov"]! + 1; logText = "violação de 3 segundos ⏱️"; }
+    else if (action == "add_24s") { stats["tov"] = stats["tov"]! + 1; logText = "violação de 24 segundos ⏱️"; }
+    else if (action == "add_dr") { stats["dr"] = stats["dr"]! + 1; stats["tov"] = stats["tov"]! + 1; logText = "fez drible duplo 🏀"; }
+    
     else if (action == "sub_foul") {
       if (stats["fls"]! > 0) stats["fls"] = stats["fls"]! - 1;
       if (isOpponent) { if (opponentFouls > 0) opponentFouls--; } else { if (myFouls > 0) myFouls--; }
+      logText = "teve falta anulada 🔄";
     }
+
+    if (logText.isNotEmpty) {
+      String time = "${durationNotifier.value.inMinutes.toString().padLeft(2, '0')}:${durationNotifier.value.inSeconds.remainder(60).toString().padLeft(2, '0')}";
+      playByPlay.insert(0, "P$currentQuarter - $time: $name $logText");
+    }
+
+    _saveLocalBackup(); 
+    notifyListeners(); 
   }
 
   Future<void> saveGameStats(BuildContext context) async {
     final supabase = Supabase.instance.client;
     isSaving = true;
-    onUpdate();
+    notifyListeners();
 
     try {
-      bool isGameFinishedNow = (currentQuarter >= 4 && duration.inSeconds == 0);
+      bool isGameFinishedNow = currentQuarter >= 4 && durationNotifier.value.inSeconds == 0;
       String newStatus = isGameFinishedNow ? 'Terminado' : 'Pausado';
 
       String topPtsName = '---'; int maxPts = -1;
       String topAstName = '---'; int maxAst = -1;
       String topRbsName = '---'; int maxRbs = -1;
-      String topDefName = '---'; int maxDef = -1;
+      String mvpName = '---';    double maxMvpScore = -999.0;
-      String mvpName = '---';    int maxMvpScore = -1;
 
-      playerStats.forEach((playerName, stats) {
+      playerStats.forEach((playerId, stats) {
         int pts = stats['pts'] ?? 0;
         int ast = stats['ast'] ?? 0;
         int rbs = stats['rbs'] ?? 0;
-        int stl = stats['stl'] ?? 0;
+        
-        int blk = stats['blk'] ?? 0;
+        double minJogados = (stats['sec'] ?? 0) / 60.0;
-        int defScore = stl + blk; 
+        if (minJogados <= 0) minJogados = 40.0; 
-        int mvpScore = pts + ast + rbs + defScore; 
+        
-        if (pts > maxPts && pts > 0) { maxPts = pts; topPtsName = '$playerName ($pts)'; }
+        int tr = rbs;
-        if (ast > maxAst && ast > 0) { maxAst = ast; topAstName = '$playerName ($ast)'; }
+        int br = stats['stl'] ?? 0;
-        if (rbs > maxRbs && rbs > 0) { maxRbs = rbs; topRbsName = '$playerName ($rbs)'; }
+        int bp = stats['tov'] ?? 0;
-        if (defScore > maxDef && defScore > 0) { maxDef = defScore; topDefName = '$playerName ($defScore)'; }
+        int lFalhados = (stats['fga'] ?? 0) - (stats['fgm'] ?? 0);
-        if (mvpScore > maxMvpScore && mvpScore > 0) { maxMvpScore = mvpScore; mvpName = playerName; } 
+        int llFalhados = (stats['fta'] ?? 0) - (stats['ftm'] ?? 0);
+        
+        double mvpScore = ((pts * 0.30) + (tr * 0.20) + (ast * 0.35) + (br * 0.15)) -
+                          ((bp * 0.35) + (lFalhados * 0.30) + (llFalhados * 0.35));
+        mvpScore = mvpScore * (minJogados / 40.0);
+
+        String pName = playerNames[playerId] ?? '---';
+
+        if (pts > maxPts && pts > 0) { maxPts = pts; topPtsName = '$pName ($pts)'; }
+        if (ast > maxAst && ast > 0) { maxAst = ast; topAstName = '$pName ($ast)'; }
+        if (rbs > maxRbs && rbs > 0) { maxRbs = rbs; topRbsName = '$pName ($rbs)'; }
+        if (mvpScore > maxMvpScore) { maxMvpScore = mvpScore; mvpName = '$pName (${mvpScore.toStringAsFixed(1)})'; } 
       });
 
       await supabase.from('games').update({
-        'my_score': myScore, 'opponent_score': opponentScore, 'remaining_seconds': duration.inSeconds,
+        'my_score': myScore, 'opponent_score': opponentScore,
-        'my_timeouts': myTimeoutsUsed, 'opp_timeouts': opponentTimeoutsUsed, 'current_quarter': currentQuarter,
+        'remaining_seconds': durationNotifier.value.inSeconds,
-        'status': newStatus, 'top_pts_name': topPtsName, 'top_ast_name': topAstName, 'top_rbs_name': topRbsName,
+        'my_timeouts': myTimeoutsUsed, 'opp_timeouts': opponentTimeoutsUsed,
-        'top_def_name': topDefName, 'mvp_name': mvpName,
+        'current_quarter': currentQuarter, 'status': newStatus,
+        'top_pts_name': topPtsName, 'top_ast_name': topAstName,
+        'top_rbs_name': topRbsName, 'mvp_name': mvpName,
+        'play_by_play': playByPlay, 
       }).eq('id', gameId);
 
-      // Atualiza Vitórias/Derrotas se o jogo terminou
-      if (isGameFinishedNow && !gameWasAlreadyFinished && myTeamDbId != null && oppTeamDbId != null) {
-        final teamsData = await supabase.from('teams').select('id, wins, losses, draws').inFilter('id', [myTeamDbId, oppTeamDbId]);
-        for(var t in teamsData) {
-          if(t['id'].toString() == myTeamDbId) {
-             int w = (t['wins'] ?? 0) + (myScore > opponentScore ? 1 : 0);
-             int l = (t['losses'] ?? 0) + (myScore < opponentScore ? 1 : 0);
-             int d = (t['draws'] ?? 0) + (myScore == opponentScore ? 1 : 0);
-             await supabase.from('teams').update({'wins': w, 'losses': l, 'draws': d}).eq('id', myTeamDbId!);
-          } else {
-             int w = (t['wins'] ?? 0) + (opponentScore > myScore ? 1 : 0);
-             int l = (t['losses'] ?? 0) + (opponentScore < myScore ? 1 : 0);
-             int d = (t['draws'] ?? 0) + (opponentScore == myScore ? 1 : 0);
-             await supabase.from('teams').update({'wins': w, 'losses': l, 'draws': d}).eq('id', oppTeamDbId!);
-          }
-        }
-        gameWasAlreadyFinished = true;
-      }
-
-      // Salvar Estatísticas Gerais
       List<Map<String, dynamic>> batchStats = [];
-      playerStats.forEach((playerName, stats) {
+      playerStats.forEach((playerId, stats) {
-        String? memberDbId = playerDbIds[playerName]; 
+        if (!playerId.startsWith("fake_")) {
-        if (memberDbId != null && stats.values.any((val) => val > 0)) {
+          bool isMyTeamPlayer = myCourt.contains(playerId) || myBench.contains(playerId);
-          bool isMyTeamPlayer = myCourt.contains(playerName) || myBench.contains(playerName);
           batchStats.add({
-            'game_id': gameId, 'member_id': memberDbId, 'team_id': isMyTeamPlayer ? myTeamDbId! : oppTeamDbId!,
+            'game_id': gameId, 'member_id': playerId, 'team_id': isMyTeamPlayer ? myTeamDbId! : oppTeamDbId!,
-            'pts': stats['pts'], 'rbs': stats['rbs'], 'ast': stats['ast'], 'stl': stats['stl'], 'blk': stats['blk'], 'tov': stats['tov'], 'fls': stats['fls'], 'fgm': stats['fgm'], 'fga': stats['fga'], 'ftm': stats['ftm'], 'fta': stats['fta'], 'orb': stats['orb'], 'drb': stats['drb'],
+            'pts': stats['pts'], 'rbs': stats['rbs'], 'ast': stats['ast'], 'stl': stats['stl'], 'blk': stats['blk'], 
+            'tov': stats['tov'], 'fls': stats['fls'], 'fgm': stats['fgm'], 'fga': stats['fga'], 'ftm': stats['ftm'], 
+            'fta': stats['fta'], 'orb': stats['orb'], 'drb': stats['drb'], 'p2m': stats['p2m'], 'p2a': stats['p2a'], 
+            'p3m': stats['p3m'], 'p3a': stats['p3a'],
+            'so': stats['so'], 'il': stats['il'], 'li': stats['li'], 'pa': stats['pa'], 'tres_seg': stats['tres_s'], 
+            'dr': stats['dr'], 'minutos_jogados': stats['min'],
           });
         }
       });
+
       await supabase.from('player_stats').delete().eq('game_id', gameId);
       if (batchStats.isNotEmpty) await supabase.from('player_stats').insert(batchStats);
 
-      // ===============================================
+      final prefs = await SharedPreferences.getInstance();
-      // 🔥 GRAVAR COORDENADAS PARA O HEATMAP
+      await prefs.remove('backup_$gameId');
-      // ===============================================
+
-      List<Map<String, dynamic>> shotsData = [];
+      if (context.mounted) ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Guardado com Sucesso!'), backgroundColor: Colors.green));
-      for (var shot in matchShots) {
-        bool isMyTeamPlayer = myCourt.contains(shot.playerName) || myBench.contains(shot.playerName);
-        shotsData.add({
-          'game_id': gameId,
-          'team_id': isMyTeamPlayer ? myTeamDbId! : oppTeamDbId!,
-          'player_name': shot.playerName,
-          'relative_x': shot.relativeX,
-          'relative_y': shot.relativeY,
-          'is_make': shot.isMake,
-        });
-      }
-      await supabase.from('game_shots').delete().eq('game_id', gameId);
-      if (shotsData.isNotEmpty) await supabase.from('game_shots').insert(shotsData);
 
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Tudo guardado com Sucesso!'), backgroundColor: Colors.green));
-      }
     } catch (e) {
+      debugPrint("Erro ao gravar estatísticas: $e");
       if (context.mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Erro ao guardar: $e'), backgroundColor: Colors.red));
     } finally {
       isSaving = false;
-      onUpdate();
+      notifyListeners();
     }
   }
 
+  @override
   void dispose() {
     timer?.cancel();
+    super.dispose();
   }
 }

lib/controllers/team_controller.dart

@@ -1,50 +1,68 @@
+import 'dart:io';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 class TeamController {
   final _supabase = Supabase.instance.client;
 
-  // 1. Variável fixa para guardar o Stream principal
+  // 1. STREAM (Realtime)
-  late final Stream<List<Map<String, dynamic>>> teamsStream;
+  Stream<List<Map<String, dynamic>>> get teamsStream {
+    final userId = _supabase.auth.currentUser?.id; 
     
-  // 2. Dicionário (Cache) para não recriar Streams de contagem repetidos
+    if (userId == null) return const Stream.empty(); 
-  final Map<String, Stream<int>> _playerCountStreams = {};
 
-  TeamController() {
+    return _supabase
-    // INICIALIZAÇÃO: O stream é criado APENAS UMA VEZ quando abres a página!
-    teamsStream = _supabase
         .from('teams')
         .stream(primaryKey: ['id'])
-        .order('name', ascending: true)
+        .eq('user_id', userId); // ✅ Bem feito, este já estava certo!
-        .map((data) => List<Map<String, dynamic>>.from(data));
   }
 
-  // CRIAR
+  // 2. CRIAR (Agora guarda o dono da equipa!)
-  Future<void> createTeam(String name, String season, String? imageUrl) async {
+  Future<void> createTeam(String name, String season, File? imageFile) async {
     try {
+      final userId = _supabase.auth.currentUser?.id;
+      if (userId == null) throw Exception("Utilizador não autenticado.");
+
+      String? uploadedImageUrl;
+
+      // Se o utilizador escolheu uma imagem, fazemos o upload primeiro
+      if (imageFile != null) {
+        final fileName = '${userId}_${DateTime.now().millisecondsSinceEpoch}.png';
+        final storagePath = 'teams/$fileName';
+
+        await _supabase.storage.from('avatars').upload(
+          storagePath, 
+          imageFile,
+          fileOptions: const FileOptions(cacheControl: '3600', upsert: true)
+        );
+
+        uploadedImageUrl = _supabase.storage.from('avatars').getPublicUrl(storagePath);
+      }
+
+      // Agora insere a equipa na base de dados com o ID DO DONO!
       await _supabase.from('teams').insert({
+        'user_id': userId, // 👈 CRUCIAL: Diz à base de dados de quem é esta equipa!
         'name': name,
         'season': season,
-        'image_url': imageUrl,
+        'image_url': uploadedImageUrl ?? '', 
         'is_favorite': false,
       });
-      print("✅ Equipa guardada no Supabase!");
+      print("✅ Equipa guardada no Supabase com dono associado!");
     } catch (e) {
-      print("❌ Erro ao criar: $e");
+      print("❌ Erro ao criar equipa: $e");
     }
   }
 
-  // ELIMINAR
+  // 3. ELIMINAR
   Future<void> deleteTeam(String id) async {
     try {
+      // Como segurança extra, podemos garantir que só apaga se for o dono (opcional se tiveres RLS no Supabase)
       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");
     }
   }
 
-  // FAVORITAR
+  // 4. FAVORITAR
   Future<void> toggleFavorite(String teamId, bool currentStatus) async {
     try {
       await _supabase
@@ -56,27 +74,29 @@ class TeamController {
     }
   }
 
-  // CONTAR JOGADORES (AGORA COM CACHE DE MEMÓRIA!)
+  // 5. CONTAR JOGADORES (LEITURA ÚNICA)
-  Stream<int> getPlayerCountStream(String teamId) {
+  Future<int> getPlayerCount(String teamId) async {
-    // Se já criámos um "Tubo de ligação" para esta equipa, REUTILIZA-O!
+    try {
-    if (_playerCountStreams.containsKey(teamId)) {
+      final count = await _supabase.from('members').count().eq('team_id', teamId);
-      return _playerCountStreams[teamId]!;
+      return count;
+    } catch (e) {
+      return 0;
+    }
   }
 
-    // Se é a primeira vez que pede esta equipa, cria a ligação e guarda na memória
+  // 6. VIEW DAS EQUIPAS (AQUI ESTAVA O TEU ERRO DE LISTAGEM!)
-    final newStream = _supabase
+  Future<List<Map<String, dynamic>>> getTeamsWithStats() async {
-        .from('members')
+    final userId = _supabase.auth.currentUser?.id;
-        .stream(primaryKey: ['id'])
+    if (userId == null) return []; // Retorna lista vazia se não houver login
-        .eq('team_id', teamId)
-        .map((data) => data.length);
 
-    _playerCountStreams[teamId] = newStream; // Guarda no dicionário
+    final data = await _supabase
-    return newStream;
+        .from('teams_with_stats') 
+        .select('*')
+        .eq('user_id', userId) // 👈 CRUCIAL: Só puxa as estatísticas das tuas equipas!
+        .order('name', ascending: true);
+        
+    return List<Map<String, dynamic>>.from(data);
   }
 
-  // LIMPEZA FINAL QUANDO SAÍMOS DA PÁGINA
+  void dispose() {}
-  void dispose() {
-    // Limpamos o dicionário de streams para libertar memória RAM
-    _playerCountStreams.clear();
-  }
 }

lib/grafico de pizza/controllers/contollers_grafico.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../dados_grafico.dart'; // Ajusta o caminho se der erro de import
+import '../dados_grafico.dart'; 
 
 class PieChartController extends ChangeNotifier {
   PieChartData _chartData = const PieChartData(victories: 0, defeats: 0, draws: 0);
@@ -10,7 +10,7 @@ class PieChartController extends ChangeNotifier {
     _chartData = PieChartData(
       victories: victories ?? _chartData.victories,
       defeats: defeats ?? _chartData.defeats,
-      draws: draws ?? _chartData.draws, // 👇 AGORA ELE ACEITA OS EMPATES
+      draws: draws ?? _chartData.draws, 
     );
     notifyListeners();
   }

lib/grafico de pizza/dados_grafico.dart

@@ -1,7 +1,7 @@
 class PieChartData {
   final int victories;
   final int defeats;
-  final int draws; // 👇 AQUI ESTÃO OS EMPATES
+  final int draws;
 
   const PieChartData({
     required this.victories,
@@ -9,7 +9,6 @@ class PieChartData {
     this.draws = 0,
   });
 
-  // 👇 MATEMÁTICA ATUALIZADA 👇
   int get total => victories + defeats + draws;
   
   double get victoryPercentage => total > 0 ? victories / total : 0;

lib/grafico de pizza/grafico.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:playmaker/grafico%20de%20pizza/widgets/grafico_widgets.dart'; 
 import 'dados_grafico.dart';
+import 'package:playmaker/classe/theme.dart'; // 👇 IMPORT DO TEMA ADICIONADO PARA USARMOS O primaryRed
 import 'dart:math' as math;
 
 class PieChartCard extends StatefulWidget {
@@ -9,7 +10,7 @@ class PieChartCard extends StatefulWidget {
   final int draws;
   final String title;
   final String subtitle;
-  final Color backgroundColor;
+  final Color? backgroundColor;
   final VoidCallback? onTap;
   final double sf;
 
@@ -21,7 +22,7 @@ class PieChartCard extends StatefulWidget {
     this.title = 'DESEMPENHO',
     this.subtitle = 'Temporada',
     this.onTap, 
-    required this.backgroundColor,
+    this.backgroundColor, 
     this.sf = 1.0, 
   });
 
@@ -60,6 +61,10 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
   Widget build(BuildContext context) {
     final data = PieChartData(victories: widget.victories, defeats: widget.defeats, draws: widget.draws);
     
+    // 👇 BLINDAGEM DO FUNDO E DO TEXTO PARA MODO CLARO/ESCURO
+    final Color cardColor = widget.backgroundColor ?? Theme.of(context).cardTheme.color ?? (Theme.of(context).brightness == Brightness.dark ? const Color(0xFF1E1E1E) : Colors.white);
+    final Color textColor = Theme.of(context).colorScheme.onSurface;
+
     return AnimatedBuilder(
       animation: _animation,
       builder: (context, child) {
@@ -70,15 +75,17 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
       },
       child: Card(
         margin: EdgeInsets.zero,
-        elevation: 8,
+        elevation: 0, // Ajustado para não ter sombra dupla, já que o tema pode ter
-        shadowColor: Colors.black54,
         clipBehavior: Clip.antiAlias,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+          side: BorderSide(color: Colors.grey.withOpacity(0.15)), // Borda suave igual ao resto da app
+        ),
         child: InkWell(
           onTap: widget.onTap,
           child: Container(
             decoration: BoxDecoration(
-              color: const Color(0xFF1A222D), 
+              color: cardColor, // 👇 APLICA A COR BLINDADA
             ),
             child: LayoutBuilder(
               builder: (context, constraints) {
@@ -90,27 +97,39 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      // --- CABEÇALHO ---
+                      // --- CABEÇALHO --- (👇 MANTIDO ALINHADO À ESQUERDA)
                       FittedBox(
                         fit: BoxFit.scaleDown,
                         child: Text(widget.title.toUpperCase(), 
-                          style: TextStyle(fontSize: ch * 0.045, fontWeight: FontWeight.bold, color: Colors.white70, letterSpacing: 1.2)),
+                          style: TextStyle(
+                            fontSize: ch * 0.045, 
+                            fontWeight: FontWeight.bold, 
+                            color: AppTheme.primaryRed, // 👇 USANDO O TEU primaryRed
+                            letterSpacing: 1.2
+                          )
+                        ), 
                       ),
                       Text(widget.subtitle, 
-                          style: TextStyle(fontSize: ch * 0.055, fontWeight: FontWeight.bold, color: Colors.white)),
+                          style: TextStyle(
+                            fontSize: ch * 0.055, 
+                            fontWeight: FontWeight.bold, 
+                            color: AppTheme.backgroundLight, // 👇 USANDO O TEU backgroundLight
+                          )
+                      ),
                       
                       const Expanded(flex: 1, child: SizedBox()), 
 
-                      // --- MIOLO (GRÁFICO + STATS GIGANTES À ESQUERDA) ---
+                      // --- MIOLO (GRÁFICO MAIOR À ESQUERDA + STATS) ---
                                            Expanded(
                         flex: 9, 
                         child: Row(
-                          mainAxisAlignment: MainAxisAlignment.start, 
+                          mainAxisAlignment: MainAxisAlignment.end, // Changed from spaceBetween to end to push stats more to the right
                           children: [
-                            // 1. Lado Esquerdo: Donut Chart LIMPO (Sem texto sobreposto)
+                            // 1. Lado Esquerdo: Donut Chart
+                            // 👇 MUDANÇA AQUI: Gráfico ainda maior! cw * 0.52
                             SizedBox(
-                              width: cw * 0.38, 
+                              width: cw * 0.52, 
-                              height: cw * 0.38, 
+                              height: cw * 0.52, 
                               child: PieChartWidget(
                                 victoryPercentage: data.victoryPercentage,
                                 defeatPercentage: data.defeatPercentage,
@@ -119,22 +138,22 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
                               ),
                             ),
 
-                            SizedBox(width: cw * 0.08), 
+                            SizedBox(width: cw * 0.005), // Reduzi o espaço no meio para dar lugar ao gráfico
 
                             // 2. Lado Direito: Números Dinâmicos
                             Expanded(
                               child: FittedBox( 
-                                alignment: Alignment.centerLeft, 
+                                alignment: Alignment.centerRight, // Encosta os números à direita
                                 fit: BoxFit.scaleDown,
                                 child: Column(
                                   mainAxisSize: MainAxisSize.min,
-                                  crossAxisAlignment: CrossAxisAlignment.start, 
+                                  crossAxisAlignment: CrossAxisAlignment.end, // Alinha os números à direita para ficar arrumado
                                   children: [
-                                    _buildDynStatRow("VIT", data.victories.toString(), (data.victoryPercentage * 100).toStringAsFixed(0), Colors.greenAccent, ch, cw),
+                                    _buildDynStatRow("VIT", data.victories.toString(), (data.victoryPercentage * 100).toStringAsFixed(0), Colors.green, textColor, ch, cw),
-                                    _buildDynStatRow("EMP", data.draws.toString(), (data.drawPercentage * 100).toStringAsFixed(0), Colors.yellowAccent, ch, cw),
+                                    _buildDynStatRow("EMP", data.draws.toString(), (data.drawPercentage * 100).toStringAsFixed(0), Colors.amber, textColor, ch, cw),
-                                    _buildDynStatRow("DER", data.defeats.toString(), (data.defeatPercentage * 100).toStringAsFixed(0), Colors.redAccent, ch, cw),
+                                    _buildDynStatRow("DER", data.defeats.toString(), (data.defeatPercentage * 100).toStringAsFixed(0), Colors.red, textColor, ch, cw),
-                                    _buildDynDivider(cw),
+                                    _buildDynDivider(cw, textColor),
-                                    _buildDynStatRow("TOT", data.total.toString(), "100", Colors.white, ch, cw),
+                                    _buildDynStatRow("TOT", data.total.toString(), "100", textColor, textColor, ch, cw),
                                   ],
                                 ),
                               ),
@@ -145,24 +164,24 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
 
                       const Expanded(flex: 1, child: SizedBox()), 
 
-                      // --- RODAPÉ: BOTÃO WIN RATE GIGANTE ---
+                      // --- RODAPÉ: BOTÃO WIN RATE GIGANTE --- (👇 MUDANÇA AQUI: Alinhado à esquerda)
                       Container(
                         width: double.infinity,
                         padding: EdgeInsets.symmetric(vertical: ch * 0.025), 
                         decoration: BoxDecoration(
-                          color: Colors.white.withOpacity(0.08), 
+                          color: textColor.withOpacity(0.05), // 👇 Fundo adaptável
                           borderRadius: BorderRadius.circular(12), 
                         ),
                         child: FittedBox( 
                           fit: BoxFit.scaleDown,
                           child: Row(
-                            mainAxisAlignment: MainAxisAlignment.center,
+                            mainAxisAlignment: MainAxisAlignment.start, // 👇 MUDANÇA AQUI: Letras mais para a esquerda!
                             children: [
-                              Icon(Icons.stars, color: Colors.greenAccent, size: ch * 0.075), 
+                              Icon(Icons.stars, color: Colors.green, size: ch * 0.075), 
                               const SizedBox(width: 10),
                               Text('WIN RATE: ${(data.victoryPercentage * 100).toStringAsFixed(1)}%', 
                                 style: TextStyle(
-                                  color: Colors.white, 
+                                 color: AppTheme.backgroundLight,
                                   fontWeight: FontWeight.w900, 
                                   letterSpacing: 1.0,
                                   fontSize: ch * 0.06 
@@ -183,7 +202,8 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
     );
   }
 
-  Widget _buildDynStatRow(String label, String number, String percent, Color color, double ch, double cw) {
+  // 👇 Ajustei a linha de stats para alinhar melhor agora que os números estão encostados à direita
+  Widget _buildDynStatRow(String label, String number, String percent, Color statColor, Color textColor, double ch, double cw) {
     return Padding(
       padding: EdgeInsets.symmetric(vertical: ch * 0.005), 
       child: Row(
@@ -196,23 +216,23 @@ class _PieChartCardState extends State<PieChartCard> with SingleTickerProviderSt
               crossAxisAlignment: CrossAxisAlignment.end, 
               mainAxisSize: MainAxisSize.min, 
               children: [
-                Text(label, style: TextStyle(fontSize: ch * 0.035, color: Colors.white60, fontWeight: FontWeight.bold)), 
+                Text(label, style: TextStyle(fontSize: ch * 0.045, color: textColor.withOpacity(0.6), fontWeight: FontWeight.bold)), // 👇 TEXTO ADAPTÁVEL (increased from 0.035)
-                Text('$percent%', style: TextStyle(fontSize: ch * 0.04, color: color, fontWeight: FontWeight.bold)), 
+                Text('$percent%', style: TextStyle(fontSize: ch * 0.05, color: statColor, fontWeight: FontWeight.bold)), // (increased from 0.04)
               ],
             ),
           ),
           SizedBox(width: cw * 0.03), 
-          Text(number, style: TextStyle(fontSize: ch * 0.125, fontWeight: FontWeight.w900, color: color, height: 1)),
+          Text(number, style: TextStyle(fontSize: ch * 0.15, fontWeight: FontWeight.w900, color: statColor, height: 1)), // (increased from 0.125)
         ],
       ),
     );
   }
 
-  Widget _buildDynDivider(double cw) {
+  Widget _buildDynDivider(double cw, Color textColor) {
     return Container(
       width: cw * 0.35, 
       height: 1.5, 
-      color: Colors.white24, 
+      color: textColor.withOpacity(0.2), // 👇 LINHA ADAPTÁVEL
       margin: const EdgeInsets.symmetric(vertical: 4) 
     );
   }

lib/grafico de pizza/widgets/grafico_widgets.dart

@@ -19,12 +19,9 @@ class PieChartWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        // 👇 MAGIA ANTI-DESAPARECIMENTO 👇
-        // Vê o espaço real. Se por algum motivo for infinito, assume 100 para não sumir.
         final double w = constraints.maxWidth.isInfinite ? 100.0 : constraints.maxWidth;
         final double h = constraints.maxHeight.isInfinite ? 100.0 : constraints.maxHeight;
         
-        // Pega no menor valor para garantir que o círculo não é cortado
         final double size = math.min(w, h);
         
         return Center(
@@ -32,7 +29,7 @@ class PieChartWidget extends StatelessWidget {
             width: size,
             height: size,
             child: CustomPaint(
-              painter: _PieChartPainter(
+              painter: _DonutChartPainter(
                 victoryPercentage: victoryPercentage,
                 defeatPercentage: defeatPercentage,
                 drawPercentage: drawPercentage,
@@ -48,24 +45,27 @@ class PieChartWidget extends StatelessWidget {
   }
 
   Widget _buildCenterLabels(double size) {
+    final bool hasGames = victoryPercentage > 0 || defeatPercentage > 0 || drawPercentage > 0;
+
     return Column(
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         Text(
-          '${(victoryPercentage * 100).toStringAsFixed(1)}%',
+          // 👇 Casa decimal aplicada aqui!
+          hasGames ? '${(victoryPercentage * 100).toStringAsFixed(1)}%' : '---', 
           style: TextStyle(
-            fontSize: size * 0.18, // O texto cresce ou encolhe com o círculo
+            fontSize: size * (hasGames ? 0.20 : 0.15), 
             fontWeight: FontWeight.bold,
-            color: Colors.white,
+            color: hasGames ? Colors.white : Colors.white54,
           ),
         ),
         SizedBox(height: size * 0.02),
         Text(
-          'Vitórias',
+          hasGames ? 'Vitórias' : 'Sem Jogos', 
           style: TextStyle(
-            fontSize: size * 0.10, 
+            fontSize: size * 0.08, 
-            color: Colors.white.withOpacity(0.8),
+            color: hasGames ? Colors.white70 : Colors.white38,
           ),
         ),
       ],
@@ -73,12 +73,12 @@ class PieChartWidget extends StatelessWidget {
   }
 }
 
-class _PieChartPainter extends CustomPainter {
+class _DonutChartPainter extends CustomPainter {
   final double victoryPercentage;
   final double defeatPercentage;
   final double drawPercentage;
 
-  _PieChartPainter({
+  _DonutChartPainter({
     required this.victoryPercentage,
     required this.defeatPercentage,
     required this.drawPercentage,
@@ -87,59 +87,40 @@ class _PieChartPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     final center = Offset(size.width / 2, size.height / 2);
-    // Margem de 5% para a linha de fora não ser cortada
+    final radius = (size.width / 2) - (size.width * 0.1); 
-    final radius = (size.width / 2) - (size.width * 0.05); 
+    final strokeWidth = size.width * 0.2;
+    
+    if (victoryPercentage == 0 && defeatPercentage == 0 && drawPercentage == 0) {
+      final bgPaint = Paint()
+        ..color = Colors.white.withOpacity(0.05)
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = strokeWidth;
+      canvas.drawCircle(center, radius, bgPaint);
+      return;
+    }
 
     const victoryColor = Colors.green;
     const defeatColor = Colors.red;
-    const drawColor = Colors.yellow;
+    const drawColor = Colors.amber;
-    const borderColor = Colors.white30;
     
     double startAngle = -math.pi / 2; 
 
-    if (victoryPercentage > 0) {
+    void drawDonutSector(double percentage, Color color) {
-      final sweepAngle = 2 * math.pi * victoryPercentage;
+      if (percentage <= 0) return;
-      _drawSector(canvas, center, radius, startAngle, sweepAngle, victoryColor, size.width);
+      final sweepAngle = 2 * math.pi * percentage;
-      startAngle += sweepAngle;
-    }
-    
-    if (drawPercentage > 0) {
-      final sweepAngle = 2 * math.pi * drawPercentage;
-      _drawSector(canvas, center, radius, startAngle, sweepAngle, drawColor, size.width);
-      startAngle += sweepAngle;
-    }
-    
-    if (defeatPercentage > 0) {
-      final sweepAngle = 2 * math.pi * defeatPercentage;
-      _drawSector(canvas, center, radius, startAngle, sweepAngle, defeatColor, size.width);
-    }
-    
-    final borderPaint = Paint()
-      ..color = borderColor
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = size.width * 0.02; 
-    
-    canvas.drawCircle(center, radius, borderPaint);
-  }
-
-  void _drawSector(Canvas canvas, Offset center, double radius, double startAngle, double sweepAngle, Color color, double totalWidth) {
       final paint = Paint()
         ..color = color
-      ..style = PaintingStyle.fill;
-    
-    canvas.drawArc(Rect.fromCircle(center: center, radius: radius), startAngle, sweepAngle, true, paint);
-    
-    if (sweepAngle < 2 * math.pi) {
-      final linePaint = Paint()
-        ..color = Colors.white.withOpacity(0.5)
         ..style = PaintingStyle.stroke
-        ..strokeWidth = totalWidth * 0.015; 
+        ..strokeWidth = strokeWidth
+        ..strokeCap = StrokeCap.butt; 
       
-      final lineX = center.dx + radius * math.cos(startAngle);
+      canvas.drawArc(Rect.fromCircle(center: center, radius: radius), startAngle, sweepAngle, false, paint);
-      final lineY = center.dy + radius * math.sin(startAngle);
+      startAngle += sweepAngle;
-      
-      canvas.drawLine(center, Offset(lineX, lineY), linePaint);
     }
+    
+    drawDonutSector(victoryPercentage, victoryColor);
+    drawDonutSector(drawPercentage, drawColor);
+    drawDonutSector(defeatPercentage, defeatColor);
   }
 
   @override

lib/main.dart

@@ -1,35 +1,47 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart'; // Para as orientações
 import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:playmaker/classe/theme.dart'; 
 import 'pages/login.dart';
 
+// Variável global para controlar o Tema
+final ValueNotifier<ThemeMode> themeNotifier = ValueNotifier(ThemeMode.system);
+
 void main() async {
+  // 1. Inicializa os bindings do Flutter
   WidgetsFlutterBinding.ensureInitialized();
 
+  // 2. Inicializa o Supabase
   await Supabase.initialize(
     url: 'https://sihwjdshexjyvsbettcd.supabase.co', 
-    anonKey: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InNpaHdqZHNoZXhqeXZzYmV0dGNkIiwicm9sZSI6ImFub24iLCJpYXQiOjE3Njg5MTQxMjgsImV4cCI6MjA4NDQ5MDEyOH0.gW3AvTJVNyE1Dqa72OTnhrUIKsndexrY3pKxMIAaAy8',    // Uma string longa
+    anonKey: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InNpaHdqZHNoZXhqeXZzYmV0dGNkIiwicm9sZSI6ImFub24iLCJpYXQiOjE3Njg5MTQxMjgsImV4cCI6MjA4NDQ5MDEyOH0.gW3AvTJVNyE1Dqa72OTnhrUIKsndexrY3pKxMIAaAy8',
-  
   );
 
+  // 3. Deixa a orientação livre (Portrait) para o arranque da App
+  SystemChrome.setPreferredOrientations([
+    DeviceOrientation.portraitUp,
+  ]);
+
   runApp(const MyApp());
 }
 
-
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
   
   @override
   Widget build(BuildContext context) {
+    return ValueListenableBuilder<ThemeMode>(
+      valueListenable: themeNotifier,
+      builder: (_, ThemeMode currentMode, __) {
         return MaterialApp(
           debugShowCheckedModeBanner: false,
           title: 'PlayMaker',
-      theme: ThemeData(
+          theme: AppTheme.lightTheme,
-        colorScheme: ColorScheme.fromSeed(
+          darkTheme: AppTheme.darkTheme,
-          seedColor: const Color(0xFFE74C3C), 
+          themeMode: currentMode,
-        ),
-        useMaterial3: true,
-      ),
           home: const LoginPage(),
         );
+      },
+    );
   }
 }

lib/models/game_model.dart

@@ -1,32 +1,71 @@
 class Game {
   final String id;
+  final String userId;
   final String myTeam;
   final String opponentTeam;
   final String myScore; 
   final String opponentScore;
-  final String status;
   final String season;
+  final String status;
+  final DateTime gameDate;
+  
+  // Novos campos que estão na tua base de dados
+  final int remainingSeconds;
+  final int myTimeouts;
+  final int oppTimeouts;
+  final int currentQuarter;
+  final String topPtsName;
+  final String topAstName;
+  final String topRbsName;
+  final String topDefName;
+  final String mvpName;
 
   Game({
     required this.id,
+    required this.userId,
     required this.myTeam,
     required this.opponentTeam,
     required this.myScore,
     required this.opponentScore,
-    required this.status,
     required this.season,
+    required this.status,
+    required this.gameDate,
+    required this.remainingSeconds,
+    required this.myTimeouts,
+    required this.oppTimeouts,
+    required this.currentQuarter,
+    required this.topPtsName,
+    required this.topAstName,
+    required this.topRbsName,
+    required this.topDefName,
+    required this.mvpName,
   });
 
-  factory Game.fromMap(Map<String, dynamic> map) {
+  // 👇 A MÁGICA ACONTECE AQUI: Lemos os dados e protegemos os NULLs
+  factory Game.fromMap(Map<String, dynamic> json) {
     return Game(
-      // O "?." converte para texto com segurança, e o "?? '...'" diz o que mostrar se for nulo (vazio)
+      id: json['id']?.toString() ?? '',
-      id: map['id']?.toString() ?? '',
+      userId: json['user_id']?.toString() ?? '',
-      myTeam: map['my_team']?.toString() ?? 'Desconhecida',
+      myTeam: json['my_team']?.toString() ?? 'Minha Equipa',
-      opponentTeam: map['opponent_team']?.toString() ?? 'Adversário',
+      opponentTeam: json['opponent_team']?.toString() ?? 'Adversário',
-      myScore: map['my_score']?.toString() ?? '0',
+      myScore: (json['my_score'] ?? 0).toString(), // Protege NULL e converte Int4 para String
-      opponentScore: map['opponent_score']?.toString() ?? '0',
+      opponentScore: (json['opponent_score'] ?? 0).toString(),
-      status: map['status']?.toString() ?? 'Terminado',
+      season: json['season']?.toString() ?? '---',
-      season: map['season']?.toString() ?? 'Sem Época',
+      status: json['status']?.toString() ?? 'Decorrer',
+      gameDate: json['game_date'] != null ? DateTime.tryParse(json['game_date']) ?? DateTime.now() : DateTime.now(),
+      
+      // Proteção para os Inteiros (se for NULL, assume 0)
+      remainingSeconds: json['remaining_seconds'] as int? ?? 600, // 600s = 10 minutos
+      myTimeouts: json['my_timeouts'] as int? ?? 0,
+      oppTimeouts: json['opp_timeouts'] as int? ?? 0,
+      currentQuarter: json['current_quarter'] as int? ?? 1,
+      
+      // Proteção para os Nomes (se for NULL, assume '---')
+      topPtsName: json['top_pts_name']?.toString() ?? '---',
+      topAstName: json['top_ast_name']?.toString() ?? '---',
+      topRbsName: json['top_rbs_name']?.toString() ?? '---',
+      topDefName: json['top_def_name']?.toString() ?? '---',
+      mvpName: json['mvp_name']?.toString() ?? '---',
     );
   }
 }

lib/models/person_model.dart

@@ -3,24 +3,43 @@ class Person {
   final String teamId;
   final String name;
   final String type; // 'Jogador' ou 'Treinador'
-  final String number;
+  final String? number; // O número é opcional (Treinadores não têm)
+  
+  // 👇 A NOVA PROPRIEDADE AQUI!
+  final String? imageUrl; 
 
   Person({
     required this.id,
     required this.teamId,
     required this.name,
     required this.type,
-    required this.number,
+    this.number,
+    this.imageUrl, // 👇 ADICIONADO AO CONSTRUTOR
   });
 
-  // Converte o JSON do Supabase para o objeto Person
+  // Lê os dados do Supabase e converte para a classe Person
   factory Person.fromMap(Map<String, dynamic> map) {
     return Person(
-      id: map['id'] ?? '',
+      id: map['id']?.toString() ?? '',
-      teamId: map['team_id'] ?? '',
+      teamId: map['team_id']?.toString() ?? '',
-      name: map['name'] ?? '',
+      name: map['name']?.toString() ?? 'Desconhecido',
-      type: map['type'] ?? 'Jogador',
+      type: map['type']?.toString() ?? 'Jogador',
-      number: map['number']?.toString() ?? '',
+      number: map['number']?.toString(),
+      
+      // 👇 AGORA ELE JÁ SABE LER O LINK DA IMAGEM DA TUA BASE DE DADOS!
+      imageUrl: map['image_url']?.toString(), 
     );
   }
+
+  // Prepara os dados para enviar para o Supabase (se necessário)
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'team_id': teamId,
+      'name': name,
+      'type': type,
+      'number': number,
+      'image_url': imageUrl, // 👇 TAMBÉM GUARDA A IMAGEM
+    };
+  }
 }

lib/models/team_model.dart

@@ -4,26 +4,33 @@ class Team {
   final String season;
   final String imageUrl;
   final bool isFavorite;
+  final String createdAt;
+  final int playerCount; // 👇 NOVA VARIÁVEL AQUI
 
   Team({
     required this.id,
     required this.name,
     required this.season,
     required this.imageUrl,
-    this.isFavorite = false
+    required this.isFavorite,
+    required this.createdAt,
+    this.playerCount = 0, // 👇 VALOR POR DEFEITO
   });
 
-  // Mapeia o JSON que vem do Supabase (id costuma ser UUID ou String)
   factory Team.fromMap(Map<String, dynamic> map) {
     return Team(
       id: map['id']?.toString() ?? '',
-      name: map['name'] ?? '',
+      name: map['name']?.toString() ?? 'Sem Nome',
-      season: map['season'] ?? '',
+      season: map['season']?.toString() ?? '',
-      imageUrl: map['image_url'] ?? '',
+      imageUrl: map['image_url']?.toString() ?? '',
       isFavorite: map['is_favorite'] ?? false,
+      createdAt: map['created_at']?.toString() ?? '',
+      // 👇 AGORA ELE LÊ A CONTAGEM DA TUA NOVA VIEW!
+      playerCount: map['player_count'] != null ? int.tryParse(map['player_count'].toString()) ?? 0 : 0,
     );
   }
 
+
   Map<String, dynamic> toMap() {
     return {
       'name': name,

lib/pages/RegisterPage.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:playmaker/classe/theme.dart'; // 👇 IMPORT DO TEMA
 import '../controllers/register_controller.dart';
 import '../widgets/register_widgets.dart';
 import '../utils/size_extension.dart'; // 👇 O NOSSO SUPERPODER!
@@ -22,11 +23,20 @@ class _RegisterPageState extends State<RegisterPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Colors.white,
+      // 👇 BLINDADO: Adapta-se automaticamente ao Modo Claro/Escuro
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       appBar: AppBar(
-        title: Text("Criar Conta", style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold)),
+        title: Text(
-        backgroundColor: Colors.white,
+          "Criar Conta", 
+          style: TextStyle(
+            fontSize: 18 * context.sf, 
+            fontWeight: FontWeight.bold,
+            color: Theme.of(context).colorScheme.onSurface, // 👇 Adaptável ao Modo Escuro
+          )
+        ),
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
         elevation: 0,
+        iconTheme: IconThemeData(color: Theme.of(context).colorScheme.onSurface),
       ),
       body: Center(
         child: SingleChildScrollView(
@@ -40,7 +50,7 @@ class _RegisterPageState extends State<RegisterPage> {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    const RegisterHeader(), // 🔥 Agora sim, usa o Header bonito!
+                    const RegisterHeader(), 
                     SizedBox(height: 30 * context.sf),
                     
                     RegisterFormFields(controller: _controller),

lib/pages/gamePage.dart

@@ -1,88 +1,174 @@
 import 'package:flutter/material.dart';
 import 'package:playmaker/pages/PlacarPage.dart'; 
-import '../controllers/game_controller.dart';
+import 'package:playmaker/classe/theme.dart'; 
+import 'package:cached_network_image/cached_network_image.dart'; 
 import '../controllers/team_controller.dart';
+import '../controllers/game_controller.dart'; 
 import '../models/game_model.dart';
 import '../utils/size_extension.dart';
-import 'dart:math' as math; // 👇 IMPORTANTE PARA O TRAVÃO DE MÃO
+import 'pdf_export_service.dart'; 
 
-// --- CARD DE EXIBIÇÃO DO JOGO ---
 class GameResultCard extends StatelessWidget {
   final String gameId, myTeam, opponentTeam, myScore, opponentScore, status, season;
   final String? myTeamLogo, opponentTeamLogo; 
+  final double sf; 
+  final VoidCallback onDelete;
 
   const GameResultCard({
     super.key, required this.gameId, required this.myTeam, required this.opponentTeam,
     required this.myScore, required this.opponentScore, required this.status, required this.season,
-    this.myTeamLogo, this.opponentTeamLogo, 
+    this.myTeamLogo, this.opponentTeamLogo, required this.sf, required this.onDelete,
   });
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO DO TABLET
+    final bgColor = Theme.of(context).cardTheme.color ?? Theme.of(context).colorScheme.surface;
+    final textColor = Theme.of(context).colorScheme.onSurface;
 
     return Container(
-      margin: EdgeInsets.only(bottom: 16 * safeSf),
+      margin: EdgeInsets.only(bottom: 16 * sf),
-      padding: EdgeInsets.all(16 * safeSf),
+      padding: EdgeInsets.all(16 * sf),
-      decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(20 * safeSf), boxShadow: [BoxShadow(color: Colors.black12, blurRadius: 10 * safeSf)]),
+      decoration: BoxDecoration(
-      child: Row(
+        color: bgColor,
+        borderRadius: BorderRadius.circular(20 * sf),
+        boxShadow: [BoxShadow(color: Colors.black12, blurRadius: 10 * sf)],
+        border: Border.all(color: Colors.grey.withOpacity(0.1)),
+      ),
+      child: Stack(
+        children: [
+          Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-          Expanded(child: _buildTeamInfo(myTeam, const Color(0xFFE74C3C), myTeamLogo, safeSf)),
+              Expanded(child: _buildTeamInfo(myTeam, AppTheme.primaryRed, myTeamLogo, sf, textColor)),
-          _buildScoreCenter(context, gameId, safeSf),
+              _buildScoreCenter(context, gameId, sf, textColor),
-          Expanded(child: _buildTeamInfo(opponentTeam, Colors.black87, opponentTeamLogo, safeSf)),
+              Expanded(child: _buildTeamInfo(opponentTeam, Colors.grey.shade600, opponentTeamLogo, sf, textColor)),
+            ],
+          ),
+          
+          Positioned(
+            top: -10 * sf,
+            right: -10 * sf,
+            child: Row(
+              children: [
+                IconButton(
+                  icon: Icon(Icons.picture_as_pdf, color: AppTheme.primaryRed.withOpacity(0.8), size: 22 * sf),
+                  splashRadius: 20 * sf,
+                  tooltip: 'Gerar PDF',
+                  onPressed: () async {
+                    ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('A gerar PDF...'), duration: Duration(seconds: 1)));
+                    await PdfExportService.generateAndPrintBoxScore(
+                      gameId: gameId,
+                      myTeam: myTeam,
+                      opponentTeam: opponentTeam,
+                      myScore: myScore,
+                      opponentScore: opponentScore,
+                      season: season,
+                    );
+                  },
+                ),
+                IconButton(
+                  icon: Icon(Icons.delete_outline, color: Colors.grey.shade400, size: 22 * sf),
+                  splashRadius: 20 * sf,
+                  tooltip: 'Eliminar Jogo',
+                  onPressed: () => _showDeleteConfirmation(context),
+                ),
+              ],
+            ),
+          ),
         ],
       ),
     );
   }
 
-  Widget _buildTeamInfo(String name, Color color, String? logoUrl, double safeSf) {
+  void _showDeleteConfirmation(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * sf)),
+        title: Text('Eliminar Jogo', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16 * sf, color: Theme.of(context).colorScheme.onSurface)),
+        content: Text('Tem a certeza que deseja eliminar este jogo? Esta ação apagará todas as estatísticas associadas e não pode ser desfeita.', style: TextStyle(fontSize: 14 * sf, color: Theme.of(context).colorScheme.onSurface)),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(ctx), 
+            child: Text('CANCELAR', style: TextStyle(color: Colors.grey, fontSize: 14 * sf))
+          ),
+          TextButton(
+            onPressed: () {
+              Navigator.pop(ctx);
+              onDelete();
+            }, 
+            child: Text('ELIMINAR', style: TextStyle(color: AppTheme.primaryRed, fontWeight: FontWeight.bold, fontSize: 14 * sf))
+          ),
+        ],
+      )
+    );
+  }
+
+  Widget _buildTeamInfo(String name, Color color, String? logoUrl, double sf, Color textColor) {
+    final double avatarSize = 48 * sf;
+
     return Column(
       children: [
-        CircleAvatar(radius: 24 * safeSf, backgroundColor: color, backgroundImage: (logoUrl != null && logoUrl.isNotEmpty) ? NetworkImage(logoUrl) : null, child: (logoUrl == null || logoUrl.isEmpty) ? Icon(Icons.shield, color: Colors.white, size: 24 * safeSf) : null),
+        ClipOval(
-        SizedBox(height: 6 * safeSf),
+          child: Container(
-        Text(name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13 * safeSf), textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, maxLines: 2),
+            width: avatarSize,
+            height: avatarSize,
+            color: color.withOpacity(0.1),
+            child: (logoUrl != null && logoUrl.isNotEmpty) 
+                ? CachedNetworkImage(
+                    imageUrl: logoUrl,
+                    fit: BoxFit.cover,
+                    fadeInDuration: Duration.zero,
+                    placeholder: (context, url) => Center(child: Icon(Icons.shield, color: color, size: 24 * sf)),
+                    errorWidget: (context, url, error) => Center(child: Icon(Icons.shield, color: color, size: 24 * sf)),
+                  )
+                : Center(child: Icon(Icons.shield, color: color, size: 24 * sf)),
+          ),
+        ),
+        SizedBox(height: 6 * sf),
+        Text(name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13 * sf, color: textColor), textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, maxLines: 2),
       ],
     );
   }
 
-  Widget _buildScoreCenter(BuildContext context, String id, double safeSf) {
+  Widget _buildScoreCenter(BuildContext context, String id, double sf, Color textColor) {
     return Column(
       children: [
         Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            _scoreBox(myScore, Colors.green, safeSf),
+            _scoreBox(myScore, AppTheme.successGreen, sf),
-            Text(" : ", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 22 * safeSf)),
+            Text(" : ", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 22 * sf, color: textColor)),
-            _scoreBox(opponentScore, Colors.grey, safeSf),
+            _scoreBox(opponentScore, Colors.grey, sf),
           ],
         ),
-        SizedBox(height: 10 * safeSf),
+        SizedBox(height: 10 * sf),
         TextButton.icon(
           onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => PlacarPage(gameId: id, myTeam: myTeam, opponentTeam: opponentTeam))),
-          icon: Icon(Icons.play_circle_fill, size: 18 * safeSf, color: const Color(0xFFE74C3C)),
+          icon: Icon(Icons.play_circle_fill, size: 18 * sf, color: AppTheme.primaryRed),
-          label: Text("RETORNAR", style: TextStyle(fontSize: 11 * safeSf, color: const Color(0xFFE74C3C), fontWeight: FontWeight.bold)),
+          label: Text("RETORNAR", style: TextStyle(fontSize: 11 * sf, color: AppTheme.primaryRed, fontWeight: FontWeight.bold)),
-          style: TextButton.styleFrom(backgroundColor: const Color(0xFFE74C3C).withOpacity(0.1), padding: EdgeInsets.symmetric(horizontal: 14 * safeSf, vertical: 8 * safeSf), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * safeSf)), visualDensity: VisualDensity.compact),
+          style: TextButton.styleFrom(backgroundColor: AppTheme.primaryRed.withOpacity(0.1), padding: EdgeInsets.symmetric(horizontal: 14 * sf, vertical: 8 * sf), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * sf)), visualDensity: VisualDensity.compact),
         ),
-        SizedBox(height: 6 * safeSf),
+        SizedBox(height: 6 * sf),
-        Text(status, style: TextStyle(fontSize: 12 * safeSf, color: Colors.blue, fontWeight: FontWeight.bold)),
+        Text(status, style: TextStyle(fontSize: 12 * sf, color: Colors.blue, fontWeight: FontWeight.bold)),
       ],
     );
   }
 
-  Widget _scoreBox(String pts, Color c, double safeSf) => Container(
+  Widget _scoreBox(String pts, Color c, double sf) => Container(
-    padding: EdgeInsets.symmetric(horizontal: 12 * safeSf, vertical: 6 * safeSf),
+    padding: EdgeInsets.symmetric(horizontal: 12 * sf, vertical: 6 * sf),
-    decoration: BoxDecoration(color: c, borderRadius: BorderRadius.circular(8 * safeSf)),
+    decoration: BoxDecoration(color: c, borderRadius: BorderRadius.circular(8 * sf)),
-    child: Text(pts, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 16 * safeSf)),
+    child: Text(pts, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 16 * sf)),
   );
 }
 
-// --- POPUP DE CRIAÇÃO ---
 class CreateGameDialogManual extends StatefulWidget {
   final TeamController teamController;
   final GameController gameController;
+  final double sf;
 
-  const CreateGameDialogManual({super.key, required this.teamController, required this.gameController});
+  const CreateGameDialogManual({super.key, required this.teamController, required this.gameController, required this.sf});
 
   @override
   State<CreateGameDialogManual> createState() => _CreateGameDialogManualState();
@@ -107,30 +193,30 @@ class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO DO TABLET
-
     return AlertDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * safeSf)),
+      backgroundColor: Theme.of(context).colorScheme.surface,
-      title: Text('Configurar Partida', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18 * safeSf)),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * widget.sf)),
+      title: Text('Configurar Partida', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18 * widget.sf, color: Theme.of(context).colorScheme.onSurface)),
       content: SingleChildScrollView(
-        child: Container(
-          constraints: BoxConstraints(maxWidth: 450 * safeSf), // LIMITA A LARGURA NO TABLET
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-              TextField(controller: _seasonController, style: TextStyle(fontSize: 14 * safeSf), decoration: InputDecoration(labelText: 'Temporada', labelStyle: TextStyle(fontSize: 14 * safeSf), border: const OutlineInputBorder(), prefixIcon: Icon(Icons.calendar_today, size: 20 * safeSf))),
+            TextField(
-              SizedBox(height: 15 * safeSf),
+              controller: _seasonController, 
-              _buildSearch(label: "Minha Equipa", controller: _myTeamController, safeSf: safeSf),
+              style: TextStyle(fontSize: 14 * widget.sf, color: Theme.of(context).colorScheme.onSurface), 
-              Padding(padding: EdgeInsets.symmetric(vertical: 10 * safeSf), child: Text("VS", style: TextStyle(fontWeight: FontWeight.bold, color: Colors.grey, fontSize: 16 * safeSf))),
+              decoration: InputDecoration(labelText: 'Temporada', labelStyle: TextStyle(fontSize: 14 * widget.sf), border: const OutlineInputBorder(), prefixIcon: Icon(Icons.calendar_today, size: 20 * widget.sf))
-              _buildSearch(label: "Adversário", controller: _opponentController, safeSf: safeSf),
+            ),
+            SizedBox(height: 15 * widget.sf),
+            _buildSearch(context, "Minha Equipa", _myTeamController),
+            Padding(padding: EdgeInsets.symmetric(vertical: 10 * widget.sf), child: Text("VS", style: TextStyle(fontWeight: FontWeight.bold, color: Colors.grey, fontSize: 16 * widget.sf))),
+            _buildSearch(context, "Adversário", _opponentController),
           ],
         ),
       ),
-      ),
       actions: [
-        TextButton(onPressed: () => Navigator.pop(context), child: Text('CANCELAR', style: TextStyle(fontSize: 14 * safeSf))),
+        TextButton(onPressed: () => Navigator.pop(context), child: Text('CANCELAR', style: TextStyle(fontSize: 14 * widget.sf, color: Colors.grey))),
         ElevatedButton(
-          style: ElevatedButton.styleFrom(backgroundColor: const Color(0xFFE74C3C), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10 * safeSf)), padding: EdgeInsets.symmetric(horizontal: 16 * safeSf, vertical: 10 * safeSf)),
+          style: ElevatedButton.styleFrom(backgroundColor: AppTheme.primaryRed, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10 * widget.sf)), padding: EdgeInsets.symmetric(horizontal: 16 * widget.sf, vertical: 10 * widget.sf)),
           onPressed: _isLoading ? null : () async {
             if (_myTeamController.text.isNotEmpty && _opponentController.text.isNotEmpty) {
               setState(() => _isLoading = true);
@@ -142,13 +228,13 @@ class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
               }
             }
           },
-          child: _isLoading ? SizedBox(width: 20 * safeSf, height: 20 * safeSf, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2)) : Text('CRIAR', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 14 * safeSf)),
+          child: _isLoading ? SizedBox(width: 20 * widget.sf, height: 20 * widget.sf, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2)) : Text('CRIAR', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 14 * widget.sf)),
         ),
       ],
     );
   }
   
-  Widget _buildSearch({required String label, required TextEditingController controller, required double safeSf}) {
+  Widget _buildSearch(BuildContext context, String label, TextEditingController controller) {
     return StreamBuilder<List<Map<String, dynamic>>>(
       stream: widget.teamController.teamsStream,
       builder: (context, snapshot) {
@@ -164,9 +250,10 @@ class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
             return Align(
               alignment: Alignment.topLeft,
               child: Material(
-                elevation: 4.0, borderRadius: BorderRadius.circular(8 * safeSf),
+                color: Theme.of(context).colorScheme.surface,
+                elevation: 4.0, borderRadius: BorderRadius.circular(8 * widget.sf),
                 child: ConstrainedBox(
-                  constraints: BoxConstraints(maxHeight: 250 * safeSf, maxWidth: 400 * safeSf), // Limita também o dropdown 
+                  constraints: BoxConstraints(maxHeight: 250 * widget.sf, maxWidth: MediaQuery.of(context).size.width * 0.7), 
                   child: ListView.builder(
                     padding: EdgeInsets.zero, shrinkWrap: true, itemCount: options.length,
                     itemBuilder: (BuildContext context, int index) {
@@ -174,8 +261,23 @@ class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
                       final String name = option['name'].toString();
                       final String? imageUrl = option['image_url'];
                       return ListTile(
-                        leading: CircleAvatar(radius: 20 * safeSf, backgroundColor: Colors.grey.shade200, backgroundImage: (imageUrl != null && imageUrl.isNotEmpty) ? NetworkImage(imageUrl) : null, child: (imageUrl == null || imageUrl.isEmpty) ? Icon(Icons.shield, color: Colors.grey, size: 20 * safeSf) : null),
+                        leading: ClipOval(
-                        title: Text(name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14 * safeSf)),
+                          child: Container(
+                            width: 40 * widget.sf,
+                            height: 40 * widget.sf,
+                            color: Colors.grey.withOpacity(0.2),
+                            child: (imageUrl != null && imageUrl.isNotEmpty) 
+                                ? CachedNetworkImage(
+                                    imageUrl: imageUrl,
+                                    fit: BoxFit.cover,
+                                    fadeInDuration: Duration.zero,
+                                    placeholder: (context, url) => Icon(Icons.shield, color: Colors.grey, size: 20 * widget.sf),
+                                    errorWidget: (context, url, error) => Icon(Icons.shield, color: Colors.grey, size: 20 * widget.sf),
+                                  )
+                                : Icon(Icons.shield, color: Colors.grey, size: 20 * widget.sf),
+                          ),
+                        ),
+                        title: Text(name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14 * widget.sf, color: Theme.of(context).colorScheme.onSurface)),
                         onTap: () { onSelected(option); },
                       );
                     },
@@ -188,8 +290,9 @@ class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
             if (txtCtrl.text.isEmpty && controller.text.isNotEmpty) txtCtrl.text = controller.text;
             txtCtrl.addListener(() { controller.text = txtCtrl.text; });
             return TextField(
-              controller: txtCtrl, focusNode: node, style: TextStyle(fontSize: 14 * safeSf),
+              controller: txtCtrl, focusNode: node, 
-              decoration: InputDecoration(labelText: label, labelStyle: TextStyle(fontSize: 14 * safeSf), prefixIcon: Icon(Icons.search, size: 20 * safeSf), border: const OutlineInputBorder()),
+              style: TextStyle(fontSize: 14 * widget.sf, color: Theme.of(context).colorScheme.onSurface),
+              decoration: InputDecoration(labelText: label, labelStyle: TextStyle(fontSize: 14 * widget.sf), prefixIcon: Icon(Icons.search, size: 20 * widget.sf, color: AppTheme.primaryRed)),
             );
           },
         );
@@ -198,9 +301,6 @@ class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
   }
 }
 
-// (O RESTO DA CLASSE GamePage CONTINUA IGUAL, o sf nativo já estava protegido lá dentro)
-
-// --- PÁGINA PRINCIPAL DOS JOGOS ---
 class GamePage extends StatefulWidget {
   const GamePage({super.key});
 
@@ -219,16 +319,16 @@ class _GamePageState extends State<GamePage> {
     bool isFilterActive = selectedSeason != 'Todas' || selectedTeam != 'Todas';
 
     return Scaffold(
-      backgroundColor: const Color(0xFFF5F7FA),
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       appBar: AppBar(
         title: Text("Jogos", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20 * context.sf)),
-        backgroundColor: Colors.white,
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
         elevation: 0,
         actions: [
           Padding(
             padding: EdgeInsets.only(right: 8.0 * context.sf),
             child: IconButton(
-              icon: Icon(isFilterActive ? Icons.filter_list_alt : Icons.filter_list, color: isFilterActive ? const Color(0xFFE74C3C) : Colors.black87, size: 26 * context.sf),
+              icon: Icon(isFilterActive ? Icons.filter_list_alt : Icons.filter_list, color: isFilterActive ? AppTheme.primaryRed : Theme.of(context).colorScheme.onSurface, size: 26 * context.sf),
               onPressed: () => _showFilterPopup(context),
             ),
           )
@@ -242,9 +342,9 @@ class _GamePageState extends State<GamePage> {
             stream: gameController.getFilteredGames(teamFilter: selectedTeam, seasonFilter: selectedSeason),
             builder: (context, gameSnapshot) {
               if (gameSnapshot.connectionState == ConnectionState.waiting && teamsList.isEmpty) return const Center(child: CircularProgressIndicator());
-              if (gameSnapshot.hasError) return Center(child: Text("Erro: ${gameSnapshot.error}", style: TextStyle(fontSize: 14 * context.sf)));
+              if (gameSnapshot.hasError) return Center(child: Text("Erro: ${gameSnapshot.error}", style: TextStyle(fontSize: 14 * context.sf, color: Theme.of(context).colorScheme.onSurface)));
               if (!gameSnapshot.hasData || gameSnapshot.data!.isEmpty) {
-                return Center(child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [Icon(Icons.search_off, size: 48 * context.sf, color: Colors.grey.shade300), SizedBox(height: 10 * context.sf), Text("Nenhum jogo encontrado.", style: TextStyle(fontSize: 14 * context.sf, color: Colors.grey.shade600))]));
+                return Center(child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [Icon(Icons.search_off, size: 48 * context.sf, color: Colors.grey.withOpacity(0.3)), SizedBox(height: 10 * context.sf), Text("Nenhum jogo encontrado.", style: TextStyle(fontSize: 14 * context.sf, color: Colors.grey))]));
               }
               return ListView.builder(
                 padding: EdgeInsets.all(16 * context.sf),
@@ -257,8 +357,31 @@ class _GamePageState extends State<GamePage> {
                     if (team['name'] == game.opponentTeam) oppLogo = team['image_url'];
                   }
                   return GameResultCard(
-                    gameId: game.id, myTeam: game.myTeam, opponentTeam: game.opponentTeam, myScore: game.myScore,
+                    gameId: game.id, 
-                    opponentScore: game.opponentScore, status: game.status, season: game.season, myTeamLogo: myLogo, opponentTeamLogo: oppLogo, 
+                    myTeam: game.myTeam, 
+                    opponentTeam: game.opponentTeam, 
+                    myScore: game.myScore,
+                    opponentScore: game.opponentScore, 
+                    status: game.status, 
+                    season: game.season, 
+                    myTeamLogo: myLogo, 
+                    opponentTeamLogo: oppLogo, 
+                    sf: context.sf,
+                    onDelete: () async {
+                      bool success = await gameController.deleteGame(game.id);
+                      if (context.mounted) {
+                        if (success) {
+                          setState(() {}); 
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(content: Text('Jogo eliminado com sucesso!'), backgroundColor: Colors.green)
+                          );
+                        } else {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(content: Text('Erro ao eliminar o jogo.'), backgroundColor: Colors.red)
+                          );
+                        }
+                      }
+                    },
                   );
                 },
               );
@@ -267,10 +390,10 @@ class _GamePageState extends State<GamePage> {
         },
       ),
       floatingActionButton: FloatingActionButton(
-        heroTag: 'add_game_btn', // 👇 A MÁGICA ESTÁ AQUI TAMBÉM!
+        heroTag: 'add_game_btn', 
-        backgroundColor: const Color(0xFFE74C3C),
+        backgroundColor: AppTheme.primaryRed,
         child: Icon(Icons.add, color: Colors.white, size: 24 * context.sf),
-        onPressed: () => showDialog(context: context, builder: (context) => CreateGameDialogManual(teamController: teamController, gameController: gameController)),
+        onPressed: () => showDialog(context: context, builder: (context) => CreateGameDialogManual(teamController: teamController, gameController: gameController, sf: context.sf)),
       ),
     );
   }
@@ -284,34 +407,36 @@ class _GamePageState extends State<GamePage> {
         return StatefulBuilder(
           builder: (context, setPopupState) {
             return AlertDialog(
+              backgroundColor: Theme.of(context).colorScheme.surface,
               shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * context.sf)),
               title: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  Text('Filtrar Jogos', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18 * context.sf)),
+                  Text('Filtrar Jogos', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18 * context.sf, color: Theme.of(context).colorScheme.onSurface)),
                   IconButton(icon: const Icon(Icons.close, color: Colors.grey), onPressed: () => Navigator.pop(context), padding: EdgeInsets.zero, constraints: const BoxConstraints())
                 ],
               ),
               content: Column(
                 mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text("Temporada", style: TextStyle(fontSize: 12 * context.sf, color: Colors.grey.shade600, fontWeight: FontWeight.bold)),
+                  Text("Temporada", style: TextStyle(fontSize: 12 * context.sf, color: Colors.grey, fontWeight: FontWeight.bold)),
                   SizedBox(height: 6 * context.sf),
                   Container(
-                    padding: EdgeInsets.symmetric(horizontal: 12 * context.sf), decoration: BoxDecoration(color: Colors.grey.shade100, borderRadius: BorderRadius.circular(10 * context.sf)),
+                    padding: EdgeInsets.symmetric(horizontal: 12 * context.sf), decoration: BoxDecoration(color: Theme.of(context).cardTheme.color, borderRadius: BorderRadius.circular(10 * context.sf), border: Border.all(color: Colors.grey.withOpacity(0.2))),
                     child: DropdownButtonHideUnderline(
                       child: DropdownButton<String>(
-                        isExpanded: true, value: tempSeason, style: TextStyle(fontSize: 14 * context.sf, color: Colors.black87, fontWeight: FontWeight.bold),
+                        dropdownColor: Theme.of(context).colorScheme.surface,
+                        isExpanded: true, value: tempSeason, style: TextStyle(fontSize: 14 * context.sf, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold),
                         items: ['Todas', '2024/25', '2025/26'].map((String value) => DropdownMenuItem<String>(value: value, child: Text(value))).toList(),
                         onChanged: (newValue) => setPopupState(() => tempSeason = newValue!),
                       ),
                     ),
                   ),
                   SizedBox(height: 20 * context.sf),
-                  Text("Equipa", style: TextStyle(fontSize: 12 * context.sf, color: Colors.grey.shade600, fontWeight: FontWeight.bold)),
+                  Text("Equipa", style: TextStyle(fontSize: 12 * context.sf, color: Colors.grey, fontWeight: FontWeight.bold)),
                   SizedBox(height: 6 * context.sf),
                   Container(
-                    padding: EdgeInsets.symmetric(horizontal: 12 * context.sf), decoration: BoxDecoration(color: Colors.grey.shade100, borderRadius: BorderRadius.circular(10 * context.sf)),
+                    padding: EdgeInsets.symmetric(horizontal: 12 * context.sf), decoration: BoxDecoration(color: Theme.of(context).cardTheme.color, borderRadius: BorderRadius.circular(10 * context.sf), border: Border.all(color: Colors.grey.withOpacity(0.2))),
                     child: StreamBuilder<List<Map<String, dynamic>>>(
                       stream: teamController.teamsStream,
                       builder: (context, snapshot) {
@@ -320,7 +445,8 @@ class _GamePageState extends State<GamePage> {
                         if (!teamNames.contains(tempTeam)) tempTeam = 'Todas';
                         return DropdownButtonHideUnderline(
                           child: DropdownButton<String>(
-                            isExpanded: true, value: tempTeam, style: TextStyle(fontSize: 14 * context.sf, color: Colors.black87, fontWeight: FontWeight.bold),
+                            dropdownColor: Theme.of(context).colorScheme.surface,
+                            isExpanded: true, value: tempTeam, style: TextStyle(fontSize: 14 * context.sf, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold),
                             items: teamNames.map((String value) => DropdownMenuItem<String>(value: value, child: Text(value, overflow: TextOverflow.ellipsis))).toList(),
                             onChanged: (newValue) => setPopupState(() => tempTeam = newValue!),
                           ),
@@ -332,7 +458,7 @@ class _GamePageState extends State<GamePage> {
               ),
               actions: [
                 TextButton(onPressed: () { setState(() { selectedSeason = 'Todas'; selectedTeam = 'Todas'; }); Navigator.pop(context); }, child: Text('LIMPAR', style: TextStyle(fontSize: 12 * context.sf, color: Colors.grey))),
-                ElevatedButton(style: ElevatedButton.styleFrom(backgroundColor: const Color(0xFFE74C3C), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10 * context.sf))), onPressed: () { setState(() { selectedSeason = tempSeason; selectedTeam = tempTeam; }); Navigator.pop(context); }, child: Text('APLICAR', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 13 * context.sf))),
+                ElevatedButton(style: ElevatedButton.styleFrom(backgroundColor: AppTheme.primaryRed, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10 * context.sf))), onPressed: () { setState(() { selectedSeason = tempSeason; selectedTeam = tempTeam; }); Navigator.pop(context); }, child: Text('APLICAR', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 13 * context.sf))),
               ],
             );
           }

lib/pages/heatmap_page.dart

@@ -1,92 +0,0 @@
-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/home.dart

@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:playmaker/classe/home.config.dart';
+import 'package:playmaker/classe/theme.dart'; 
 import 'package:playmaker/grafico%20de%20pizza/grafico.dart'; 
 import 'package:playmaker/pages/gamePage.dart';
 import 'package:playmaker/pages/teamPage.dart';
 import 'package:playmaker/controllers/team_controller.dart'; 
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:playmaker/pages/status_page.dart'; 
+import 'package:cached_network_image/cached_network_image.dart'; 
+import 'package:shared_preferences/shared_preferences.dart'; 
 import '../utils/size_extension.dart';
-import 'package:playmaker/grafico%20de%20pizza/controllers/contollers_grafico.dart'; 
+import 'settings_screen.dart';
-import 'dart:math' as math; // 👇 IMPORTANTE
 
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
@@ -29,26 +30,109 @@ class _HomeScreenState extends State<HomeScreen> {
 
   final _supabase = Supabase.instance.client;
   
+  String? _avatarUrl;
+  bool _isMemoryLoaded = false; // A variável mágica que impede o "piscar" inicial
+
+  @override
+  void initState() {
+    super.initState();
+    _loadUserAvatar(); 
+  }
+
+  // FUNÇÃO OTIMIZADA: Carrega da memória instantaneamente e atualiza em background
+  Future<void> _loadUserAvatar() async {
+    // 1. LÊ DA MEMÓRIA RÁPIDA PRIMEIRO
+    final prefs = await SharedPreferences.getInstance();
+    final savedUrl = prefs.getString('meu_avatar_guardado');
+    
+    if (mounted) {
+      setState(() {
+        if (savedUrl != null) _avatarUrl = savedUrl;
+        _isMemoryLoaded = true; // Avisa o ecrã que a memória já respondeu!
+      });
+    }
+
+    // 2. VAI AO SUPABASE VERIFICAR SE TROCASTE DE FOTO
+    final userId = _supabase.auth.currentUser?.id;
+    if (userId == null) return;
+
+    try {
+      final data = await _supabase
+          .from('profiles')
+          .select('avatar_url')
+          .eq('id', userId)
+          .maybeSingle();
+      
+      if (mounted && data != null && data['avatar_url'] != null) {
+        final urlDoSupabase = data['avatar_url'];
+        
+        // Se a foto na base de dados for nova, ele guarda e atualiza!
+        if (urlDoSupabase != savedUrl) {
+          await prefs.setString('meu_avatar_guardado', urlDoSupabase);
+          setState(() {
+            _avatarUrl = urlDoSupabase;
+          });
+        }
+      }
+    } catch (e) {
+      debugPrint("Erro ao carregar avatar na Home: $e");
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO
-
     final List<Widget> pages = [
-      _buildHomeContent(context, safeSf), // Passamos o safeSf
+      _buildHomeContent(context), 
       const GamePage(),
       const TeamsPage(),                                 
       const StatusPage(),
     ];
 
     return Scaffold(
-      backgroundColor: Colors.white,
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       appBar: AppBar(
-        title: Text('PlayMaker', style: TextStyle(fontSize: 20 * safeSf)), 
+        title: Text('PlayMaker', style: TextStyle(fontSize: 20 * context.sf, fontWeight: FontWeight.bold)), 
-        backgroundColor: HomeConfig.primaryColor,
+        backgroundColor: AppTheme.primaryRed,
         foregroundColor: Colors.white,
-        leading: IconButton(
+        elevation: 0,
-          icon: Icon(Icons.person, size: 24 * safeSf),
+        
-          onPressed: () {},
+        leading: Padding(
+          padding: EdgeInsets.all(10.0 * context.sf),
+          child: InkWell(
+            borderRadius: BorderRadius.circular(100),
+            onTap: () async {
+              await Navigator.push(
+                context,
+                MaterialPageRoute(builder: (context) => const SettingsScreen()),
+              );
+              _loadUserAvatar(); 
+            },
+            // SÓ MOSTRA A IMAGEM OU O BONECO DEPOIS DE LER A MEMÓRIA
+            child: !_isMemoryLoaded
+                // Nos primeiros 0.05 segs, mostra só o círculo de fundo (sem boneco)
+                ? CircleAvatar(backgroundColor: Colors.white.withOpacity(0.2)) 
+                
+                // Depois da memória responder:
+                : _avatarUrl != null && _avatarUrl!.isNotEmpty 
+                    ? CachedNetworkImage(
+                        imageUrl: _avatarUrl!,
+                        fadeInDuration: Duration.zero, // Corta o atraso visual!
+                        imageBuilder: (context, imageProvider) => CircleAvatar(
+                          backgroundColor: Colors.white.withOpacity(0.2),
+                          backgroundImage: imageProvider,
+                        ),
+                        placeholder: (context, url) => CircleAvatar(backgroundColor: Colors.white.withOpacity(0.2)),
+                        errorWidget: (context, url, error) => CircleAvatar(
+                          backgroundColor: Colors.white.withOpacity(0.2),
+                          child: Icon(Icons.person, color: Colors.white, size: 20 * context.sf),
+                        ),
+                      )
+                    // Se não tiver foto nenhuma, aí sim mostra o boneco
+                    : CircleAvatar(
+                        backgroundColor: Colors.white.withOpacity(0.2),
+                        child: Icon(Icons.person, color: Colors.white, size: 20 * context.sf),
+                      ),
+          ),
         ),
       ),
       
@@ -63,7 +147,7 @@ class _HomeScreenState extends State<HomeScreen> {
         backgroundColor: Theme.of(context).colorScheme.surface,
         surfaceTintColor: Theme.of(context).colorScheme.surfaceTint,
         elevation: 1,
-        height: 70 * safeSf, 
+        height: 70 * (context.sf < 1.2 ? context.sf : 1.2), 
         destinations: const [
           NavigationDestination(icon: Icon(Icons.home_outlined), selectedIcon: Icon(Icons.home_filled), label: 'Home'),
           NavigationDestination(icon: Icon(Icons.sports_soccer_outlined), selectedIcon: Icon(Icons.sports_soccer), label: 'Jogo'),
@@ -74,16 +158,22 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
-  void _showTeamSelector(BuildContext context, double safeSf) {
+  void _showTeamSelector(BuildContext context) {
     showModalBottomSheet(
       context: context,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(20 * safeSf))),
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(20 * context.sf))),
       builder: (context) {
         return StreamBuilder<List<Map<String, dynamic>>>(
           stream: _teamController.teamsStream,
           builder: (context, snapshot) {
-            if (snapshot.connectionState == ConnectionState.waiting) return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
+            // Correção: Verifica hasData para evitar piscar tela de loading
-            if (!snapshot.hasData || snapshot.data!.isEmpty) return SizedBox(height: 200 * safeSf, child: const Center(child: Text("Nenhuma equipa criada.")));
+            if (!snapshot.hasData && snapshot.connectionState == ConnectionState.waiting) {
+              return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
+            }
+            if (!snapshot.hasData || snapshot.data!.isEmpty) {
+              return SizedBox(height: 200 * context.sf, child: Center(child: Text("Nenhuma equipa criada.", style: TextStyle(color: Theme.of(context).colorScheme.onSurface))));
+            }
 
             final teams = snapshot.data!;
             return ListView.builder(
@@ -92,14 +182,15 @@ class _HomeScreenState extends State<HomeScreen> {
               itemBuilder: (context, index) {
                 final team = teams[index];
                 return ListTile(
-                  title: Text(team['name'], style: TextStyle(fontSize: 16 * safeSf)),
+                  leading: const Icon(Icons.shield, color: AppTheme.primaryRed),
+                  title: Text(team['name'] ?? 'Sem Nome', style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold)),
                   onTap: () {
                     setState(() {
-                      _selectedTeamId = team['id'];
+                      _selectedTeamId = team['id'].toString();
-                      _selectedTeamName = team['name'];
+                      _selectedTeamName = team['name'] ?? 'Desconhecido';
-                      _teamWins = team['wins'] != null ? int.tryParse(team['wins'].toString()) ?? 0 : 0;
+                      _teamWins = int.tryParse(team['wins']?.toString() ?? '0') ?? 0;
-                      _teamLosses = team['losses'] != null ? int.tryParse(team['losses'].toString()) ?? 0 : 0;
+                      _teamLosses = int.tryParse(team['losses']?.toString() ?? '0') ?? 0;
-                      _teamDraws = team['draws'] != null ? int.tryParse(team['draws'].toString()) ?? 0 : 0;
+                      _teamDraws = int.tryParse(team['draws']?.toString() ?? '0') ?? 0;
                     });
                     Navigator.pop(context);
                   },
@@ -112,10 +203,10 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
-  Widget _buildHomeContent(BuildContext context, double safeSf) {
+  Widget _buildHomeContent(BuildContext context) {
     final double wScreen = MediaQuery.of(context).size.width;
-    // Evita que os cartões fiquem muito altos no tablet:
+    final double cardHeight = wScreen * 0.5; 
-    final double cardHeight = math.min(wScreen * 0.5, 200 * safeSf); 
+    final textColor = Theme.of(context).colorScheme.onSurface; 
 
     return StreamBuilder<List<Map<String, dynamic>>>(
       stream: _selectedTeamId != null 
@@ -126,44 +217,52 @@ class _HomeScreenState extends State<HomeScreen> {
 
         return SingleChildScrollView(
           child: Padding(
-            padding: EdgeInsets.symmetric(horizontal: 22.0 * safeSf, vertical: 16.0 * safeSf),
+            padding: EdgeInsets.symmetric(horizontal: 22.0 * context.sf, vertical: 16.0 * context.sf),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 InkWell(
-                  onTap: () => _showTeamSelector(context, safeSf),
+                  onTap: () => _showTeamSelector(context),
                   child: Container(
-                    padding: EdgeInsets.all(12 * safeSf),
+                    padding: EdgeInsets.all(12 * context.sf),
-                    decoration: BoxDecoration(color: Colors.grey.shade100, borderRadius: BorderRadius.circular(15 * safeSf), border: Border.all(color: Colors.grey.shade300)),
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).cardTheme.color, 
+                      borderRadius: BorderRadius.circular(15 * context.sf), 
+                      border: Border.all(color: Colors.grey.withOpacity(0.2))
+                    ),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Row(children: [Icon(Icons.shield, color: HomeConfig.primaryColor, size: 24 * safeSf), SizedBox(width: 10 * safeSf), Text(_selectedTeamName, style: TextStyle(fontSize: 16 * safeSf, fontWeight: FontWeight.bold))]),
+                        Row(children: [
-                        const Icon(Icons.arrow_drop_down),
+                          Icon(Icons.shield, color: AppTheme.primaryRed, size: 24 * context.sf), 
+                          SizedBox(width: 10 * context.sf), 
+                          Text(_selectedTeamName, style: TextStyle(fontSize: 16 * context.sf, fontWeight: FontWeight.bold, color: textColor))
+                        ]),
+                        Icon(Icons.arrow_drop_down, color: textColor),
                       ],
                     ),
                   ),
                 ),
-                SizedBox(height: 20 * safeSf),
+                SizedBox(height: 20 * context.sf),
 
                 SizedBox(
                   height: cardHeight,
                   child: Row(
                     children: [
-                      Expanded(child: _buildStatCard(context: context, title: 'Mais Pontos', playerName: leaders['pts_name'], statValue: leaders['pts_val'].toString(), statLabel: 'TOTAL', color: const Color(0xFF1565C0), isHighlighted: true)),
+                      Expanded(child: _buildStatCard(context: context, title: 'Mais Pontos', playerName: leaders['pts_name'], statValue: leaders['pts_val'].toString(), statLabel: 'TOTAL', color: AppTheme.statPtsBg, isHighlighted: true)),
-                      SizedBox(width: 12 * safeSf),
+                      SizedBox(width: 12 * context.sf),
-                      Expanded(child: _buildStatCard(context: context, title: 'Assistências', playerName: leaders['ast_name'], statValue: leaders['ast_val'].toString(), statLabel: 'TOTAL', color: const Color(0xFF2E7D32))),
+                      Expanded(child: _buildStatCard(context: context, title: 'Assistências', playerName: leaders['ast_name'], statValue: leaders['ast_val'].toString(), statLabel: 'TOTAL', color: AppTheme.statAstBg)),
                     ],
                   ),
                 ),
-                SizedBox(height: 12 * safeSf),
+                SizedBox(height: 12 * context.sf),
 
                 SizedBox(
                   height: cardHeight,
                   child: Row(
                     children: [
-                      Expanded(child: _buildStatCard(context: context, title: 'Rebotes', playerName: leaders['rbs_name'], statValue: leaders['rbs_val'].toString(), statLabel: 'TOTAL', color: const Color(0xFF6A1B9A))),
+                      Expanded(child: _buildStatCard(context: context, title: 'Rebotes', playerName: leaders['rbs_name'], statValue: leaders['rbs_val'].toString(), statLabel: 'TOTAL', color: AppTheme.statRebBg)),
-                      SizedBox(width: 12 * safeSf),
+                      SizedBox(width: 12 * context.sf),
                       Expanded(
                         child: PieChartCard(
                           victories: _teamWins, 
@@ -171,31 +270,71 @@ class _HomeScreenState extends State<HomeScreen> {
                           draws: _teamDraws, 
                           title: 'DESEMPENHO', 
                           subtitle: 'Temporada', 
-                          backgroundColor: const Color(0xFFC62828), 
+                          backgroundColor: AppTheme.statPieBg, 
-                          sf: safeSf 
+                          sf: context.sf 
                         ),
                       ),
                     ],
                   ),
                 ),
-                SizedBox(height: 40 * safeSf),
+                SizedBox(height: 40 * context.sf),
                 
-                Text('Histórico de Jogos', style: TextStyle(fontSize: 20 * safeSf, fontWeight: FontWeight.bold, color: Colors.grey[800])),
+                Text('Histórico de Jogos', style: TextStyle(fontSize: 20 * context.sf, fontWeight: FontWeight.bold, color: textColor)),
-                SizedBox(height: 16 * safeSf),
+                SizedBox(height: 16 * context.sf),
                 
                 _selectedTeamName == "Selecionar Equipa" 
                   ? Container(
-                      padding: EdgeInsets.all(20 * safeSf),
+                      width: double.infinity,
-                      alignment: Alignment.center,
+                      padding: EdgeInsets.all(24.0 * context.sf),
-                      child: Text("Seleciona uma equipa no topo.", style: TextStyle(color: Colors.grey, fontSize: 14 * safeSf)),
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).cardTheme.color ?? Colors.white,
+                        borderRadius: BorderRadius.circular(16 * context.sf),
+                        border: Border.all(color: Colors.grey.withOpacity(0.1)),
+                        boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 10, offset: const Offset(0, 4))],
+                      ),
+                      child: Column(
+                        children: [
+                          Container(
+                            padding: EdgeInsets.all(18 * context.sf),
+                            decoration: BoxDecoration(color: AppTheme.primaryRed.withOpacity(0.08), shape: BoxShape.circle),
+                            child: Icon(Icons.shield_outlined, color: AppTheme.primaryRed, size: 42 * context.sf),
+                          ),
+                          SizedBox(height: 20 * context.sf),
+                          Text("Nenhuma Equipa Ativa", style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold, color: textColor)),
+                          SizedBox(height: 8 * context.sf),
+                          Text(
+                            "Escolha uma equipa no seletor acima para ver as estatísticas e o histórico.",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(fontSize: 13 * context.sf, color: Colors.grey.shade600, height: 1.4),
+                          ),
+                          SizedBox(height: 24 * context.sf),
+                          SizedBox(
+                            width: double.infinity,
+                            height: 48 * context.sf,
+                            child: ElevatedButton.icon(
+                              onPressed: () => _showTeamSelector(context), 
+                              style: ElevatedButton.styleFrom(
+                                backgroundColor: AppTheme.primaryRed,
+                                foregroundColor: Colors.white,
+                                elevation: 0,
+                                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10 * context.sf)),
+                              ),
+                              icon: Icon(Icons.touch_app, size: 20 * context.sf),
+                              label: Text("Selecionar Agora", style: TextStyle(fontSize: 15 * context.sf, fontWeight: FontWeight.bold)),
+                            ),
+                          ),
+                        ],
+                      ),
                     )
                   : StreamBuilder<List<Map<String, dynamic>>>(
-                      stream: _supabase.from('games').stream(primaryKey: ['id'])
+                      stream: _supabase.from('games').stream(primaryKey: ['id']).order('game_date', ascending: false),
-                          .order('game_date', ascending: false),
                       builder: (context, gameSnapshot) {
-                        
                         if (gameSnapshot.hasError) return Text("Erro: ${gameSnapshot.error}", style: const TextStyle(color: Colors.red));
-                        if (gameSnapshot.connectionState == ConnectionState.waiting) return const Center(child: CircularProgressIndicator());
+                        
+                        // Correção: Verifica hasData em vez de ConnectionState para manter a lista na tela enquanto atualiza em plano de fundo
+                        if (!gameSnapshot.hasData && gameSnapshot.connectionState == ConnectionState.waiting) {
+                          return const Center(child: CircularProgressIndicator());
+                        }
 
                         final todosOsJogos = gameSnapshot.data ?? [];
                         final gamesList = todosOsJogos.where((game) {
@@ -207,10 +346,11 @@ class _HomeScreenState extends State<HomeScreen> {
 
                         if (gamesList.isEmpty) {
                           return Container(
-                            padding: EdgeInsets.all(20 * safeSf),
+                            width: double.infinity,
-                            decoration: BoxDecoration(color: Colors.grey.shade50, borderRadius: BorderRadius.circular(14)),
+                            padding: EdgeInsets.all(20 * context.sf),
+                            decoration: BoxDecoration(color: Theme.of(context).cardTheme.color, borderRadius: BorderRadius.circular(14)),
                             alignment: Alignment.center,
-                            child: Text("Ainda não há jogos terminados para $_selectedTeamName.", style: TextStyle(color: Colors.grey)),
+                            child: const Text("Ainda não há jogos terminados.", style: TextStyle(color: Colors.grey)),
                           );
                         }
 
@@ -218,8 +358,8 @@ class _HomeScreenState extends State<HomeScreen> {
                           children: gamesList.map((game) {
                             String dbMyTeam = game['my_team']?.toString() ?? '';
                             String dbOppTeam = game['opponent_team']?.toString() ?? '';
-                            int dbMyScore = int.tryParse(game['my_score'].toString()) ?? 0;
+                            int dbMyScore = int.tryParse(game['my_score']?.toString() ?? '0') ?? 0;
-                            int dbOppScore = int.tryParse(game['opponent_score'].toString()) ?? 0;
+                            int dbOppScore = int.tryParse(game['opponent_score']?.toString() ?? '0') ?? 0;
                             
                             String opponent; int myScore; int oppScore;
 
@@ -237,25 +377,16 @@ class _HomeScreenState extends State<HomeScreen> {
                             if (myScore < oppScore) result = 'D';
 
                             return _buildGameHistoryCard(
-                              context: context, 
+                              context: context, opponent: opponent, result: result, 
-                              opponent: opponent, 
+                              myScore: myScore, oppScore: oppScore, date: date, 
-                              result: result, 
+                              topPts: game['top_pts_name'] ?? '---', topAst: game['top_ast_name'] ?? '---',
-                              myScore: myScore, 
+                              topRbs: game['top_rbs_name'] ?? '---', topDef: game['top_def_name'] ?? '---', mvp: game['mvp_name'] ?? '---',
-                              oppScore: oppScore, 
-                              date: date, 
-                              topPts: game['top_pts_name'] ?? '---', 
-                              topAst: game['top_ast_name'] ?? '---',
-                              topRbs: game['top_rbs_name'] ?? '---',
-                              topDef: game['top_def_name'] ?? '---',
-                              mvp: game['mvp_name'] ?? '---',
-                              safeSf: safeSf // Passa a escala aqui
                             );
                           }).toList(),
                         );
                       },
                     ),
-                
+                SizedBox(height: 20 * context.sf), 
-                SizedBox(height: 20 * safeSf), 
               ],
             ),
           ),
@@ -267,29 +398,45 @@ class _HomeScreenState extends State<HomeScreen> {
   Map<String, dynamic> _calculateLeaders(List<Map<String, dynamic>> data) {
     Map<String, int> ptsMap = {}; Map<String, int> astMap = {}; Map<String, int> rbsMap = {}; Map<String, String> namesMap = {}; 
     for (var row in data) {
-      String pid = row['member_id'].toString(); 
+      String pid = row['member_id']?.toString() ?? "unknown"; 
       namesMap[pid] = row['player_name']?.toString() ?? "Desconhecido";
-      ptsMap[pid] = (ptsMap[pid] ?? 0) + (row['pts'] as int? ?? 0);
+      ptsMap[pid] = (ptsMap[pid] ?? 0) + (int.tryParse(row['pts']?.toString() ?? '0') ?? 0);
-      astMap[pid] = (astMap[pid] ?? 0) + (row['ast'] as int? ?? 0);
+      astMap[pid] = (astMap[pid] ?? 0) + (int.tryParse(row['ast']?.toString() ?? '0') ?? 0);
-      rbsMap[pid] = (rbsMap[pid] ?? 0) + (row['rbs'] as int? ?? 0);
+      rbsMap[pid] = (rbsMap[pid] ?? 0) + (int.tryParse(row['rbs']?.toString() ?? '0') ?? 0);
     }
-    if (ptsMap.isEmpty) return {'pts_name': '---', 'pts_val': 0, 'ast_name': '---', 'ast_val': 0, 'rbs_name': '---', 'rbs_val': 0};
+    
-    String getBest(Map<String, int> map) { var bestId = map.entries.reduce((a, b) => a.value > b.value ? a : b).key; return namesMap[bestId]!; }
+    if (ptsMap.isEmpty) {
-    int getBestVal(Map<String, int> map) => map.values.reduce((a, b) => a > b ? a : b);
+      return {'pts_name': '---', 'pts_val': 0, 'ast_name': '---', 'ast_val': 0, 'rbs_name': '---', 'rbs_val': 0};
-    return {'pts_name': getBest(ptsMap), 'pts_val': getBestVal(ptsMap), 'ast_name': getBest(astMap), 'ast_val': getBestVal(astMap), 'rbs_name': getBest(rbsMap), 'rbs_val': getBestVal(rbsMap)};
+    }
+    
+    String getBest(Map<String, int> map) { 
+      if (map.isEmpty) return '---';
+      var bestId = map.entries.reduce((a, b) => a.value > b.value ? a : b).key; 
+      return namesMap[bestId] ?? '---'; 
+    }
+    
+    int getBestVal(Map<String, int> map) {
+      if (map.isEmpty) return 0;
+      return map.values.reduce((a, b) => a > b ? a : b);
+    }
+    
+    return {
+      'pts_name': getBest(ptsMap), 'pts_val': getBestVal(ptsMap), 
+      'ast_name': getBest(astMap), 'ast_val': getBestVal(astMap), 
+      'rbs_name': getBest(rbsMap), 'rbs_val': getBestVal(rbsMap)
+    };
   }
 
   Widget _buildStatCard({required BuildContext context, required String title, required String playerName, required String statValue, required String statLabel, required Color color, bool isHighlighted = false}) {
     return Card(
       elevation: 4, margin: EdgeInsets.zero,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14), side: isHighlighted ? const BorderSide(color: Colors.amber, width: 2) : BorderSide.none),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14), side: isHighlighted ? const BorderSide(color: AppTheme.warningAmber, width: 2) : BorderSide.none),
       child: Container(
         decoration: BoxDecoration(borderRadius: BorderRadius.circular(14), gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [color.withOpacity(0.9), color])),
         child: LayoutBuilder(
           builder: (context, constraints) {
             final double ch = constraints.maxHeight; 
             final double cw = constraints.maxWidth;  
-            
             return Padding(
               padding: EdgeInsets.all(cw * 0.06), 
               child: Column(
@@ -325,49 +472,51 @@ class _HomeScreenState extends State<HomeScreen> {
 
   Widget _buildGameHistoryCard({
     required BuildContext context, required String opponent, required String result, required int myScore, required int oppScore, required String date, 
-    required String topPts, required String topAst, required String topRbs, required String topDef, required String mvp, required double safeSf
+    required String topPts, required String topAst, required String topRbs, required String topDef, required String mvp
   }) {
     bool isWin = result == 'V';
     bool isDraw = result == 'E';
-    Color statusColor = isWin ? Colors.green : (isDraw ? Colors.yellow.shade700 : Colors.red);
+    Color statusColor = isWin ? AppTheme.successGreen : (isDraw ? AppTheme.warningAmber : AppTheme.oppTeamRed);
+    final bgColor = Theme.of(context).cardTheme.color;
+    final textColor = Theme.of(context).colorScheme.onSurface;
 
     return Container(
-      margin: EdgeInsets.only(bottom: 14 * safeSf),
+      margin: EdgeInsets.only(bottom: 14 * context.sf),
       decoration: BoxDecoration(
-        color: Colors.white, borderRadius: BorderRadius.circular(16),
+        color: bgColor, borderRadius: BorderRadius.circular(16),
-        border: Border.all(color: Colors.grey.shade200), boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 8, offset: const Offset(0, 4))],
+        border: Border.all(color: Colors.grey.withOpacity(0.1)), boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 8, offset: const Offset(0, 4))],
       ),
       child: Column(
         children: [
           Padding(
-            padding: EdgeInsets.all(14 * safeSf),
+            padding: EdgeInsets.all(14 * context.sf),
             child: Row(
               children: [
                 Container(
-                  width: 36 * safeSf, height: 36 * safeSf,
+                  width: 36 * context.sf, height: 36 * context.sf,
                   decoration: BoxDecoration(color: statusColor.withOpacity(0.15), shape: BoxShape.circle),
-                  child: Center(child: Text(result, style: TextStyle(color: statusColor, fontWeight: FontWeight.bold, fontSize: 16 * safeSf))),
+                  child: Center(child: Text(result, style: TextStyle(color: statusColor, fontWeight: FontWeight.bold, fontSize: 16 * context.sf))),
                 ),
-                SizedBox(width: 14 * safeSf),
+                SizedBox(width: 14 * context.sf),
                 Expanded(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text(date, style: TextStyle(fontSize: 11 * safeSf, color: Colors.grey, fontWeight: FontWeight.w600)),
+                      Text(date, style: TextStyle(fontSize: 11 * context.sf, color: Colors.grey, fontWeight: FontWeight.w600)),
-                      SizedBox(height: 6 * safeSf),
+                      SizedBox(height: 6 * context.sf),
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                          Expanded(child: Text(_selectedTeamName == "Selecionar Equipa" ? "Minha Equipa" : _selectedTeamName, style: TextStyle(fontSize: 14 * safeSf, fontWeight: FontWeight.bold), maxLines: 1, overflow: TextOverflow.ellipsis)),
+                          Expanded(child: Text(_selectedTeamName == "Selecionar Equipa" ? "Minha Equipa" : _selectedTeamName, style: TextStyle(fontSize: 14 * context.sf, fontWeight: FontWeight.bold, color: textColor), maxLines: 1, overflow: TextOverflow.ellipsis)),
                           Padding(
-                            padding: EdgeInsets.symmetric(horizontal: 8 * safeSf),
+                            padding: EdgeInsets.symmetric(horizontal: 8 * context.sf),
                             child: Container(
-                              padding: EdgeInsets.symmetric(horizontal: 8 * safeSf, vertical: 4 * safeSf),
+                              padding: EdgeInsets.symmetric(horizontal: 8 * context.sf, vertical: 4 * context.sf),
-                              decoration: BoxDecoration(color: Colors.grey.shade100, borderRadius: BorderRadius.circular(8)),
+                              decoration: BoxDecoration(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.05), borderRadius: BorderRadius.circular(8)),
-                              child: Text('$myScore - $oppScore', style: TextStyle(fontSize: 15 * safeSf, fontWeight: FontWeight.w900, letterSpacing: 1.5, color: Colors.black87)),
+                              child: Text('$myScore - $oppScore', style: TextStyle(fontSize: 15 * context.sf, fontWeight: FontWeight.w900, letterSpacing: 1.5, color: textColor)),
                             ),
                           ),
-                          Expanded(child: Text(opponent, style: TextStyle(fontSize: 14 * safeSf, fontWeight: FontWeight.bold), textAlign: TextAlign.right, maxLines: 1, overflow: TextOverflow.ellipsis)),
+                          Expanded(child: Text(opponent, style: TextStyle(fontSize: 14 * context.sf, fontWeight: FontWeight.bold, color: textColor), textAlign: TextAlign.right, maxLines: 1, overflow: TextOverflow.ellipsis)),
                         ],
                       ),
                     ],
@@ -376,29 +525,29 @@ class _HomeScreenState extends State<HomeScreen> {
               ],
             ),
           ),
-          Divider(height: 1, color: Colors.grey.shade100, thickness: 1.5),
+          Divider(height: 1, color: Colors.grey.withOpacity(0.1), thickness: 1.5),
           Container(
-            width: double.infinity, padding: EdgeInsets.symmetric(horizontal: 16 * safeSf, vertical: 12 * safeSf),
+            width: double.infinity, padding: EdgeInsets.symmetric(horizontal: 16 * context.sf, vertical: 12 * context.sf),
-            decoration: BoxDecoration(color: Colors.grey.shade50, borderRadius: const BorderRadius.only(bottomLeft: Radius.circular(16), bottomRight: Radius.circular(16))),
+            decoration: BoxDecoration(color: Theme.of(context).colorScheme.surface, borderRadius: const BorderRadius.only(bottomLeft: Radius.circular(16), bottomRight: Radius.circular(16))),
             child: Column(
               children: [
                 Row(
                   children: [
-                    Expanded(child: _buildGridStatRow(Icons.workspace_premium, Colors.amber.shade700, "MVP", mvp, safeSf, isMvp: true)),
+                    Expanded(child: _buildGridStatRow(context, Icons.workspace_premium, Colors.amber.shade700, "MVP", mvp, isMvp: true)),
-                    Expanded(child: _buildGridStatRow(Icons.shield, Colors.deepOrange.shade700, "Defesa", topDef, safeSf)),
+                    Expanded(child: _buildGridStatRow(context, Icons.shield, Colors.deepOrange.shade700, "Defesa", topDef)),
                   ],
                 ),
-                SizedBox(height: 8 * safeSf),
+                SizedBox(height: 8 * context.sf),
                 Row(
                   children: [
-                    Expanded(child: _buildGridStatRow(Icons.bolt, Colors.blue.shade700, "Pontos", topPts, safeSf)),
+                    Expanded(child: _buildGridStatRow(context, Icons.bolt, Colors.blue.shade700, "Pontos", topPts)),
-                    Expanded(child: _buildGridStatRow(Icons.trending_up, Colors.purple.shade700, "Rebotes", topRbs, safeSf)),
+                    Expanded(child: _buildGridStatRow(context, Icons.trending_up, Colors.purple.shade700, "Rebotes", topRbs)),
                   ],
                 ),
-                SizedBox(height: 8 * safeSf),
+                SizedBox(height: 8 * context.sf),
                 Row(
                   children: [
-                    Expanded(child: _buildGridStatRow(Icons.star, Colors.green.shade700, "Assists", topAst, safeSf)),
+                    Expanded(child: _buildGridStatRow(context, Icons.star, Colors.green.shade700, "Assists", topAst)),
                     const Expanded(child: SizedBox()), 
                   ],
                 ),
@@ -410,18 +559,18 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
-  Widget _buildGridStatRow(IconData icon, Color color, String label, String value, double safeSf, {bool isMvp = false}) {
+  Widget _buildGridStatRow(BuildContext context, IconData icon, Color color, String label, String value, {bool isMvp = false}) {
     return Row(
       children: [
-        Icon(icon, size: 14 * safeSf, color: color),
+        Icon(icon, size: 14 * context.sf, color: color),
-        SizedBox(width: 4 * safeSf),
+        SizedBox(width: 4 * context.sf),
-        Text('$label: ', style: TextStyle(fontSize: 11 * safeSf, color: Colors.grey.shade600, fontWeight: FontWeight.bold)),
+        Text('$label: ', style: TextStyle(fontSize: 11 * context.sf, color: Colors.grey, fontWeight: FontWeight.bold)),
         Expanded(
           child: Text(
             value, 
             style: TextStyle(
-              fontSize: 11 * safeSf, 
+              fontSize: 11 * context.sf, 
-              color: isMvp ? Colors.amber.shade900 : Colors.black87, 
+              color: isMvp ? AppTheme.warningAmber : Theme.of(context).colorScheme.onSurface, 
               fontWeight: FontWeight.bold
             ), 
             maxLines: 1, overflow: TextOverflow.ellipsis

lib/pages/login.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:playmaker/controllers/login_controller.dart';
 import '../widgets/login_widgets.dart';
-import 'home.dart'; // <--- IMPORTANTE: Importa a tua HomeScreen
+import 'home.dart'; 
-import '../utils/size_extension.dart'; // 👇 O NOSSO SUPERPODER!
+import '../utils/size_extension.dart'; 
 
 class LoginPage extends StatefulWidget {
   const LoginPage({super.key});
@@ -23,7 +23,8 @@ class _LoginPageState extends State<LoginPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Colors.white,
+      // 👇 Adaptável ao Modo Claro/Escuro do Flutter
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor, 
       body: SafeArea(
         child: ListenableBuilder(
           listenable: controller,
@@ -32,7 +33,6 @@ class _LoginPageState extends State<LoginPage> {
               child: SingleChildScrollView( 
                 child: Container(
                   width: double.infinity,
-                  // Garante que o form não fica gigante num tablet
                   constraints: BoxConstraints(maxWidth: 450 * context.sf), 
                   padding: EdgeInsets.all(32 * context.sf),
                   child: Column(

lib/pages/pdf_export_service.dart

@@ -0,0 +1,374 @@
+import 'dart:typed_data';
+import 'package:pdf/pdf.dart';
+import 'package:pdf/widgets.dart' as pw;
+import 'package:printing/printing.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+class PdfExportService {
+  static Future<void> generateAndPrintBoxScore({
+    required String gameId,
+    required String myTeam,
+    required String opponentTeam,
+    required String myScore,
+    required String opponentScore,
+    required String season,
+  }) async {
+    final supabase = Supabase.instance.client;
+
+    final gameData = await supabase.from('games').select().eq('id', gameId).single();
+
+    final teamsData = await supabase.from('teams').select('id, name').inFilter('name', [myTeam, opponentTeam]);
+    String? myTeamId, oppTeamId;
+    for (var t in teamsData) {
+      if (t['name'] == myTeam) myTeamId = t['id'].toString();
+      if (t['name'] == opponentTeam) oppTeamId = t['id'].toString();
+    }
+
+    List<dynamic> myPlayers = myTeamId != null ? await supabase.from('members').select().eq('team_id', myTeamId).eq('type', 'Jogador') : [];
+    List<dynamic> oppPlayers = oppTeamId != null ? await supabase.from('members').select().eq('team_id', oppTeamId).eq('type', 'Jogador') : [];
+
+    final statsData = await supabase.from('player_stats').select().eq('game_id', gameId);
+    Map<String, Map<String, dynamic>> statsMap = {};
+    for (var s in statsData) {
+      statsMap[s['member_id'].toString()] = s;
+    }
+
+    List<List<String>> myTeamTable = _buildTeamTableData(myPlayers, statsMap);
+    List<List<String>> oppTeamTable = _buildTeamTableData(oppPlayers, statsMap);
+
+    final pdf = pw.Document();
+
+pdf.addPage(
+      pw.Page( // 1. Trocado de MultiPage para Page
+        pageFormat: PdfPageFormat.a4.landscape,
+        margin: const pw.EdgeInsets.all(16), // Margens ligeiramente reduzidas para aproveitar o espaço
+        build: (pw.Context context) {
+          // 2. Envolvemos tudo num FittedBox
+          return pw.FittedBox(
+            fit: pw.BoxFit.scaleDown, // Reduz o tamanho apenas se não couber na página
+            child: pw.Container(
+              // Fixamos a largura do contentor à largura útil da página
+              width: PdfPageFormat.a4.landscape.availableWidth, 
+              // 3. Colocamos todos os elementos dentro de uma Column
+              child: pw.Column(
+                crossAxisAlignment: pw.CrossAxisAlignment.start,
+                children: [
+                  pw.Row(
+                    mainAxisAlignment: pw.MainAxisAlignment.spaceBetween,
+                    children: [
+                      pw.Text('Relatório Estatístico', style: pw.TextStyle(fontSize: 24, fontWeight: pw.FontWeight.bold)),
+                      pw.Column(
+                        crossAxisAlignment: pw.CrossAxisAlignment.end,
+                        children: [
+                          pw.Text('$myTeam vs $opponentTeam', style: pw.TextStyle(fontSize: 16, fontWeight: pw.FontWeight.bold)),
+                          pw.Text('Resultado: $myScore - $opponentScore', style: const pw.TextStyle(fontSize: 14)),
+                          pw.Text('Época: $season', style: const pw.TextStyle(fontSize: 12)),
+                        ]
+                      )
+                    ]
+                  ),
+                  pw.SizedBox(height: 15), // Espaçamentos verticais um pouco mais otimizados
+
+                  pw.Text('Equipa: $myTeam', style: pw.TextStyle(fontSize: 14, fontWeight: pw.FontWeight.bold, color: const PdfColor.fromInt(0xFFA00000))),
+                  pw.SizedBox(height: 4),
+                  _buildPdfTable(myTeamTable, const PdfColor.fromInt(0xFFA00000)),
+                  
+                  pw.SizedBox(height: 15),
+
+                  pw.Text('Equipa: $opponentTeam', style: pw.TextStyle(fontSize: 14, fontWeight: pw.FontWeight.bold, color: PdfColors.grey700)),
+                  pw.SizedBox(height: 4),
+                  _buildPdfTable(oppTeamTable, PdfColors.grey700),
+
+                  pw.SizedBox(height: 15),
+
+                  pw.Row(
+                    crossAxisAlignment: pw.CrossAxisAlignment.start,
+                    children: [
+                      _buildSummaryBox('Melhor Marcador', gameData['top_pts_name'] ?? '---'),
+                      pw.SizedBox(width: 10),
+                      _buildSummaryBox('Melhor Ressaltador', gameData['top_rbs_name'] ?? '---'),
+                      pw.SizedBox(width: 10),
+                      _buildSummaryBox('Melhor Passador', gameData['top_ast_name'] ?? '---'),
+                      pw.SizedBox(width: 10),
+                      _buildSummaryBox('MVP', gameData['mvp_name'] ?? '---'),
+                    ]
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+
+    await Printing.layoutPdf(
+      onLayout: (PdfPageFormat format) async => pdf.save(),
+      name: 'BoxScore_${myTeam}_vs_${opponentTeam}.pdf',
+    );
+  }
+
+  static List<List<String>> _buildTeamTableData(List<dynamic> players, Map<String, Map<String, dynamic>> statsMap) {
+    List<List<String>> tableData = [];
+    int tPts = 0, tFgm = 0, tFga = 0, tFtm = 0, tFta = 0, tFls = 0;
+    int tOrb = 0, tDrb = 0, tTr = 0, tStl = 0, tAst = 0, tTov = 0, tBlk = 0;
+    int tP3m = 0, tP2m = 0, tP3a = 0, tP2a = 0;
+
+    players.sort((a, b) {
+      int numA = int.tryParse(a['number']?.toString() ?? '0') ?? 0;
+      int numB = int.tryParse(b['number']?.toString() ?? '0') ?? 0;
+      return numA.compareTo(numB);
+    });
+
+    for (var p in players) {
+      String id = p['id'].toString();
+      String name = p['name'] ?? 'Desconhecido';
+      String number = p['number']?.toString() ?? '-';
+
+      var stat = statsMap[id] ?? {};
+
+      int pts = stat['pts'] ?? 0;
+      int fgm = stat['fgm'] ?? 0;
+      int fga = stat['fga'] ?? 0;
+      int ftm = stat['ftm'] ?? 0;
+      int fta = stat['fta'] ?? 0;
+      int p2m = stat['p2m'] ?? 0;
+      int p2a = stat['p2a'] ?? 0;
+      int p3m = stat['p3m'] ?? 0;
+      int p3a = stat['p3a'] ?? 0;
+      int fls = stat['fls'] ?? 0;
+      int orb = stat['orb'] ?? 0;
+      int drb = stat['drb'] ?? 0;
+      int tr = orb + drb;
+      int stl = stat['stl'] ?? 0;
+      int ast = stat['ast'] ?? 0;
+      int tov = stat['tov'] ?? 0;
+      int blk = stat['blk'] ?? 0;
+
+      tPts += pts; tFgm += fgm; tFga += fga; tFtm += ftm; tFta += fta;
+      tFls += fls; tOrb += orb; tDrb += drb; tTr += tr; tStl += stl;
+      tAst += ast; tTov += tov; tBlk += blk;
+      tP3m += p3m; tP2m += p2m; tP3a += p3a; tP2a += p2a;
+
+      String p2Pct = p2a > 0 ? ((p2m / p2a) * 100).toStringAsFixed(0) + '%' : '0%';
+      String p3Pct = p3a > 0 ? ((p3m / p3a) * 100).toStringAsFixed(0) + '%' : '0%';
+      String globalPct = fga > 0 ? ((fgm / fga) * 100).toStringAsFixed(0) + '%' : '0%';
+      String llPct = fta > 0 ? ((ftm / fta) * 100).toStringAsFixed(0) + '%' : '0%';
+
+      tableData.add([
+        number, name, pts.toString(),
+        p2m.toString(), p2a.toString(), p2Pct,
+        p3m.toString(), p3a.toString(), p3Pct,
+        fgm.toString(), fga.toString(), globalPct,
+        ftm.toString(), fta.toString(), llPct,
+        fls.toString(), orb.toString(), drb.toString(), tr.toString(),
+        stl.toString(), ast.toString(), tov.toString(), blk.toString()
+      ]);
+    }
+
+    if (tableData.isEmpty) {
+      tableData.add([
+        '-', 'Sem jogadores registados', '0', 
+        '0', '0', '0%', 
+        '0', '0', '0%', 
+        '0', '0', '0%', 
+        '0', '0', '0%', 
+        '0', '0', '0', '0', '0', '0', '0', '0'
+      ]);
+    }
+
+    String tP2Pct = tP2a > 0 ? ((tP2m / tP2a) * 100).toStringAsFixed(0) + '%' : '0%';
+    String tP3Pct = tP3a > 0 ? ((tP3m / tP3a) * 100).toStringAsFixed(0) + '%' : '0%';
+    String tGlobalPct = tFga > 0 ? ((tFgm / tFga) * 100).toStringAsFixed(0) + '%' : '0%';
+    String tLlPct = tFta > 0 ? ((tFtm / tFta) * 100).toStringAsFixed(0) + '%' : '0%';
+
+    tableData.add([
+      '', 'TOTAIS', tPts.toString(), 
+      tP2m.toString(), tP2a.toString(), tP2Pct, 
+      tP3m.toString(), tP3a.toString(), tP3Pct, 
+      tFgm.toString(), tFga.toString(), tGlobalPct, 
+      tFtm.toString(), tFta.toString(), tLlPct,
+      tFls.toString(), tOrb.toString(), tDrb.toString(), tTr.toString(),
+      tStl.toString(), tAst.toString(), tTov.toString(), tBlk.toString()
+    ]);
+
+    return tableData;
+  }
+
+  static pw.Widget _buildPdfTable(List<List<String>> data, PdfColor headerColor) {
+    final headerStyle = pw.TextStyle(color: PdfColors.white, fontWeight: pw.FontWeight.bold, fontSize: 8);
+    final subHeaderStyle = pw.TextStyle(color: PdfColors.white, fontWeight: pw.FontWeight.bold, fontSize: 7);
+    final cellStyle = const pw.TextStyle(fontSize: 8);
+
+    // Agora usamos apenas 15 colunas principais na tabela.
+    // Os grupos (2P, 3P, etc.) são subdivididos INTERNAMENTE para evitar erros de colSpan.
+    return pw.Table(
+      border: pw.TableBorder.all(color: PdfColors.grey400, width: 0.5),
+     columnWidths: {
+        0: const pw.FlexColumnWidth(1.2), // Nº
+        1: const pw.FlexColumnWidth(5.0), // NOME (Maior para caber nomes como S.Gilgeous-alexander)
+        2: const pw.FlexColumnWidth(1.5), // PT
+        3: const pw.FlexColumnWidth(4.5), // 2 PONTOS (Grupo de 3)
+        4: const pw.FlexColumnWidth(4.5), // 3 PONTOS (Grupo de 3)
+        5: const pw.FlexColumnWidth(4.5), // GLOBAL (Grupo de 3)
+        6: const pw.FlexColumnWidth(4.5), // L. LIVRES (Grupo de 3)
+        7: const pw.FlexColumnWidth(1.5), // FLS
+        8: const pw.FlexColumnWidth(1.5), // RO
+        9: const pw.FlexColumnWidth(1.5), // RD
+        10: const pw.FlexColumnWidth(1.5), // TR
+        11: const pw.FlexColumnWidth(1.5), // BR
+        12: const pw.FlexColumnWidth(1.5), // AS
+        13: const pw.FlexColumnWidth(1.5), // BP
+        14: const pw.FlexColumnWidth(1.5), // BLK
+      },
+      children: [
+        // --- LINHA 1: CABEÇALHOS ---
+        pw.TableRow(
+          decoration: pw.BoxDecoration(color: headerColor),
+          children: [
+            _simpleHeader('Nº', subHeaderStyle),
+            _simpleHeader('NOME', subHeaderStyle, align: pw.Alignment.centerLeft),
+            _simpleHeader('PT', subHeaderStyle),
+            _groupHeader('2 PONTOS', headerStyle, subHeaderStyle),
+            _groupHeader('3 PONTOS', headerStyle, subHeaderStyle),
+            _groupHeader('GLOBAL', headerStyle, subHeaderStyle),
+            _groupHeader('L. LIVRES', headerStyle, subHeaderStyle),
+            _simpleHeader('FLS', subHeaderStyle),
+            _simpleHeader('RO', subHeaderStyle),
+            _simpleHeader('RD', subHeaderStyle),
+            _simpleHeader('TR', subHeaderStyle),
+            _simpleHeader('BR', subHeaderStyle),
+            _simpleHeader('AS', subHeaderStyle),
+            _simpleHeader('BP', subHeaderStyle),
+            _simpleHeader('BLK', subHeaderStyle),
+          ],
+        ),
+        // --- LINHAS 2+: DADOS ---
+        ...data.map((row) {
+          bool isTotais = row[1] == 'TOTAIS';
+          var rowStyle = isTotais ? pw.TextStyle(fontSize: 8, fontWeight: pw.FontWeight.bold) : cellStyle;
+          return pw.TableRow(
+            decoration: pw.BoxDecoration(
+              color: isTotais ? PdfColors.grey200 : PdfColors.white,
+            ),
+            children: [
+              _simpleData(row[0], rowStyle),
+              _simpleData(row[1], rowStyle, align: pw.Alignment.centerLeft),
+              _simpleData(row[2], rowStyle),
+              _groupData(row[3], row[4], row[5], rowStyle),    // 2P: C, T, %
+              _groupData(row[6], row[7], row[8], rowStyle),    // 3P: C, T, %
+              _groupData(row[9], row[10], row[11], rowStyle),  // GLOBAL: C, T, %
+              _groupData(row[12], row[13], row[14], rowStyle), // L. LIVRES: C, T, %
+              _simpleData(row[15], rowStyle),
+              _simpleData(row[16], rowStyle),
+              _simpleData(row[17], rowStyle),
+              _simpleData(row[18], rowStyle),
+              _simpleData(row[19], rowStyle),
+              _simpleData(row[20], rowStyle),
+              _simpleData(row[21], rowStyle),
+              _simpleData(row[22], rowStyle),
+            ],
+          );
+        }),
+      ],
+    );
+  }
+
+  // ==== WIDGETS AUXILIARES PARA RESOLVER A ESTRUTURA DO PDF ====
+
+  // Cabeçalho simples (Colunas que não se dividem)
+  static pw.Widget _simpleHeader(String text, pw.TextStyle style, {pw.Alignment align = pw.Alignment.center}) {
+    return pw.Container(
+      alignment: align,
+      padding: const pw.EdgeInsets.symmetric(vertical: 2, horizontal: 2),
+      child: pw.Text(text, style: style),
+    );
+  }
+
+  // Dados simples
+  static pw.Widget _simpleData(String text, pw.TextStyle style, {pw.Alignment align = pw.Alignment.center}) {
+    return pw.Container(
+      alignment: align,
+      padding: const pw.EdgeInsets.symmetric(vertical: 3, horizontal: 2),
+      child: pw.Text(text, style: style),
+    );
+  }
+
+  // Cria a divisão do Cabeçalho (O falso ColSpan que une "2 PONTOS" sobre "C | T | %")
+  static pw.Widget _groupHeader(String title, pw.TextStyle hStyle, pw.TextStyle sStyle) {
+  return pw.Column(
+    children: [
+      pw.Container(
+        width: double.infinity,
+        alignment: pw.Alignment.center,
+        padding: const pw.EdgeInsets.symmetric(vertical: 2),
+        decoration: const pw.BoxDecoration(
+          border: pw.Border(bottom: pw.BorderSide(color: PdfColors.white, width: 0.5)),
+        ),
+        child: pw.Text(title, style: hStyle),
+      ),
+      pw.Row(
+        children: [
+          pw.Expanded(child: pw.Container(alignment: pw.Alignment.center, child: pw.Text('C', style: sStyle))),
+          pw.Container(width: 0.5, height: 10, color: PdfColors.white), // Divisória vertical manual
+          pw.Expanded(child: pw.Container(alignment: pw.Alignment.center, child: pw.Text('T', style: sStyle))),
+          pw.Container(width: 0.5, height: 10, color: PdfColors.white), // Divisória vertical manual
+          pw.Expanded(child: pw.Container(alignment: pw.Alignment.center, child: pw.Text('%', style: sStyle))),
+        ],
+      ),
+    ],
+  );
+}
+
+static pw.Widget _groupData(String c, String t, String pct, pw.TextStyle style) {
+  return pw.Row(
+    children: [
+      pw.Expanded(
+        child: pw.Container(
+          alignment: pw.Alignment.center,
+          padding: const pw.EdgeInsets.symmetric(vertical: 3),
+          child: pw.Text(c, style: style),
+        ),
+      ),
+      pw.Container(width: 0.5, height: 12, color: PdfColors.grey400), // Divisória cinza
+      pw.Expanded(
+        child: pw.Container(
+          alignment: pw.Alignment.center,
+          padding: const pw.EdgeInsets.symmetric(vertical: 3),
+          child: pw.Text(t, style: style),
+        ),
+      ),
+      pw.Container(width: 0.5, height: 12, color: PdfColors.grey400), // Divisória cinza
+      pw.Expanded(
+        child: pw.Container(
+          alignment: pw.Alignment.center,
+          padding: const pw.EdgeInsets.symmetric(vertical: 3),
+          child: pw.Text(pct, style: style),
+        ),
+      ),
+    ],
+  );
+}
+  static pw.Widget _buildSummaryBox(String title, String value) {
+    return pw.Container(
+      width: 120,
+      decoration: pw.BoxDecoration(
+        border: pw.TableBorder.all(color: PdfColors.black, width: 1),
+      ),
+      child: pw.Column(
+        children: [
+          pw.Container(
+            width: double.infinity,
+            padding: const pw.EdgeInsets.all(4),
+            color: const PdfColor.fromInt(0xFFA00000), 
+            child: pw.Text(title, style: pw.TextStyle(color: PdfColors.white, fontSize: 9, fontWeight: pw.FontWeight.bold), textAlign: pw.TextAlign.center),
+          ),
+          pw.Container(
+            width: double.infinity,
+            padding: const pw.EdgeInsets.all(6),
+            child: pw.Text(value, style: pw.TextStyle(fontSize: 10, fontWeight: pw.FontWeight.bold), textAlign: pw.TextAlign.center),
+          ),
+        ]
+      )
+    );
+  }
+}

lib/pages/settings_screen.dart

@@ -0,0 +1,385 @@
+import 'dart:io'; 
+
+import 'package:flutter/material.dart';
+import 'package:playmaker/classe/theme.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:image_picker/image_picker.dart'; 
+import 'package:cached_network_image/cached_network_image.dart'; // 👇 IMPORTAÇÃO PARA CACHE
+import 'package:shared_preferences/shared_preferences.dart'; // 👇 IMPORTAÇÃO PARA MEMÓRIA RÁPIDA
+
+import '../utils/size_extension.dart';
+import 'login.dart'; 
+import '../main.dart'; 
+
+class SettingsScreen extends StatefulWidget {
+  const SettingsScreen({super.key});
+
+  @override
+  State<SettingsScreen> createState() => _SettingsScreenState();
+}
+
+class _SettingsScreenState extends State<SettingsScreen> {
+  
+  File? _localImageFile; 
+  String? _uploadedImageUrl; 
+  bool _isUploadingImage = false; 
+  bool _isMemoryLoaded = false; // 👇 VARIÁVEL MÁGICA CONTRA O PISCAR
+  
+  final supabase = Supabase.instance.client;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadUserAvatar();
+  }
+
+  // 👇 LÊ A IMAGEM DA MEMÓRIA INSTANTANEAMENTE E CONFIRMA NA BD
+  Future<void> _loadUserAvatar() async {
+    // 1. Lê da memória rápida primeiro!
+    final prefs = await SharedPreferences.getInstance();
+    final savedUrl = prefs.getString('meu_avatar_guardado');
+    
+    if (mounted) {
+      setState(() {
+        if (savedUrl != null) _uploadedImageUrl = savedUrl;
+        _isMemoryLoaded = true; // Avisa que já leu a memória
+      });
+    }
+
+    final userId = supabase.auth.currentUser?.id;
+    if (userId == null) return;
+
+    try {
+      final data = await supabase
+          .from('profiles') 
+          .select('avatar_url')
+          .eq('id', userId)
+          .maybeSingle(); 
+      
+      if (mounted && data != null && data['avatar_url'] != null) {
+        final urlDoSupabase = data['avatar_url'];
+
+        // Atualiza a memória se a foto na base de dados for diferente
+        if (urlDoSupabase != savedUrl) {
+          await prefs.setString('meu_avatar_guardado', urlDoSupabase);
+          setState(() {
+            _uploadedImageUrl = urlDoSupabase;
+          });
+        }
+      }
+    } catch (e) {
+      print("Erro ao carregar avatar: $e");
+    }
+  }
+
+  Future<void> _handleImageChange() async {
+    final ImagePicker picker = ImagePicker();
+    
+    final XFile? pickedFile = await picker.pickImage(source: ImageSource.gallery);
+    if (pickedFile == null || !mounted) return;
+
+    try {
+      setState(() {
+        _localImageFile = File(pickedFile.path); 
+        _isUploadingImage = true; 
+      });
+      
+      final userId = supabase.auth.currentUser?.id;
+      if (userId == null) throw Exception("Utilizador não autenticado.");
+
+      final String storagePath = '$userId/profile_picture.png';
+      
+      await supabase.storage.from('avatars').upload(
+        storagePath, 
+        _localImageFile!, 
+        fileOptions: const FileOptions(cacheControl: '3600', upsert: true)
+      );
+      
+      final String publicUrl = supabase.storage.from('avatars').getPublicUrl(storagePath);
+      
+      await supabase
+          .from('profiles')
+          .upsert({
+            'id': userId, 
+            'avatar_url': publicUrl
+          });
+      
+      // 👇 MÁGICA: GUARDA LOGO O NOVO URL NA MEMÓRIA PARA A HOME SABER!
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('meu_avatar_guardado', publicUrl);
+
+      if (mounted) {
+        setState(() {
+          _uploadedImageUrl = publicUrl;
+          _isUploadingImage = false; 
+          _localImageFile = null; 
+        });
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text("Foto atualizada!"), backgroundColor: Colors.green)
+        );
+      }
+      
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _isUploadingImage = false;
+          _localImageFile = null;
+        });
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text("Erro: $e"), backgroundColor: AppTheme.primaryRed)
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Color primaryRed = AppTheme.primaryRed; 
+    final Color bgColor = Theme.of(context).scaffoldBackgroundColor; 
+    final Color cardColor = Theme.of(context).cardTheme.color ?? Theme.of(context).colorScheme.surface;
+    final Color textColor = Theme.of(context).colorScheme.onSurface;
+    final Color textLightColor = textColor.withOpacity(0.6);
+
+    bool isDark = Theme.of(context).brightness == Brightness.dark;
+
+    return Scaffold(
+      backgroundColor: bgColor,
+      appBar: AppBar(
+        backgroundColor: primaryRed,
+        foregroundColor: Colors.white,
+        elevation: 0,
+        centerTitle: true,
+        title: Text(
+          "Perfil e Definições",
+          style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.w600),
+        ),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.pop(context),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: EdgeInsets.symmetric(horizontal: 16.0 * context.sf, vertical: 24.0 * context.sf),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+              padding: EdgeInsets.all(20 * context.sf),
+              decoration: BoxDecoration(
+                color: cardColor,
+                borderRadius: BorderRadius.circular(16 * context.sf),
+                border: Border.all(color: Colors.grey.withOpacity(0.1)),
+                boxShadow: [
+                  BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 10, offset: const Offset(0, 4)),
+                ],
+              ),
+              child: Row(
+                children: [
+                  _buildTappableProfileAvatar(context, primaryRed),
+                  SizedBox(width: 16 * context.sf),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          "Treinador",
+                          style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold, color: textColor),
+                        ),
+                        SizedBox(height: 4 * context.sf),
+                        Text(
+                          supabase.auth.currentUser?.email ?? "sem@email.com",
+                          style: TextStyle(color: textLightColor, fontSize: 14 * context.sf),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            
+            SizedBox(height: 32 * context.sf),
+
+            Padding(
+              padding: EdgeInsets.only(left: 4 * context.sf, bottom: 12 * context.sf),
+              child: Text(
+                "Definições",
+                style: TextStyle(color: textLightColor, fontSize: 14 * context.sf, fontWeight: FontWeight.bold),
+              ),
+            ),
+            Container(
+              decoration: BoxDecoration(
+                color: cardColor,
+                borderRadius: BorderRadius.circular(16 * context.sf),
+                border: Border.all(color: Colors.grey.withOpacity(0.1)),
+                boxShadow: [
+                  BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 10, offset: const Offset(0, 4)),
+                ],
+              ),
+              child: ListTile(
+                contentPadding: EdgeInsets.symmetric(horizontal: 20 * context.sf, vertical: 8 * context.sf),
+                leading: Icon(isDark ? Icons.dark_mode : Icons.light_mode, color: primaryRed, size: 28 * context.sf),
+                title: Text(
+                  "Modo Escuro",
+                  style: TextStyle(fontWeight: FontWeight.bold, color: textColor, fontSize: 16 * context.sf),
+                ),
+                subtitle: Text(
+                  "Altera as cores da aplicação",
+                  style: TextStyle(color: textLightColor, fontSize: 13 * context.sf),
+                ),
+                trailing: Switch(
+                  value: isDark,
+                  activeColor: primaryRed,
+                  onChanged: (bool value) {
+                    themeNotifier.value = value ? ThemeMode.dark : ThemeMode.light;
+                  },
+                ),
+              ),
+            ),
+
+            SizedBox(height: 32 * context.sf),
+
+            Padding(
+              padding: EdgeInsets.only(left: 4 * context.sf, bottom: 12 * context.sf),
+              child: Text(
+                "Conta",
+                style: TextStyle(color: textLightColor, fontSize: 14 * context.sf, fontWeight: FontWeight.bold),
+              ),
+            ),
+            Container(
+              decoration: BoxDecoration(
+                color: cardColor,
+                borderRadius: BorderRadius.circular(16 * context.sf),
+                border: Border.all(color: Colors.grey.withOpacity(0.1)),
+                boxShadow: [
+                  BoxShadow(color: Colors.black.withOpacity(0.04), blurRadius: 10, offset: const Offset(0, 4)),
+                ],
+              ),
+              child: ListTile(
+                contentPadding: EdgeInsets.symmetric(horizontal: 20 * context.sf, vertical: 4 * context.sf),
+                leading: Icon(Icons.logout_outlined, color: primaryRed, size: 26 * context.sf),
+                title: Text(
+                  "Terminar Sessão",
+                  style: TextStyle(color: primaryRed, fontWeight: FontWeight.bold, fontSize: 15 * context.sf),
+                ),
+                onTap: () => _confirmLogout(context),
+              ),
+            ),
+
+            SizedBox(height: 50 * context.sf),
+
+            Center(
+              child: Text(
+                "PlayMaker v1.0.0",
+                style: TextStyle(color: textLightColor.withOpacity(0.7), fontSize: 13 * context.sf),
+              ),
+            ),
+            SizedBox(height: 20 * context.sf),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // 👇 AVATAR OTIMIZADO: SEM LAG, COM CACHE E MEMÓRIA
+  Widget _buildTappableProfileAvatar(BuildContext context, Color primaryRed) {
+    return GestureDetector(
+      onTap: () {
+        _handleImageChange();
+      },
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          Container(
+            width: 72 * context.sf,
+            height: 72 * context.sf,
+            decoration: BoxDecoration(
+              color: primaryRed.withOpacity(0.1),
+              shape: BoxShape.circle,
+            ),
+            child: ClipOval(
+              child: _isUploadingImage && _localImageFile != null
+                  // 1. Mostrar imagem local (galeria) ENQUANTO está a fazer upload
+                  ? Image.file(_localImageFile!, fit: BoxFit.cover)
+                  
+                  // 2. Antes da memória carregar, fica só o fundo (evita piscar)
+                  : !_isMemoryLoaded
+                      ? const SizedBox()
+                      
+                      // 3. Depois da memória carregar, se houver URL, desenha com Cache!
+                      : _uploadedImageUrl != null && _uploadedImageUrl!.isNotEmpty
+                          ? CachedNetworkImage(
+                              imageUrl: _uploadedImageUrl!,
+                              fit: BoxFit.cover,
+                              fadeInDuration: Duration.zero, // Fica instantâneo!
+                              placeholder: (context, url) => const SizedBox(),
+                              errorWidget: (context, url, error) => Icon(Icons.person, color: primaryRed, size: 36 * context.sf),
+                            )
+                            
+                          // 4. Se não houver URL, mete o boneco
+                          : Icon(Icons.person, color: primaryRed, size: 36 * context.sf),
+            ),
+          ),
+          
+          // ÍCONE DE LÁPIS
+          Positioned(
+            bottom: 0,
+            right: 0,
+            child: Container(
+              padding: EdgeInsets.all(6 * context.sf),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surface, 
+                shape: BoxShape.circle,
+                border: Border.all(color: Colors.grey.withOpacity(0.2)),
+              ),
+              child: Icon(Icons.edit_outlined, color: primaryRed, size: 16 * context.sf),
+            ),
+          ),
+
+          // LOADING OVERLAY (Enquanto faz o upload)
+          if (_isUploadingImage)
+            Positioned.fill(
+              child: Container(
+                decoration: BoxDecoration(color: Colors.black.withOpacity(0.4), shape: BoxShape.circle),
+                child: const Padding(
+                  padding: EdgeInsets.all(16.0),
+                  child: CircularProgressIndicator(color: Colors.white, strokeWidth: 3),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  void _confirmLogout(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16 * context.sf)),
+        title: Text("Terminar Sessão", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold)),
+        content: Text("Tens a certeza que queres sair da conta?", style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(ctx), child: const Text("Cancelar", style: TextStyle(color: Colors.grey))),
+          ElevatedButton(
+            style: ElevatedButton.styleFrom(backgroundColor: AppTheme.primaryRed, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8))),
+            onPressed: () async {
+              // Limpa a memória do Avatar ao sair para não aparecer na conta de outra pessoa!
+              final prefs = await SharedPreferences.getInstance();
+              await prefs.remove('meu_avatar_guardado');
+
+              await Supabase.instance.client.auth.signOut();
+              if (ctx.mounted) {
+                Navigator.of(ctx).pushAndRemoveUntil(
+                  MaterialPageRoute(builder: (context) => const LoginPage()),
+                  (Route<dynamic> route) => false,
+                );
+              }
+            }, 
+            child: const Text("Sair", style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/status_page.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:playmaker/classe/theme.dart'; 
+import 'package:cached_network_image/cached_network_image.dart'; // 👇 A MAGIA DO CACHE
 import '../controllers/team_controller.dart';
 import '../utils/size_extension.dart'; 
-import 'dart:math' as math; 
-import '../controllers/placar_controller.dart'; // Para a classe ShotRecord
-import '../pages/heatmap_page.dart'; // Para abrir a página do mapa
 
 class StatusPage extends StatefulWidget {
   const StatusPage({super.key});
@@ -22,92 +21,43 @@ class _StatusPageState extends State<StatusPage> {
   String _sortColumn = 'pts';
   bool _isAscending = false;
 
-  // 👇 NOVA FUNÇÃO: BUSCA OS LANÇAMENTOS DO JOGADOR NO SUPABASE E ABRE O MAPA
-  Future<void> _openPlayerHeatmap(String playerName) async {
-    if (_selectedTeamId == null) return;
-    
-    // Mostra um loading rápido
-    showDialog(
-      context: context, 
-      barrierDismissible: false, 
-      builder: (_) => const Center(child: CircularProgressIndicator(color: Color(0xFFE74C3C)))
-    );
-
-    try {
-      final response = await _supabase
-          .from('game_shots')
-          .select()
-          .eq('team_id', _selectedTeamId!)
-          .eq('player_name', playerName);
-      
-      if (mounted) Navigator.pop(context); // Fecha o loading
-
-      if (response == null || (response as List).isEmpty) {
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text('O $playerName ainda não tem lançamentos registados!'))
-          );
-        }
-        return;
-      }
-
-      final List<ShotRecord> shots = (response as List).map((s) => ShotRecord(
-        relativeX: (s['relative_x'] as num).toDouble(),
-        relativeY: (s['relative_y'] as num).toDouble(),
-        isMake: s['is_make'] as bool,
-        playerName: s['player_name'],
-      )).toList();
-
-      if (mounted) {
-        Navigator.push(context, MaterialPageRoute(
-          builder: (_) => HeatmapPage(shots: shots, teamName: "Mapa de: $playerName")
-        ));
-      }
-    } catch (e) {
-      if (mounted) Navigator.pop(context);
-      debugPrint("Erro ao carregar heatmap: $e");
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); 
+    final bgColor = Theme.of(context).cardTheme.color ?? Colors.white;
-    final double screenWidth = MediaQuery.of(context).size.width;
+    final textColor = Theme.of(context).colorScheme.onSurface;
 
     return Column(
       children: [
-        // --- SELETOR DE EQUIPA ---
         Padding(
-          padding: EdgeInsets.all(16.0 * safeSf),
+          padding: EdgeInsets.all(16.0 * context.sf),
           child: InkWell(
-            onTap: () => _showTeamSelector(context, safeSf),
+            onTap: () => _showTeamSelector(context),
             child: Container(
-              padding: EdgeInsets.all(12 * safeSf),
+              padding: EdgeInsets.all(12 * context.sf),
               decoration: BoxDecoration(
-                color: Colors.white, 
+                color: bgColor, 
-                borderRadius: BorderRadius.circular(15 * safeSf), 
+                borderRadius: BorderRadius.circular(15 * context.sf), 
-                border: Border.all(color: Colors.grey.shade300),
+                border: Border.all(color: Colors.grey.withOpacity(0.2)),
                 boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 5)]
               ),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   Row(children: [
-                    Icon(Icons.shield, color: const Color(0xFFE74C3C), size: 24 * safeSf), 
+                    Icon(Icons.shield, color: AppTheme.primaryRed, size: 24 * context.sf), 
-                    SizedBox(width: 10 * safeSf), 
+                    SizedBox(width: 10 * context.sf), 
-                    Text(_selectedTeamName, style: TextStyle(fontSize: 16 * safeSf, fontWeight: FontWeight.bold))
+                    Text(_selectedTeamName, style: TextStyle(fontSize: 16 * context.sf, fontWeight: FontWeight.bold, color: textColor))
                   ]),
-                  const Icon(Icons.arrow_drop_down),
+                  Icon(Icons.arrow_drop_down, color: textColor),
                 ],
               ),
             ),
           ),
         ),
 
-        // --- TABELA DE ESTATÍSTICAS ---
         Expanded(
           child: _selectedTeamId == null
-            ? Center(child: Text("Seleciona uma equipa acima.", style: TextStyle(color: Colors.grey, fontSize: 14 * safeSf)))
+            ? Center(child: Text("Seleciona uma equipa acima.", style: TextStyle(color: Colors.grey, fontSize: 14 * context.sf)))
             : StreamBuilder<List<Map<String, dynamic>>>(
                 stream: _supabase.from('player_stats_with_names').stream(primaryKey: ['id']).eq('team_id', _selectedTeamId!),
                 builder: (context, statsSnapshot) {
@@ -118,11 +68,11 @@ class _StatusPageState extends State<StatusPage> {
                         stream: _supabase.from('members').stream(primaryKey: ['id']).eq('team_id', _selectedTeamId!),
                         builder: (context, membersSnapshot) {
                           if (statsSnapshot.connectionState == ConnectionState.waiting || gamesSnapshot.connectionState == ConnectionState.waiting || membersSnapshot.connectionState == ConnectionState.waiting) {
-                            return const Center(child: CircularProgressIndicator(color: Color(0xFFE74C3C)));
+                            return const Center(child: CircularProgressIndicator(color: AppTheme.primaryRed));
                           }
 
                           final membersData = membersSnapshot.data ?? [];
-                          if (membersData.isEmpty) return Center(child: Text("Esta equipa não tem jogadores registados.", style: TextStyle(color: Colors.grey, fontSize: 14 * safeSf)));
+                          if (membersData.isEmpty) return Center(child: Text("Esta equipa não tem jogadores registados.", style: TextStyle(color: Colors.grey, fontSize: 14 * context.sf)));
 
                           final statsData = statsSnapshot.data ?? [];
                           final gamesData = gamesSnapshot.data ?? [];
@@ -137,7 +87,7 @@ class _StatusPageState extends State<StatusPage> {
                             return _isAscending ? valA.compareTo(valB) : valB.compareTo(valA);
                           });
 
-                          return _buildStatsGrid(context, playerTotals, teamTotals, safeSf, screenWidth);
+                          return _buildStatsGrid(context, playerTotals, teamTotals, bgColor, textColor);
                         }
                       );
                     }
@@ -149,21 +99,28 @@ class _StatusPageState extends State<StatusPage> {
     );
   }
 
-  // (Lógica de _aggregateStats e _calculateTeamTotals continua igual...)
+  // 👇 AGORA GUARDA TAMBÉM O IMAGE_URL DO MEMBRO PARA MOSTRAR NA TABELA
   List<Map<String, dynamic>> _aggregateStats(List<dynamic> stats, List<dynamic> games, List<dynamic> members) {
     Map<String, Map<String, dynamic>> aggregated = {};
     for (var member in members) {
       String name = member['name']?.toString() ?? "Desconhecido";
-      aggregated[name] = {'name': name, 'j': 0, 'pts': 0, 'ast': 0, 'rbs': 0, 'stl': 0, 'blk': 0, 'mvp': 0, 'def': 0};
+      String? imageUrl = member['image_url']?.toString(); // 👈 CAPTURA A IMAGEM AQUI
+      aggregated[name] = {'name': name, 'image_url': imageUrl, 'j': 0, 'pts': 0, 'ast': 0, 'rbs': 0, 'stl': 0, 'blk': 0, 'mvp': 0, 'def': 0};
     }
     for (var row in stats) {
       String name = row['player_name']?.toString() ?? "Desconhecido";
-      if (!aggregated.containsKey(name)) aggregated[name] = {'name': name, 'j': 0, 'pts': 0, 'ast': 0, 'rbs': 0, 'stl': 0, 'blk': 0, 'mvp': 0, 'def': 0};
+      if (!aggregated.containsKey(name)) aggregated[name] = {'name': name, 'image_url': null, 'j': 0, 'pts': 0, 'ast': 0, 'rbs': 0, 'stl': 0, 'blk': 0, 'mvp': 0, 'def': 0};
-      aggregated[name]!['j'] += 1; aggregated[name]!['pts'] += (row['pts'] ?? 0); aggregated[name]!['ast'] += (row['ast'] ?? 0);
+      
-      aggregated[name]!['rbs'] += (row['rbs'] ?? 0); aggregated[name]!['stl'] += (row['stl'] ?? 0); aggregated[name]!['blk'] += (row['blk'] ?? 0);
+      aggregated[name]!['j'] += 1; 
+      aggregated[name]!['pts'] += (row['pts'] ?? 0);
+      aggregated[name]!['ast'] += (row['ast'] ?? 0);
+      aggregated[name]!['rbs'] += (row['rbs'] ?? 0);
+      aggregated[name]!['stl'] += (row['stl'] ?? 0);
+      aggregated[name]!['blk'] += (row['blk'] ?? 0);
     }
     for (var game in games) {
-      String? mvp = game['mvp_name']; String? defRaw = game['top_def_name'];
+      String? mvp = game['mvp_name'];
+      String? defRaw = game['top_def_name'];
       if (mvp != null && aggregated.containsKey(mvp)) aggregated[mvp]!['mvp'] += 1;
       if (defRaw != null) {
         String defName = defRaw.split(' (')[0].trim(); 
@@ -178,116 +135,120 @@ class _StatusPageState extends State<StatusPage> {
     for (var p in players) {
       tPts += (p['pts'] as int); tAst += (p['ast'] as int); tRbs += (p['rbs'] as int); tStl += (p['stl'] as int); tBlk += (p['blk'] as int); tMvp += (p['mvp'] as int); tDef += (p['def'] as int);
     }
-    return {'name': 'TOTAL EQUIPA', 'j': teamGames, 'pts': tPts, 'ast': tAst, 'rbs': tRbs, 'stl': tStl, 'blk': tBlk, 'mvp': tMvp, 'def': tDef};
+    return {'name': 'TOTAL EQUIPA', 'image_url': null, 'j': teamGames, 'pts': tPts, 'ast': tAst, 'rbs': tRbs, 'stl': tStl, 'blk': tBlk, 'mvp': tMvp, 'def': tDef};
   }
 
-  Widget _buildStatsGrid(BuildContext context, List<Map<String, dynamic>> players, Map<String, dynamic> teamTotals, double safeSf, double screenWidth) {
+  Widget _buildStatsGrid(BuildContext context, List<Map<String, dynamic>> players, Map<String, dynamic> teamTotals, Color bgColor, Color textColor) {
-    double dynamicSpacing = math.max(15 * safeSf, (screenWidth - (180 * safeSf)) / 8); 
-
     return Container(
-      color: Colors.white,
+      color: Colors.transparent,
-      width: double.infinity,
       child: SingleChildScrollView(
         scrollDirection: Axis.vertical,
         child: SingleChildScrollView(
           scrollDirection: Axis.horizontal,
-          child: ConstrainedBox(
-            constraints: BoxConstraints(minWidth: screenWidth), 
           child: DataTable(
-              columnSpacing: dynamicSpacing,
+            columnSpacing: 25 * context.sf,
-              horizontalMargin: 20 * safeSf,
+            headingRowColor: WidgetStateProperty.all(Theme.of(context).colorScheme.surface),
-              headingRowColor: MaterialStateProperty.all(Colors.grey.shade100),
+            dataRowMaxHeight: 60 * context.sf,
-              dataRowHeight: 60 * safeSf,
+            dataRowMinHeight: 60 * context.sf,
             columns: [
-                DataColumn(label: const Text('JOGADOR')),
+              DataColumn(label: Text('JOGADOR', style: TextStyle(color: textColor))),
-                _buildSortableColumn('J', 'j', safeSf),
+              _buildSortableColumn(context, 'J', 'j', textColor),
-                _buildSortableColumn('PTS', 'pts', safeSf),
+              _buildSortableColumn(context, 'PTS', 'pts', textColor),
-                _buildSortableColumn('AST', 'ast', safeSf),
+              _buildSortableColumn(context, 'AST', 'ast', textColor),
-                _buildSortableColumn('RBS', 'rbs', safeSf),
+              _buildSortableColumn(context, 'RBS', 'rbs', textColor),
-                _buildSortableColumn('STL', 'stl', safeSf),
+              _buildSortableColumn(context, 'STL', 'stl', textColor),
-                _buildSortableColumn('BLK', 'blk', safeSf),
+              _buildSortableColumn(context, 'BLK', 'blk', textColor),
-                _buildSortableColumn('DEF 🛡️', 'def', safeSf),
+              _buildSortableColumn(context, 'DEF 🛡️', 'def', textColor),
-                _buildSortableColumn('MVP 🏆', 'mvp', safeSf),
+              _buildSortableColumn(context, 'MVP 🏆', 'mvp', textColor),
             ],
             rows: [
               ...players.map((player) => DataRow(cells: [
                 DataCell(
-                    // 👇 TORNEI O NOME CLICÁVEL PARA ABRIR O MAPA
+                  Row(
-                    InkWell(
+                    children: [
-                      onTap: () => _openPlayerHeatmap(player['name']),
+                      // 👇 FOTO DO JOGADOR NA TABELA (COM CACHE!) 👇
-                      child: Row(children: [
+                      ClipOval(
-                        CircleAvatar(radius: 15 * safeSf, backgroundColor: Colors.grey.shade200, child: Icon(Icons.person, size: 18 * safeSf)), 
+                        child: Container(
-                        SizedBox(width: 10 * safeSf), 
+                          width: 30 * context.sf,
-                        Text(player['name'], style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13 * safeSf, color: Colors.blue.shade700))
+                          height: 30 * context.sf,
-                      ]),
+                          color: Colors.grey.withOpacity(0.2),
+                          child: (player['image_url'] != null && player['image_url'].toString().isNotEmpty)
+                              ? CachedNetworkImage(
+                                  imageUrl: player['image_url'],
+                                  fit: BoxFit.cover,
+                                  fadeInDuration: Duration.zero,
+                                  placeholder: (context, url) => Icon(Icons.person, size: 18 * context.sf, color: Colors.grey),
+                                  errorWidget: (context, url, error) => Icon(Icons.person, size: 18 * context.sf, color: Colors.grey),
+                                )
+                              : Icon(Icons.person, size: 18 * context.sf, color: Colors.grey),
+                        ),
+                      ),
+                      SizedBox(width: 10 * context.sf), 
+                      Text(player['name'], style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13 * context.sf, color: textColor))
+                    ]
                   )
                 ),
-                  DataCell(Center(child: Text(player['j'].toString()))),
+                DataCell(Center(child: Text(player['j'].toString(), style: TextStyle(color: textColor)))),
-                  _buildStatCell(player['pts'], safeSf, isHighlight: true),
+                _buildStatCell(context, player['pts'], textColor, isHighlight: true),
-                  _buildStatCell(player['ast'], safeSf),
+                _buildStatCell(context, player['ast'], textColor),
-                  _buildStatCell(player['rbs'], safeSf),
+                _buildStatCell(context, player['rbs'], textColor),
-                  _buildStatCell(player['stl'], safeSf),
+                _buildStatCell(context, player['stl'], textColor),
-                  _buildStatCell(player['blk'], safeSf),
+                _buildStatCell(context, player['blk'], textColor),
-                  _buildStatCell(player['def'], safeSf, isBlue: true),
+                _buildStatCell(context, player['def'], textColor, isBlue: true),
-                  _buildStatCell(player['mvp'], safeSf, isGold: true),
+                _buildStatCell(context, player['mvp'], textColor, isGold: true),
               ])),
               DataRow(
-                  color: MaterialStateProperty.all(Colors.grey.shade50),
+                color: WidgetStateProperty.all(Theme.of(context).colorScheme.surface.withOpacity(0.5)),
                 cells: [
-                    DataCell(Text('TOTAL EQUIPA', style: TextStyle(fontWeight: FontWeight.w900, color: Colors.black, fontSize: 12 * safeSf))),
+                  DataCell(Text('TOTAL EQUIPA', style: TextStyle(fontWeight: FontWeight.w900, color: textColor, fontSize: 12 * context.sf))),
-                    DataCell(Center(child: Text(teamTotals['j'].toString(), style: const TextStyle(fontWeight: FontWeight.bold)))),
+                  DataCell(Center(child: Text(teamTotals['j'].toString(), style: TextStyle(fontWeight: FontWeight.bold, color: textColor)))),
-                    _buildStatCell(teamTotals['pts'], safeSf, isHighlight: true),
+                  _buildStatCell(context, teamTotals['pts'], textColor, isHighlight: true),
-                    _buildStatCell(teamTotals['ast'], safeSf),
+                  _buildStatCell(context, teamTotals['ast'], textColor),
-                    _buildStatCell(teamTotals['rbs'], safeSf),
+                  _buildStatCell(context, teamTotals['rbs'], textColor),
-                    _buildStatCell(teamTotals['stl'], safeSf),
+                  _buildStatCell(context, teamTotals['stl'], textColor),
-                    _buildStatCell(teamTotals['blk'], safeSf),
+                  _buildStatCell(context, teamTotals['blk'], textColor),
-                    _buildStatCell(teamTotals['def'], safeSf, isBlue: true),
+                  _buildStatCell(context, teamTotals['def'], textColor, isBlue: true),
-                    _buildStatCell(teamTotals['mvp'], safeSf, isGold: true),
+                  _buildStatCell(context, teamTotals['mvp'], textColor, isGold: true),
                 ]
               )
             ],
           ),
         ),
       ),
-      ),
     );
   }
 
-  // (Outras funções de build continuam igual...)
+  DataColumn _buildSortableColumn(BuildContext context, String title, String sortKey, Color textColor) {
-  DataColumn _buildSortableColumn(String title, String sortKey, double safeSf) {
     return DataColumn(label: InkWell(
       onTap: () => setState(() {
         if (_sortColumn == sortKey) _isAscending = !_isAscending;
         else { _sortColumn = sortKey; _isAscending = false; }
       }),
-      child: Row(
+      child: Row(children: [
-        mainAxisSize: MainAxisSize.min,
+        Text(title, style: TextStyle(fontSize: 12 * context.sf, fontWeight: FontWeight.bold, color: textColor)),
-        children: [
+        if (_sortColumn == sortKey) Icon(_isAscending ? Icons.arrow_drop_up : Icons.arrow_drop_down, size: 18 * context.sf, color: AppTheme.primaryRed),
-          Text(title, style: TextStyle(fontSize: 12 * safeSf, fontWeight: FontWeight.bold)),
+      ]),
-          if (_sortColumn == sortKey) Icon(_isAscending ? Icons.arrow_drop_up : Icons.arrow_drop_down, size: 18 * safeSf, color: const Color(0xFFE74C3C)),
-        ]
-      ),
     ));
   }
 
-  DataCell _buildStatCell(int value, double safeSf, {bool isHighlight = false, bool isGold = false, bool isBlue = false}) {
+  DataCell _buildStatCell(BuildContext context, int value, Color textColor, {bool isHighlight = false, bool isGold = false, bool isBlue = false}) {
     return DataCell(Center(child: Container(
-      padding: EdgeInsets.symmetric(horizontal: 8 * safeSf, vertical: 4 * safeSf),
+      padding: EdgeInsets.symmetric(horizontal: 8 * context.sf, vertical: 4 * context.sf),
       decoration: BoxDecoration(color: isGold && value > 0 ? Colors.amber.withOpacity(0.2) : (isBlue && value > 0 ? Colors.blue.withOpacity(0.1) : Colors.transparent), borderRadius: BorderRadius.circular(6)),
       child: Text(value == 0 ? "-" : value.toString(), style: TextStyle(
         fontWeight: (isHighlight || isGold || isBlue) ? FontWeight.w900 : FontWeight.w600, 
-        fontSize: 14 * safeSf, color: isGold && value > 0 ? Colors.orange.shade900 : (isBlue && value > 0 ? Colors.blue.shade800 : (isHighlight ? Colors.green.shade700 : Colors.black87))
+        fontSize: 14 * context.sf, color: isGold && value > 0 ? Colors.orange.shade900 : (isBlue && value > 0 ? Colors.blue.shade800 : (isHighlight ? AppTheme.successGreen : textColor))
       )),
     )));
   }
 
-  void _showTeamSelector(BuildContext context, double safeSf) {
+  void _showTeamSelector(BuildContext context) {
-    showModalBottomSheet(context: context, builder: (context) => StreamBuilder<List<Map<String, dynamic>>>(
+    showModalBottomSheet(context: context, backgroundColor: Theme.of(context).colorScheme.surface, builder: (context) => StreamBuilder<List<Map<String, dynamic>>>(
       stream: _teamController.teamsStream,
       builder: (context, snapshot) {
         final teams = snapshot.data ?? [];
         return ListView.builder(itemCount: teams.length, itemBuilder: (context, i) => ListTile(
-          title: Text(teams[i]['name'], style: TextStyle(fontSize: 15 * safeSf)),
+          title: Text(teams[i]['name'], style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
           onTap: () { setState(() { _selectedTeamId = teams[i]['id']; _selectedTeamName = teams[i]['name']; }); Navigator.pop(context); },
         ));
       },

lib/pages/teamPage.dart

@@ -1,9 +1,13 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:image_cropper/image_cropper.dart'; 
+import 'package:cached_network_image/cached_network_image.dart'; // 👇 A MAGIA DO CACHE AQUI
 import 'package:playmaker/screens/team_stats_page.dart';
+import 'package:playmaker/classe/theme.dart';
 import '../controllers/team_controller.dart';
 import '../models/team_model.dart';
 import '../utils/size_extension.dart';
-import 'dart:math' as math;
 
 class TeamsPage extends StatefulWidget {
   const TeamsPage({super.key});
@@ -33,14 +37,14 @@ class _TeamsPageState extends State<TeamsPage> {
         return StatefulBuilder(
           builder: (context, setModalState) {
             return AlertDialog(
-              backgroundColor: const Color(0xFF2C3E50), 
+              backgroundColor: Theme.of(context).colorScheme.surface, 
               shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * context.sf)),
               title: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  Text("Filtros de pesquisa", style: TextStyle(color: Colors.white, fontSize: 18 * context.sf, fontWeight: FontWeight.bold)),
+                  Text("Filtros de pesquisa", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 18 * context.sf, fontWeight: FontWeight.bold)),
                   IconButton(
-                    icon: Icon(Icons.close, color: Colors.white, size: 20 * context.sf),
+                    icon: Icon(Icons.close, color: Colors.grey, size: 20 * context.sf),
                     onPressed: () => Navigator.pop(context),
                   )
                 ],
@@ -48,7 +52,7 @@ class _TeamsPageState extends State<TeamsPage> {
               content: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  const Divider(color: Colors.white24),
+                  Divider(color: Colors.grey.withOpacity(0.2)),
                   SizedBox(height: 16 * context.sf),
                   Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -83,7 +87,7 @@ class _TeamsPageState extends State<TeamsPage> {
               actions: [
                 TextButton(
                   onPressed: () => Navigator.pop(context),
-                  child: Text("CONCLUÍDO", style: TextStyle(color: const Color(0xFFE74C3C), fontWeight: FontWeight.bold, fontSize: 14 * context.sf)),
+                  child: Text("CONCLUÍDO", style: TextStyle(color: AppTheme.primaryRed, fontWeight: FontWeight.bold, fontSize: 14 * context.sf)),
                 ),
               ],
             );
@@ -108,7 +112,7 @@ class _TeamsPageState extends State<TeamsPage> {
               child: Text(
                 opt,
                 style: TextStyle(
-                  color: isSelected ? const Color(0xFFE74C3C) : Colors.white70,
+                  color: isSelected ? AppTheme.primaryRed : Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
                   fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
                   fontSize: 14 * context.sf,
                 ),
@@ -123,14 +127,14 @@ class _TeamsPageState extends State<TeamsPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: const Color(0xFFF5F7FA),
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       appBar: AppBar(
         title: Text("Minhas Equipas", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20 * context.sf)),
-        backgroundColor: const Color(0xFFF5F7FA),
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
         elevation: 0,
         actions: [
           IconButton(
-            icon: Icon(Icons.filter_list, color: const Color(0xFFE74C3C), size: 24 * context.sf),
+            icon: Icon(Icons.filter_list, color: AppTheme.primaryRed, size: 24 * context.sf),
             onPressed: () => _showFilterDialog(context),
           ),
         ],
@@ -143,7 +147,7 @@ class _TeamsPageState extends State<TeamsPage> {
       ),
       floatingActionButton: FloatingActionButton(
         heroTag: 'add_team_btn', 
-        backgroundColor: const Color(0xFFE74C3C),
+        backgroundColor: AppTheme.primaryRed,
         child: Icon(Icons.add, color: Colors.white, size: 24 * context.sf),
         onPressed: () => _showCreateDialog(context),
       ),
@@ -151,33 +155,30 @@ class _TeamsPageState extends State<TeamsPage> {
   }
 
   Widget _buildSearchBar() {
-    final double safeSf = math.min(context.sf, 1.15); // Travão para a barra não ficar com margens gigantes
     return Padding(
-      padding: EdgeInsets.all(16.0 * safeSf),
+      padding: EdgeInsets.all(16.0 * context.sf),
       child: TextField(
         controller: _searchController,
         onChanged: (v) => setState(() => _searchQuery = v.toLowerCase()),
-        style: TextStyle(fontSize: 16 * safeSf),
+        style: TextStyle(fontSize: 16 * context.sf, color: Theme.of(context).colorScheme.onSurface),
         decoration: InputDecoration(
           hintText: 'Pesquisar equipa...',
-          hintStyle: TextStyle(fontSize: 16 * safeSf),
+          hintStyle: TextStyle(fontSize: 16 * context.sf, color: Colors.grey),
-          prefixIcon: Icon(Icons.search, color: const Color(0xFFE74C3C), size: 22 * safeSf),
+          prefixIcon: Icon(Icons.search, color: AppTheme.primaryRed, size: 22 * context.sf),
           filled: true,
-          fillColor: Colors.white,
+          fillColor: Theme.of(context).colorScheme.surface, 
-          border: OutlineInputBorder(borderRadius: BorderRadius.circular(15 * safeSf), borderSide: BorderSide.none),
+          border: OutlineInputBorder(borderRadius: BorderRadius.circular(15 * context.sf), borderSide: BorderSide.none),
         ),
       ),
     );
   }
 
   Widget _buildTeamsList() {
-    final double safeSf = math.min(context.sf, 1.15);
+    return FutureBuilder<List<Map<String, dynamic>>>(
-
+      future: controller.getTeamsWithStats(),
-    return StreamBuilder<List<Map<String, dynamic>>>(
-      stream: controller.teamsStream,
       builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) return const Center(child: CircularProgressIndicator());
+        if (snapshot.connectionState == ConnectionState.waiting) return Center(child: CircularProgressIndicator(color: AppTheme.primaryRed));
-        if (!snapshot.hasData || snapshot.data!.isEmpty) return Center(child: Text("Nenhuma equipa encontrada.", style: TextStyle(fontSize: 16 * safeSf)));
+        if (!snapshot.hasData || snapshot.data!.isEmpty) return Center(child: Text("Nenhuma equipa encontrada.", style: TextStyle(fontSize: 16 * context.sf, color: Theme.of(context).colorScheme.onSurface)));
 
         var data = List<Map<String, dynamic>>.from(snapshot.data!);
 
@@ -193,27 +194,45 @@ class _TeamsPageState extends State<TeamsPage> {
           else return (b['created_at'] ?? '').toString().compareTo((a['created_at'] ?? '').toString());
         });
 
-        return ListView.builder(
+        return RefreshIndicator(
-          padding: EdgeInsets.symmetric(horizontal: 16 * safeSf), // Margem perfeitamente alinhada
+          color: AppTheme.primaryRed,
+          onRefresh: () async => setState(() {}),
+          child: ListView.builder(
+            padding: EdgeInsets.symmetric(horizontal: 16 * context.sf),
             itemCount: data.length,
             itemBuilder: (context, index) {
               final team = Team.fromMap(data[index]);
               return GestureDetector(
-              onTap: () => Navigator.push(context, MaterialPageRoute(builder: (context) => TeamStatsPage(team: team))),
+                onTap: () => Navigator.push(context, MaterialPageRoute(builder: (context) => TeamStatsPage(team: team))).then((_) => setState(() {})),
                 child: TeamCard(
                   team: team, 
                   controller: controller,
-                onFavoriteTap: () => controller.toggleFavorite(team.id, team.isFavorite),
+                  onFavoriteTap: () async {
+                    await controller.toggleFavorite(team.id, team.isFavorite);
+                    setState(() {});
+                  },
+                  onDelete: () => setState(() {}),
+                  sf: context.sf,
                 ),
               );
             },
+          ),
         );
       },
     );
   }
 
   void _showCreateDialog(BuildContext context) {
-    showDialog(context: context, builder: (context) => CreateTeamDialog(onConfirm: (name, season, imageUrl) => controller.createTeam(name, season, imageUrl)));
+    showDialog(
+      context: context, 
+      builder: (context) => CreateTeamDialog(
+        sf: context.sf, 
+        onConfirm: (name, season, imageFile) async {
+          await controller.createTeam(name, season, imageFile);
+          setState(() {}); 
+        }
+      ),
+    );
   }
 }
 
@@ -222,85 +241,160 @@ class TeamCard extends StatelessWidget {
   final Team team;
   final TeamController controller;
   final VoidCallback onFavoriteTap;
+  final VoidCallback onDelete; 
+  final double sf; 
 
-  const TeamCard({super.key, required this.team, required this.controller, required this.onFavoriteTap});
+  const TeamCard({
+    super.key,
+    required this.team,
+    required this.controller,
+    required this.onFavoriteTap,
+    required this.onDelete,
+    required this.sf,
+  });
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // O verdadeiro salvador do tablet
+    final bgColor = Theme.of(context).cardTheme.color ?? Theme.of(context).colorScheme.surface;
+    final textColor = Theme.of(context).colorScheme.onSurface;
+    final double avatarSize = 56 * sf; // 2 * radius (28)
 
-    return Card(
+    return Container(
-      color: Colors.white, elevation: 3, margin: EdgeInsets.only(bottom: 12 * safeSf),
+      margin: EdgeInsets.only(bottom: 12 * sf), 
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * safeSf)),
+      decoration: BoxDecoration(
+        color: bgColor, 
+        borderRadius: BorderRadius.circular(15 * sf), 
+        border: Border.all(color: Colors.grey.withOpacity(0.15)), 
+        boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10 * sf)] 
+      ),
+      child: Material(
+        color: Colors.transparent, 
+        borderRadius: BorderRadius.circular(15 * sf),
         child: ListTile(
-        contentPadding: EdgeInsets.symmetric(horizontal: 16 * safeSf, vertical: 8 * safeSf),
+          contentPadding: EdgeInsets.symmetric(horizontal: 16 * sf, vertical: 8 * sf),
           leading: Stack(
             clipBehavior: Clip.none,
             children: [
-            CircleAvatar(
+              // 👇 AVATAR DA EQUIPA OTIMIZADO COM CACHE 👇
-              radius: 28 * safeSf, backgroundColor: Colors.grey[200],
+              ClipOval(
-              backgroundImage: (team.imageUrl.isNotEmpty && team.imageUrl.startsWith('http')) ? NetworkImage(team.imageUrl) : null,
+                child: Container(
-              child: (team.imageUrl.isEmpty || !team.imageUrl.startsWith('http')) ? Text(team.imageUrl.isEmpty ? "🏀" : team.imageUrl, style: TextStyle(fontSize: 24 * safeSf)) : null,
+                  width: avatarSize,
+                  height: avatarSize,
+                  color: Colors.grey.withOpacity(0.2),
+                  child: (team.imageUrl.isNotEmpty && team.imageUrl.startsWith('http'))
+                      ? CachedNetworkImage(
+                          imageUrl: team.imageUrl,
+                          fit: BoxFit.cover,
+                          fadeInDuration: Duration.zero, // Fica instantâneo no scroll
+                          placeholder: (context, url) => const SizedBox(), // Fica só o fundo cinza
+                          errorWidget: (context, url, error) => Center(
+                            child: Text("🏀", style: TextStyle(fontSize: 24 * sf)),
+                          ),
+                        )
+                      : Center(
+                          child: Text(
+                            team.imageUrl.isEmpty ? "🏀" : team.imageUrl, 
+                            style: TextStyle(fontSize: 24 * sf),
+                          ),
+                        ),
+                ),
               ),
               Positioned(
-              left: -15 * safeSf, top: -10 * safeSf,
+                left: -15 * sf,
+                top: -10 * sf,
                 child: IconButton(
-                icon: Icon(team.isFavorite ? Icons.star : Icons.star_border, color: team.isFavorite ? Colors.amber : Colors.black.withOpacity(0.1), size: 28 * safeSf, shadows: [Shadow(color: Colors.black.withOpacity(team.isFavorite ? 0.3 : 0.1), blurRadius: 4 * safeSf)]),
+                  icon: Icon(
+                    team.isFavorite ? Icons.star : Icons.star_border,
+                    color: team.isFavorite ? AppTheme.warningAmber : Theme.of(context).colorScheme.onSurface.withOpacity(0.2), 
+                    size: 28 * sf,
+                    shadows: [Shadow(color: Colors.black.withOpacity(team.isFavorite ? 0.3 : 0.1), blurRadius: 4 * sf)],
+                  ),
                   onPressed: onFavoriteTap,
                 ),
               ),
             ],
           ),
-        title: Text(team.name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16 * safeSf), overflow: TextOverflow.ellipsis),
+          title: Text(
+            team.name,
+            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16 * sf, color: textColor),
+            overflow: TextOverflow.ellipsis,
+          ),
           subtitle: Padding(
-          padding: EdgeInsets.only(top: 6.0 * safeSf),
+            padding: EdgeInsets.only(top: 6.0 * sf),
             child: Row(
               children: [
-              Icon(Icons.groups_outlined, size: 16 * safeSf, color: Colors.grey),
+                Icon(Icons.groups_outlined, size: 16 * sf, color: Colors.grey),
-              SizedBox(width: 4 * safeSf),
+                SizedBox(width: 4 * sf),
-              StreamBuilder<int>(
+                Text(
-                stream: controller.getPlayerCountStream(team.id),
+                  "${team.playerCount} Jogs.", 
-                initialData: 0,
+                  style: TextStyle(
-                builder: (context, snapshot) {
+                    color: team.playerCount > 0 ? AppTheme.successGreen : AppTheme.warningAmber, 
-                  final count = snapshot.data ?? 0;
+                    fontWeight: FontWeight.bold,
-                  return Text("$count Jogs.", style: TextStyle(color: count > 0 ? Colors.green[700] : Colors.orange, fontWeight: FontWeight.bold, fontSize: 13 * safeSf));
+                    fontSize: 13 * sf,
-                },
+                  ),
+                ),
+                SizedBox(width: 8 * sf),
+                Expanded( 
+                  child: Text("|  ${team.season}", style: TextStyle(color: Colors.grey, fontSize: 13 * sf), overflow: TextOverflow.ellipsis),
                 ),
-              SizedBox(width: 8 * safeSf),
-              Expanded(child: Text("|  ${team.season}", style: TextStyle(color: Colors.grey, fontSize: 13 * safeSf), overflow: TextOverflow.ellipsis)),
               ],
             ),
           ),
           trailing: Row(
             mainAxisSize: MainAxisSize.min, 
             children: [
-            IconButton(tooltip: 'Ver Estatísticas', icon: Icon(Icons.bar_chart_rounded, color: Colors.blue, size: 24 * safeSf), onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => TeamStatsPage(team: team)))),
+              IconButton(
-            IconButton(tooltip: 'Eliminar Equipa', icon: Icon(Icons.delete_outline, color: const Color(0xFFE74C3C), size: 24 * safeSf), onPressed: () => _confirmDelete(context, safeSf)),
+                tooltip: 'Ver Estatísticas',
+                icon: Icon(Icons.bar_chart_rounded, color: Colors.blue, size: 24 * sf),
+                onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => TeamStatsPage(team: team))).then((_) => onDelete()),
+              ),
+              IconButton(
+                tooltip: 'Eliminar Equipa',
+                icon: Icon(Icons.delete_outline, color: AppTheme.primaryRed, size: 24 * sf), 
+                onPressed: () => _confirmDelete(context, sf, bgColor, textColor),
+              ),
             ],
           ),
         ),
+      ),
     );
   }
 
-  void _confirmDelete(BuildContext context, double safeSf) {
+  void _confirmDelete(BuildContext context, double sf, Color cardColor, Color textColor) {
     showDialog(
       context: context,
-      builder: (context) => AlertDialog(
+      builder: (ctx) => AlertDialog(
-        title: Text('Eliminar Equipa?', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
+        backgroundColor: cardColor, 
-        content: Text('Tens a certeza que queres eliminar "${team.name}"?', style: TextStyle(fontSize: 14 * safeSf)),
+        surfaceTintColor: Colors.transparent, 
+        title: Text('Eliminar Equipa?', style: TextStyle(fontSize: 18 * sf, fontWeight: FontWeight.bold, color: textColor)), 
+        content: Text('Tens a certeza que queres eliminar "${team.name}"?', style: TextStyle(fontSize: 14 * sf, color: textColor)), 
         actions: [
-          TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancelar', style: TextStyle(fontSize: 14 * safeSf))),
+          TextButton(
-          TextButton(onPressed: () { controller.deleteTeam(team.id); Navigator.pop(context); }, child: Text('Eliminar', style: TextStyle(color: Colors.red, fontSize: 14 * safeSf))),
+            onPressed: () => Navigator.pop(ctx),
+            child: Text('Cancelar', style: TextStyle(fontSize: 14 * sf, color: Colors.grey)),
+          ),
+          TextButton(
+            onPressed: () {
+              Navigator.pop(ctx); 
+              onDelete(); 
+              controller.deleteTeam(team.id).catchError((e) {
+                if (context.mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Erro ao eliminar: $e'), backgroundColor: Colors.red));
+              });
+            },
+            child: Text('Eliminar', style: TextStyle(color: AppTheme.primaryRed, fontSize: 14 * sf)), 
+          ),
         ],
       ),
     );
   }
 }
 
-// --- DIALOG DE CRIAÇÃO ---
+// --- DIALOG DE CRIAÇÃO (COM CROPPER E ESCUDO) ---
 class CreateTeamDialog extends StatefulWidget {
-  final Function(String name, String season, String imageUrl) onConfirm;
+  final Function(String name, String season, File? imageFile) onConfirm; 
-  const CreateTeamDialog({super.key, required this.onConfirm});
+  final double sf;
+
+  const CreateTeamDialog({super.key, required this.onConfirm, required this.sf});
 
   @override
   State<CreateTeamDialog> createState() => _CreateTeamDialogState();
@@ -308,42 +402,112 @@ class CreateTeamDialog extends StatefulWidget {
 
 class _CreateTeamDialogState extends State<CreateTeamDialog> {
   final TextEditingController _nameController = TextEditingController();
-  final TextEditingController _imageController = TextEditingController();
   String _selectedSeason = '2024/25';
   
+  File? _selectedImage;
+  bool _isLoading = false;
+  bool _isPickerActive = false; 
+
+  Future<void> _pickImage() async {
+    if (_isPickerActive) return;
+    setState(() => _isPickerActive = true);
+
+    try {
+      final ImagePicker picker = ImagePicker();
+      final XFile? pickedFile = await picker.pickImage(source: ImageSource.gallery);
+      
+      if (pickedFile != null) {
+        CroppedFile? croppedFile = await ImageCropper().cropImage(
+          sourcePath: pickedFile.path,
+          aspectRatio: const CropAspectRatio(ratioX: 1, ratioY: 1), 
+          uiSettings: [
+            AndroidUiSettings(
+                toolbarTitle: 'Recortar Logo',
+                toolbarColor: AppTheme.primaryRed,
+                toolbarWidgetColor: Colors.white,
+                initAspectRatio: CropAspectRatioPreset.square,
+                lockAspectRatio: true,
+                hideBottomControls: true, 
+            ),
+            IOSUiSettings(title: 'Recortar Logo', aspectRatioLockEnabled: true, resetButtonHidden: true),
+          ],
+        );
+
+        if (croppedFile != null && mounted) {
+          setState(() {
+            _selectedImage = File(croppedFile.path);
+          });
+        }
+      }
+    } finally {
+      if (mounted) setState(() => _isPickerActive = false);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); 
-    
     return AlertDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * safeSf)),
+      backgroundColor: Theme.of(context).colorScheme.surface,
-      title: Text('Nova Equipa', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * widget.sf)),
+      title: Text('Nova Equipa', style: TextStyle(fontSize: 18 * widget.sf, fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.onSurface)),
       content: SingleChildScrollView(
-        child: Container(
-          constraints: BoxConstraints(maxWidth: 450 * safeSf), // O popup pode ter um travão para não cobrir a tela toda, fica mais bonito
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-              TextField(controller: _nameController, style: TextStyle(fontSize: 14 * safeSf), decoration: InputDecoration(labelText: 'Nome da Equipa', labelStyle: TextStyle(fontSize: 14 * safeSf)), textCapitalization: TextCapitalization.words),
+            GestureDetector(
-              SizedBox(height: 15 * safeSf),
+              onTap: _pickImage,
-              DropdownButtonFormField<String>(
+              child: Stack(
-                value: _selectedSeason, decoration: InputDecoration(labelText: 'Temporada', labelStyle: TextStyle(fontSize: 14 * safeSf)),
+                children: [
-                style: TextStyle(fontSize: 14 * safeSf, color: Colors.black87),
+                  CircleAvatar(
-                items: ['2023/24', '2024/25', '2025/26'].map((s) => DropdownMenuItem(value: s, child: Text(s))).toList(),
+                    radius: 40 * widget.sf,
-                onChanged: (val) => setState(() => _selectedSeason = val!),
+                    backgroundColor: Theme.of(context).colorScheme.onSurface.withOpacity(0.05),
+                    backgroundImage: _selectedImage != null ? FileImage(_selectedImage!) : null,
+                    child: _selectedImage == null
+                        ? Icon(Icons.add_photo_alternate_outlined, size: 30 * widget.sf, color: Colors.grey)
+                        : null,
+                  ),
+                  if (_selectedImage == null)
+                    Positioned(
+                      bottom: 0, right: 0,
+                      child: Container(
+                        padding: EdgeInsets.all(4 * widget.sf),
+                        decoration: const BoxDecoration(color: AppTheme.primaryRed, shape: BoxShape.circle),
+                        child: Icon(Icons.add, color: Colors.white, size: 16 * widget.sf),
+                      ),
                     ),
-              SizedBox(height: 15 * safeSf),
-              TextField(controller: _imageController, style: TextStyle(fontSize: 14 * safeSf), decoration: InputDecoration(labelText: 'URL Imagem ou Emoji', labelStyle: TextStyle(fontSize: 14 * safeSf), hintText: 'Ex: 🏀 ou https://...', hintStyle: TextStyle(fontSize: 14 * safeSf))),
                 ],
               ),
             ),
+            SizedBox(height: 10 * widget.sf),
+            Text("Logótipo (Opcional)", style: TextStyle(fontSize: 12 * widget.sf, color: Colors.grey)),
+            SizedBox(height: 20 * widget.sf),
+
+            TextField(controller: _nameController, style: TextStyle(fontSize: 14 * widget.sf, color: Theme.of(context).colorScheme.onSurface), decoration: InputDecoration(labelText: 'Nome da Equipa', labelStyle: TextStyle(fontSize: 14 * widget.sf)), textCapitalization: TextCapitalization.words),
+            SizedBox(height: 15 * widget.sf),
+            DropdownButtonFormField<String>(
+              dropdownColor: Theme.of(context).colorScheme.surface,
+              value: _selectedSeason, decoration: InputDecoration(labelText: 'Temporada', labelStyle: TextStyle(fontSize: 14 * widget.sf)),
+              style: TextStyle(fontSize: 14 * widget.sf, color: Theme.of(context).colorScheme.onSurface),
+              items: ['2023/24', '2024/25', '2025/26'].map((s) => DropdownMenuItem(value: s, child: Text(s))).toList(),
+              onChanged: (val) => setState(() => _selectedSeason = val!),
+            ),
+          ],
+        ),
       ),
       actions: [
-        TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancelar', style: TextStyle(fontSize: 14 * safeSf))),
+        TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancelar', style: TextStyle(fontSize: 14 * widget.sf, color: Colors.grey))),
         ElevatedButton(
-          style: ElevatedButton.styleFrom(backgroundColor: const Color(0xFFE74C3C), padding: EdgeInsets.symmetric(horizontal: 16 * safeSf, vertical: 10 * safeSf)),
+          style: ElevatedButton.styleFrom(backgroundColor: AppTheme.primaryRed, padding: EdgeInsets.symmetric(horizontal: 16 * widget.sf, vertical: 10 * widget.sf)),
-          onPressed: () { if (_nameController.text.trim().isNotEmpty) { widget.onConfirm(_nameController.text.trim(), _selectedSeason, _imageController.text.trim()); Navigator.pop(context); } },
+          onPressed: _isLoading ? null : () async {
-          child: Text('Criar', style: TextStyle(color: Colors.white, fontSize: 14 * safeSf)),
+            if (_nameController.text.trim().isNotEmpty) {
+              setState(() => _isLoading = true);
+              await widget.onConfirm(_nameController.text.trim(), _selectedSeason, _selectedImage);
+              if (context.mounted) Navigator.pop(context);
+            }
+          },
+          child: _isLoading 
+              ? SizedBox(width: 16 * widget.sf, height: 16 * widget.sf, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2))
+              : Text('Criar', style: TextStyle(color: Colors.white, fontSize: 14 * widget.sf)),
         ),
       ],
     );

lib/screens/team_stats_page.dart

@@ -1,53 +1,103 @@
-import 'dart:async';
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:image_cropper/image_cropper.dart'; 
+import 'package:shimmer/shimmer.dart'; 
+import 'package:cached_network_image/cached_network_image.dart'; // 👇 MAGIA DO CACHE AQUI
 import 'package:supabase_flutter/supabase_flutter.dart'; 
+import 'package:playmaker/classe/theme.dart'; 
 import '../models/team_model.dart';
 import '../models/person_model.dart';
+import '../utils/size_extension.dart';
 
-// --- CABEÇALHO ---
+// ==========================================
+// 1. CABEÇALHO (AGORA COM CACHE DE IMAGEM INSTANTÂNEO)
+// ==========================================
 class StatsHeader extends StatelessWidget {
   final Team team;
+  final String? currentImageUrl;
+  final VoidCallback onEditPhoto;
+  final bool isUploading;
 
-  const StatsHeader({super.key, required this.team});
+  const StatsHeader({
+    super.key, 
+    required this.team, 
+    required this.currentImageUrl, 
+    required this.onEditPhoto,
+    required this.isUploading,
+  });
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.only(top: 50, left: 20, right: 20, bottom: 20),
+      padding: EdgeInsets.only(top: 50 * context.sf, left: 20 * context.sf, right: 20 * context.sf, bottom: 20 * context.sf),
-      decoration: const BoxDecoration(
+      decoration: BoxDecoration(
-        color: Color(0xFF2C3E50),
+        color: AppTheme.primaryRed,
-        borderRadius: BorderRadius.only(bottomLeft: Radius.circular(30), bottomRight: Radius.circular(30)),
+        borderRadius: BorderRadius.only(
+          bottomLeft: Radius.circular(30 * context.sf), 
+          bottomRight: Radius.circular(30 * context.sf)
+        ),
       ),
       child: Row(
         children: [
           IconButton(
-            icon: const Icon(Icons.arrow_back, color: Colors.white),
+            icon: Icon(Icons.arrow_back, color: Colors.white, size: 24 * context.sf), 
-            onPressed: () => Navigator.pop(context),
+            onPressed: () => Navigator.pop(context)
           ),
-          const SizedBox(width: 10),
+          SizedBox(width: 10 * context.sf),
           
-          // IMAGEM OU EMOJI DA EQUIPA AQUI!
+          GestureDetector(
-          CircleAvatar(
+            onTap: onEditPhoto,
-            radius: 24,
+            child: Stack(
-            backgroundColor: Colors.white24,
+              alignment: Alignment.center,
-            backgroundImage: (team.imageUrl.isNotEmpty && team.imageUrl.startsWith('http'))
+              children: [
-                ? NetworkImage(team.imageUrl)
+                // 👇 AVATAR DA EQUIPA SEM LAG 👇
-                : null,
+                ClipOval(
-            child: (team.imageUrl.isEmpty || !team.imageUrl.startsWith('http'))
+                  child: Container(
-                ? Text(
+                    width: 56 * context.sf,
-                    team.imageUrl.isEmpty ? "🛡️" : team.imageUrl,
+                    height: 56 * context.sf,
-                    style: const TextStyle(fontSize: 20),
+                    color: Colors.white24,
+                    child: (currentImageUrl != null && currentImageUrl!.isNotEmpty && currentImageUrl!.startsWith('http')) 
+                        ? CachedNetworkImage(
+                            imageUrl: currentImageUrl!,
+                            fit: BoxFit.cover,
+                            fadeInDuration: Duration.zero, // Corta o atraso
+                            placeholder: (context, url) => Center(child: Text("🛡️", style: TextStyle(fontSize: 24 * context.sf))),
+                            errorWidget: (context, url, error) => Center(child: Text("🛡️", style: TextStyle(fontSize: 24 * context.sf))),
                           )
-                : null,
+                        : Center(
+                            child: Text(
+                              (currentImageUrl != null && currentImageUrl!.isNotEmpty) ? currentImageUrl! : "🛡️", 
+                              style: TextStyle(fontSize: 24 * context.sf)
+                            ),
+                          ),
+                  ),
+                ),
+                Positioned(
+                  bottom: 0, right: 0,
+                  child: Container(
+                    padding: EdgeInsets.all(4 * context.sf),
+                    decoration: const BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+                    child: Icon(Icons.edit, color: AppTheme.primaryRed, size: 12 * context.sf),
+                  ),
+                ),
+                if (isUploading)
+                  Container(
+                    width: 56 * context.sf, height: 56 * context.sf,
+                    decoration: const BoxDecoration(color: Colors.black45, shape: BoxShape.circle),
+                    child: const Padding(padding: EdgeInsets.all(12.0), child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2)),
+                  )
+              ],
+            ),
           ),
           
-          const SizedBox(width: 15),
+          SizedBox(width: 15 * context.sf),
-          Expanded( // Expanded evita overflow se o nome for muito longo
+          Expanded( 
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(team.name, style: const TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold), overflow: TextOverflow.ellipsis),
+                Text(team.name, style: TextStyle(color: Colors.white, fontSize: 20 * context.sf, fontWeight: FontWeight.bold), overflow: TextOverflow.ellipsis),
-                Text(team.season, style: const TextStyle(color: Colors.white70, fontSize: 14)),
+                Text(team.season, style: TextStyle(color: Colors.white70, fontSize: 14 * context.sf)),
               ],
             ),
           ),
@@ -60,25 +110,28 @@ class StatsHeader extends StatelessWidget {
 // --- CARD DE RESUMO ---
 class StatsSummaryCard extends StatelessWidget {
   final int total;
-
   const StatsSummaryCard({super.key, required this.total});
 
   @override
   Widget build(BuildContext context) {
+    final Color bgColor = Theme.of(context).brightness == Brightness.dark ? const Color(0xFF1E1E1E) : Colors.white;
     return Card(
       elevation: 4,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * context.sf)),
       child: Container(
-        padding: const EdgeInsets.all(20),
+        padding: EdgeInsets.all(20 * context.sf),
-        decoration: BoxDecoration(
+        decoration: BoxDecoration(color: bgColor, borderRadius: BorderRadius.circular(20 * context.sf), border: Border.all(color: Colors.grey.withOpacity(0.15))),
-          borderRadius: BorderRadius.circular(20),
-          gradient: LinearGradient(colors: [Colors.blue.shade700, Colors.blue.shade400]),
-        ),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            const Text("Total de Membros", style: TextStyle(color: Colors.white, fontSize: 16)),
+            Row(
-            Text("$total", style: const TextStyle(color: Colors.white, fontSize: 28, fontWeight: FontWeight.bold)),
+              children: [
+                Icon(Icons.groups, color: AppTheme.primaryRed, size: 28 * context.sf), 
+                SizedBox(width: 10 * context.sf),
+                Text("Total de Membros", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 16 * context.sf, fontWeight: FontWeight.w600)),
+              ],
+            ),
+            Text("$total", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 28 * context.sf, fontWeight: FontWeight.bold)),
           ],
         ),
       ),
@@ -89,7 +142,6 @@ class StatsSummaryCard extends StatelessWidget {
 // --- TÍTULO DE SECÇÃO ---
 class StatsSectionTitle extends StatelessWidget {
   final String title;
-
   const StatsSectionTitle({super.key, required this.title});
 
   @override
@@ -97,63 +149,119 @@ class StatsSectionTitle extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(title, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Color(0xFF2C3E50))),
+        Text(title, style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.onSurface)),
-        const Divider(),
+        Divider(color: Colors.grey.withOpacity(0.2)),
       ],
     );
   }
 }
 
-// --- CARD DA PESSOA (JOGADOR/TREINADOR) ---
+// --- CARD DA PESSOA (FOTO SEM LAG) ---
 class PersonCard extends StatelessWidget {
   final Person person;
   final bool isCoach;
   final VoidCallback onEdit;
   final VoidCallback onDelete;
 
-  const PersonCard({
+  const PersonCard({super.key, required this.person, required this.isCoach, required this.onEdit, required this.onDelete});
-    super.key,
-    required this.person,
-    required this.isCoach,
-    required this.onEdit,
-    required this.onDelete,
-  });
 
   @override
   Widget build(BuildContext context) {
-    return Card(
+    final Color defaultBg = Theme.of(context).brightness == Brightness.dark ? const Color(0xFF1E1E1E) : Colors.white;
-      margin: const EdgeInsets.only(top: 12),
+    final Color coachBg = Theme.of(context).brightness == Brightness.dark ? AppTheme.warningAmber.withOpacity(0.1) : const Color(0xFFFFF9C4);
-      elevation: 2,
+    final String? pImage = person.imageUrl;
-      color: isCoach ? const Color(0xFFFFF9C4) : Colors.white,
+    final Color iconColor = isCoach ? Colors.white : AppTheme.primaryRed;
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
-      child: ListTile(
-        leading: isCoach
-            ? const CircleAvatar(backgroundColor: Colors.orange, child: Icon(Icons.person, color: Colors.white))  
-            : Container(
-                width: 45,
-                height: 45,
-                alignment: Alignment.center,
-                decoration: BoxDecoration(color: Colors.blue.withOpacity(0.1), borderRadius: BorderRadius.circular(10)),
-                child: Text(person.number ?? "J", style: const TextStyle(color: Colors.blue, fontWeight: FontWeight.bold, fontSize: 16)),
-              ),
-        title: Text(person.name, style: const TextStyle(fontWeight: FontWeight.bold)),
 
-        // --- CANTO DIREITO (Trailing) ---
+    return Card(
-        trailing: Row(
+      margin: EdgeInsets.only(top: 12 * context.sf),
+      elevation: 2, 
+      color: isCoach ? coachBg : defaultBg,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * context.sf)),
+      child: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 16 * context.sf, vertical: 12 * context.sf),
+        child: Row(
+          children: [
+            // 👇 FOTO DO JOGADOR/TREINADOR INSTANTÂNEA 👇
+            ClipOval(
+              child: Container(
+                width: 44 * context.sf,
+                height: 44 * context.sf,
+                color: isCoach ? AppTheme.warningAmber : AppTheme.primaryRed.withOpacity(0.1),
+                child: (pImage != null && pImage.isNotEmpty)
+                    ? CachedNetworkImage(
+                        imageUrl: pImage,
+                        fit: BoxFit.cover,
+                        fadeInDuration: Duration.zero,
+                        placeholder: (context, url) => Icon(Icons.person, color: iconColor, size: 24 * context.sf),
+                        errorWidget: (context, url, error) => Icon(Icons.person, color: iconColor, size: 24 * context.sf),
+                      )
+                    : Icon(Icons.person, color: iconColor, size: 24 * context.sf),
+              ),
+            ),
+            SizedBox(width: 12 * context.sf),
+            Expanded(
+              child: Row(
+                children: [
+                  if (!isCoach && person.number != null && person.number!.isNotEmpty) ...[
+                    Container(
+                      padding: EdgeInsets.symmetric(horizontal: 8 * context.sf, vertical: 4 * context.sf),
+                      decoration: BoxDecoration(color: AppTheme.primaryRed.withOpacity(0.1), borderRadius: BorderRadius.circular(6 * context.sf)),
+                      child: Text(person.number!, style: TextStyle(color: AppTheme.primaryRed, fontWeight: FontWeight.bold, fontSize: 14 * context.sf)),
+                    ),
+                    SizedBox(width: 10 * context.sf),
+                  ],
+                  Expanded(
+                    child: Text(person.name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16 * context.sf, color: Theme.of(context).colorScheme.onSurface), overflow: TextOverflow.ellipsis)
+                  ),
+                ],
+              ),
+            ),
+            Row(
               mainAxisSize: MainAxisSize.min,
               children: [
-            // IMAGEM DA EQUIPA NO CARD DO JOGADOR
+                IconButton(icon: Icon(Icons.edit_outlined, color: Colors.blue, size: 22 * context.sf), onPressed: onEdit, padding: EdgeInsets.zero, constraints: const BoxConstraints()),
-
+                SizedBox(width: 16 * context.sf),
-            const SizedBox(width: 5), // Espaço
+                IconButton(icon: Icon(Icons.delete_outline, color: AppTheme.primaryRed, size: 22 * context.sf), onPressed: onDelete, padding: EdgeInsets.zero, constraints: const BoxConstraints()),
-            
+              ],
-            IconButton(
-              icon: const Icon(Icons.edit_outlined, color: Colors.blue),
-              onPressed: onEdit,
             ),
-            IconButton(
+          ],
-              icon: const Icon(Icons.delete_outline, color: Colors.red),
-              onPressed: onDelete,
         ),
+      ),
+    );
+  }
+}
+
+// ==========================================
+// WIDGET NOVO: SKELETON LOADING (SHIMMER)
+// ==========================================
+class SkeletonLoadingStats extends StatelessWidget {
+  const SkeletonLoadingStats({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    final baseColor = isDark ? Colors.grey[800]! : Colors.grey[300]!;
+    final highlightColor = isDark ? Colors.grey[700]! : Colors.grey[100]!;
+
+    return Shimmer.fromColors(
+      baseColor: baseColor,
+      highlightColor: highlightColor,
+      child: SingleChildScrollView(
+        padding: EdgeInsets.all(16.0 * context.sf),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(height: 80 * context.sf, width: double.infinity, decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(20 * context.sf))),
+            SizedBox(height: 30 * context.sf),
+            Container(height: 20 * context.sf, width: 150 * context.sf, color: Colors.white),
+            SizedBox(height: 10 * context.sf),
+            for (int i = 0; i < 3; i++) ...[
+              Container(
+                height: 60 * context.sf, width: double.infinity,
+                margin: EdgeInsets.only(top: 12 * context.sf),
+                decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(15 * context.sf)),
+              ),
+            ]
           ],
         ),
       ),
@@ -164,10 +272,8 @@ class PersonCard extends StatelessWidget {
 // ==========================================
 // 2. PÁGINA PRINCIPAL
 // ==========================================
-
 class TeamStatsPage extends StatefulWidget {
   final Team team;
-
   const TeamStatsPage({super.key, required this.team});
 
   @override
@@ -177,71 +283,103 @@ class TeamStatsPage extends StatefulWidget {
 class _TeamStatsPageState extends State<TeamStatsPage> {
   final StatsController _controller = StatsController();
   
+  late String _teamImageUrl;
+  bool _isUploadingTeamPhoto = false;
+  bool _isPickerActive = false; 
+
+  @override
+  void initState() {
+    super.initState();
+    _teamImageUrl = widget.team.imageUrl;
+  }
+
+  Future<void> _updateTeamPhoto() async {
+    if (_isPickerActive) return; 
+    setState(() => _isPickerActive = true);
+
+    try {
+      final File? croppedFile = await _controller.pickAndCropImage(context);
+      if (croppedFile == null) return;
+
+      setState(() => _isUploadingTeamPhoto = true);
+
+      final fileName = 'team_${widget.team.id}_${DateTime.now().millisecondsSinceEpoch}.png';
+      final supabase = Supabase.instance.client;
+
+      await supabase.storage.from('avatars').upload(fileName, croppedFile, fileOptions: const FileOptions(upsert: true));
+      final publicUrl = supabase.storage.from('avatars').getPublicUrl(fileName);
+
+      await supabase.from('teams').update({'image_url': publicUrl}).eq('id', widget.team.id);
+
+      if (_teamImageUrl.isNotEmpty && _teamImageUrl.startsWith('http')) {
+        final oldPath = _controller.extractPathFromUrl(_teamImageUrl, 'avatars');
+        if (oldPath != null) await supabase.storage.from('avatars').remove([oldPath]);
+      }
+
+      if (mounted) setState(() => _teamImageUrl = publicUrl);
+    } catch (e) {
+      if (mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Erro: $e"), backgroundColor: AppTheme.primaryRed));
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isUploadingTeamPhoto = false;
+          _isPickerActive = false; 
+        });
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: const Color(0xFFF5F7FA),
+      backgroundColor: Theme.of(context).scaffoldBackgroundColor, 
       body: Column(
         children: [
-          // Cabeçalho
+          StatsHeader(team: widget.team, currentImageUrl: _teamImageUrl, onEditPhoto: _updateTeamPhoto, isUploading: _isUploadingTeamPhoto),
-          StatsHeader(team: widget.team),
           
           Expanded(
             child: StreamBuilder<List<Person>>(
               stream: _controller.getMembers(widget.team.id),
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.waiting) {
-                  return const Center(child: CircularProgressIndicator());
+                  return const SkeletonLoadingStats(); 
                 }
 
-                if (snapshot.hasError) {
+                if (snapshot.hasError) return Center(child: Text("Erro ao carregar: ${snapshot.error}", style: TextStyle(color: Theme.of(context).colorScheme.onSurface)));
-                  return Center(child: Text("Erro ao carregar: ${snapshot.error}"));
-                }
 
                 final members = snapshot.data ?? [];
                 
-                final coaches = members.where((m) => m.type == 'Treinador').toList();
+                final coaches = members.where((m) => m.type == 'Treinador').toList()..sort((a, b) => a.name.compareTo(b.name));
-                final players = members.where((m) => m.type == 'Jogador').toList();
+                final players = members.where((m) => m.type == 'Jogador').toList()..sort((a, b) {
+                  int numA = int.tryParse(a.number ?? '999') ?? 999;
+                  int numB = int.tryParse(b.number ?? '999') ?? 999;
+                  return numA.compareTo(numB);
+                });
 
                 return RefreshIndicator(
+                  color: AppTheme.primaryRed,
                   onRefresh: () async => setState(() {}),
                   child: SingleChildScrollView(
                     physics: const AlwaysScrollableScrollPhysics(),
-                    padding: const EdgeInsets.all(16.0),
+                    padding: EdgeInsets.all(16.0 * context.sf),
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         StatsSummaryCard(total: members.length),
-                        const SizedBox(height: 30),
+                        SizedBox(height: 30 * context.sf),
 
-                        // TREINADORES
                         if (coaches.isNotEmpty) ...[
                           const StatsSectionTitle(title: "Treinadores"),
-                          ...coaches.map((c) => PersonCard(
+                          ...coaches.map((c) => PersonCard(person: c, isCoach: true, onEdit: () => _controller.showEditPersonDialog(context, widget.team.id, c), onDelete: () => _confirmDelete(context, c))),
-                                person: c,
+                          SizedBox(height: 30 * context.sf),
-                                isCoach: true,
-
-                                onEdit: () => _controller.showEditPersonDialog(context, widget.team.id, c),
-                                onDelete: () => _confirmDelete(context, c),
-                              )),
-                          const SizedBox(height: 30),
                         ],
 
-                        // JOGADORES
                         const StatsSectionTitle(title: "Jogadores"),
                         if (players.isEmpty)
-                          const Padding(
+                          Padding(padding: EdgeInsets.only(top: 20 * context.sf), child: Text("Nenhum jogador nesta equipa.", style: TextStyle(color: Colors.grey, fontSize: 16 * context.sf)))
-                            padding: EdgeInsets.only(top: 20),
-                            child: Text("Nenhum jogador nesta equipa.", style: TextStyle(color: Colors.grey, fontSize: 16)),
-                          )
                         else
-                          ...players.map((p) => PersonCard(
+                          ...players.map((p) => PersonCard(person: p, isCoach: false, onEdit: () => _controller.showEditPersonDialog(context, widget.team.id, p), onDelete: () => _confirmDelete(context, p))),
-                                person: p,
+                        SizedBox(height: 80 * context.sf),
-                                isCoach: false,
-                                onEdit: () => _controller.showEditPersonDialog(context, widget.team.id, p),
-                                onDelete: () => _confirmDelete(context, p),
-                              )),
-                        const SizedBox(height: 80),
                       ],
                     ),
                   ),
@@ -254,63 +392,102 @@ class _TeamStatsPageState extends State<TeamStatsPage> {
       floatingActionButton: FloatingActionButton(
         heroTag: 'fab_team_${widget.team.id}', 
         onPressed: () => _controller.showAddPersonDialog(context, widget.team.id),
-        backgroundColor: const Color(0xFF00C853),
+        backgroundColor: AppTheme.successGreen, 
-        child: const Icon(Icons.add, color: Colors.white),
+        child: Icon(Icons.add, color: Colors.white, size: 24 * context.sf),
       ),
     );
   }
 
-  void _confirmDelete(BuildContext context, Person person) {
+void _confirmDelete(BuildContext context, Person person) {
     showDialog(
       context: context,
       builder: (ctx) => AlertDialog(
-        title: const Text("Eliminar Membro?"),
+        backgroundColor: Theme.of(context).colorScheme.surface,
-        content: Text("Tens a certeza que queres remover ${person.name}?"),
+        title: Text("Eliminar Membro?", style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
+        content: Text("Tens a certeza que queres remover ${person.name}?", style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
         actions: [
-          TextButton(onPressed: () => Navigator.pop(ctx), child: const Text("Cancelar")),
+          TextButton(onPressed: () => Navigator.pop(ctx), child: const Text("Cancelar", style: TextStyle(color: Colors.grey))),
           TextButton(
-            onPressed: () async {
+            onPressed: () { 
-              await _controller.deletePerson(person.id);
+              Navigator.pop(ctx); 
-              if (ctx.mounted) Navigator.pop(ctx);
+              ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("A remover ${person.name}..."), duration: const Duration(seconds: 1)));
+              
+              _controller.deletePerson(person).catchError((e) {
+                 if (context.mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Erro: $e"), backgroundColor: AppTheme.primaryRed));
+              }); 
             },
-            child: const Text("Eliminar", style: TextStyle(color: Colors.red)),
+            child: const Text("Eliminar", style: TextStyle(color: AppTheme.primaryRed)), 
           ),
         ],
       ),
     );
   }
-}
+  }
+
 
 // ==========================================
 // 3. CONTROLLER
 // ==========================================
-
 class StatsController {
   final _supabase = Supabase.instance.client;
 
   Stream<List<Person>> getMembers(String teamId) {
-    return _supabase
+    return _supabase.from('members').stream(primaryKey: ['id']).eq('team_id', teamId).map((data) => data.map((json) => Person.fromMap(json)).toList());
-        .from('members')
-        .stream(primaryKey: ['id'])
-        .eq('team_id', teamId)
-        .order('name', ascending: true)
-        .map((data) => data.map((json) => Person.fromMap(json)).toList());
   }
 
-  Future<void> deletePerson(String personId) async {
+  String? extractPathFromUrl(String url, String bucket) {
+    if (url.isEmpty) return null;
+    final parts = url.split('/$bucket/');
+    if (parts.length > 1) return parts.last;
+    return null;
+  }
+
+  Future<void> deletePerson(Person person) async {
     try { 
-      await _supabase.from('members').delete().eq('id', personId);
+      await _supabase.from('members').delete().eq('id', person.id); 
+      
+      if (person.imageUrl != null && person.imageUrl!.isNotEmpty) {
+        final path = extractPathFromUrl(person.imageUrl!, 'avatars');
+        if (path != null) await _supabase.storage.from('avatars').remove([path]);
+      }
     } catch (e) { 
       debugPrint("Erro ao eliminar: $e"); 
     }
   }
 
-  void showAddPersonDialog(BuildContext context, String teamId) {
+  void showAddPersonDialog(BuildContext context, String teamId) { _showForm(context, teamId: teamId); }
-    _showForm(context, teamId: teamId);
+  void showEditPersonDialog(BuildContext context, String teamId, Person person) { _showForm(context, teamId: teamId, person: person); }
-  }
 
-  void showEditPersonDialog(BuildContext context, String teamId, Person person) {
+  Future<File?> pickAndCropImage(BuildContext context) async {
-    _showForm(context, teamId: teamId, person: person);
+    final picker = ImagePicker();
+    final pickedFile = await picker.pickImage(source: ImageSource.gallery);
+    
+    if (pickedFile == null) return null; 
+
+    CroppedFile? croppedFile = await ImageCropper().cropImage(
+      sourcePath: pickedFile.path,
+      aspectRatio: const CropAspectRatio(ratioX: 1, ratioY: 1), 
+      uiSettings: [
+        AndroidUiSettings(
+            toolbarTitle: 'Recortar Foto',
+            toolbarColor: AppTheme.primaryRed,
+            toolbarWidgetColor: Colors.white,
+            initAspectRatio: CropAspectRatioPreset.square,
+            lockAspectRatio: true,
+            hideBottomControls: true, 
+        ),
+        IOSUiSettings(
+          title: 'Recortar Foto',
+          aspectRatioLockEnabled: true,
+          resetButtonHidden: true,
+        ),
+      ],
+    );
+
+    if (croppedFile != null) {
+      return File(croppedFile.path);
+    }
+    return null;
   }
 
   void _showForm(BuildContext context, {required String teamId, Person? person}) {
@@ -319,37 +496,101 @@ class StatsController {
     final numCtrl = TextEditingController(text: person?.number ?? '');
     String selectedType = person?.type ?? 'Jogador';
     
+    File? selectedImage;
+    bool isUploading = false;
+    bool isPickerActive = false; 
+    String? currentImageUrl = isEdit ? person.imageUrl : null;
+    
+    String? nameError; 
+    String? numError;
+
     showDialog(
       context: context,
       builder: (ctx) => StatefulBuilder(
         builder: (ctx, setState) => AlertDialog(
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
+          backgroundColor: Theme.of(context).colorScheme.surface,
-          title: Text(isEdit ? "Editar Membro" : "Novo Membro"),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * context.sf)),
+          title: Text(isEdit ? "Editar Membro" : "Novo Membro", style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
           content: SingleChildScrollView(
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
+                GestureDetector(
+                  onTap: () async {
+                    if (isPickerActive) return; 
+                    setState(() => isPickerActive = true);
+
+                    try {
+                      final File? croppedFile = await pickAndCropImage(context);
+                      if (croppedFile != null) {
+                        setState(() => selectedImage = croppedFile);
+                      }
+                    } finally {
+                      setState(() => isPickerActive = false); 
+                    }
+                  },
+                  child: Stack(
+                    alignment: Alignment.center,
+                    children: [
+                      // 👇 PREVIEW DA FOTO NO POPUP SEM LAG 👇
+                      ClipOval(
+                        child: Container(
+                          width: 80 * context.sf,
+                          height: 80 * context.sf,
+                          color: Theme.of(context).colorScheme.onSurface.withOpacity(0.05),
+                          child: selectedImage != null 
+                              ? Image.file(selectedImage!, fit: BoxFit.cover) 
+                              : (currentImageUrl != null && currentImageUrl!.isNotEmpty)
+                                  ? CachedNetworkImage(
+                                      imageUrl: currentImageUrl!,
+                                      fit: BoxFit.cover,
+                                      fadeInDuration: Duration.zero,
+                                      placeholder: (context, url) => Icon(Icons.add_a_photo, size: 30 * context.sf, color: Colors.grey),
+                                      errorWidget: (context, url, error) => Icon(Icons.add_a_photo, size: 30 * context.sf, color: Colors.grey),
+                                    )
+                                  : Icon(Icons.add_a_photo, size: 30 * context.sf, color: Colors.grey),
+                        ),
+                      ),
+                      Positioned(
+                        bottom: 0, right: 0,
+                        child: Container(
+                          padding: EdgeInsets.all(6 * context.sf),
+                          decoration: BoxDecoration(color: AppTheme.primaryRed, shape: BoxShape.circle, border: Border.all(color: Colors.white, width: 2)),
+                          child: Icon(Icons.edit, color: Colors.white, size: 14 * context.sf),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                SizedBox(height: 20 * context.sf),
+
                 TextField(
                   controller: nameCtrl,
-                  decoration: const InputDecoration(labelText: "Nome Completo"),
+                  style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
+                  decoration: InputDecoration(
+                    labelText: "Nome Completo",
+                    errorText: nameError, 
+                  ),
                   textCapitalization: TextCapitalization.words,
                 ),
-                const SizedBox(height: 15),
+                SizedBox(height: 15 * context.sf),
                 DropdownButtonFormField<String>(
                   value: selectedType,
+                  dropdownColor: Theme.of(context).colorScheme.surface,
+                  style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 16 * context.sf),
                   decoration: const InputDecoration(labelText: "Função"),
-                  items: ["Jogador", "Treinador"]
+                  items: ["Jogador", "Treinador"].map((e) => DropdownMenuItem(value: e, child: Text(e))).toList(),
-                      .map((e) => DropdownMenuItem(value: e, child: Text(e)))
+                  onChanged: (v) { if (v != null) setState(() => selectedType = v); },  
-                      .toList(),
-                  onChanged: (v) {
-                    if (v != null) setState(() => selectedType = v);
-                  },  
                 ),
                 if (selectedType == "Jogador") ...[
-                  const SizedBox(height: 15),
+                  SizedBox(height: 15 * context.sf),
                   TextField(
                     controller: numCtrl,
-                    decoration: const InputDecoration(labelText: "Número da Camisola"),
+                    style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
+                    decoration: InputDecoration(
+                      labelText: "Número da Camisola",
+                      errorText: numError, 
+                    ),
                     keyboardType: TextInputType.number,
                   ),
                 ]
@@ -357,28 +598,45 @@ class StatsController {
             ),
           ),
           actions: [
-            TextButton(
+            TextButton(onPressed: () => Navigator.pop(ctx), child: const Text("Cancelar", style: TextStyle(color: Colors.grey))),
-              onPressed: () => Navigator.pop(ctx), 
-              child: const Text("Cancelar")
-            ),
             ElevatedButton(
-              style: ElevatedButton.styleFrom(
+              style: ElevatedButton.styleFrom(backgroundColor: AppTheme.successGreen, foregroundColor: Colors.white, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8 * context.sf))),
-                backgroundColor: const Color(0xFF00C853),
+              onPressed: isUploading ? null : () async {
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8))
-              ),
-              onPressed: () async {
-                if (nameCtrl.text.trim().isEmpty) return;
                 
-                String? numeroFinal = (selectedType == "Treinador") 
+                setState(() {
-                    ? null 
+                  nameError = null;
-                    : (numCtrl.text.trim().isEmpty ? null : numCtrl.text.trim());
+                  numError = null;
+                });
+
+                if (nameCtrl.text.trim().isEmpty) {
+                  setState(() => nameError = "O nome é obrigatório");
+                  return;
+                }
+
+                setState(() => isUploading = true);
+
+                String? numeroFinal = (selectedType == "Treinador") ? null : (numCtrl.text.trim().isEmpty ? null : numCtrl.text.trim());
 
                 try {
+                  String? finalImageUrl = currentImageUrl;
+
+                  if (selectedImage != null) {
+                    final fileName = 'person_${DateTime.now().millisecondsSinceEpoch}.png';
+                    await _supabase.storage.from('avatars').upload(fileName, selectedImage!, fileOptions: const FileOptions(upsert: true));
+                    finalImageUrl = _supabase.storage.from('avatars').getPublicUrl(fileName);
+
+                    if (currentImageUrl != null && currentImageUrl!.isNotEmpty) {
+                      final oldPath = extractPathFromUrl(currentImageUrl!, 'avatars');
+                      if (oldPath != null) await _supabase.storage.from('avatars').remove([oldPath]);
+                    }
+                  }
+
                   if (isEdit) {
                     await _supabase.from('members').update({
                       'name': nameCtrl.text.trim(),
                       'type': selectedType,
                       'number': numeroFinal,
+                      'image_url': finalImageUrl, 
                     }).eq('id', person.id);
                   } else {
                     await _supabase.from('members').insert({
@@ -386,23 +644,24 @@ class StatsController {
                       'name': nameCtrl.text.trim(),
                       'type': selectedType,
                       'number': numeroFinal,
+                      'image_url': finalImageUrl, 
                     });
                   }
                   if (ctx.mounted) Navigator.pop(ctx);
                 } catch (e) {
-                  debugPrint("Erro Supabase: $e");
+                  setState(() {
-                  if (ctx.mounted) {
+                    isUploading = false;
-                    String errorMsg = "Erro ao guardar: $e";
+                    if (e is PostgrestException && e.code == '23505') {
-                    if (e.toString().contains('unique')) {
+                      numError = "Este número já está em uso!";
-                      errorMsg = "Já existe um membro com este numero na equipa.";
+                    } else if (e.toString().toLowerCase().contains('unique') || e.toString().toLowerCase().contains('duplicate')) {
-                    }
+                      numError = "Este número já está em uso!";
-                    ScaffoldMessenger.of(ctx).showSnackBar(
+                    } else {
-                      SnackBar(content: Text(errorMsg), backgroundColor: Colors.red)
+                      nameError = "Erro ao guardar. Tente novamente.";
-                    );
                     }
+                  });
                 }
               },
-              child: const Text("Guardar", style: TextStyle(color: Colors.white)),
+              child: isUploading ? SizedBox(width: 16 * context.sf, height: 16 * context.sf, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2)) : const Text("Guardar"),
             )
           ],
         ),

lib/utils/size_extension.dart

@@ -1,15 +1,31 @@
 import 'package:flutter/material.dart';
 import 'dart:math' as math;
 
-// Esta extensão adiciona o superpoder "sf" ao BuildContext
 extension SizeExtension on BuildContext {
-  
   double get sf {
-    final double wScreen = MediaQuery.of(this).size.width;
+    final Size size = MediaQuery.of(this).size;
-    final double hScreen = MediaQuery.of(this).size.height;
     
-    // Calcula e devolve a escala na hora!
+    // 1. Definimos os valores base do design (geralmente feitos no Figma/Adobe XD)
-    return math.min(wScreen, hScreen) / 400;
+    const double baseWidth = 375;
+    const double baseHeight = 812;
+
+    // 2. Calculamos o rácio de largura e altura
+    double scaleW = size.width / baseWidth;
+    double scaleH = size.height / baseHeight;
+
+    // 3. Usamos a média ou o menor valor para manter a proporção
+    // O 'min' evita que o texto estique demasiado se o ecrã for muito alto ou largo
+    double scale = math.min(scaleW, scaleH);
+
+    // 4. Segurança (Clamping): Não deixa as coisas ficarem minúsculas 
+    // nem exageradamente grandes em tablets.
+    return scale.clamp(0.8, 1.4); 
   }
 
+  // Atalhos úteis para facilitar o código
+  double get screenWidth => MediaQuery.of(this).size.width;
+  double get screenHeight => MediaQuery.of(this).size.height;
+  
+  // Verifica se é Tablet (opcional)
+  bool get isTablet => screenWidth > 600;
 }

lib/widgets/game_widgets.dart

@@ -1,104 +1,83 @@
 import 'package:flutter/material.dart';
 import 'package:playmaker/pages/PlacarPage.dart'; 
+import 'package:playmaker/classe/theme.dart'; // 👇 IMPORT DO TEMA!
 import '../controllers/team_controller.dart';
 import '../controllers/game_controller.dart'; 
 
-// --- CARD DE EXIBIÇÃO DO JOGO ---
 class GameResultCard extends StatelessWidget {
-  final String gameId;
+  final String gameId, myTeam, opponentTeam, myScore, opponentScore, status, season;
-  final String myTeam, opponentTeam, myScore, opponentScore, status, season;
+  final String? myTeamLogo, opponentTeamLogo; 
-  final String? myTeamLogo;       
+  final double sf; 
-  final String? opponentTeamLogo; 
-  final double sf; // NOVA VARIÁVEL DE ESCALA
 
   const GameResultCard({
-    super.key,
+    super.key, required this.gameId, required this.myTeam, required this.opponentTeam,
-    required this.gameId,
+    required this.myScore, required this.opponentScore, required this.status, required this.season,
-    required this.myTeam,
+    this.myTeamLogo, this.opponentTeamLogo, required this.sf, 
-    required this.opponentTeam,
-    required this.myScore,
-    required this.opponentScore,
-    required this.status,
-    required this.season,
-    this.myTeamLogo,       
-    this.opponentTeamLogo, 
-    required this.sf, // OBRIGATÓRIO RECEBER A ESCALA
   });
 
   @override
   Widget build(BuildContext context) {
+    // 👇 Puxa as cores de fundo dependendo do Modo (Claro/Escuro)
+    final bgColor = Theme.of(context).colorScheme.surface;
+    final textColor = Theme.of(context).colorScheme.onSurface;
+
     return Container(
       margin: EdgeInsets.only(bottom: 16 * sf),
       padding: EdgeInsets.all(16 * sf),
       decoration: BoxDecoration(
-        color: Colors.white,
+        color: bgColor, // Usa a cor do tema
         borderRadius: BorderRadius.circular(20 * sf),
         boxShadow: [BoxShadow(color: Colors.black12, blurRadius: 10 * sf)],
       ),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Expanded(child: _buildTeamInfo(myTeam, const Color(0xFFE74C3C), myTeamLogo, sf)),
+          Expanded(child: _buildTeamInfo(myTeam, AppTheme.primaryRed, myTeamLogo, sf, textColor)), // Usa o primaryRed
           _buildScoreCenter(context, gameId, sf),
-          Expanded(child: _buildTeamInfo(opponentTeam, Colors.black87, opponentTeamLogo, sf)),
+          Expanded(child: _buildTeamInfo(opponentTeam, textColor, opponentTeamLogo, sf, textColor)),
         ],
       ),
     );
   }
 
-  Widget _buildTeamInfo(String name, Color color, String? logoUrl, double sf) {
+  Widget _buildTeamInfo(String name, Color color, String? logoUrl, double sf, Color textColor) {
     return Column(
       children: [
         CircleAvatar(
-          radius: 24 * sf, // Ajuste do tamanho do logo
+          radius: 24 * sf, 
           backgroundColor: color,
-          backgroundImage: (logoUrl != null && logoUrl.isNotEmpty)
+          backgroundImage: (logoUrl != null && logoUrl.isNotEmpty) ? NetworkImage(logoUrl) : null,
-              ? NetworkImage(logoUrl)
+          child: (logoUrl == null || logoUrl.isEmpty) ? Icon(Icons.shield, color: Colors.white, size: 24 * sf) : null,
-              : null,
-          child: (logoUrl == null || logoUrl.isEmpty)
-              ? Icon(Icons.shield, color: Colors.white, size: 24 * sf)
-              : null,
         ),
         SizedBox(height: 6 * sf),
         Text(name, 
-          style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13 * sf),
+          style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13 * sf, color: textColor), // Adapta à noite/dia
-          textAlign: TextAlign.center,
+          textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, maxLines: 2, 
-          overflow: TextOverflow.ellipsis,
-          maxLines: 2, // Permite 2 linhas para nomes compridos não cortarem
         ),
       ],
     );
   }
 
   Widget _buildScoreCenter(BuildContext context, String id, double sf) {
+    final textColor = Theme.of(context).colorScheme.onSurface;
+
     return Column(
       children: [
         Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            _scoreBox(myScore, Colors.green, sf),
+            _scoreBox(myScore, AppTheme.successGreen, sf), // Verde do tema
-            Text(" : ", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 22 * sf)),
+            Text(" : ", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 22 * sf, color: textColor)),
             _scoreBox(opponentScore, Colors.grey, sf),
           ],
         ),
         SizedBox(height: 10 * sf),
         TextButton.icon(
-          onPressed: () {
+          onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => PlacarPage(gameId: id, myTeam: myTeam, opponentTeam: opponentTeam))),
-            Navigator.push(
+          icon: Icon(Icons.play_circle_fill, size: 18 * sf, color: AppTheme.primaryRed),
-              context,
+          label: Text("RETORNAR", style: TextStyle(fontSize: 11 * sf, color: AppTheme.primaryRed, fontWeight: FontWeight.bold)),
-              MaterialPageRoute(
-                builder: (context) => PlacarPage(
-                  gameId: id,
-                  myTeam: myTeam,
-                  opponentTeam: opponentTeam,
-                ),
-              ),
-            );
-          },
-          icon: Icon(Icons.play_circle_fill, size: 18 * sf, color: const Color(0xFFE74C3C)),
-          label: Text("RETORNAR", style: TextStyle(fontSize: 11 * sf, color: const Color(0xFFE74C3C), fontWeight: FontWeight.bold)),
           style: TextButton.styleFrom(
-            backgroundColor: const Color(0xFFE74C3C).withOpacity(0.1),
+            backgroundColor: AppTheme.primaryRed.withOpacity(0.1),
             padding: EdgeInsets.symmetric(horizontal: 14 * sf, vertical: 8 * sf),
             shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * sf)),
             visualDensity: VisualDensity.compact,
@@ -116,203 +95,3 @@ class GameResultCard extends StatelessWidget {
     child: Text(pts, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 16 * sf)),
   );
 }
-
-// --- POPUP DE CRIAÇÃO ---
-class CreateGameDialogManual extends StatefulWidget {
-  final TeamController teamController;
-  final GameController gameController; 
-  final double sf; // NOVA VARIÁVEL DE ESCALA
-
-  const CreateGameDialogManual({
-    super.key, 
-    required this.teamController, 
-    required this.gameController,
-    required this.sf,
-  });
-
-  @override
-  State<CreateGameDialogManual> createState() => _CreateGameDialogManualState();
-}
-
-class _CreateGameDialogManualState extends State<CreateGameDialogManual> {
-  late TextEditingController _seasonController;
-  final TextEditingController _myTeamController = TextEditingController();
-  final TextEditingController _opponentController = TextEditingController();
-  
-  bool _isLoading = false; 
-
-  @override
-  void initState() {
-    super.initState();
-    _seasonController = TextEditingController(text: _calculateSeason());
-  }
-
-  String _calculateSeason() {
-    final now = DateTime.now();
-    return now.month >= 7 ? "${now.year}/${(now.year + 1).toString().substring(2)}" : "${now.year - 1}/${now.year.toString().substring(2)}";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * widget.sf)),
-      title: Text('Configurar Partida', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18 * widget.sf)),
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextField(
-              controller: _seasonController,
-              style: TextStyle(fontSize: 14 * widget.sf),
-              decoration: InputDecoration(
-                labelText: 'Temporada', 
-                labelStyle: TextStyle(fontSize: 14 * widget.sf),
-                border: const OutlineInputBorder(), 
-                prefixIcon: Icon(Icons.calendar_today, size: 20 * widget.sf)
-              ),
-            ),
-            SizedBox(height: 15 * widget.sf),
-            
-            _buildSearch(label: "Minha Equipa", controller: _myTeamController, sf: widget.sf),
-            
-            Padding(
-              padding: EdgeInsets.symmetric(vertical: 10 * widget.sf), 
-              child: Text("VS", style: TextStyle(fontWeight: FontWeight.bold, color: Colors.grey, fontSize: 16 * widget.sf))
-            ),
-            
-            _buildSearch(label: "Adversário", controller: _opponentController, sf: widget.sf),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context), 
-          child: Text('CANCELAR', style: TextStyle(fontSize: 14 * widget.sf))
-        ),
-        
-        ElevatedButton(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: const Color(0xFFE74C3C),
-            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10 * widget.sf)),
-            padding: EdgeInsets.symmetric(horizontal: 16 * widget.sf, vertical: 10 * widget.sf)
-          ),
-          onPressed: _isLoading ? null : () async {
-            if (_myTeamController.text.isNotEmpty && _opponentController.text.isNotEmpty) {
-              setState(() => _isLoading = true);
-
-              String? newGameId = await widget.gameController.createGame(
-                _myTeamController.text,
-                _opponentController.text,
-                _seasonController.text,
-              );
-
-              setState(() => _isLoading = false);
-
-              if (newGameId != null && context.mounted) {
-                Navigator.pop(context);
-
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => PlacarPage(
-                      gameId: newGameId,
-                      myTeam: _myTeamController.text,
-                      opponentTeam: _opponentController.text,
-                    ),
-                  ),
-                );
-              }
-            }
-          },
-          child: _isLoading 
-            ? SizedBox(width: 20 * widget.sf, height: 20 * widget.sf, child: const CircularProgressIndicator(color: Colors.white, strokeWidth: 2))
-            : Text('CRIAR', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 14 * widget.sf)),
-        ),
-      ],
-    );
-  }
-  
-  Widget _buildSearch({required String label, required TextEditingController controller, required double sf}) {
-    return StreamBuilder<List<Map<String, dynamic>>>(
-      stream: widget.teamController.teamsStream,
-      builder: (context, snapshot) {
-        List<Map<String, dynamic>> teamList = snapshot.hasData ? snapshot.data! : [];
-            
-        return Autocomplete<Map<String, dynamic>>(
-          displayStringForOption: (Map<String, dynamic> option) => option['name'].toString(),
-          
-          optionsBuilder: (TextEditingValue val) {
-            if (val.text.isEmpty) return const Iterable<Map<String, dynamic>>.empty();
-            return teamList.where((t) => 
-                t['name'].toString().toLowerCase().contains(val.text.toLowerCase()));
-          },
-          
-          onSelected: (Map<String, dynamic> selection) {
-            controller.text = selection['name'].toString();
-          },
-          
-          optionsViewBuilder: (context, onSelected, options) {
-            return Align(
-              alignment: Alignment.topLeft,
-              child: Material(
-                elevation: 4.0,
-                borderRadius: BorderRadius.circular(8 * sf),
-                child: ConstrainedBox(
-                  constraints: BoxConstraints(maxHeight: 250 * sf, maxWidth: MediaQuery.of(context).size.width * 0.7), 
-                  child: ListView.builder(
-                    padding: EdgeInsets.zero,
-                    shrinkWrap: true,
-                    itemCount: options.length,
-                    itemBuilder: (BuildContext context, int index) {
-                      final option = options.elementAt(index);
-                      final String name = option['name'].toString();
-                      final String? imageUrl = option['image_url'];
-
-                      return ListTile(
-                        leading: CircleAvatar(
-                          radius: 20 * sf,
-                          backgroundColor: Colors.grey.shade200,
-                          backgroundImage: (imageUrl != null && imageUrl.isNotEmpty)
-                              ? NetworkImage(imageUrl)
-                              : null,
-                          child: (imageUrl == null || imageUrl.isEmpty)
-                              ? Icon(Icons.shield, color: Colors.grey, size: 20 * sf)
-                              : null,
-                        ),
-                        title: Text(name, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14 * sf)),
-                        onTap: () {
-                          onSelected(option);
-                        },
-                      );
-                    },
-                  ),
-                ),
-              ),
-            );
-          },
-
-          fieldViewBuilder: (ctx, txtCtrl, node, submit) {
-            if (txtCtrl.text.isEmpty && controller.text.isNotEmpty) {
-               txtCtrl.text = controller.text;
-            }
-            txtCtrl.addListener(() {
-               controller.text = txtCtrl.text;
-            });
-            
-            return TextField(
-              controller: txtCtrl,
-              focusNode: node,
-              style: TextStyle(fontSize: 14 * sf),
-              decoration: InputDecoration(
-                labelText: label, 
-                labelStyle: TextStyle(fontSize: 14 * sf),
-                prefixIcon: Icon(Icons.search, size: 20 * sf), 
-                border: const OutlineInputBorder()
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}

lib/widgets/home_widgets.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:playmaker/classe/home.config.dart';
 
 class StatCard extends StatelessWidget {
   final String title;
@@ -10,11 +11,6 @@ class StatCard extends StatelessWidget {
   final bool isHighlighted;
   final VoidCallback? onTap;
 
-  // Variáveis novas para que o tamanho não fique preso à HomeConfig
-  final double sf;
-  final double cardWidth;
-  final double cardHeight;
-
   const StatCard({
     super.key,
     required this.title,
@@ -25,30 +21,27 @@ class StatCard extends StatelessWidget {
     required this.icon,
     this.isHighlighted = false,
     this.onTap,
-    this.sf = 1.0, // Default 1.0 para não dar erro se não passares o valor
-    required this.cardWidth,
-    required this.cardHeight,
   });
 
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      width: cardWidth,
+      width: HomeConfig.cardwidthPadding,
-      height: cardHeight,
+      height: HomeConfig.cardheightPadding,
       child: Card(
         elevation: 0,
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20 * sf),
+          borderRadius: BorderRadius.circular(20),
           side: isHighlighted 
-            ? BorderSide(color: Colors.amber, width: 2 * sf)
+            ? const BorderSide(color: Colors.amber, width: 2)
             : BorderSide.none,
         ),
         child: InkWell(
           onTap: onTap,
-          borderRadius: BorderRadius.circular(20 * sf),
+          borderRadius: BorderRadius.circular(20),
           child: Container(
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(20 * sf),
+              borderRadius: BorderRadius.circular(20),
               gradient: LinearGradient(
                 begin: Alignment.topCenter,
                 end: Alignment.bottomCenter,
@@ -59,14 +52,13 @@ class StatCard extends StatelessWidget {
               ),
             ),
             child: Padding(
-              padding: EdgeInsets.all(16.0 * sf),
+              padding: const EdgeInsets.all(20.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   // Cabeçalho
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Expanded(
                         child: Column(
@@ -74,12 +66,12 @@ class StatCard extends StatelessWidget {
                           children: [
                             Text(
                               title.toUpperCase(),
-                              style: TextStyle(fontSize: 11 * sf, fontWeight: FontWeight.bold, color: Colors.white70),
+                              style: HomeConfig.titleStyle,
                             ),
-                            SizedBox(height: 2 * sf),
+                            const SizedBox(height: 5),
                             Text(
                               playerName,
-                              style: TextStyle(fontSize: 14 * sf, fontWeight: FontWeight.bold, color: Colors.white),
+                              style: HomeConfig.playerNameStyle,
                               maxLines: 1,
                               overflow: TextOverflow.ellipsis,
                             ),
@@ -88,75 +80,50 @@ class StatCard extends StatelessWidget {
                       ),
                       if (isHighlighted)
                         Container(
-                          padding: EdgeInsets.all(6 * sf),
+                          padding: const EdgeInsets.all(8),
                           decoration: const BoxDecoration(
                             color: Colors.amber,
                             shape: BoxShape.circle,
                           ),
-                          child: Icon(
+                          child: const Icon(Icons.star, size: 20, color: Colors.white),
-                            Icons.star,
-                            size: 16 * sf,
-                            color: Colors.white,
-                          ),
                         ),
                     ],
                   ),
-                  
+                  const SizedBox(height: 10),
-                  SizedBox(height: 8 * sf),
-                  
                   // Ícone
                   Container(
-                    width: 45 * sf,
+                    width: 60,
-                    height: 45 * sf,
+                    height: 60,
                     decoration: BoxDecoration(
                       color: Colors.white.withOpacity(0.2),
                       shape: BoxShape.circle,
                     ),
-                    child: Icon(
+                    child: Icon(icon, size: 30, color: Colors.white),
-                      icon,
-                      size: 24 * sf,
-                      color: Colors.white,
                   ),
-                  ),
-                  
                   const Spacer(),
-                  
                   // Estatística
                   Center(
                     child: Column(
                       children: [
-                        Text(
+                        Text(statValue, style: HomeConfig.statValueStyle),
-                          statValue,
+                        const SizedBox(height: 5),
-                          style: TextStyle(fontSize: 34 * sf, fontWeight: FontWeight.bold, color: Colors.white),
+                        Text(statLabel.toUpperCase(), style: HomeConfig.statLabelStyle),
-                        ),
-                        SizedBox(height: 2 * sf),
-                        Text(
-                          statLabel.toUpperCase(),
-                          style: TextStyle(fontSize: 12 * sf, color: Colors.white70),
-                        ),
                       ],
                     ),
                   ),
-                  
                   const Spacer(),
-                  
                   // Botão
                   Container(
                     width: double.infinity,
-                    padding: EdgeInsets.symmetric(vertical: 8 * sf),
+                    padding: const EdgeInsets.symmetric(vertical: 12),
                     decoration: BoxDecoration(
                       color: Colors.white.withOpacity(0.2),
-                      borderRadius: BorderRadius.circular(10 * sf),
+                      borderRadius: BorderRadius.circular(15),
                     ),
-                    child: Center(
+                    child: const Center(
                       child: Text(
                         'VER DETALHES',
-                        style: TextStyle(
+                        style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 14, letterSpacing: 1),
-                          color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 11 * sf,
-                          letterSpacing: 1,
-                        ),
                       ),
                     ),
                   ),
@@ -177,7 +144,7 @@ class SportGrid extends StatelessWidget {
   const SportGrid({
     super.key,
     required this.children,
-    this.spacing = 20.0, // Valor padrão se não for passado nada
+    this.spacing = HomeConfig.cardSpacing,
   });
 
   @override
@@ -186,7 +153,6 @@ class SportGrid extends StatelessWidget {
     
     return Column(
       children: [
-        // Primeira linha
         if (children.length >= 2)
           Padding(
             padding: EdgeInsets.only(bottom: spacing),
@@ -199,8 +165,6 @@ class SportGrid extends StatelessWidget {
               ],
             ),
           ),
-        
-        // Segunda linha
         if (children.length >= 4)
           Row(
             mainAxisAlignment: MainAxisAlignment.center,

lib/widgets/login_widgets.dart

@@ -1,45 +1,60 @@
 import 'package:flutter/material.dart';
 import 'package:playmaker/controllers/login_controller.dart';
 import 'package:playmaker/pages/RegisterPage.dart';
+import 'package:playmaker/classe/theme.dart'; // 👇 IMPORT DO TEMA
 import '../utils/size_extension.dart'; 
-import 'dart:math' as math; // 👇 IMPORTANTE PARA O TRAVÃO NO TABLET!
 
 class BasketTrackHeader extends StatelessWidget {
   const BasketTrackHeader({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO DE MÃO
-
     return Column(
       children: [
+        // Usamos um Stack para controlar a sobreposição exata
+        Stack(
+          alignment: Alignment.center,
+          children: [
+            // 1. A Imagem (Aumentada para 320)
             SizedBox(
-          width: 200 * safeSf, 
+              width: 320 * context.sf,
-          height: 200 * safeSf,
+              height: 350 * context.sf,
               child: Image.asset(
                 'assets/playmaker-logos.png',
                 fit: BoxFit.contain,
               ),
             ),
+            // 2. O Texto "subido" para dentro da área da imagem
+            Positioned(
+              bottom: 5 * context.sf, // Ajusta este valor para aproximar/afastar do centro da logo
+              child: Column(
+                children: [
                   Text(
                     'BasketTrack',
                     style: TextStyle(
-            fontSize: 36 * safeSf,
+                      fontSize: 36 * context.sf,
                       fontWeight: FontWeight.bold,
-            color: Colors.grey[900],
+                      color: Theme.of(context).colorScheme.onSurface,
                     ),
                   ),
-        SizedBox(height: 6 * safeSf), 
+                  SizedBox(height: 4 * context.sf),
                   Text(
                     'Gere as tuas equipas e estatísticas',
                     style: TextStyle(
-            fontSize: 16 * safeSf,
+                      fontSize: 16 * context.sf,
-            color: Colors.grey[600],
+                      color: Colors.grey,
                       fontWeight: FontWeight.w500,
                     ),
                     textAlign: TextAlign.center,
                   ),
                 ],
+              ),
+            ),
+          ],
+        ),
+        // Espaço extra para não bater nos campos de login logo a seguir
+        SizedBox(height: 10 * context.sf),
+      ],
     );
   }
 }
@@ -51,42 +66,49 @@ class LoginFormFields extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15);
-
     return Column(
       children: [
         TextField(
           controller: controller.emailController,
-          style: TextStyle(fontSize: 15 * safeSf),
+          style: TextStyle(fontSize: 15 * context.sf, color: Theme.of(context).colorScheme.onSurface),
           decoration: InputDecoration(
             labelText: 'E-mail',
-            labelStyle: TextStyle(fontSize: 15 * safeSf),
+            labelStyle: TextStyle(fontSize: 15 * context.sf),
-            prefixIcon: Icon(Icons.email_outlined, size: 22 * safeSf),
+            prefixIcon: Icon(Icons.email_outlined, size: 22 * context.sf, color: AppTheme.primaryRed), // 👇 Cor do tema
             errorText: controller.emailError, 
-            border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * safeSf)),
+            border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * context.sf)),
-            contentPadding: EdgeInsets.symmetric(vertical: 18 * safeSf, horizontal: 16 * safeSf),
+            focusedBorder: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(12 * context.sf),
+              borderSide: BorderSide(color: AppTheme.primaryRed, width: 2), // 👇 Cor do tema ao focar
+            ),
+            contentPadding: EdgeInsets.symmetric(vertical: 18 * context.sf, horizontal: 16 * context.sf),
           ),
           keyboardType: TextInputType.emailAddress,
         ),
-        SizedBox(height: 20 * safeSf),
+        SizedBox(height: 20 * context.sf),
         TextField(
           controller: controller.passwordController,
           obscureText: controller.obscurePassword,
-          style: TextStyle(fontSize: 15 * safeSf),
+          style: TextStyle(fontSize: 15 * context.sf, color: Theme.of(context).colorScheme.onSurface),
           decoration: InputDecoration(
             labelText: 'Palavra-passe',
-            labelStyle: TextStyle(fontSize: 15 * safeSf),
+            labelStyle: TextStyle(fontSize: 15 * context.sf),
-            prefixIcon: Icon(Icons.lock_outlined, size: 22 * safeSf),
+            prefixIcon: Icon(Icons.lock_outlined, size: 22 * context.sf, color: AppTheme.primaryRed), // 👇 Cor do tema
             errorText: controller.passwordError,
+            focusedBorder: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(12 * context.sf),
+              borderSide: BorderSide(color: AppTheme.primaryRed, width: 2), // 👇 Cor do tema ao focar
+            ),
             suffixIcon: IconButton(
               icon: Icon(
                 controller.obscurePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined,
-                size: 22 * safeSf
+                size: 22 * context.sf,
+                color: Colors.grey,
               ),
               onPressed: controller.togglePasswordVisibility,
             ),
-            border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * safeSf)),
+            border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * context.sf)),
-            contentPadding: EdgeInsets.symmetric(vertical: 18 * safeSf, horizontal: 16 * safeSf),
+            contentPadding: EdgeInsets.symmetric(vertical: 18 * context.sf, horizontal: 16 * context.sf),
           ),
         ),
       ],
@@ -102,28 +124,26 @@ class LoginButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15);
-
     return SizedBox(
       width: double.infinity,
-      height: 58 * safeSf,
+      height: 58 * context.sf,
       child: ElevatedButton(
         onPressed: controller.isLoading ? null : () async {
           final success = await controller.login();
           if (success) onLoginSuccess();
         },
         style: ElevatedButton.styleFrom(
-          backgroundColor: const Color(0xFFE74C3C),
+          backgroundColor: AppTheme.primaryRed, // 👇 Usando a cor do tema
           foregroundColor: Colors.white,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * safeSf)),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * context.sf)),
           elevation: 3,
         ),
         child: controller.isLoading
             ? SizedBox(
-                width: 28 * safeSf, height: 28 * safeSf,
+                width: 28 * context.sf, height: 28 * context.sf,
                 child: const CircularProgressIndicator(strokeWidth: 3, valueColor: AlwaysStoppedAnimation<Color>(Colors.white)),
               )
-            : Text('Entrar', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
+            : Text('Entrar', style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold)),
       ),
     );
   }
@@ -134,21 +154,19 @@ class CreateAccountButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15);
-
     return SizedBox(
       width: double.infinity,
-      height: 58 * safeSf,
+      height: 58 * context.sf,
       child: OutlinedButton(
         onPressed: () {
           Navigator.push(context, MaterialPageRoute(builder: (context) => const RegisterPage()));
         },
         style: OutlinedButton.styleFrom(
-          foregroundColor: const Color(0xFFE74C3C),
+          foregroundColor: AppTheme.primaryRed, // 👇 Usando a cor do tema
-          side: BorderSide(color: const Color(0xFFE74C3C), width: 2 * safeSf),
+          side: BorderSide(color: AppTheme.primaryRed, width: 2 * context.sf), // 👇 Usando a cor do tema
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * safeSf)),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * context.sf)),
         ),
-        child: Text('Criar Conta', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
+        child: Text('Criar Conta', style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold)),
       ),
     );
   }

lib/widgets/placar_widgets.dart

@@ -1,7 +1,58 @@
 import 'package:flutter/material.dart';
-import 'package:playmaker/controllers/placar_controller.dart';
+import 'dart:math' as math;
+
+import '../classe/theme.dart'; 
+import '../controllers/placar_controller.dart'; 
+import 'package:playmaker/zone_map_dialog.dart';
+
+void showAssistDialog(BuildContext context, PlacarController controller, bool isOpponent, String scorerId, double sf) {
+  final teamCourt = isOpponent ? controller.oppCourt : controller.myCourt;
+  final prefix = isOpponent ? "player_opp_" : "player_my_";
+  
+  final possibleAssistants = teamCourt.where((id) => id != scorerId && !id.startsWith("fake_")).toList();
+
+  if (possibleAssistants.isEmpty) return; 
+
+  showDialog(
+    context: context,
+    barrierDismissible: false, 
+    builder: (ctx) => AlertDialog(
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * sf)),
+      title: Text("Houve Assistência?", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold, fontSize: 18 * sf)),
+      content: SingleChildScrollView(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ...possibleAssistants.map((id) {
+              final name = controller.playerNames[id] ?? "Desconhecido";
+              final number = controller.playerNumbers[id] ?? "0";
+              return ListTile(
+                leading: CircleAvatar(
+                  backgroundColor: isOpponent ? AppTheme.oppTeamRed : AppTheme.myTeamBlue,
+                  child: Text(number, style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold)),
+                ),
+                title: Text(name, style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold)),
+                onTap: () {
+                  Navigator.pop(ctx); 
+                  controller.commitStat("add_ast", "$prefix$id"); 
+                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Assistência: $name'), duration: const Duration(seconds: 1), backgroundColor: AppTheme.successGreen));
+                },
+              );
+            }),
+            Divider(color: Colors.grey.withOpacity(0.3)),
+            ListTile(
+              leading: const CircleAvatar(backgroundColor: Colors.grey, child: Icon(Icons.person_off, color: Colors.white)),
+              title: Text("Isolado (Sem assistência)", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontStyle: FontStyle.italic)),
+              onTap: () => Navigator.pop(ctx), 
+            )
+          ],
+        ),
+      ),
+    ),
+  );
+}
 
-// --- PLACAR SUPERIOR ---
 class TopScoreboard extends StatelessWidget {
   final PlacarController controller;
   final double sf;
@@ -11,43 +62,37 @@ class TopScoreboard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(vertical: 10 * sf, horizontal: 35 * sf),
+      padding: EdgeInsets.symmetric(vertical: 6 * sf, horizontal: 20 * sf),
       decoration: BoxDecoration(
-        color: const Color(0xFF16202C), 
+        color: AppTheme.placarDarkSurface, 
-        borderRadius: BorderRadius.only(
+        borderRadius: BorderRadius.only(bottomLeft: Radius.circular(22 * sf), bottomRight: Radius.circular(22 * sf)), 
-          bottomLeft: Radius.circular(22 * sf), 
+        border: Border.all(color: Colors.white, width: 2.0 * sf), 
-          bottomRight: Radius.circular(22 * sf)
-        ), 
-        border: Border.all(color: Colors.white, width: 2.5 * sf), 
       ),
       child: Row(
         mainAxisSize: MainAxisSize.min, 
         children: [
-          _buildTeamSection(controller.myTeam, controller.myScore, controller.myFouls, controller.myTimeoutsUsed, const Color(0xFF1E5BB2), false, sf),
+          _buildTeamSection(controller.myTeam, controller.myScore, controller.myFouls, controller.myTimeoutsUsed, AppTheme.myTeamBlue, false, sf), 
-          SizedBox(width: 30 * sf),
+          SizedBox(width: 20 * sf),
           Column(
             mainAxisSize: MainAxisSize.min,
             children: [
               Container(
-                padding: EdgeInsets.symmetric(horizontal: 18 * sf, vertical: 5 * sf),
+                padding: EdgeInsets.symmetric(horizontal: 14 * sf, vertical: 4 * sf),
-                decoration: BoxDecoration(
+                decoration: BoxDecoration(color: AppTheme.placarTimerBg, borderRadius: BorderRadius.circular(9 * sf)),
-                  color: const Color(0xFF2C3E50), 
+                child: ValueListenableBuilder<Duration>(
-                  borderRadius: BorderRadius.circular(9 * sf)
+                  valueListenable: controller.durationNotifier,
-                ),
+                  builder: (context, duration, child) {
-                child: Text(
+                    String formatTime = "${duration.inMinutes.toString().padLeft(2, '0')}:${duration.inSeconds.remainder(60).toString().padLeft(2, '0')}";
-                  controller.formatTime(), 
+                    return Text(formatTime, style: TextStyle(color: Colors.white, fontSize: 24 * sf, fontWeight: FontWeight.w900, fontFamily: 'monospace', letterSpacing: 1.5 * sf));
-                  style: TextStyle(color: Colors.white, fontSize: 28 * sf, fontWeight: FontWeight.w900, fontFamily: 'monospace', letterSpacing: 2 * sf)
+                  }
                 ),
               ),
-              SizedBox(height: 5 * sf),
+              SizedBox(height: 4 * sf),
-              Text(
+              Text("PERÍODO ${controller.currentQuarter}", style: TextStyle(color: AppTheme.warningAmber, fontSize: 12 * sf, fontWeight: FontWeight.w900)),
-                "PERÍODO ${controller.currentQuarter}", 
-                style: TextStyle(color: Colors.orangeAccent, fontSize: 14 * sf, fontWeight: FontWeight.w900)
-              ),
             ],
           ),
-          SizedBox(width: 30 * sf),
+          SizedBox(width: 20 * sf),
-          _buildTeamSection(controller.opponentTeam, controller.opponentScore, controller.opponentFouls, controller.opponentTimeoutsUsed, const Color(0xFFD92C2C), true, sf),
+          _buildTeamSection(controller.opponentTeam, controller.opponentScore, controller.opponentFouls, controller.opponentTimeoutsUsed, AppTheme.oppTeamRed, true, sf), 
         ],
       ),
     );
@@ -55,224 +100,228 @@ class TopScoreboard extends StatelessWidget {
 
   Widget _buildTeamSection(String name, int score, int fouls, int timeouts, Color color, bool isOpp, double sf) {
     int displayFouls = fouls > 5 ? 5 : fouls;
-
     final timeoutIndicators = Row(
       mainAxisSize: MainAxisSize.min,
       children: List.generate(3, (index) => Container(
-        margin: EdgeInsets.symmetric(horizontal: 3.5 * sf),
+        margin: EdgeInsets.symmetric(horizontal: 2.5 * sf), width: 10 * sf, height: 10 * sf,
-        width: 12 * sf, height: 12 * sf,
+        decoration: BoxDecoration(shape: BoxShape.circle, color: index < timeouts ? AppTheme.warningAmber : Colors.grey.shade600, border: Border.all(color: Colors.white54, width: 1.0 * sf)),
-        decoration: BoxDecoration(
-          shape: BoxShape.circle, 
-          color: index < timeouts ? Colors.yellow : Colors.grey.shade600, 
-          border: Border.all(color: Colors.white54, width: 1.5 * sf)
-        ),
       )),
     );
-    
     List<Widget> content = [
-      Column(
+      Column(children: [_scoreBox(score, color, sf), SizedBox(height: 5 * sf), timeoutIndicators]),
-        children: [
+      SizedBox(width: 12 * sf),
-          _scoreBox(score, color, sf), 
-          SizedBox(height: 7 * sf),
-          timeoutIndicators
-        ]
-      ),
-      SizedBox(width: 18 * sf),
       Column(
         crossAxisAlignment: isOpp ? CrossAxisAlignment.start : CrossAxisAlignment.end,
         children: [
-          Text(
+          Text(name.toUpperCase(), style: TextStyle(color: Colors.white, fontSize: 16 * sf, fontWeight: FontWeight.w900, letterSpacing: 1.0 * sf)),
-            name.toUpperCase(), 
+          SizedBox(height: 3 * sf),
-            style: TextStyle(color: Colors.white, fontSize: 20 * sf, fontWeight: FontWeight.w900, letterSpacing: 1.2 * sf)
+          Text("FALTAS: $displayFouls", style: TextStyle(color: displayFouls >= 5 ? AppTheme.actionMiss : AppTheme.warningAmber, fontSize: 11 * sf, fontWeight: FontWeight.bold)),
-          ),
-          SizedBox(height: 5 * sf),
-          Text(
-            "FALTAS: $displayFouls", 
-            style: TextStyle(color: displayFouls >= 5 ? Colors.redAccent : Colors.yellowAccent, fontSize: 13 * sf, fontWeight: FontWeight.bold)
-          ),
         ],
       )
     ];
-
     return Row(crossAxisAlignment: CrossAxisAlignment.center, children: isOpp ? content : content.reversed.toList());
   }
 
   Widget _scoreBox(int score, Color color, double sf) => Container(
-    width: 58 * sf, height: 45 * sf,
+    width: 45 * sf, height: 35 * sf, alignment: Alignment.center,
-    alignment: Alignment.center,
+    decoration: BoxDecoration(color: color, borderRadius: BorderRadius.circular(6 * sf)),
-    decoration: BoxDecoration(color: color, borderRadius: BorderRadius.circular(7 * sf)),
+    child: Text(score.toString(), style: TextStyle(color: Colors.white, fontSize: 20 * sf, fontWeight: FontWeight.w900)),
-    child: Text(score.toString(), style: TextStyle(color: Colors.white, fontSize: 26 * sf, fontWeight: FontWeight.w900)),
   );
 }
 
-// --- BANCO DE SUPLENTES ---
+class BenchPopup extends StatelessWidget {
-class BenchPlayersList extends StatelessWidget {
   final PlacarController controller;
   final bool isOpponent;
   final double sf;
   
-  const BenchPlayersList({super.key, required this.controller, required this.isOpponent, required this.sf});
+  const BenchPopup({super.key, required this.controller, required this.isOpponent, required this.sf});
 
   @override
   Widget build(BuildContext context) {
     final bench = isOpponent ? controller.oppBench : controller.myBench;
-    final teamColor = isOpponent ? const Color(0xFFD92C2C) : const Color(0xFF1E5BB2);
+    final teamColor = isOpponent ? AppTheme.oppTeamRed : AppTheme.myTeamBlue; 
     final prefix = isOpponent ? "bench_opp_" : "bench_my_";
+    final teamName = isOpponent ? controller.opponentTeam : controller.myTeam;
 
-    return Column(
+    return Container(
+      width: 280 * sf, 
+      padding: EdgeInsets.all(12 * sf),
+      decoration: BoxDecoration(
+        color: AppTheme.placarDarkSurface.withOpacity(0.95), 
+        borderRadius: BorderRadius.circular(16 * sf),
+        border: Border.all(color: teamColor, width: 2 * sf),
+        boxShadow: [BoxShadow(color: Colors.black54, blurRadius: 10 * sf, spreadRadius: 2 * sf)],
+      ),
+      child: Column(
         mainAxisSize: MainAxisSize.min,
-      children: bench.map((playerName) {
+        children: [
-        final num = controller.playerNumbers[playerName] ?? "0";
+          Row(
-        final int fouls = controller.playerStats[playerName]?["fls"] ?? 0;
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text("SUPLENTES: ${teamName.toUpperCase()}", style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 12 * sf)),
+              InkWell(
+                onTap: () {
+                  if (isOpponent) { controller.showOppBench = false; } 
+                  else { controller.showMyBench = false; }
+                  controller.notifyListeners();
+                },
+                child: Icon(Icons.close, color: Colors.white70, size: 20 * sf),
+              )
+            ],
+          ),
+          Divider(color: Colors.white24, height: 16 * sf),
+          
+          Wrap(
+            spacing: 12 * sf,
+            runSpacing: 12 * sf,
+            alignment: WrapAlignment.center,
+            children: bench.map((playerId) {
+              final playerName = controller.playerNames[playerId] ?? "Erro";
+              final num = controller.playerNumbers[playerId] ?? "0";
+              final int fouls = controller.playerStats[playerId]?["fls"] ?? 0;
               final bool isFouledOut = fouls >= 5; 
 
-        Widget avatarUI = Container(
+              String shortName = playerName.length > 8 ? "${playerName.substring(0, 7)}." : playerName;
-          margin: EdgeInsets.only(bottom: 7 * sf),
+
-          decoration: BoxDecoration(
+              Widget avatarUI = Column(
-            shape: BoxShape.circle, 
+                mainAxisSize: MainAxisSize.min,
-            border: Border.all(color: Colors.white, width: 1.8 * sf),
+                children: [
-            boxShadow: [BoxShadow(color: Colors.black45, blurRadius: 5 * sf, offset: Offset(0, 2.5 * sf))]
+                  CircleAvatar(
-          ),
+                    radius: 20 * sf,
-          child: CircleAvatar(
-            radius: 22 * sf,
                     backgroundColor: isFouledOut ? Colors.grey.shade800 : teamColor, 
-            child: Text(
+                    child: Text(num, style: TextStyle(color: isFouledOut ? Colors.red.shade300 : Colors.white, fontSize: 16 * sf, fontWeight: FontWeight.bold, decoration: isFouledOut ? TextDecoration.lineThrough : TextDecoration.none)),
-              num, 
-              style: TextStyle(
-                color: isFouledOut ? Colors.red.shade300 : Colors.white, 
-                fontSize: 16 * sf,
-                fontWeight: FontWeight.bold, 
-                decoration: isFouledOut ? TextDecoration.lineThrough : TextDecoration.none
-              )
-            ),
                   ),
+                  SizedBox(height: 4 * sf),
+                  Text(shortName, style: TextStyle(color: Colors.white, fontSize: 10 * sf, fontWeight: FontWeight.bold), overflow: TextOverflow.ellipsis),
+                ],
               );
 
               if (isFouledOut) {
-          return GestureDetector(
+                return GestureDetector(onTap: () => ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('🛑 $playerName expulso!'), backgroundColor: AppTheme.actionMiss)), child: avatarUI);
-            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", 
+                data: "$prefix$playerId", 
-          feedback: Material(
+                feedback: Material(color: Colors.transparent, child: CircleAvatar(radius: 26 * sf, backgroundColor: teamColor, child: Text(num, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 18 * sf)))),
-            color: Colors.transparent, 
+                childWhenDragging: Opacity(opacity: 0.3, child: avatarUI),
-            child: CircleAvatar(
-              radius: 28 * sf,
-              backgroundColor: teamColor, 
-              child: Text(num, style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 18 * sf))
-            )
-          ),
-          childWhenDragging: Opacity(opacity: 0.5, child: SizedBox(width: 45 * sf, height: 45 * sf)),
                 child: avatarUI,
               );
             }).toList(),
+          ),
+        ],
+      ),
     );
   }
 }
 
-// --- CARTÃO DO JOGADOR NO CAMPO ---
 class PlayerCourtCard extends StatelessWidget {
   final PlacarController controller;
-  final String name;
+  final String playerId; 
   final bool isOpponent;
   final double sf; 
   
-  const PlayerCourtCard({super.key, required this.controller, required this.name, required this.isOpponent, required this.sf});
+  const PlayerCourtCard({super.key, required this.controller, required this.playerId, required this.isOpponent, required this.sf}); 
 
   @override
   Widget build(BuildContext context) {
-    final teamColor = isOpponent ? const Color(0xFFD92C2C) : const Color(0xFF1E5BB2);
+    final teamColor = isOpponent ? AppTheme.oppTeamRed : AppTheme.myTeamBlue; 
-    final stats = controller.playerStats[name]!;
+    
-    final number = controller.playerNumbers[name]!;
+    final realName = controller.playerNames[playerId] ?? "Erro";
+    final stats = controller.playerStats[playerId]!;
+    final number = controller.playerNumbers[playerId]!;
     final prefix = isOpponent ? "player_opp_" : "player_my_";
 
     return Draggable<String>(
-      data: "$prefix$name", 
+      data: "$prefix$playerId", 
       feedback: Material(
         color: Colors.transparent,
         child: Container(
-          padding: EdgeInsets.symmetric(horizontal: 18 * sf, vertical: 11 * sf),
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-          decoration: BoxDecoration(color: teamColor.withOpacity(0.9), borderRadius: BorderRadius.circular(9 * sf)),
+          decoration: BoxDecoration(color: teamColor.withOpacity(0.9), borderRadius: BorderRadius.circular(6)),
-          child: Text(name, style: TextStyle(color: Colors.white, fontSize: 20 * sf, fontWeight: FontWeight.bold)),
+          child: Text(realName, style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold)),
         ),
       ),
-      childWhenDragging: Opacity(opacity: 0.5, child: _playerCardUI(number, name, stats, teamColor, false, false, sf)),
+      childWhenDragging: Opacity(opacity: 0.5, child: _playerCardUI(number, realName, stats, teamColor, false, false, sf)),
       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"); 
+          if (action == "add_pts_2" || action == "add_pts_3" || action == "miss_2" || action == "miss_3") {
-          } else if (action.startsWith("bench_")) {
+             bool isMake = action.startsWith("add_");
-             controller.handleSubbing(context, action, name, isOpponent);
+             bool is3Pt = action.endsWith("_3"); 
+             
+             showDialog(
+               context: context,
+               builder: (ctx) => ZoneMapDialog(
+                 playerName: realName, 
+                 isMake: isMake,
+                 is3PointAction: is3Pt, 
+                 onZoneSelected: (zone, points, relX, relY) {
+                   Navigator.pop(ctx); 
+                   controller.registerShotFromPopup(context, action, "$prefix$playerId", zone, points, relX, relY);
+                   
+                   if (isMake) {
+                     showAssistDialog(context, controller, isOpponent, playerId, sf);
+                   }
+                 },
+               ),
+             );
+          } 
+          else if (action.startsWith("add_") || action.startsWith("sub_") || action.startsWith("miss_")) {
+             controller.handleActionDrag(context, action, "$prefix$playerId"); 
+          } 
+          else if (action.startsWith("bench_")) {
+             controller.handleSubbing(context, action, playerId, 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(number, name, stats, teamColor, isSubbing, isActionHover, sf);
+          
+          return _playerCardUI(number, realName, stats, teamColor, isSubbing, isActionHover, sf);
         },
       ),
     );
   }
 
-  Widget _playerCardUI(String number, String name, Map<String, int> stats, Color teamColor, bool isSubbing, bool isActionHover, double sf) {
+  Widget _playerCardUI(String number, String displayNameStr, Map<String, int> stats, Color teamColor, bool isSubbing, bool isActionHover, double sf) {
     bool isFouledOut = stats["fls"]! >= 5; 
-    Color bgColor = isFouledOut ? Colors.red.shade50 : Colors.white;
+    Color bgColor = isFouledOut ? Colors.red.shade100 : Colors.white;
-    Color borderColor = isFouledOut ? Colors.redAccent : Colors.transparent;
+    Color borderColor = isFouledOut ? AppTheme.actionMiss : Colors.transparent;
     
-    if (isSubbing) { 
+    if (isSubbing) { bgColor = Colors.blue.shade50; borderColor = AppTheme.myTeamBlue; } 
-      bgColor = Colors.blue.shade50; borderColor = Colors.blue; 
+    else if (isActionHover && !isFouledOut) { bgColor = Colors.orange.shade50; borderColor = AppTheme.actionPoints; }
-    } else if (isActionHover && !isFouledOut) { 
-      bgColor = Colors.orange.shade50; borderColor = Colors.orange; 
-    }
 
-    int fgm = stats["fgm"]!;
+    int fgm = stats["fgm"]!; int fga = stats["fga"]!;
-    int fga = stats["fga"]!;
     String fgPercent = fga > 0 ? ((fgm / fga) * 100).toStringAsFixed(0) : "0";
-    String displayName = name.length > 12 ? "${name.substring(0, 10)}..." : name;
+    String displayName = displayNameStr.length > 12 ? "${displayNameStr.substring(0, 10)}..." : displayNameStr;
 
     return Container(
-      decoration: BoxDecoration(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4), 
-        color: bgColor, 
+      decoration: BoxDecoration(color: bgColor, borderRadius: BorderRadius.circular(8), border: Border.all(color: borderColor, width: 1.5), boxShadow: const [BoxShadow(color: Colors.black26, blurRadius: 4, offset: Offset(0, 2))]),
-        borderRadius: BorderRadius.circular(11 * sf),
-        border: Border.all(color: borderColor, width: 1.8 * sf),
-        boxShadow: [BoxShadow(color: Colors.black26, blurRadius: 5 * sf, offset: Offset(2 * sf, 3.5 * sf))],
-      ),
       child: ClipRRect(
-        borderRadius: BorderRadius.circular(9 * sf),
+        borderRadius: BorderRadius.circular(6 * sf),
         child: IntrinsicHeight( 
           child: Row(
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.stretch, 
             children: [
               Container(
-                padding: EdgeInsets.symmetric(horizontal: 16 * sf),
+                padding: EdgeInsets.symmetric(horizontal: 10 * sf), 
                 color: isFouledOut ? Colors.grey[700] : teamColor,
                 alignment: Alignment.center,
-                child: Text(number, style: TextStyle(color: Colors.white, fontSize: 22 * sf, fontWeight: FontWeight.bold)),
+                child: Text(number, style: TextStyle(color: Colors.white, fontSize: 18 * sf, fontWeight: FontWeight.bold)), 
               ),
               Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12 * sf, vertical: 7 * sf),
+                padding: EdgeInsets.symmetric(horizontal: 8 * sf, vertical: 4 * sf), 
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start, 
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    Text(
+                    Text(displayName, style: TextStyle(fontSize: 14 * sf, fontWeight: FontWeight.bold, color: isFouledOut ? AppTheme.actionMiss : Colors.black87, decoration: isFouledOut ? TextDecoration.lineThrough : TextDecoration.none)),
-                      displayName, 
+                    SizedBox(height: 1.5 * sf), 
-                      style: TextStyle(fontSize: 16 * sf, fontWeight: FontWeight.bold, color: isFouledOut ? Colors.red : Colors.black87, decoration: isFouledOut ? TextDecoration.lineThrough : TextDecoration.none)
+                    Text("${stats["pts"]} Pts | FG: $fgm/$fga ($fgPercent%)", style: TextStyle(fontSize: 10 * sf, color: isFouledOut ? AppTheme.actionMiss : Colors.grey[700], fontWeight: FontWeight.w600)),
-                    ),
+                    Text("${stats["ast"]} Ast | ${stats["orb"]! + stats["drb"]!} Rbs | ${stats["fls"]} Fls", style: TextStyle(fontSize: 10 * sf, color: isFouledOut ? AppTheme.actionMiss : Colors.grey[500], fontWeight: FontWeight.w600)),
-                    SizedBox(height: 2.5 * sf),
-                    Text(
-                      "${stats["pts"]} Pts | FG: $fgm/$fga ($fgPercent%)", 
-                      style: TextStyle(fontSize: 12 * 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 * sf, color: isFouledOut ? Colors.red : Colors.grey[500], fontWeight: FontWeight.w600)
-                    ),
                   ],
                 ),
               ),
@@ -284,7 +333,6 @@ class PlayerCourtCard extends StatelessWidget {
   }
 }
 
-// --- PAINEL DE BOTÕES DE AÇÃO ---
 class ActionButtonsPanel extends StatelessWidget {
   final PlacarController controller;
   final double sf;
@@ -293,39 +341,39 @@ class ActionButtonsPanel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double baseSize = 65 * sf; // Reduzido (Antes era 75)
+    final double baseSize = 58 * sf; 
-    final double feedSize = 82 * sf; // Reduzido (Antes era 95)
+    final double feedSize = 73 * sf; 
-    final double gap = 7 * sf; 
+    final double gap = 5 * sf; 
 
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.end,
       children: [
         _columnBtn([
-          _dragAndTargetBtn("M1", Colors.redAccent, "miss_1", baseSize, feedSize, sf),
+          _dragAndTargetBtn("M1", AppTheme.actionMiss, "miss_1", baseSize, feedSize, sf), 
-          _dragAndTargetBtn("1", Colors.orange, "add_pts_1", baseSize, feedSize, sf),
+          _dragAndTargetBtn("1", AppTheme.actionPoints, "add_pts_1", baseSize, feedSize, sf), 
-          _dragAndTargetBtn("1", Colors.orange, "sub_pts_1", baseSize, feedSize, sf, isX: true),
+          _dragAndTargetBtn("1", AppTheme.actionPoints, "sub_pts_1", baseSize, feedSize, sf, isX: true),
-          _dragAndTargetBtn("STL", Colors.green, "add_stl", baseSize, feedSize, sf),
+          _dragAndTargetBtn("STL", AppTheme.actionSteal, "add_stl", baseSize, feedSize, sf), 
         ], gap),
         SizedBox(width: gap * 1),
         _columnBtn([
-          _dragAndTargetBtn("M2", Colors.redAccent, "miss_2", baseSize, feedSize, sf),            
+          _dragAndTargetBtn("M2", AppTheme.actionMiss, "miss_2", baseSize, feedSize, sf),            
-          _dragAndTargetBtn("2", Colors.orange, "add_pts_2", baseSize, feedSize, sf),             
+          _dragAndTargetBtn("2", AppTheme.actionPoints, "add_pts_2", baseSize, feedSize, sf),             
-          _dragAndTargetBtn("2", Colors.orange, "sub_pts_2", baseSize, feedSize, sf, isX: true),  
+          _dragAndTargetBtn("2", AppTheme.actionPoints, "sub_pts_2", baseSize, feedSize, sf, isX: true),  
-          _dragAndTargetBtn("AST", Colors.blueGrey, "add_ast", baseSize, feedSize, sf),
+          _dragAndTargetBtn("AST", AppTheme.actionAssist, "add_ast", baseSize, feedSize, sf), 
         ], gap),
         SizedBox(width: gap * 1),
         _columnBtn([
-          _dragAndTargetBtn("M3", Colors.redAccent, "miss_3", baseSize, feedSize, sf),            
+          _dragAndTargetBtn("M3", AppTheme.actionMiss, "miss_3", baseSize, feedSize, sf),            
-          _dragAndTargetBtn("3", Colors.orange, "add_pts_3", baseSize, feedSize, sf),             
+          _dragAndTargetBtn("3", AppTheme.actionPoints, "add_pts_3", baseSize, feedSize, sf),             
-          _dragAndTargetBtn("3", Colors.orange, "sub_pts_3", baseSize, feedSize, sf, isX: true),  
+          _dragAndTargetBtn("3", AppTheme.actionPoints, "sub_pts_3", baseSize, feedSize, sf, isX: true),  
-          _dragAndTargetBtn("TOV", Colors.redAccent, "add_tov", baseSize, feedSize, sf),
+          _dragAndTargetBtn("TOV", AppTheme.actionMiss, "add_tov", baseSize, feedSize, sf),
         ], gap),
         SizedBox(width: gap * 1),
         _columnBtn([
-          _dragAndTargetBtn("ORB", const Color(0xFF1E2A38), "add_orb", baseSize, feedSize, sf, icon: Icons.sports_basketball),
+          _dragAndTargetBtn("ORB", AppTheme.actionRebound, "add_orb", baseSize, feedSize, sf, icon: Icons.sports_basketball), 
-          _dragAndTargetBtn("DRB", const Color(0xFF1E2A38), "add_drb", baseSize, feedSize, sf, icon: Icons.sports_basketball),
+          _dragAndTargetBtn("DRB", AppTheme.actionRebound, "add_drb", baseSize, feedSize, sf, icon: Icons.sports_basketball), 
-          _dragAndTargetBtn("BLK", Colors.deepPurple, "add_blk", baseSize, feedSize, sf, icon: Icons.front_hand),
+          _dragAndTargetBtn("BLK", AppTheme.actionBlock, "add_blk", baseSize, feedSize, sf, icon: Icons.front_hand), 
         ], gap),
       ],
     );
@@ -408,7 +456,9 @@ class ActionButtonsPanel extends StatelessWidget {
       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 * sf, offset: Offset(0, 3 * sf))]),
+          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 * sf, offset: Offset(0, 3 * sf))]),
           alignment: Alignment.center, 
           child: content,
         ),
@@ -417,3 +467,454 @@ class ActionButtonsPanel extends StatelessWidget {
     );
   }
 }
+
+class HeatmapDialog extends StatefulWidget {
+  final List<dynamic> shots;
+  final String myTeamName;
+  final String oppTeamName;
+  final List<String> myPlayers;
+  final List<String> oppPlayers;
+  final Map<String, Map<String, int>> playerStats;
+
+  const HeatmapDialog({
+    super.key, 
+    required this.shots,
+    required this.myTeamName,
+    required this.oppTeamName,
+    required this.myPlayers,
+    required this.oppPlayers,
+    required this.playerStats,
+  });
+
+  @override
+  State<HeatmapDialog> createState() => _HeatmapDialogState();
+}
+
+class _HeatmapDialogState extends State<HeatmapDialog> {
+  bool _isMapVisible = false;
+  String _selectedTeam = '';
+  String _selectedPlayer = '';
+
+  @override
+  Widget build(BuildContext context) {
+    final Color headerColor = const Color(0xFFE88F15);
+    final Color yellowBackground = const Color(0xFFDFAB00);
+
+    final double screenHeight = MediaQuery.of(context).size.height;
+    final double dialogHeight = screenHeight * 0.95; 
+    final double dialogWidth = dialogHeight * 1.0; 
+
+    return Dialog(
+      backgroundColor: yellowBackground,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      clipBehavior: Clip.antiAlias,
+      insetPadding: const EdgeInsets.all(10),
+      child: SizedBox(
+        height: dialogHeight,
+        width: dialogWidth,
+        child: _isMapVisible ? _buildMapScreen(headerColor) : _buildSelectionScreen(headerColor),
+      ),
+    );
+  }
+
+  Widget _buildSelectionScreen(Color headerColor) {
+    return Column(
+      children: [
+        Container(
+          height: 40,
+          color: headerColor,
+          width: double.infinity,
+          child: Stack(
+            alignment: Alignment.center,
+            children: [
+              const Text(
+                "ESCOLHE A EQUIPA OU UM JOGADOR",
+                style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold),
+              ),
+              Positioned(
+                right: 8,
+                child: InkWell(
+                  onTap: () => Navigator.pop(context),
+                  child: Container(
+                    padding: const EdgeInsets.all(4),
+                    decoration: const BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+                    child: Icon(Icons.close, color: headerColor, size: 16),
+                  ),
+                ),
+              )
+            ],
+          ),
+        ),
+        
+        Expanded(
+          child: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Row(
+              children: [
+                Expanded(
+                  child: _buildTeamColumn(
+                    teamName: widget.myTeamName,
+                    players: widget.myPlayers,
+                    teamColor: AppTheme.myTeamBlue, 
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: _buildTeamColumn(
+                    teamName: widget.oppTeamName,
+                    players: widget.oppPlayers,
+                    teamColor: AppTheme.oppTeamRed, 
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildTeamColumn({required String teamName, required List<String> players, required Color teamColor}) {
+    List<String> realPlayers = players.where((p) => !p.startsWith("Sem ")).toList();
+
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Column(
+        children: [
+          InkWell(
+            onTap: () => setState(() {
+              _selectedTeam = teamName;
+              _selectedPlayer = 'Todos';
+              _isMapVisible = true;
+            }),
+            child: Container(
+              width: double.infinity,
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              decoration: BoxDecoration(
+                color: teamColor,
+                borderRadius: const BorderRadius.only(topLeft: Radius.circular(8), topRight: Radius.circular(8)),
+              ),
+              child: Column(
+                children: [
+                  Text(teamName.toUpperCase(), style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 16)),
+                  const SizedBox(height: 4),
+                  Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
+                    decoration: BoxDecoration(color: Colors.white24, borderRadius: BorderRadius.circular(12)),
+                    child: const Text("MAPA GERAL DA EQUIPA", style: TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold)),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Expanded(
+            child: ListView.separated(
+              itemCount: realPlayers.length,
+              separatorBuilder: (context, index) => const Divider(height: 1, color: Colors.black12),
+              itemBuilder: (context, index) {
+                String p = realPlayers[index];
+                int pts = widget.playerStats[p]?['pts'] ?? 0;
+                
+                return ListTile(
+                  dense: true,
+                  visualDensity: VisualDensity.compact,
+                  leading: Icon(Icons.person, color: teamColor),
+                  title: Text(p, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 13, color: Colors.black87)),
+                  trailing: Text("$pts Pts", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13, color: teamColor)),
+                  onTap: () => setState(() {
+                    _selectedTeam = teamName;
+                    _selectedPlayer = p;
+                    _isMapVisible = true; 
+                  }),
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildMapScreen(Color headerColor) {
+    List<dynamic> filteredShots = widget.shots.where((s) {
+      if (_selectedPlayer != 'Todos') return s.playerName == _selectedPlayer;
+      if (_selectedTeam == widget.myTeamName) return widget.myPlayers.contains(s.playerName);
+      if (_selectedTeam == widget.oppTeamName) return widget.oppPlayers.contains(s.playerName);
+      return true;
+    }).toList();
+
+    String titleText = _selectedPlayer == 'Todos' 
+        ? "MAPA GERAL: ${_selectedTeam.toUpperCase()}" 
+        : "MAPA: ${_selectedPlayer.toUpperCase()}";
+
+    return Column(
+      children: [
+        Container(
+          height: 40,
+          color: headerColor,
+          width: double.infinity,
+          child: Stack(
+            alignment: Alignment.center,
+            children: [
+              Positioned(
+                left: 8,
+                child: InkWell(
+                  onTap: () => setState(() => _isMapVisible = false), 
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                    decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(12)),
+                    child: Row(
+                      children: [
+                        Icon(Icons.arrow_back, color: headerColor, size: 14),
+                        const SizedBox(width: 4),
+                        Text("VOLTAR", style: TextStyle(color: headerColor, fontWeight: FontWeight.bold, fontSize: 12)),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+              Text(
+                titleText,
+                style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold),
+              ),
+              Positioned(
+                right: 8,
+                child: InkWell(
+                  onTap: () => Navigator.pop(context), 
+                  child: Container(
+                    padding: const EdgeInsets.all(4),
+                    decoration: const BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+                    child: Icon(Icons.close, color: headerColor, size: 16),
+                  ),
+                ),
+              )
+            ],
+          ),
+        ),
+        Expanded(
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              return Stack(
+                children: [
+                  CustomPaint(
+                    size: Size(constraints.maxWidth, constraints.maxHeight),
+                    painter: HeatmapCourtPainter(), 
+                  ),
+                  ...filteredShots.map((shot) => Positioned(
+                    left: (shot.relativeX * constraints.maxWidth) - 8, 
+                    top: (shot.relativeY * constraints.maxHeight) - 8, 
+                    child: CircleAvatar(
+                      radius: 8, 
+                      backgroundColor: shot.isMake ? AppTheme.successGreen : AppTheme.actionMiss, 
+                      child: Icon(shot.isMake ? Icons.check : Icons.close, size: 10, color: Colors.white)
+                    ), 
+                  )),
+                ],
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class HeatmapCourtPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final double w = size.width;
+    final double h = size.height;
+    final double basketX = w / 2;
+
+    final Paint whiteStroke = Paint()..color = Colors.white..style = PaintingStyle.stroke..strokeWidth = 2.0;
+    final Paint blackStroke = Paint()..color = Colors.black87..style = PaintingStyle.stroke..strokeWidth = 2.0;
+
+    final double margin = w * 0.10;
+    final double length = h * 0.35;
+    final double larguraDoArco = (w / 2) - margin;
+    final double alturaDoArco = larguraDoArco * 0.30;
+    final double totalArcoHeight = alturaDoArco * 4;
+
+    canvas.drawLine(Offset(margin, 0), Offset(margin, length), whiteStroke);
+    canvas.drawLine(Offset(w - margin, 0), Offset(w - margin, length), whiteStroke);
+    canvas.drawLine(Offset(0, length), Offset(margin, length), whiteStroke);
+    canvas.drawLine(Offset(w - margin, length), Offset(w, length), whiteStroke);
+    canvas.drawArc(Rect.fromCenter(center: Offset(basketX, length), width: larguraDoArco * 2, height: totalArcoHeight), 0, math.pi, false, whiteStroke);
+
+    double sXL = basketX + (larguraDoArco * math.cos(math.pi * 0.75));
+    double sYL = length + ((totalArcoHeight / 2) * math.sin(math.pi * 0.75));
+    double sXR = basketX + (larguraDoArco * math.cos(math.pi * 0.25));
+    double sYR = length + ((totalArcoHeight / 2) * math.sin(math.pi * 0.25));
+
+    canvas.drawLine(Offset(sXL, sYL), Offset(0, h * 0.85), whiteStroke);
+    canvas.drawLine(Offset(sXR, sYR), Offset(w, h * 0.85), whiteStroke);
+
+    final double pW = w * 0.28;
+    final double pH = h * 0.38;
+    canvas.drawRect(Rect.fromLTWH(basketX - pW / 2, 0, pW, pH), blackStroke);
+    
+    final double ftR = pW / 2;
+    canvas.drawArc(Rect.fromCircle(center: Offset(basketX, pH), radius: ftR), 0, math.pi, false, blackStroke);
+    for (int i = 0; i < 10; i++) {
+      canvas.drawArc(Rect.fromCircle(center: Offset(basketX, pH), radius: ftR), math.pi + (i * 2 * (math.pi / 20)), math.pi / 20, false, blackStroke);
+    }
+
+    canvas.drawLine(Offset(basketX - pW / 2, pH), Offset(sXL, sYL), blackStroke); 
+    canvas.drawLine(Offset(basketX + pW / 2, pH), Offset(sXR, sYR), blackStroke); 
+
+    canvas.drawArc(Rect.fromCircle(center: Offset(basketX, h), radius: w * 0.12), math.pi, math.pi, false, blackStroke);
+    canvas.drawCircle(Offset(basketX, h * 0.12), w * 0.02, blackStroke);
+    canvas.drawLine(Offset(basketX - w * 0.08, h * 0.12 - 5), Offset(basketX + w * 0.08, h * 0.12 - 5), blackStroke);
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
+
+// ============================================================================
+// 5. CAIXA DE HISTÓRICO (PLAY-BY-PLAY)
+// ============================================================================
+class PlayByPlayDialog extends StatelessWidget {
+  final PlacarController controller;
+  const PlayByPlayDialog({super.key, required this.controller});
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      backgroundColor: AppTheme.placarDarkSurface,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Container(
+        width: 400,
+        height: MediaQuery.of(context).size.height * 0.8,
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                const Text("HISTÓRICO DE JOGADAS", style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold)),
+                IconButton(icon: const Icon(Icons.close, color: Colors.white), onPressed: () => Navigator.pop(context))
+              ],
+            ),
+            const Divider(color: Colors.white24),
+            Expanded(
+              child: controller.playByPlay.isEmpty 
+                ? const Center(child: Text("Ainda não há jogadas.", style: TextStyle(color: Colors.white54)))
+                : ListView.separated(
+                    itemCount: controller.playByPlay.length,
+                    separatorBuilder: (_, __) => const Divider(color: Colors.white10),
+                    itemBuilder: (context, index) {
+                      return Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 4.0),
+                        child: Text(
+                          controller.playByPlay[index], 
+                          style: const TextStyle(color: Colors.white, fontSize: 14),
+                        ),
+                      );
+                    },
+                  ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+// ============================================================================
+// 6. ECRÃ DE BOX SCORE (ESTATÍSTICAS GERAIS)
+// ============================================================================
+class BoxScoreDialog extends StatelessWidget {
+  final PlacarController controller;
+  const BoxScoreDialog({super.key, required this.controller});
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      backgroundColor: AppTheme.placarDarkSurface,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Container(
+        width: MediaQuery.of(context).size.width * 0.9,
+        height: MediaQuery.of(context).size.height * 0.9,
+        padding: const EdgeInsets.all(16),
+        child: DefaultTabController(
+          length: 2,
+          child: Column(
+            children: [
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  const Text("BOX SCORE", style: TextStyle(color: Colors.white, fontSize: 22, fontWeight: FontWeight.bold)),
+                  IconButton(icon: const Icon(Icons.close, color: Colors.white), onPressed: () => Navigator.pop(context))
+                ],
+              ),
+              TabBar(
+                indicatorColor: AppTheme.warningAmber,
+                labelColor: Colors.white,
+                unselectedLabelColor: Colors.white54,
+                tabs: [
+                  Tab(text: controller.myTeam.toUpperCase()),
+                  Tab(text: controller.opponentTeam.toUpperCase()),
+                ],
+              ),
+              const SizedBox(height: 10),
+              Expanded(
+                child: TabBarView(
+                  children: [
+                    _buildStatsTable(controller.myCourt + controller.myBench, controller),
+                    _buildStatsTable(controller.oppCourt + controller.oppBench, controller),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStatsTable(List<String> teamPlayers, PlacarController ctrl) {
+    return SingleChildScrollView(
+      scrollDirection: Axis.vertical,
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: DataTable(
+          headingRowColor: WidgetStateProperty.all(Colors.black26),
+          columns: const [
+            DataColumn(label: Text('JOGADOR', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('PTS', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('REB', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('AST', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('STL', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('BLK', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('TOV', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('FLS', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+            DataColumn(label: Text('FG', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold))),
+          ],
+          rows: teamPlayers.where((id) => !id.startsWith("fake_")).map((id) {
+            final name = ctrl.playerNames[id] ?? "---";
+            final s = ctrl.playerStats[id]!;
+            final rebs = s['orb']! + s['drb']!;
+            final fgText = "${s['fgm']}/${s['fga']}";
+            return DataRow(
+              cells: [
+                DataCell(Text(name, style: const TextStyle(color: Colors.white))),
+                DataCell(Text(s['pts'].toString(), style: const TextStyle(color: AppTheme.warningAmber, fontWeight: FontWeight.bold))),
+                DataCell(Text(rebs.toString(), style: const TextStyle(color: Colors.white))),
+                DataCell(Text(s['ast'].toString(), style: const TextStyle(color: Colors.white))),
+                DataCell(Text(s['stl'].toString(), style: const TextStyle(color: Colors.white))),
+                DataCell(Text(s['blk'].toString(), style: const TextStyle(color: Colors.white))),
+                DataCell(Text(s['tov'].toString(), style: const TextStyle(color: Colors.redAccent))),
+                DataCell(Text(s['fls'].toString(), style: const TextStyle(color: Colors.white))),
+                DataCell(Text(fgText, style: const TextStyle(color: Colors.white54))),
+              ],
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/register_widgets.dart

@@ -1,27 +1,29 @@
 import 'package:flutter/material.dart';
+import 'package:playmaker/classe/theme.dart'; // 👇 IMPORT DO TEMA
 import '../controllers/register_controller.dart'; 
-import '../utils/size_extension.dart'; 
+import '../utils/size_extension.dart'; // 👇 O NOSSO SUPERPODER!
-import 'dart:math' as math; // 👇 IMPORTANTE
 
 class RegisterHeader extends StatelessWidget {
   const RegisterHeader({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO
-
     return Column(
       children: [
-        Icon(Icons.person_add_outlined, size: 100 * safeSf, color: const Color(0xFFE74C3C)),
+        Icon(Icons.person_add_outlined, size: 100 * context.sf, color: AppTheme.primaryRed), // 👇 Cor do tema
-        SizedBox(height: 10 * safeSf),
+        SizedBox(height: 10 * context.sf),
         Text(
           'Nova Conta',
-          style: TextStyle(fontSize: 36 * safeSf, fontWeight: FontWeight.bold, color: Colors.grey[900]),
+          style: TextStyle(
+            fontSize: 36 * context.sf, 
+            fontWeight: FontWeight.bold, 
+            color: Theme.of(context).colorScheme.onSurface, // 👇 Adaptável ao Modo Escuro
           ),
-        SizedBox(height: 5 * safeSf),
+        ),
+        SizedBox(height: 5 * context.sf),
         Text(
           'Cria o teu perfil no BasketTrack',
-          style: TextStyle(fontSize: 16 * safeSf, color: Colors.grey[600], fontWeight: FontWeight.w500),
+          style: TextStyle(fontSize: 16 * context.sf, color: Colors.grey, fontWeight: FontWeight.w500),
           textAlign: TextAlign.center,
         ),
       ],
@@ -42,77 +44,88 @@ class _RegisterFormFieldsState extends State<RegisterFormFields> {
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO
+    return Form(
-
-    return Container(
-      constraints: BoxConstraints(maxWidth: 450 * safeSf), // LIMITA A LARGURA NO TABLET
-      child: Form(
       key: widget.controller.formKey, 
       child: Column(
         children: [
           TextFormField(
             controller: widget.controller.nameController,
-              style: TextStyle(fontSize: 15 * safeSf),
+            style: TextStyle(fontSize: 15 * context.sf, color: Theme.of(context).colorScheme.onSurface),
             decoration: InputDecoration(
               labelText: 'Nome Completo',
-                labelStyle: TextStyle(fontSize: 15 * safeSf),
+              labelStyle: TextStyle(fontSize: 15 * context.sf),
-                prefixIcon: Icon(Icons.person_outline, size: 22 * safeSf),
+              prefixIcon: Icon(Icons.person_outline, size: 22 * context.sf, color: AppTheme.primaryRed), // 👇 Cor do tema
-                border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * safeSf)),
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * context.sf)),
-                contentPadding: EdgeInsets.symmetric(vertical: 18 * safeSf, horizontal: 16 * safeSf),
+              focusedBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12 * context.sf),
+                borderSide: BorderSide(color: AppTheme.primaryRed, width: 2), // 👇 Destaque ao focar
+              ),
+              contentPadding: EdgeInsets.symmetric(vertical: 18 * context.sf, horizontal: 16 * context.sf),
             ),
           ),
-            SizedBox(height: 20 * safeSf),
+          SizedBox(height: 20 * context.sf),
 
           TextFormField(
             controller: widget.controller.emailController,
             validator: widget.controller.validateEmail, 
-              style: TextStyle(fontSize: 15 * safeSf),
+            style: TextStyle(fontSize: 15 * context.sf, color: Theme.of(context).colorScheme.onSurface),
             decoration: InputDecoration(
               labelText: 'E-mail',
-                labelStyle: TextStyle(fontSize: 15 * safeSf),
+              labelStyle: TextStyle(fontSize: 15 * context.sf),
-                prefixIcon: Icon(Icons.email_outlined, size: 22 * safeSf),
+              prefixIcon: Icon(Icons.email_outlined, size: 22 * context.sf, color: AppTheme.primaryRed),
-                border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * safeSf)),
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * context.sf)),
-                contentPadding: EdgeInsets.symmetric(vertical: 18 * safeSf, horizontal: 16 * safeSf),
+              focusedBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12 * context.sf),
+                borderSide: BorderSide(color: AppTheme.primaryRed, width: 2),
+              ),
+              contentPadding: EdgeInsets.symmetric(vertical: 18 * context.sf, horizontal: 16 * context.sf),
             ),
             keyboardType: TextInputType.emailAddress,
           ),
-            SizedBox(height: 20 * safeSf),
+          SizedBox(height: 20 * context.sf),
 
           TextFormField(
             controller: widget.controller.passwordController,
             obscureText: _obscurePassword,
             validator: widget.controller.validatePassword,
-              style: TextStyle(fontSize: 15 * safeSf),
+            style: TextStyle(fontSize: 15 * context.sf, color: Theme.of(context).colorScheme.onSurface),
             decoration: InputDecoration(
               labelText: 'Palavra-passe',
-                labelStyle: TextStyle(fontSize: 15 * safeSf),
+              labelStyle: TextStyle(fontSize: 15 * context.sf),
-                prefixIcon: Icon(Icons.lock_outlined, size: 22 * safeSf),
+              prefixIcon: Icon(Icons.lock_outlined, size: 22 * context.sf, color: AppTheme.primaryRed),
+              focusedBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(12 * context.sf),
+                borderSide: BorderSide(color: AppTheme.primaryRed, width: 2),
+              ),
               suffixIcon: IconButton(
-                  icon: Icon(_obscurePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined, size: 22 * safeSf),
+                icon: Icon(_obscurePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined, size: 22 * context.sf, color: Colors.grey),
                 onPressed: () => setState(() => _obscurePassword = !_obscurePassword),
               ),
-                border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * safeSf)),
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * context.sf)),
-                contentPadding: EdgeInsets.symmetric(vertical: 18 * safeSf, horizontal: 16 * safeSf),
+              contentPadding: EdgeInsets.symmetric(vertical: 18 * context.sf, horizontal: 16 * context.sf),
             ),
           ),
-            SizedBox(height: 20 * safeSf),
+          SizedBox(height: 20 * context.sf),
 
           TextFormField(
             controller: widget.controller.confirmPasswordController,
             obscureText: _obscurePassword,
             validator: widget.controller.validateConfirmPassword,
-              style: TextStyle(fontSize: 15 * safeSf),
+            style: TextStyle(fontSize: 15 * context.sf, color: Theme.of(context).colorScheme.onSurface),
             decoration: InputDecoration(
               labelText: 'Confirmar Palavra-passe',
-                labelStyle: TextStyle(fontSize: 15 * safeSf),
+              labelStyle: TextStyle(fontSize: 15 * context.sf),
-                prefixIcon: Icon(Icons.lock_clock_outlined, size: 22 * safeSf),
+              prefixIcon: Icon(Icons.lock_clock_outlined, size: 22 * context.sf, color: AppTheme.primaryRed),
-                border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * safeSf)),
+              focusedBorder: OutlineInputBorder(
-                contentPadding: EdgeInsets.symmetric(vertical: 18 * safeSf, horizontal: 16 * safeSf),
+                borderRadius: BorderRadius.circular(12 * context.sf),
+                borderSide: BorderSide(color: AppTheme.primaryRed, width: 2),
+              ),
+              border: OutlineInputBorder(borderRadius: BorderRadius.circular(12 * context.sf)),
+              contentPadding: EdgeInsets.symmetric(vertical: 18 * context.sf, horizontal: 16 * context.sf),
             ),
           ),
         ],
       ),
-      ),
     );
   }
 }
@@ -123,25 +136,23 @@ class RegisterButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double safeSf = math.min(context.sf, 1.15); // TRAVÃO
+    return SizedBox(
-
+      width: double.infinity,
-    return Container(
+      height: 58 * context.sf,
-      constraints: BoxConstraints(maxWidth: 450 * safeSf), // LIMITA LARGURA
-      height: 58 * safeSf,
       child: ElevatedButton(
         onPressed: controller.isLoading ? null : () => controller.signUp(context),
         style: ElevatedButton.styleFrom(
-          backgroundColor: const Color(0xFFE74C3C),
+          backgroundColor: AppTheme.primaryRed, // 👇 Cor do tema
           foregroundColor: Colors.white,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * safeSf)),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14 * context.sf)),
           elevation: 3,
         ),
         child: controller.isLoading
             ? SizedBox(
-                width: 28 * safeSf, height: 28 * safeSf,
+                width: 28 * context.sf, height: 28 * context.sf,
                 child: const CircularProgressIndicator(strokeWidth: 3, valueColor: AlwaysStoppedAnimation<Color>(Colors.white)),
               )
-            : Text('Criar Conta', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
+            : Text('Criar Conta', style: TextStyle(fontSize: 18 * context.sf, fontWeight: FontWeight.bold)),
       ),
     );
   }

lib/widgets/stats_widgets.dart

@@ -118,8 +118,7 @@ class PersonCard extends StatelessWidget {
                 height: 45,
                 alignment: Alignment.center,
                 decoration: BoxDecoration(color: Colors.blue.withOpacity(0.1), borderRadius: BorderRadius.circular(10)),
-                child: Text(person.number, style: const TextStyle(color: Colors.blue, fontWeight: FontWeight.bold, fontSize: 16)),
+child: Text(person.number ?? "J", style: const TextStyle(color: Colors.blue, fontWeight: FontWeight.bold, fontSize: 16)),              ),
-              ),
         title: Text(person.name, style: const TextStyle(fontWeight: FontWeight.bold)),
         trailing: Row(
           mainAxisSize: MainAxisSize.min,

lib/widgets/team_widgets.dart

@@ -1,260 +1,232 @@
 import 'package:flutter/material.dart';
-import 'package:playmaker/screens/team_stats_page.dart';
+import 'package:playmaker/classe/theme.dart'; // 👇 IMPORT DO TEMA
 import '../models/team_model.dart';
-import '../controllers/team_controller.dart';
+import '../models/person_model.dart';
-import 'dart:math' as math; // 👇 IMPORTANTE PARA O TRAVÃO DE MÃO
+import '../utils/size_extension.dart'; // 👇 O NOSSO SUPERPODER!
 
-class TeamCard extends StatelessWidget {
+// --- CABEÇALHO ---
+class StatsHeader extends StatelessWidget {
   final Team team;
-  final TeamController controller;
-  final VoidCallback onFavoriteTap;
-  final double sf; // <-- Variável de escala original
 
-  const TeamCard({
+  const StatsHeader({super.key, required this.team});
-    super.key,
-    required this.team,
-    required this.controller,
-    required this.onFavoriteTap,
-    required this.sf,
-  });
 
   @override
   Widget build(BuildContext context) {
-    // 👇 O SEGREDO ESTÁ AQUI: TRAVÃO DE MÃO PARA TABLETS 👇
+    return Container(
-    // O sf pode crescer, mas NUNCA vai ser maior que 1.15!
+      padding: EdgeInsets.only(
-    final double safeSf = math.min(sf, 1.15); 
+        top: 50 * context.sf, 
-
+        left: 20 * context.sf, 
-    return Card(
+        right: 20 * context.sf, 
-      color: Colors.white,
+        bottom: 20 * context.sf
-      elevation: 3,
+      ),
-      margin: EdgeInsets.only(bottom: 12 * safeSf),
+      decoration: BoxDecoration(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * safeSf)),
+        color: AppTheme.primaryRed, // 👇 Usando a cor do teu tema!
-      child: ListTile(
+        borderRadius: BorderRadius.only(
-        contentPadding: EdgeInsets.symmetric(horizontal: 16 * safeSf, vertical: 8 * safeSf),
+          bottomLeft: Radius.circular(30 * context.sf), 
-
+          bottomRight: Radius.circular(30 * context.sf)
-        // --- 1. IMAGEM + FAVORITO ---
+        ),
-        leading: Stack(
+      ),
-          clipBehavior: Clip.none,
+      child: Row(
         children: [
+          IconButton(
+            icon: Icon(Icons.arrow_back, color: Colors.white, size: 24 * context.sf),
+            onPressed: () => Navigator.pop(context),
+          ),
+          SizedBox(width: 10 * context.sf),
           CircleAvatar(
-              radius: 28 * safeSf,
+            radius: 24 * context.sf,
-              backgroundColor: Colors.grey[200],
+            backgroundColor: Colors.white24,
             backgroundImage: (team.imageUrl.isNotEmpty && team.imageUrl.startsWith('http'))
                 ? NetworkImage(team.imageUrl)
                 : null,
             child: (team.imageUrl.isEmpty || !team.imageUrl.startsWith('http'))
                 ? Text(
-                      team.imageUrl.isEmpty ? "🏀" : team.imageUrl,
+                    team.imageUrl.isEmpty ? "🛡️" : team.imageUrl,
-                      style: TextStyle(fontSize: 24 * safeSf),
+                    style: TextStyle(fontSize: 20 * context.sf),
                   )
                 : null,
           ),
-            Positioned(
+          SizedBox(width: 15 * context.sf),
-              left: -15 * safeSf,
+          Expanded(
-              top: -10 * safeSf,
+            child: Column(
-              child: IconButton(
+              crossAxisAlignment: CrossAxisAlignment.start,
-                icon: Icon(
+              children: [
-                  team.isFavorite ? Icons.star : Icons.star_border,
+                Text(
-                  color: team.isFavorite ? Colors.amber : Colors.black.withOpacity(0.1),
-                  size: 28 * safeSf,
-                  shadows: [
-                    Shadow(
-                      color: Colors.black.withOpacity(team.isFavorite ? 0.3 : 0.1),
-                      blurRadius: 4 * safeSf,
-                    ),
-                  ],
-                ),
-                onPressed: onFavoriteTap,
-              ),
-            ),
-          ],
-        ),
-
-        // --- 2. TÍTULO ---
-        title: Text(
                   team.name, 
-          style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16 * safeSf),
+                  style: TextStyle(color: Colors.white, fontSize: 20 * context.sf, fontWeight: FontWeight.bold),
                   overflow: TextOverflow.ellipsis,
                 ),
-
+                Text(
-        // --- 3. SUBTÍTULO (Contagem + Época em TEMPO REAL) ---
+                  team.season, 
-        subtitle: Padding(
+                  style: TextStyle(color: Colors.white70, fontSize: 14 * context.sf)
-          padding: EdgeInsets.only(top: 6.0 * safeSf),
+                ),
-          child: Row(
+              ],
-            children: [
+            ),
-              Icon(Icons.groups_outlined, size: 16 * safeSf, color: Colors.grey),
+          ),
-              SizedBox(width: 4 * safeSf),
+        ],
-              
-              StreamBuilder<int>(
-                stream: controller.getPlayerCountStream(team.id),
-                initialData: 0,
-                builder: (context, snapshot) {
-                  final count = snapshot.data ?? 0;
-                  return Text(
-                    "$count Jogs.", 
-                    style: TextStyle(
-                      color: count > 0 ? Colors.green[700] : Colors.orange,
-                      fontWeight: FontWeight.bold,
-                      fontSize: 13 * safeSf,
       ),
     );
-                },
+  }
-              ),
+}
 
-              SizedBox(width: 8 * safeSf),
+// --- CARD DE RESUMO ---
-              Expanded( 
+class StatsSummaryCard extends StatelessWidget {
-                child: Text(
+  final int total;
-                  "|  ${team.season}",
+
-                  style: TextStyle(color: Colors.grey, fontSize: 13 * safeSf),
+  const StatsSummaryCard({super.key, required this.total});
-                  overflow: TextOverflow.ellipsis,
+
+  @override
+  Widget build(BuildContext context) {
+    // 👇 Adaptável ao Modo Escuro
+    final cardColor = Theme.of(context).brightness == Brightness.dark 
+        ? const Color(0xFF1E1E1E) 
+        : Colors.white;
+
+    return Card(
+      elevation: 4,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20 * context.sf)),
+      child: Container(
+        padding: EdgeInsets.all(20 * context.sf),
+        decoration: BoxDecoration(
+          color: cardColor,
+          borderRadius: BorderRadius.circular(20 * context.sf),
+          border: Border.all(color: Colors.grey.withOpacity(0.15)),
         ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Row(
+              children: [
+                Icon(Icons.groups, color: AppTheme.primaryRed, size: 28 * context.sf), // 👇 Cor do tema
+                SizedBox(width: 10 * context.sf),
+                Text(
+                  "Total de Membros", 
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.onSurface, // 👇 Adaptável
+                    fontSize: 16 * context.sf,
+                    fontWeight: FontWeight.w600
+                  )
+                ),
+              ],
+            ),
+            Text(
+              "$total", 
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.onSurface, // 👇 Adaptável
+                fontSize: 28 * context.sf, 
+                fontWeight: FontWeight.bold
+              )
             ),
           ],
         ),
       ),
+    );
+  }
+}
 
-        // --- 4. BOTÕES (Estatísticas e Apagar) ---
+// --- TÍTULO DE SECÇÃO ---
+class StatsSectionTitle extends StatelessWidget {
+  final String title;
+
+  const StatsSectionTitle({super.key, required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          title, 
+          style: TextStyle(
+            fontSize: 18 * context.sf, 
+            fontWeight: FontWeight.bold, 
+            color: Theme.of(context).colorScheme.onSurface // 👇 Adaptável
+          )
+        ),
+        Divider(color: Colors.grey.withOpacity(0.3)),
+      ],
+    );
+  }
+}
+
+// --- CARD DA PESSOA (JOGADOR/TREINADOR) ---
+class PersonCard extends StatelessWidget {
+  final Person person;
+  final bool isCoach;
+  final VoidCallback onEdit;
+  final VoidCallback onDelete;
+
+  const PersonCard({
+    super.key,
+    required this.person,
+    required this.isCoach,
+    required this.onEdit,
+    required this.onDelete,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // 👇 Cores adaptáveis para o Card
+    final defaultBg = Theme.of(context).brightness == Brightness.dark 
+        ? const Color(0xFF1E1E1E) 
+        : Colors.white;
+        
+    final coachBg = Theme.of(context).brightness == Brightness.dark 
+        ? AppTheme.warningAmber.withOpacity(0.1) // Amarelo escuro se for modo noturno
+        : const Color(0xFFFFF9C4); // Amarelo claro original
+
+    return Card(
+      margin: EdgeInsets.only(top: 12 * context.sf),
+      elevation: 2,
+      color: isCoach ? coachBg : defaultBg,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * context.sf)),
+      child: ListTile(
+        contentPadding: EdgeInsets.symmetric(horizontal: 16 * context.sf, vertical: 4 * context.sf),
+        leading: isCoach
+            ? CircleAvatar(
+                radius: 22 * context.sf,
+                backgroundColor: AppTheme.warningAmber, // 👇 Cor do tema
+                child: Icon(Icons.person, color: Colors.white, size: 24 * context.sf)
+              )  
+            : Container(
+                width: 45 * context.sf,
+                height: 45 * context.sf,
+                alignment: Alignment.center,
+                decoration: BoxDecoration(
+                  color: AppTheme.primaryRed.withOpacity(0.1), // 👇 Cor do tema
+                  borderRadius: BorderRadius.circular(10 * context.sf)
+                ),
+                child: Text(
+                  person.number ?? "J", 
+                  style: TextStyle(
+                    color: AppTheme.primaryRed, // 👇 Cor do tema
+                    fontWeight: FontWeight.bold, 
+                    fontSize: 16 * context.sf
+                  )
+                ),
+              ),
+        title: Text(
+          person.name, 
+          style: TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 16 * context.sf,
+            color: Theme.of(context).colorScheme.onSurface, // 👇 Adaptável
+          )
+        ),
         trailing: Row(
           mainAxisSize: MainAxisSize.min,
           children: [
             IconButton(
-              tooltip: 'Ver Estatísticas',
+              icon: Icon(Icons.edit_outlined, color: Colors.blue, size: 22 * context.sf),
-              icon: Icon(Icons.bar_chart_rounded, color: Colors.blue, size: 24 * safeSf),
+              onPressed: onEdit,
-              onPressed: () {
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => TeamStatsPage(team: team),
-                  ),
-                );
-              },
             ),
             IconButton(
-              tooltip: 'Eliminar Equipa',
+              icon: Icon(Icons.delete_outline, color: AppTheme.primaryRed, size: 22 * context.sf), // 👇 Cor do tema
-              icon: Icon(Icons.delete_outline, color: const Color(0xFFE74C3C), size: 24 * safeSf),
+              onPressed: onDelete,
-              onPressed: () => _confirmDelete(context, safeSf),
             ),
           ],
         ),
       ),
     );
   }
-
-  void _confirmDelete(BuildContext context, double safeSf) {
-    showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text('Eliminar Equipa?', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
-        content: Text('Tens a certeza que queres eliminar "${team.name}"?', style: TextStyle(fontSize: 14 * safeSf)),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context),
-            child: Text('Cancelar', style: TextStyle(fontSize: 14 * safeSf)),
-          ),
-          TextButton(
-            onPressed: () {
-              controller.deleteTeam(team.id);
-              Navigator.pop(context);
-            },
-            child: Text('Eliminar', style: TextStyle(color: Colors.red, fontSize: 14 * safeSf)),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-// --- DIALOG DE CRIAÇÃO ---
-class CreateTeamDialog extends StatefulWidget {
-  final Function(String name, String season, String imageUrl) onConfirm;
-  final double sf; 
-
-  const CreateTeamDialog({super.key, required this.onConfirm, required this.sf});
-
-  @override
-  State<CreateTeamDialog> createState() => _CreateTeamDialogState();
-}
-
-class _CreateTeamDialogState extends State<CreateTeamDialog> {
-  final TextEditingController _nameController = TextEditingController();
-  final TextEditingController _imageController = TextEditingController();
-  String _selectedSeason = '2024/25';
-
-  @override
-  Widget build(BuildContext context) {
-    // 👇 MESMO TRAVÃO NO POPUP PARA NÃO FICAR GIGANTE 👇
-    final double safeSf = math.min(widget.sf, 1.15); 
-
-    return AlertDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15 * safeSf)),
-      title: Text('Nova Equipa', style: TextStyle(fontSize: 18 * safeSf, fontWeight: FontWeight.bold)),
-      content: SingleChildScrollView(
-        child: Container(
-          // 👇 Limita a largura máxima no tablet para o popup não ficar super esticado!
-          constraints: BoxConstraints(maxWidth: 450 * safeSf), 
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              TextField(
-                controller: _nameController,
-                style: TextStyle(fontSize: 14 * safeSf),
-                decoration: InputDecoration(
-                  labelText: 'Nome da Equipa', 
-                  labelStyle: TextStyle(fontSize: 14 * safeSf)
-                ),
-                textCapitalization: TextCapitalization.words,
-              ),
-              SizedBox(height: 15 * safeSf),
-              DropdownButtonFormField<String>(
-                value: _selectedSeason,
-                decoration: InputDecoration(
-                  labelText: 'Temporada',
-                  labelStyle: TextStyle(fontSize: 14 * safeSf)
-                ),
-                style: TextStyle(fontSize: 14 * safeSf, color: Colors.black87),
-                items: ['2023/24', '2024/25', '2025/26']
-                    .map((s) => DropdownMenuItem(value: s, child: Text(s)))
-                    .toList(),
-                onChanged: (val) => setState(() => _selectedSeason = val!),
-              ),
-              SizedBox(height: 15 * safeSf),
-              TextField(
-                controller: _imageController,
-                style: TextStyle(fontSize: 14 * safeSf),
-                decoration: InputDecoration(
-                  labelText: 'URL Imagem ou Emoji',
-                  labelStyle: TextStyle(fontSize: 14 * safeSf),
-                  hintText: 'Ex: 🏀 ou https://...',
-                  hintStyle: TextStyle(fontSize: 14 * safeSf)
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context), 
-          child: Text('Cancelar', style: TextStyle(fontSize: 14 * safeSf))
-        ),
-        ElevatedButton(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: const Color(0xFFE74C3C),
-            padding: EdgeInsets.symmetric(horizontal: 16 * safeSf, vertical: 10 * safeSf)
-          ),
-          onPressed: () {
-            if (_nameController.text.trim().isNotEmpty) {
-              widget.onConfirm(
-                _nameController.text.trim(),
-                _selectedSeason,
-                _imageController.text.trim(),
-              );
-              Navigator.pop(context);
-            }
-          },
-          child: Text('Criar', style: TextStyle(color: Colors.white, fontSize: 14 * safeSf)),
-        ),
-      ],
-    );
-  }
 }

lib/zone_map_dialog.dart

@@ -0,0 +1,228 @@
+import 'package:flutter/material.dart';
+import 'dart:math' as math;
+
+class ZoneMapDialog extends StatelessWidget {
+  final String playerName;
+  final bool isMake;
+  final bool is3PointAction; // 👇 AGORA O POP-UP SABE O QUE ARRASTASTE!
+  final Function(String zone, int points, double relativeX, double relativeY) onZoneSelected;
+
+  const ZoneMapDialog({
+    super.key,
+    required this.playerName,
+    required this.isMake,
+    required this.is3PointAction,
+    required this.onZoneSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final Color headerColor = const Color(0xFFE88F15);
+    final Color yellowBackground = const Color(0xFFDFAB00);
+
+    final double screenHeight = MediaQuery.of(context).size.height;
+    final double dialogHeight = screenHeight * 0.95; 
+    final double dialogWidth = dialogHeight * 1.0;
+
+    return Dialog(
+      backgroundColor: yellowBackground,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      clipBehavior: Clip.antiAlias,
+      insetPadding: const EdgeInsets.all(10),
+      child: SizedBox(
+        height: dialogHeight,
+        width: dialogWidth,
+        child: Column(
+          children: [
+            Container(
+              height: 40,
+              color: headerColor,
+              width: double.infinity,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  Text(
+                    isMake ? "Lançamento de $playerName (Marcou)" : "Lançamento de $playerName (Falhou)",
+                    style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold),
+                  ),
+                  Positioned(
+                    right: 8,
+                    child: InkWell(
+                      onTap: () => Navigator.pop(context),
+                      child: Container(
+                        padding: const EdgeInsets.all(4),
+                        decoration: const BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+                        child: Icon(Icons.close, color: headerColor, size: 16),
+                      ),
+                    ),
+                  )
+                ],
+              ),
+            ),
+            Expanded(
+              child: LayoutBuilder(
+                builder: (context, constraints) {
+                  return GestureDetector(
+                    onTapUp: (details) => _calculateAndReturnZone(context, details.localPosition, constraints.biggest),
+                    child: CustomPaint(
+                      size: Size(constraints.maxWidth, constraints.maxHeight),
+                      painter: DebugPainter(is3PointAction: is3PointAction), // 👇 Passa a info para o desenhador
+                    ),
+                  );
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+void _calculateAndReturnZone(BuildContext context, Offset tap, Size size) {
+    final double w = size.width;
+    final double h = size.height;
+    final double x = tap.dx;
+    final double y = tap.dy;
+    final double basketX = w / 2;
+
+    final double margin = w * 0.10;
+    final double length = h * 0.35;
+    final double larguraDoArco = (w / 2) - margin;
+    final double alturaDoArco = larguraDoArco * 0.30;
+    final double totalArcoHeight = alturaDoArco * 4;
+
+    String zone = "";
+    int pts = 2;
+
+    // 1. SABER SE CLICOU NA ZONA DE 3 OU DE 2
+    bool is3 = false;
+    if (y < length) {
+      if (x < margin || x > w - margin) is3 = true;
+    } else {
+      double dx = x - basketX;
+      double dy = y - length;
+      double ellipse = (dx * dx) / (larguraDoArco * larguraDoArco) + (dy * dy) / (math.pow(totalArcoHeight / 2, 2));
+      if (ellipse > 1.0) is3 = true;
+    }
+
+    // 👇 MAGIA AQUI: BLOQUEIA O CLIQUE NA ZONA ESCURA! 👇
+    if (is3PointAction && !is3) return; // Arrastou 3pts mas clicou na de 2pts -> IGNORA
+    if (!is3PointAction && is3) return; // Arrastou 2pts mas clicou na de 3pts -> IGNORA
+
+    double angle = math.atan2(y - length, x - basketX);
+
+    if (is3) {
+      pts = 3;
+      if (y < length) {
+        zone = (x < w / 2) ? "Canto Esquerdo (3pt)" : "Canto Direito (3pt)";
+      } else if (angle > 2.35) {
+        zone = "Ala Esquerda (3pt)";
+      } else if (angle < 0.78) {
+        zone = "Ala Direita (3pt)";
+      } else {
+        zone = "Topo (3pt)";
+      }
+    } else {
+      pts = 2;
+      final double pW = w * 0.28;
+      final double pH = h * 0.38;
+      if (x > basketX - pW / 2 && x < basketX + pW / 2 && y < pH) {
+        zone = "Garrafão";
+      } else {
+        if (y < length) {
+          zone = (x < w / 2) ? "Meia Distância (Canto Esq)" : "Meia Distância (Canto Dir)";
+        } else if (angle > 2.35) {
+          zone = "Meia Distância (Esq)";
+        } else if (angle < 0.78) {
+          zone = "Meia Distância (Dir)";
+        } else {
+          zone = "Meia Distância (Centro)";
+        }
+      }
+    }
+
+    // 👇 A MUDANÇA ESTÁ AQUI! Passamos os dados e deixamos quem chamou decidir como fechar!
+    onZoneSelected(zone, pts, x / w, y / h);
+  }
+  }
+
+class DebugPainter extends CustomPainter {
+  final bool is3PointAction;
+
+  DebugPainter({required this.is3PointAction});
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final double w = size.width;
+    final double h = size.height;
+    final double basketX = w / 2;
+
+    final Paint whiteStroke = Paint()..color = Colors.white..style = PaintingStyle.stroke..strokeWidth = 2.0;
+    final Paint blackStroke = Paint()..color = Colors.black87..style = PaintingStyle.stroke..strokeWidth = 2.0;
+
+    final double margin = w * 0.10;
+    final double length = h * 0.35;
+    final double larguraDoArco = (w / 2) - margin;
+    final double alturaDoArco = larguraDoArco * 0.30;
+    final double totalArcoHeight = alturaDoArco * 4;
+
+    // DESENHA O CAMPO
+    canvas.drawLine(Offset(margin, 0), Offset(margin, length), whiteStroke);
+    canvas.drawLine(Offset(w - margin, 0), Offset(w - margin, length), whiteStroke);
+    canvas.drawLine(Offset(0, length), Offset(margin, length), whiteStroke);
+    canvas.drawLine(Offset(w - margin, length), Offset(w, length), whiteStroke);
+    canvas.drawArc(Rect.fromCenter(center: Offset(basketX, length), width: larguraDoArco * 2, height: totalArcoHeight), 0, math.pi, false, whiteStroke);
+
+    double sXL = basketX + (larguraDoArco * math.cos(math.pi * 0.75));
+    double sYL = length + ((totalArcoHeight / 2) * math.sin(math.pi * 0.75));
+    double sXR = basketX + (larguraDoArco * math.cos(math.pi * 0.25));
+    double sYR = length + ((totalArcoHeight / 2) * math.sin(math.pi * 0.25));
+
+    canvas.drawLine(Offset(sXL, sYL), Offset(0, h * 0.85), whiteStroke);
+    canvas.drawLine(Offset(sXR, sYR), Offset(w, h * 0.85), whiteStroke);
+
+    final double pW = w * 0.28;
+    final double pH = h * 0.38;
+    canvas.drawRect(Rect.fromLTWH(basketX - pW / 2, 0, pW, pH), blackStroke);
+    
+    final double ftR = pW / 2;
+    canvas.drawArc(Rect.fromCircle(center: Offset(basketX, pH), radius: ftR), 0, math.pi, false, blackStroke);
+    for (int i = 0; i < 10; i++) {
+      canvas.drawArc(Rect.fromCircle(center: Offset(basketX, pH), radius: ftR), math.pi + (i * 2 * (math.pi / 20)), math.pi / 20, false, blackStroke);
+    }
+
+    canvas.drawLine(Offset(basketX - pW / 2, pH), Offset(sXL, sYL), blackStroke); 
+    canvas.drawLine(Offset(basketX + pW / 2, pH), Offset(sXR, sYR), blackStroke); 
+
+    canvas.drawArc(Rect.fromCircle(center: Offset(basketX, h), radius: w * 0.12), math.pi, math.pi, false, blackStroke);
+    canvas.drawCircle(Offset(basketX, h * 0.12), w * 0.02, blackStroke);
+    canvas.drawLine(Offset(basketX - w * 0.08, h * 0.12 - 5), Offset(basketX + w * 0.08, h * 0.12 - 5), blackStroke);
+
+    // ==========================================
+    // 👇 EFEITO DE ESCURECIMENTO (SHADOW) 👇
+    // ==========================================
+    final Paint shadowPaint = Paint()..color = Colors.black.withOpacity(0.75); // 75% escuro!
+
+    // Cria o molde da área de 2 pontos
+    Path path2pt = Path();
+    path2pt.moveTo(margin, 0);
+    path2pt.lineTo(margin, length);
+    // Faz o arco curvo da linha de 3 pontos
+    path2pt.arcTo(Rect.fromCenter(center: Offset(basketX, length), width: larguraDoArco * 2, height: totalArcoHeight), math.pi, -math.pi, false);
+    path2pt.lineTo(w - margin, 0);
+    path2pt.close();
+
+    if (is3PointAction) {
+      // Arrastou 3 Pontos -> Escurece a Zona de 2!
+      canvas.drawPath(path2pt, shadowPaint);
+    } else {
+      // Arrastou 2 Pontos -> Escurece a Zona de 3!
+      Path fullScreen = Path()..addRect(Rect.fromLTWH(0, 0, w, h));
+      Path path3pt = Path.combine(PathOperation.difference, fullScreen, path2pt);
+      canvas.drawPath(path3pt, shadowPaint);
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+}

linux/flutter/generated_plugin_registrant.cc

@@ -6,13 +6,21 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <file_selector_linux/file_selector_plugin.h>
 #include <gtk/gtk_plugin.h>
+#include <printing/printing_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
   g_autoptr(FlPluginRegistrar) gtk_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
   gtk_plugin_register_with_registrar(gtk_registrar);
+  g_autoptr(FlPluginRegistrar) printing_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "PrintingPlugin");
+  printing_plugin_register_with_registrar(printing_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,7 +3,9 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_linux
   gtk
+  printing
   url_launcher_linux
 )
 

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,13 +6,19 @@ import FlutterMacOS
 import Foundation
 
 import app_links
+import file_selector_macos
 import path_provider_foundation
+import printing
 import shared_preferences_foundation
+import sqflite_darwin
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  PrintingPlugin.register(with: registry.registrar(forPlugin: "PrintingPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
 }

pubspec.lock

@@ -41,6 +41,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.9"
   async:
     dependency: transitive
     description:
@@ -49,6 +57,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.13.0"
+  barcode:
+    dependency: transitive
+    description:
+      name: barcode
+      sha256: "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.9"
+  bidi:
+    dependency: transitive
+    description:
+      name: bidi
+      sha256: "77f475165e94b261745cf1032c751e2032b8ed92ccb2bf5716036db79320637d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.13"
   boolean_selector:
     dependency: transitive
     description:
@@ -57,14 +81,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  cached_network_image:
+    dependency: "direct main"
+    description:
+      name: cached_network_image
+      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   clock:
     dependency: transitive
     description:
@@ -89,6 +137,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5+2"
   crypto:
     dependency: transitive
     description:
@@ -145,6 +201,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  file_selector_linux:
+    dependency: transitive
+    description:
+      name: file_selector_linux
+      sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4"
+  file_selector_macos:
+    dependency: transitive
+    description:
+      name: file_selector_macos
+      sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.5"
+  file_selector_platform_interface:
+    dependency: transitive
+    description:
+      name: file_selector_platform_interface
+      sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  file_selector_windows:
+    dependency: transitive
+    description:
+      name: file_selector_windows
+      sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3+5"
   fixnum:
     dependency: transitive
     description:
@@ -158,6 +246,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_cache_manager:
+    dependency: transitive
+    description:
+      name: flutter_cache_manager
+      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -166,6 +262,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.33"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -216,6 +320,102 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.8.0"
+  image_cropper:
+    dependency: "direct main"
+    description:
+      name: image_cropper
+      sha256: "46c8f9aae51c8350b2a2982462f85a129e77b04675d35b09db5499437d7a996b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.0"
+  image_cropper_for_web:
+    dependency: transitive
+    description:
+      name: image_cropper_for_web
+      sha256: e09749714bc24c4e3b31fbafa2e5b7229b0ff23e8b14d4ba44bd723b77611a0f
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
+  image_cropper_platform_interface:
+    dependency: transitive
+    description:
+      name: image_cropper_platform_interface
+      sha256: "886a30ec199362cdcc2fbb053b8e53347fbfb9dbbdaa94f9ff85622609f5e7ff"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.0.0"
+  image_picker:
+    dependency: "direct main"
+    description:
+      name: image_picker
+      sha256: "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  image_picker_android:
+    dependency: transitive
+    description:
+      name: image_picker_android
+      sha256: eda9b91b7e266d9041084a42d605a74937d996b87083395c5e47835916a86156
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.13+14"
+  image_picker_for_web:
+    dependency: transitive
+    description:
+      name: image_picker_for_web
+      sha256: "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  image_picker_ios:
+    dependency: transitive
+    description:
+      name: image_picker_ios
+      sha256: b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.13+6"
+  image_picker_linux:
+    dependency: transitive
+    description:
+      name: image_picker_linux
+      sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2"
+  image_picker_macos:
+    dependency: transitive
+    description:
+      name: image_picker_macos
+      sha256: "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2+1"
+  image_picker_platform_interface:
+    dependency: transitive
+    description:
+      name: image_picker_platform_interface
+      sha256: "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.11.1"
+  image_picker_windows:
+    dependency: transitive
+    description:
+      name: image_picker_windows
+      sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2"
   jwt_decode:
     dependency: transitive
     description:
@@ -268,18 +468,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.18"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   meta:
     dependency: transitive
     description:
@@ -304,6 +504,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  octo_image:
+    dependency: transitive
+    description:
+      name: octo_image
+      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
@@ -312,6 +520,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   path_provider:
     dependency: transitive
     description:
@@ -360,6 +576,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  pdf:
+    dependency: "direct main"
+    description:
+      name: pdf
+      sha256: e47a275b267873d5944ad5f5ff0dcc7ac2e36c02b3046a0ffac9b72fd362c44b
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.12.0"
+  pdf_widget_wrapper:
+    dependency: transitive
+    description:
+      name: pdf_widget_wrapper
+      sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.2"
   platform:
     dependency: transitive
     description:
@@ -384,6 +624,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
   postgrest:
     dependency: transitive
     description:
@@ -392,6 +640,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.6.0"
+  printing:
+    dependency: "direct main"
+    description:
+      name: printing
+      sha256: "689170c9ddb1bda85826466ba80378aa8993486d3c959a71cd7d2d80cb606692"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.14.3"
   provider:
     dependency: "direct main"
     description:
@@ -400,6 +656,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.5+1"
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   realtime_client:
     dependency: transitive
     description:
@@ -425,7 +689,7 @@ packages:
     source: hosted
     version: "0.28.0"
   shared_preferences:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: shared_preferences
       sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
@@ -480,6 +744,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.1"
+  shimmer:
+    dependency: "direct main"
+    description:
+      name: shimmer
+      sha256: "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -493,6 +765,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.1"
+  sqflite:
+    dependency: transitive
+    description:
+      name: sqflite
+      sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2+3"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   stack_trace:
     dependency: transitive
     description:
@@ -541,6 +853,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.12.0"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
   term_glyph:
     dependency: transitive
     description:
@@ -553,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.7"
+    version: "0.7.9"
   typed_data:
     dependency: transitive
     description:
@@ -629,6 +949,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.5"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.3"
   vector_math:
     dependency: transitive
     description:
@@ -677,6 +1005,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.6.1"
   yet_another_json_isolate:
     dependency: transitive
     description:

pubspec.yaml

@@ -36,6 +36,13 @@ dependencies:
   cupertino_icons: ^1.0.8
   provider: ^6.1.5+1
   supabase_flutter: ^2.12.0
+  image_picker: ^1.2.1
+  image_cropper: ^11.0.0
+  shimmer: ^3.0.0
+  cached_network_image: ^3.4.1
+  shared_preferences: ^2.5.4
+  printing: ^5.14.3
+  pdf: ^3.12.0
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -7,11 +7,17 @@
 #include "generated_plugin_registrant.h"
 
 #include <app_links/app_links_plugin_c_api.h>
+#include <file_selector_windows/file_selector_windows.h>
+#include <printing/printing_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AppLinksPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
+  PrintingPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PrintingPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -4,6 +4,8 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   app_links
+  file_selector_windows
+  printing
   url_launcher_windows
 )