From ae7290393869a7ced0b56f95cf08a2d52c76c214 Mon Sep 17 00:00:00 2001
From: Kyle-gi <hyrokai.oliver@gmail.com>
Date: Tue, 19 May 2026 13:44:15 +0200
Subject: [PATCH 1/2] Cambios realizados

---
 .idea/copilotDiffState.xml                    |  17 --
 .../iesquevedo/controller/GameController.java |   7 +
 .../ui/MatchingScreenController.java          | 159 ++++++++++++++++++
 src/main/resources/fxml/MatchingScreen.fxml   |  26 +++
 4 files changed, 192 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/es/iesquevedo/ui/MatchingScreenController.java
 create mode 100644 src/main/resources/fxml/MatchingScreen.fxml

diff --git a/.idea/copilotDiffState.xml b/.idea/copilotDiffState.xml
index b5d06bc..dc8be36 100644
--- a/.idea/copilotDiffState.xml
+++ b/.idea/copilotDiffState.xml
@@ -20,23 +20,6 @@
             </PendingDiffInfo>
           </value>
         </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Board.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Board.java" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.util.ArrayList;&#10;import java.util.HashSet;&#10;import java.util.LinkedList;&#10;import java.util.List;&#10;import java.util.Queue;&#10;import java.util.Set;&#10;&#10;/**&#10; * Representa el tablero de Inazuma Go (9x9 intersecciones).&#10; * Estado de cada celda: vacía (0), negra (1), blanca (2).&#10; */&#10;public class Board {&#10;    private static final int SIZE = 9;&#10;    private int[][] board; // 0 = empty, 1 = black, 2 = white&#10;&#10;    public Board() {&#10;        this.board = new int[SIZE][SIZE];&#10;    }&#10;&#10;    public Board(Board other) {&#10;        this.board = new int[SIZE][SIZE];&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                this.board[r][c] = other.board[r][c];&#10;            }&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Obtiene el tamaño del tablero.&#10;     */&#10;    public int getSize() {&#10;        return SIZE;&#10;    }&#10;&#10;    /**&#10;     * Obtiene el estado de una celda (0=vacía, 1=negra, 2=blanca).&#10;     */&#10;    public int getCell(int row, int col) {&#10;        if (!isValid(row, col)) return -1;&#10;        return board[row][col];&#10;    }&#10;&#10;    /**&#10;     * Coloca una piedra en el tablero.&#10;     */&#10;    public void placeStone(int row, int col, int color) {&#10;        if (isValid(row, col)) {&#10;            board[row][col] = color;&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Remueve una piedra del tablero.&#10;     */&#10;    public void removeStone(int row, int col) {&#10;        if (isValid(row, col)) {&#10;            board[row][col] = 0;&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Verifica si una coordenada es válida.&#10;     */&#10;    public boolean isValid(int row, int col) {&#10;        return row &gt;= 0 &amp;&amp; row &lt; SIZE &amp;&amp; col &gt;= 0 &amp;&amp; col &lt; SIZE;&#10;    }&#10;&#10;    /**&#10;     * Verifica si una celda está vacía.&#10;     */&#10;    public boolean isEmpty(int row, int col) {&#10;        return isValid(row, col) &amp;&amp; board[row][col] == 0;&#10;    }&#10;&#10;    /**&#10;     * Obtiene los vecinos ortogonales de una celda.&#10;     */&#10;    public List&lt;int[]&gt; getNeighbors(int row, int col) {&#10;        List&lt;int[]&gt; neighbors = new ArrayList&lt;&gt;();&#10;        int[][] directions = {{-1, 0}, {1, 0}, {0, -1}, {0, 1}};&#10;        for (int[] dir : directions) {&#10;            int nr = row + dir[0];&#10;            int nc = col + dir[1];&#10;            if (isValid(nr, nc)) {&#10;                neighbors.add(new int[]{nr, nc});&#10;            }&#10;        }&#10;        return neighbors;&#10;    }&#10;&#10;    /**&#10;     * Calcula las libertades (grados de libertad) de un grupo.&#10;     * Retorna el número de intersecciones vacías adyacentes al grupo.&#10;     */&#10;    public int countLibertiesForGroup(int row, int col) {&#10;        int color = board[row][col];&#10;        if (color == 0) return 0;&#10;&#10;        Set&lt;String&gt; visited = new HashSet&lt;&gt;();&#10;        Set&lt;String&gt; liberties = new HashSet&lt;&gt;();&#10;        Queue&lt;int[]&gt; queue = new LinkedList&lt;&gt;();&#10;        queue.add(new int[]{row, col});&#10;        visited.add(row + &quot;,&quot; + col);&#10;&#10;        while (!queue.isEmpty()) {&#10;            int[] current = queue.poll();&#10;            int r = current[0];&#10;            int c = current[1];&#10;&#10;            for (int[] neighbor : getNeighbors(r, c)) {&#10;                int nr = neighbor[0];&#10;                int nc = neighbor[1];&#10;                String key = nr + &quot;,&quot; + nc;&#10;&#10;                if (isEmpty(nr, nc)) {&#10;                    liberties.add(key);&#10;                } else if (board[nr][nc] == color &amp;&amp; !visited.contains(key)) {&#10;                    visited.add(key);&#10;                    queue.add(new int[]{nr, nc});&#10;                }&#10;            }&#10;        }&#10;&#10;        return liberties.size();&#10;    }&#10;&#10;    /**&#10;     * Obtiene todas las piedras de un grupo.&#10;     */&#10;    public Set&lt;String&gt; getGroup(int row, int col) {&#10;        int color = board[row][col];&#10;        if (color == 0) return new HashSet&lt;&gt;();&#10;&#10;        Set&lt;String&gt; group = new HashSet&lt;&gt;();&#10;        Queue&lt;int[]&gt; queue = new LinkedList&lt;&gt;();&#10;        queue.add(new int[]{row, col});&#10;        group.add(row + &quot;,&quot; + col);&#10;&#10;        while (!queue.isEmpty()) {&#10;            int[] current = queue.poll();&#10;            int r = current[0];&#10;            int c = current[1];&#10;&#10;            for (int[] neighbor : getNeighbors(r, c)) {&#10;                int nr = neighbor[0];&#10;                int nc = neighbor[1];&#10;                String key = nr + &quot;,&quot; + nc;&#10;&#10;                if (board[nr][nc] == color &amp;&amp; !group.contains(key)) {&#10;                    group.add(key);&#10;                    queue.add(new int[]{nr, nc});&#10;                }&#10;            }&#10;        }&#10;&#10;        return group;&#10;    }&#10;&#10;    /**&#10;     * Detecta y captura grupos sin libertades.&#10;     * Retorna el número de piedras capturadas.&#10;     */&#10;    public int captureGroupsWithoutLiberties() {&#10;        int captured = 0;&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                if (board[r][c] != 0 &amp;&amp; countLibertiesForGroup(r, c) == 0) {&#10;                    Set&lt;String&gt; group = getGroup(r, c);&#10;                    for (String stone : group) {&#10;                        String[] parts = stone.split(&quot;,&quot;);&#10;                        int sr = Integer.parseInt(parts[0]);&#10;                        int sc = Integer.parseInt(parts[1]);&#10;                        removeStone(sr, sc);&#10;                        captured++;&#10;                    }&#10;                }&#10;            }&#10;        }&#10;        return captured;&#10;    }&#10;&#10;    /**&#10;     * Crea una copia del tablero.&#10;     */&#10;    public Board clone() {&#10;        return new Board(this);&#10;    }&#10;&#10;    /**&#10;     * Compara dos tableros.&#10;     */&#10;    @Override&#10;    public boolean equals(Object obj) {&#10;        if (!(obj instanceof Board)) return false;&#10;        Board other = (Board) obj;&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                if (this.board[r][c] != other.board[r][c]) return false;&#10;            }&#10;        }&#10;        return true;&#10;    }&#10;&#10;    /**&#10;     * Representación en texto del tablero.&#10;     */&#10;    @Override&#10;    public String toString() {&#10;        StringBuilder sb = new StringBuilder();&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                char ch = board[r][c] == 0 ? '.' : (board[r][c] == 1 ? 'X' : 'O');&#10;                sb.append(ch).append(&quot; &quot;);&#10;            }&#10;            sb.append(&quot;\n&quot;);&#10;        }&#10;        return sb.toString();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Game.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Game.java" />
-              <option name="originalContent" value="package es.iesquevedo.model;&#10;&#10;import java.time.LocalDateTime;&#10;import java.util.ArrayList;&#10;import java.util.List;&#10;import java.util.UUID;&#10;&#10;public class Game {&#10;    private String id;&#10;    private String name;&#10;    private List&lt;Player&gt; players;&#10;    private GameState state;&#10;    private int currentPlayerIndex;&#10;    private int turnCount;&#10;    private String winnerPlayerId;&#10;    private LocalDateTime createdAt;&#10;    private LocalDateTime finishedAt;&#10;&#10;    public Game(String name, Player player1) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.name = name;&#10;        this.players = new ArrayList&lt;&gt;();&#10;        this.players.add(player1);&#10;        this.state = GameState.WAITING;&#10;        this.currentPlayerIndex = 0;&#10;        this.turnCount = 0;&#10;        this.winnerPlayerId = null;&#10;        this.createdAt = LocalDateTime.now();&#10;        this.finishedAt = null;&#10;    }&#10;&#10;    public String getId() { return id; }&#10;    public String getName() { return name; }&#10;    public List&lt;Player&gt; getPlayers() { return players; }&#10;    public GameState getState() { return state; }&#10;    public void setState(GameState state) { this.state = state; }&#10;    public int getCurrentPlayerIndex() { return currentPlayerIndex; }&#10;    public Player getCurrentPlayer() {&#10;        return players.isEmpty() ? null : players.get(currentPlayerIndex);&#10;    }&#10;    public int getTurnCount() { return turnCount; }&#10;    public void incrementTurnCount() { this.turnCount++; }&#10;    public String getWinnerPlayerId() { return winnerPlayerId; }&#10;    public void setWinnerPlayerId(String playerId) { this.winnerPlayerId = playerId; }&#10;    public LocalDateTime getCreatedAt() { return createdAt; }&#10;    public LocalDateTime getFinishedAt() { return finishedAt; }&#10;&#10;    public void addPlayer(Player player) {&#10;        if (state != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;No se pueden añadir jugadores&quot;);&#10;        }&#10;        if (players.size() &gt;= 2) {&#10;            throw new IllegalStateException(&quot;Ya hay 2 jugadores&quot;);&#10;        }&#10;        players.add(player);&#10;    }&#10;&#10;    public void start() {&#10;        if (players.size() &lt; 2) {&#10;            throw new IllegalStateException(&quot;Se necesitan 2 jugadores&quot;);&#10;        }&#10;        this.state = GameState.IN_PROGRESS;&#10;        this.currentPlayerIndex = 0;&#10;    }&#10;&#10;    public void nextTurn() {&#10;        if (state != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;No se puede avanzar turno&quot;);&#10;        }&#10;        currentPlayerIndex = (currentPlayerIndex + 1) % players.size();&#10;        incrementTurnCount();&#10;    }&#10;&#10;    public void finish(String winnerPlayerId) {&#10;        this.state = GameState.FINISHED;&#10;        this.winnerPlayerId = winnerPlayerId;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;&#10;    public void abandon() {&#10;        this.state = GameState.ABANDONED;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;}&#10;" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.time.LocalDateTime;&#10;import java.util.ArrayList;&#10;import java.util.List;&#10;import java.util.UUID;&#10;&#10;public class Game {&#10;    private String id;&#10;    private String name;&#10;    private List&lt;Player&gt; players;&#10;    private GameState state;&#10;    private int currentPlayerIndex;&#10;    private int turnCount;&#10;    private String winnerPlayerId;&#10;    private LocalDateTime createdAt;&#10;    private LocalDateTime finishedAt;&#10;    private Board board;&#10;    private List&lt;Move&gt; moves;&#10;    private int consecutivePasses;&#10;    private Board lastBoardState;&#10;&#10;    public Game(String name, Player player1) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.name = name;&#10;        this.players = new ArrayList&lt;&gt;();&#10;        this.players.add(player1);&#10;        this.state = GameState.WAITING;&#10;        this.currentPlayerIndex = 0;&#10;        this.turnCount = 0;&#10;        this.winnerPlayerId = null;&#10;        this.createdAt = LocalDateTime.now();&#10;        this.finishedAt = null;&#10;        this.board = new Board();&#10;        this.moves = new ArrayList&lt;&gt;();&#10;        this.consecutivePasses = 0;&#10;        this.lastBoardState = null;&#10;    }&#10;&#10;    public String getId() { return id; }&#10;    public String getName() { return name; }&#10;    public List&lt;Player&gt; getPlayers() { return players; }&#10;    public GameState getState() { return state; }&#10;    public void setState(GameState state) { this.state = state; }&#10;    public int getCurrentPlayerIndex() { return currentPlayerIndex; }&#10;    public Player getCurrentPlayer() {&#10;        return players.isEmpty() ? null : players.get(currentPlayerIndex);&#10;    }&#10;    public int getTurnCount() { return turnCount; }&#10;    public void incrementTurnCount() { this.turnCount++; }&#10;    public String getWinnerPlayerId() { return winnerPlayerId; }&#10;    public void setWinnerPlayerId(String playerId) { this.winnerPlayerId = playerId; }&#10;    public LocalDateTime getCreatedAt() { return createdAt; }&#10;    public LocalDateTime getFinishedAt() { return finishedAt; }&#10;    public Board getBoard() { return board; }&#10;    public List&lt;Move&gt; getMoves() { return moves; }&#10;    public int getConsecutivePasses() { return consecutivePasses; }&#10;    public void incrementConsecutivePasses() { this.consecutivePasses++; }&#10;    public void resetConsecutivePasses() { this.consecutivePasses = 0; }&#10;    public Board getLastBoardState() { return lastBoardState; }&#10;    public void setLastBoardState(Board boardState) { this.lastBoardState = boardState; }&#10;&#10;    public void addPlayer(Player player) {&#10;        if (state != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;No se pueden añadir jugadores&quot;);&#10;        }&#10;        if (players.size() &gt;= 2) {&#10;            throw new IllegalStateException(&quot;Ya hay 2 jugadores&quot;);&#10;        }&#10;        players.add(player);&#10;    }&#10;&#10;    public void start() {&#10;        if (players.size() &lt; 2) {&#10;            throw new IllegalStateException(&quot;Se necesitan 2 jugadores&quot;);&#10;        }&#10;        this.state = GameState.IN_PROGRESS;&#10;        this.currentPlayerIndex = 0;&#10;        this.board = new Board(); // Reinicializar tablero limpio&#10;        this.moves = new ArrayList&lt;&gt;();&#10;        this.consecutivePasses = 0;&#10;    }&#10;&#10;    public void nextTurn() {&#10;        if (state != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;No se puede avanzar turno&quot;);&#10;        }&#10;        currentPlayerIndex = (currentPlayerIndex + 1) % players.size();&#10;        incrementTurnCount();&#10;    }&#10;&#10;    public void finish(String winnerPlayerId) {&#10;        this.state = GameState.FINISHED;&#10;        this.winnerPlayerId = winnerPlayerId;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;&#10;    public void abandon() {&#10;        this.state = GameState.ABANDONED;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
         <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Move.java">
           <value>
             <PendingDiffInfo>
diff --git a/src/main/java/es/iesquevedo/controller/GameController.java b/src/main/java/es/iesquevedo/controller/GameController.java
index d403057..5fbba8f 100644
--- a/src/main/java/es/iesquevedo/controller/GameController.java
+++ b/src/main/java/es/iesquevedo/controller/GameController.java
@@ -280,6 +280,13 @@ private void onBoardClick(MouseEvent event) {
         }
     }
 
+    public void initGame(String gameId, String playerName) {
+        this.player1Name = playerName + " (Negro)";
+        this.player2Name = "Oponente (Blanco)";
+        updatePlayerInfo();
+        LOGGER.log(Level.INFO, "Partida iniciada - GameID: " + gameId + " - Jugador: " + playerName);
+    }
+
     private boolean isValidPosition(int row, int col) {
         return row >= 0 && row < BOARD_SIZE && col >= 0 && col < BOARD_SIZE;
     }
diff --git a/src/main/java/es/iesquevedo/ui/MatchingScreenController.java b/src/main/java/es/iesquevedo/ui/MatchingScreenController.java
new file mode 100644
index 0000000..9bdb5bf
--- /dev/null
+++ b/src/main/java/es/iesquevedo/ui/MatchingScreenController.java
@@ -0,0 +1,159 @@
+package es.iesquevedo.ui;
+
+import es.iesquevedo.controller.GameController;
+import es.iesquevedo.model.Game;
+import es.iesquevedo.model.Player;
+import es.iesquevedo.service.GameService;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class MatchingScreenController {
+
+    private static final Logger LOGGER = Logger.getLogger(MatchingScreenController.class.getName());
+
+    @FXML
+    private Label statusLabel;
+
+    @FXML
+    private Label timeLabel;
+
+    @FXML
+    private Button cancelButton;
+
+    private GameService gameService;
+    private Player currentPlayer;
+    private Timer timer;
+    private int elapsedSeconds = 0;
+    private CompletableFuture<Game> currentSearch;
+    private volatile boolean searching = true;
+
+    public void setGameService(GameService gameService) {
+        this.gameService = gameService;
+    }
+
+    public void startMatching(Player player) {
+        this.currentPlayer = player;
+        startTimer();
+        startSearch();
+    }
+
+    private void startTimer() {
+        timer = new Timer(true);
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                Platform.runLater(() -> {
+                    elapsedSeconds++;
+                    timeLabel.setText("Tiempo de espera: " + elapsedSeconds + "s");
+                });
+            }
+        }, 1000, 1000);
+    }
+
+    private void startSearch() {
+        statusLabel.setText("Buscando jugador disponible...");
+
+        currentSearch = CompletableFuture.supplyAsync(() -> {
+            try {
+                int waitTime = 3000 + (int)(Math.random() * 5000);
+                Thread.sleep(waitTime);
+                if (!searching) return null;
+
+                String gameName = "Partida_" + System.currentTimeMillis();
+                return gameService.createGame(gameName, currentPlayer);
+            } catch (Exception e) {
+                LOGGER.log(Level.WARNING, "Search interrupted", e);
+                return null;
+            }
+        });
+
+        currentSearch.thenAccept(game -> {
+            if (game != null && searching) {
+                Platform.runLater(() -> {
+                    stopTimer();
+                    statusLabel.setText("¡Oponente encontrado!");
+                    navigateToGame(game.getId());
+                });
+            }
+        }).exceptionally(ex -> {
+            Platform.runLater(() -> {
+                if (searching) {
+                    statusLabel.setText("Error en la búsqueda. Intenta de nuevo.");
+                    cancelButton.setText("Volver");
+                }
+            });
+            return null;
+        });
+    }
+
+    private void navigateToGame(String gameId) {
+        try {
+            searching = false;
+            if (currentSearch != null) {
+                currentSearch.cancel(true);
+            }
+
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Game.fxml"));
+            Parent root = loader.load();
+
+            GameController gameController = loader.getController();
+            String playerName = currentPlayer != null ? currentPlayer.getName() : "Jugador";
+            gameController.initGame(gameId, playerName);
+
+            Stage stage = (Stage) cancelButton.getScene().getWindow();
+            stage.setScene(new Scene(root, 900, 700));
+            stage.setTitle("InazumaGo - Partida: " + gameId);
+            stage.show();
+
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Error loading game screen", e);
+            statusLabel.setText("Error al cargar la partida");
+        }
+    }
+
+    @FXML
+    private void onCancel() {
+        searching = false;
+        if (currentSearch != null) {
+            currentSearch.cancel(true);
+        }
+        stopTimer();
+        goBackToMainMenu();
+    }
+
+    private void goBackToMainMenu() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MainScreen.fxml"));
+            Parent root = loader.load();
+
+            // Just load the main screen - no additional setup needed
+            Stage stage = (Stage) cancelButton.getScene().getWindow();
+            stage.setScene(new Scene(root, 700, 500));
+            stage.setTitle("InazumaGo - Pantalla Principal");
+            stage.show();
+
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Error returning to main menu", e);
+        }
+    }
+
+    private void stopTimer() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/MatchingScreen.fxml b/src/main/resources/fxml/MatchingScreen.fxml
new file mode 100644
index 0000000..0b88457
--- /dev/null
+++ b/src/main/resources/fxml/MatchingScreen.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="es.iesquevedo.ui.MatchingScreenController"
+      spacing="20"
+      alignment="CENTER"
+      padding="20">
+
+    <Label text="Buscando oponente..." style="-fx-font-size: 24px; -fx-font-weight: bold;"/>
+
+    <ProgressIndicator/>
+
+    <Label fx:id="statusLabel" text="Buscando jugador disponible..." style="-fx-font-size: 14px;"/>
+
+    <Label fx:id="timeLabel" text="Tiempo de espera: 0s" style="-fx-font-size: 12px; -fx-text-fill: gray;"/>
+
+    <HBox spacing="20" alignment="CENTER">
+        <Button fx:id="cancelButton" text="Cancelar" onAction="#onCancel" style="-fx-background-color: #ff4444; -fx-text-fill: white;"/>
+    </HBox>
+
+</VBox>
\ No newline at end of file

From 229983d7f9fb8bef49d49f8d5d39a124948d9c7c Mon Sep 17 00:00:00 2001
From: Kyle-gi <hyrokai.oliver@gmail.com>
Date: Tue, 19 May 2026 13:44:15 +0200
Subject: [PATCH 2/2] Cambios realizados

---
 .idea/copilotDiffState.xml                    |  17 --
 pom.xml                                       |   8 +
 .../iesquevedo/controller/GameController.java |   7 +
 .../ui/MatchingScreenController.java          | 159 ++++++++++++++++++
 src/main/resources/fxml/MatchingScreen.fxml   |  26 +++
 5 files changed, 200 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/es/iesquevedo/ui/MatchingScreenController.java
 create mode 100644 src/main/resources/fxml/MatchingScreen.fxml

diff --git a/.idea/copilotDiffState.xml b/.idea/copilotDiffState.xml
index b5d06bc..dc8be36 100644
--- a/.idea/copilotDiffState.xml
+++ b/.idea/copilotDiffState.xml
@@ -20,23 +20,6 @@
             </PendingDiffInfo>
           </value>
         </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Board.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Board.java" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.util.ArrayList;&#10;import java.util.HashSet;&#10;import java.util.LinkedList;&#10;import java.util.List;&#10;import java.util.Queue;&#10;import java.util.Set;&#10;&#10;/**&#10; * Representa el tablero de Inazuma Go (9x9 intersecciones).&#10; * Estado de cada celda: vacía (0), negra (1), blanca (2).&#10; */&#10;public class Board {&#10;    private static final int SIZE = 9;&#10;    private int[][] board; // 0 = empty, 1 = black, 2 = white&#10;&#10;    public Board() {&#10;        this.board = new int[SIZE][SIZE];&#10;    }&#10;&#10;    public Board(Board other) {&#10;        this.board = new int[SIZE][SIZE];&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                this.board[r][c] = other.board[r][c];&#10;            }&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Obtiene el tamaño del tablero.&#10;     */&#10;    public int getSize() {&#10;        return SIZE;&#10;    }&#10;&#10;    /**&#10;     * Obtiene el estado de una celda (0=vacía, 1=negra, 2=blanca).&#10;     */&#10;    public int getCell(int row, int col) {&#10;        if (!isValid(row, col)) return -1;&#10;        return board[row][col];&#10;    }&#10;&#10;    /**&#10;     * Coloca una piedra en el tablero.&#10;     */&#10;    public void placeStone(int row, int col, int color) {&#10;        if (isValid(row, col)) {&#10;            board[row][col] = color;&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Remueve una piedra del tablero.&#10;     */&#10;    public void removeStone(int row, int col) {&#10;        if (isValid(row, col)) {&#10;            board[row][col] = 0;&#10;        }&#10;    }&#10;&#10;    /**&#10;     * Verifica si una coordenada es válida.&#10;     */&#10;    public boolean isValid(int row, int col) {&#10;        return row &gt;= 0 &amp;&amp; row &lt; SIZE &amp;&amp; col &gt;= 0 &amp;&amp; col &lt; SIZE;&#10;    }&#10;&#10;    /**&#10;     * Verifica si una celda está vacía.&#10;     */&#10;    public boolean isEmpty(int row, int col) {&#10;        return isValid(row, col) &amp;&amp; board[row][col] == 0;&#10;    }&#10;&#10;    /**&#10;     * Obtiene los vecinos ortogonales de una celda.&#10;     */&#10;    public List&lt;int[]&gt; getNeighbors(int row, int col) {&#10;        List&lt;int[]&gt; neighbors = new ArrayList&lt;&gt;();&#10;        int[][] directions = {{-1, 0}, {1, 0}, {0, -1}, {0, 1}};&#10;        for (int[] dir : directions) {&#10;            int nr = row + dir[0];&#10;            int nc = col + dir[1];&#10;            if (isValid(nr, nc)) {&#10;                neighbors.add(new int[]{nr, nc});&#10;            }&#10;        }&#10;        return neighbors;&#10;    }&#10;&#10;    /**&#10;     * Calcula las libertades (grados de libertad) de un grupo.&#10;     * Retorna el número de intersecciones vacías adyacentes al grupo.&#10;     */&#10;    public int countLibertiesForGroup(int row, int col) {&#10;        int color = board[row][col];&#10;        if (color == 0) return 0;&#10;&#10;        Set&lt;String&gt; visited = new HashSet&lt;&gt;();&#10;        Set&lt;String&gt; liberties = new HashSet&lt;&gt;();&#10;        Queue&lt;int[]&gt; queue = new LinkedList&lt;&gt;();&#10;        queue.add(new int[]{row, col});&#10;        visited.add(row + &quot;,&quot; + col);&#10;&#10;        while (!queue.isEmpty()) {&#10;            int[] current = queue.poll();&#10;            int r = current[0];&#10;            int c = current[1];&#10;&#10;            for (int[] neighbor : getNeighbors(r, c)) {&#10;                int nr = neighbor[0];&#10;                int nc = neighbor[1];&#10;                String key = nr + &quot;,&quot; + nc;&#10;&#10;                if (isEmpty(nr, nc)) {&#10;                    liberties.add(key);&#10;                } else if (board[nr][nc] == color &amp;&amp; !visited.contains(key)) {&#10;                    visited.add(key);&#10;                    queue.add(new int[]{nr, nc});&#10;                }&#10;            }&#10;        }&#10;&#10;        return liberties.size();&#10;    }&#10;&#10;    /**&#10;     * Obtiene todas las piedras de un grupo.&#10;     */&#10;    public Set&lt;String&gt; getGroup(int row, int col) {&#10;        int color = board[row][col];&#10;        if (color == 0) return new HashSet&lt;&gt;();&#10;&#10;        Set&lt;String&gt; group = new HashSet&lt;&gt;();&#10;        Queue&lt;int[]&gt; queue = new LinkedList&lt;&gt;();&#10;        queue.add(new int[]{row, col});&#10;        group.add(row + &quot;,&quot; + col);&#10;&#10;        while (!queue.isEmpty()) {&#10;            int[] current = queue.poll();&#10;            int r = current[0];&#10;            int c = current[1];&#10;&#10;            for (int[] neighbor : getNeighbors(r, c)) {&#10;                int nr = neighbor[0];&#10;                int nc = neighbor[1];&#10;                String key = nr + &quot;,&quot; + nc;&#10;&#10;                if (board[nr][nc] == color &amp;&amp; !group.contains(key)) {&#10;                    group.add(key);&#10;                    queue.add(new int[]{nr, nc});&#10;                }&#10;            }&#10;        }&#10;&#10;        return group;&#10;    }&#10;&#10;    /**&#10;     * Detecta y captura grupos sin libertades.&#10;     * Retorna el número de piedras capturadas.&#10;     */&#10;    public int captureGroupsWithoutLiberties() {&#10;        int captured = 0;&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                if (board[r][c] != 0 &amp;&amp; countLibertiesForGroup(r, c) == 0) {&#10;                    Set&lt;String&gt; group = getGroup(r, c);&#10;                    for (String stone : group) {&#10;                        String[] parts = stone.split(&quot;,&quot;);&#10;                        int sr = Integer.parseInt(parts[0]);&#10;                        int sc = Integer.parseInt(parts[1]);&#10;                        removeStone(sr, sc);&#10;                        captured++;&#10;                    }&#10;                }&#10;            }&#10;        }&#10;        return captured;&#10;    }&#10;&#10;    /**&#10;     * Crea una copia del tablero.&#10;     */&#10;    public Board clone() {&#10;        return new Board(this);&#10;    }&#10;&#10;    /**&#10;     * Compara dos tableros.&#10;     */&#10;    @Override&#10;    public boolean equals(Object obj) {&#10;        if (!(obj instanceof Board)) return false;&#10;        Board other = (Board) obj;&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                if (this.board[r][c] != other.board[r][c]) return false;&#10;            }&#10;        }&#10;        return true;&#10;    }&#10;&#10;    /**&#10;     * Representación en texto del tablero.&#10;     */&#10;    @Override&#10;    public String toString() {&#10;        StringBuilder sb = new StringBuilder();&#10;        for (int r = 0; r &lt; SIZE; r++) {&#10;            for (int c = 0; c &lt; SIZE; c++) {&#10;                char ch = board[r][c] == 0 ? '.' : (board[r][c] == 1 ? 'X' : 'O');&#10;                sb.append(ch).append(&quot; &quot;);&#10;            }&#10;            sb.append(&quot;\n&quot;);&#10;        }&#10;        return sb.toString();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Game.java">
-          <value>
-            <PendingDiffInfo>
-              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Game.java" />
-              <option name="originalContent" value="package es.iesquevedo.model;&#10;&#10;import java.time.LocalDateTime;&#10;import java.util.ArrayList;&#10;import java.util.List;&#10;import java.util.UUID;&#10;&#10;public class Game {&#10;    private String id;&#10;    private String name;&#10;    private List&lt;Player&gt; players;&#10;    private GameState state;&#10;    private int currentPlayerIndex;&#10;    private int turnCount;&#10;    private String winnerPlayerId;&#10;    private LocalDateTime createdAt;&#10;    private LocalDateTime finishedAt;&#10;&#10;    public Game(String name, Player player1) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.name = name;&#10;        this.players = new ArrayList&lt;&gt;();&#10;        this.players.add(player1);&#10;        this.state = GameState.WAITING;&#10;        this.currentPlayerIndex = 0;&#10;        this.turnCount = 0;&#10;        this.winnerPlayerId = null;&#10;        this.createdAt = LocalDateTime.now();&#10;        this.finishedAt = null;&#10;    }&#10;&#10;    public String getId() { return id; }&#10;    public String getName() { return name; }&#10;    public List&lt;Player&gt; getPlayers() { return players; }&#10;    public GameState getState() { return state; }&#10;    public void setState(GameState state) { this.state = state; }&#10;    public int getCurrentPlayerIndex() { return currentPlayerIndex; }&#10;    public Player getCurrentPlayer() {&#10;        return players.isEmpty() ? null : players.get(currentPlayerIndex);&#10;    }&#10;    public int getTurnCount() { return turnCount; }&#10;    public void incrementTurnCount() { this.turnCount++; }&#10;    public String getWinnerPlayerId() { return winnerPlayerId; }&#10;    public void setWinnerPlayerId(String playerId) { this.winnerPlayerId = playerId; }&#10;    public LocalDateTime getCreatedAt() { return createdAt; }&#10;    public LocalDateTime getFinishedAt() { return finishedAt; }&#10;&#10;    public void addPlayer(Player player) {&#10;        if (state != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;No se pueden añadir jugadores&quot;);&#10;        }&#10;        if (players.size() &gt;= 2) {&#10;            throw new IllegalStateException(&quot;Ya hay 2 jugadores&quot;);&#10;        }&#10;        players.add(player);&#10;    }&#10;&#10;    public void start() {&#10;        if (players.size() &lt; 2) {&#10;            throw new IllegalStateException(&quot;Se necesitan 2 jugadores&quot;);&#10;        }&#10;        this.state = GameState.IN_PROGRESS;&#10;        this.currentPlayerIndex = 0;&#10;    }&#10;&#10;    public void nextTurn() {&#10;        if (state != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;No se puede avanzar turno&quot;);&#10;        }&#10;        currentPlayerIndex = (currentPlayerIndex + 1) % players.size();&#10;        incrementTurnCount();&#10;    }&#10;&#10;    public void finish(String winnerPlayerId) {&#10;        this.state = GameState.FINISHED;&#10;        this.winnerPlayerId = winnerPlayerId;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;&#10;    public void abandon() {&#10;        this.state = GameState.ABANDONED;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;}&#10;" />
-              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.time.LocalDateTime;&#10;import java.util.ArrayList;&#10;import java.util.List;&#10;import java.util.UUID;&#10;&#10;public class Game {&#10;    private String id;&#10;    private String name;&#10;    private List&lt;Player&gt; players;&#10;    private GameState state;&#10;    private int currentPlayerIndex;&#10;    private int turnCount;&#10;    private String winnerPlayerId;&#10;    private LocalDateTime createdAt;&#10;    private LocalDateTime finishedAt;&#10;    private Board board;&#10;    private List&lt;Move&gt; moves;&#10;    private int consecutivePasses;&#10;    private Board lastBoardState;&#10;&#10;    public Game(String name, Player player1) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.name = name;&#10;        this.players = new ArrayList&lt;&gt;();&#10;        this.players.add(player1);&#10;        this.state = GameState.WAITING;&#10;        this.currentPlayerIndex = 0;&#10;        this.turnCount = 0;&#10;        this.winnerPlayerId = null;&#10;        this.createdAt = LocalDateTime.now();&#10;        this.finishedAt = null;&#10;        this.board = new Board();&#10;        this.moves = new ArrayList&lt;&gt;();&#10;        this.consecutivePasses = 0;&#10;        this.lastBoardState = null;&#10;    }&#10;&#10;    public String getId() { return id; }&#10;    public String getName() { return name; }&#10;    public List&lt;Player&gt; getPlayers() { return players; }&#10;    public GameState getState() { return state; }&#10;    public void setState(GameState state) { this.state = state; }&#10;    public int getCurrentPlayerIndex() { return currentPlayerIndex; }&#10;    public Player getCurrentPlayer() {&#10;        return players.isEmpty() ? null : players.get(currentPlayerIndex);&#10;    }&#10;    public int getTurnCount() { return turnCount; }&#10;    public void incrementTurnCount() { this.turnCount++; }&#10;    public String getWinnerPlayerId() { return winnerPlayerId; }&#10;    public void setWinnerPlayerId(String playerId) { this.winnerPlayerId = playerId; }&#10;    public LocalDateTime getCreatedAt() { return createdAt; }&#10;    public LocalDateTime getFinishedAt() { return finishedAt; }&#10;    public Board getBoard() { return board; }&#10;    public List&lt;Move&gt; getMoves() { return moves; }&#10;    public int getConsecutivePasses() { return consecutivePasses; }&#10;    public void incrementConsecutivePasses() { this.consecutivePasses++; }&#10;    public void resetConsecutivePasses() { this.consecutivePasses = 0; }&#10;    public Board getLastBoardState() { return lastBoardState; }&#10;    public void setLastBoardState(Board boardState) { this.lastBoardState = boardState; }&#10;&#10;    public void addPlayer(Player player) {&#10;        if (state != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;No se pueden añadir jugadores&quot;);&#10;        }&#10;        if (players.size() &gt;= 2) {&#10;            throw new IllegalStateException(&quot;Ya hay 2 jugadores&quot;);&#10;        }&#10;        players.add(player);&#10;    }&#10;&#10;    public void start() {&#10;        if (players.size() &lt; 2) {&#10;            throw new IllegalStateException(&quot;Se necesitan 2 jugadores&quot;);&#10;        }&#10;        this.state = GameState.IN_PROGRESS;&#10;        this.currentPlayerIndex = 0;&#10;        this.board = new Board(); // Reinicializar tablero limpio&#10;        this.moves = new ArrayList&lt;&gt;();&#10;        this.consecutivePasses = 0;&#10;    }&#10;&#10;    public void nextTurn() {&#10;        if (state != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;No se puede avanzar turno&quot;);&#10;        }&#10;        currentPlayerIndex = (currentPlayerIndex + 1) % players.size();&#10;        incrementTurnCount();&#10;    }&#10;&#10;    public void finish(String winnerPlayerId) {&#10;        this.state = GameState.FINISHED;&#10;        this.winnerPlayerId = winnerPlayerId;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;&#10;    public void abandon() {&#10;        this.state = GameState.ABANDONED;&#10;        this.finishedAt = LocalDateTime.now();&#10;    }&#10;}&#10;" />
-            </PendingDiffInfo>
-          </value>
-        </entry>
         <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Move.java">
           <value>
             <PendingDiffInfo>
diff --git a/pom.xml b/pom.xml
index f587d8d..5c1252d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <configuration>
+                    <mainClass>es.iesquevedo.MainGUI</mainClass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/src/main/java/es/iesquevedo/controller/GameController.java b/src/main/java/es/iesquevedo/controller/GameController.java
index d403057..5fbba8f 100644
--- a/src/main/java/es/iesquevedo/controller/GameController.java
+++ b/src/main/java/es/iesquevedo/controller/GameController.java
@@ -280,6 +280,13 @@ private void onBoardClick(MouseEvent event) {
         }
     }
 
+    public void initGame(String gameId, String playerName) {
+        this.player1Name = playerName + " (Negro)";
+        this.player2Name = "Oponente (Blanco)";
+        updatePlayerInfo();
+        LOGGER.log(Level.INFO, "Partida iniciada - GameID: " + gameId + " - Jugador: " + playerName);
+    }
+
     private boolean isValidPosition(int row, int col) {
         return row >= 0 && row < BOARD_SIZE && col >= 0 && col < BOARD_SIZE;
     }
diff --git a/src/main/java/es/iesquevedo/ui/MatchingScreenController.java b/src/main/java/es/iesquevedo/ui/MatchingScreenController.java
new file mode 100644
index 0000000..9bdb5bf
--- /dev/null
+++ b/src/main/java/es/iesquevedo/ui/MatchingScreenController.java
@@ -0,0 +1,159 @@
+package es.iesquevedo.ui;
+
+import es.iesquevedo.controller.GameController;
+import es.iesquevedo.model.Game;
+import es.iesquevedo.model.Player;
+import es.iesquevedo.service.GameService;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class MatchingScreenController {
+
+    private static final Logger LOGGER = Logger.getLogger(MatchingScreenController.class.getName());
+
+    @FXML
+    private Label statusLabel;
+
+    @FXML
+    private Label timeLabel;
+
+    @FXML
+    private Button cancelButton;
+
+    private GameService gameService;
+    private Player currentPlayer;
+    private Timer timer;
+    private int elapsedSeconds = 0;
+    private CompletableFuture<Game> currentSearch;
+    private volatile boolean searching = true;
+
+    public void setGameService(GameService gameService) {
+        this.gameService = gameService;
+    }
+
+    public void startMatching(Player player) {
+        this.currentPlayer = player;
+        startTimer();
+        startSearch();
+    }
+
+    private void startTimer() {
+        timer = new Timer(true);
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                Platform.runLater(() -> {
+                    elapsedSeconds++;
+                    timeLabel.setText("Tiempo de espera: " + elapsedSeconds + "s");
+                });
+            }
+        }, 1000, 1000);
+    }
+
+    private void startSearch() {
+        statusLabel.setText("Buscando jugador disponible...");
+
+        currentSearch = CompletableFuture.supplyAsync(() -> {
+            try {
+                int waitTime = 3000 + (int)(Math.random() * 5000);
+                Thread.sleep(waitTime);
+                if (!searching) return null;
+
+                String gameName = "Partida_" + System.currentTimeMillis();
+                return gameService.createGame(gameName, currentPlayer);
+            } catch (Exception e) {
+                LOGGER.log(Level.WARNING, "Search interrupted", e);
+                return null;
+            }
+        });
+
+        currentSearch.thenAccept(game -> {
+            if (game != null && searching) {
+                Platform.runLater(() -> {
+                    stopTimer();
+                    statusLabel.setText("¡Oponente encontrado!");
+                    navigateToGame(game.getId());
+                });
+            }
+        }).exceptionally(ex -> {
+            Platform.runLater(() -> {
+                if (searching) {
+                    statusLabel.setText("Error en la búsqueda. Intenta de nuevo.");
+                    cancelButton.setText("Volver");
+                }
+            });
+            return null;
+        });
+    }
+
+    private void navigateToGame(String gameId) {
+        try {
+            searching = false;
+            if (currentSearch != null) {
+                currentSearch.cancel(true);
+            }
+
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Game.fxml"));
+            Parent root = loader.load();
+
+            GameController gameController = loader.getController();
+            String playerName = currentPlayer != null ? currentPlayer.getName() : "Jugador";
+            gameController.initGame(gameId, playerName);
+
+            Stage stage = (Stage) cancelButton.getScene().getWindow();
+            stage.setScene(new Scene(root, 900, 700));
+            stage.setTitle("InazumaGo - Partida: " + gameId);
+            stage.show();
+
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Error loading game screen", e);
+            statusLabel.setText("Error al cargar la partida");
+        }
+    }
+
+    @FXML
+    private void onCancel() {
+        searching = false;
+        if (currentSearch != null) {
+            currentSearch.cancel(true);
+        }
+        stopTimer();
+        goBackToMainMenu();
+    }
+
+    private void goBackToMainMenu() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MainScreen.fxml"));
+            Parent root = loader.load();
+
+            // Just load the main screen - no additional setup needed
+            Stage stage = (Stage) cancelButton.getScene().getWindow();
+            stage.setScene(new Scene(root, 700, 500));
+            stage.setTitle("InazumaGo - Pantalla Principal");
+            stage.show();
+
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Error returning to main menu", e);
+        }
+    }
+
+    private void stopTimer() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/MatchingScreen.fxml b/src/main/resources/fxml/MatchingScreen.fxml
new file mode 100644
index 0000000..0b88457
--- /dev/null
+++ b/src/main/resources/fxml/MatchingScreen.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="es.iesquevedo.ui.MatchingScreenController"
+      spacing="20"
+      alignment="CENTER"
+      padding="20">
+
+    <Label text="Buscando oponente..." style="-fx-font-size: 24px; -fx-font-weight: bold;"/>
+
+    <ProgressIndicator/>
+
+    <Label fx:id="statusLabel" text="Buscando jugador disponible..." style="-fx-font-size: 14px;"/>
+
+    <Label fx:id="timeLabel" text="Tiempo de espera: 0s" style="-fx-font-size: 12px; -fx-text-fill: gray;"/>
+
+    <HBox spacing="20" alignment="CENTER">
+        <Button fx:id="cancelButton" text="Cancelar" onAction="#onCancel" style="-fx-background-color: #ff4444; -fx-text-fill: white;"/>
+    </HBox>
+
+</VBox>
\ No newline at end of file