Added find functionality

app/src/main/java/org/toop/app/App.java

@@ -1,13 +1,14 @@
 package org.toop.app;
 
 import javafx.application.Platform;
-import javafx.scene.paint.Color;
+import javafx.scene.input.KeyCode;
-import org.toop.Main;
+import javafx.scene.input.KeyEvent;
+
 import org.toop.app.widget.Primitive;
-import org.toop.app.widget.Widget;
 import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.complex.LoadingWidget;
 import org.toop.app.widget.display.SongDisplay;
+import org.toop.app.widget.popup.EscapePopup;
 import org.toop.app.widget.popup.QuitPopup;
 import org.toop.app.widget.view.MainView;
 import org.toop.framework.audio.*;
@@ -30,6 +31,8 @@ import javafx.scene.Scene;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
+import java.util.Objects;
+
 public final class App extends Application {
 	private static Stage stage;
 	private static Scene scene;
@@ -37,8 +40,6 @@ public final class App extends Application {
     private static int height;
     private static int width;
 
-	private static boolean isQuitting;
-
 	public static void run(String[] args) {
 		launch(args);
 	}
@@ -78,10 +79,10 @@ public final class App extends Application {
 		App.width = (int)stage.getWidth();
 		App.height = (int)stage.getHeight();
 
-		App.isQuitting = false;
-
 		AppSettings.applySettings();
 
+		setKeybinds(root);
+
         LoadingWidget loading = new LoadingWidget(Primitive.text(
                 "Loading...", false), 0, 0, Integer.MAX_VALUE, false, false // Just set a high default
         );
@@ -130,6 +131,27 @@ public final class App extends Application {
 
 	}
 
+	private void setKeybinds(StackPane root) {
+		root.addEventHandler(KeyEvent.KEY_PRESSED,event -> {
+			if (event.getCode() == KeyCode.ESCAPE) {
+				escapePopup();
+			}
+		});
+	}
+
+	public void escapePopup() {
+		if (!Objects.requireNonNull(
+				WidgetContainer.find(widget -> widget instanceof QuitPopup || widget instanceof EscapePopup)
+		).isEmpty()) {
+			WidgetContainer.removeFirst(QuitPopup.class);
+			WidgetContainer.removeFirst(EscapePopup.class);
+			return;
+		}
+
+		EscapePopup escPopup = new EscapePopup();
+		escPopup.show(Pos.CENTER);
+	}
+
 	private void setOnLoadingSuccess(LoadingWidget loading) {
 		loading.setOnSuccess(() -> {
 			initSystems();
@@ -140,7 +162,12 @@ public final class App extends Application {
 			WidgetContainer.add(Pos.BOTTOM_RIGHT, new SongDisplay());
 			stage.setOnCloseRequest(event -> {
 				event.consume();
-				startQuit();
+
+				if (WidgetContainer.getAllWidgets().stream().anyMatch(e -> e instanceof QuitPopup)) return;
+
+				QuitPopup a = new QuitPopup();
+				a.show(Pos.CENTER);
+
 			});
 		});
 	}
@@ -177,19 +204,6 @@ public final class App extends Application {
         }
     }
 
-	public static void startQuit() {
-		if (isQuitting) {
-			return;
-		}
-
-		WidgetContainer.add(Pos.CENTER, new QuitPopup());
-		isQuitting = true;
-	}
-
-	public static void stopQuit() {
-		isQuitting = false;
-	}
-
 	public static void quit() {
 		stage.close();
 		System.exit(0); // TODO: This is like dropping a nuke

app/src/main/java/org/toop/app/Server.java

@@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class Server {
-    // TODO: Keep track of listeners. Remove them on Server connection close so reference is deleted.
 	private String user = "";
 	private long clientId = -1;
 
@@ -48,7 +47,7 @@ public final class Server {
 
 	private ScheduledExecutorService scheduler;
 
-    private EventFlow eventFlow = new EventFlow();
+	private EventFlow connectFlow;
 
 	public static GameInformation.Type gameToType(String game) {
 		if (game.equalsIgnoreCase("tic-tac-toe")) {
@@ -98,9 +97,8 @@ public final class Server {
 			);
 
         loading.setOnFailure(() -> {
-            WidgetContainer.getCurrentView().transitionPrevious();
+            if (WidgetContainer.getCurrentView() == loading) WidgetContainer.getCurrentView().transitionPrevious();
-            a.unsubscribe("connecting");
+			a.unsubscribeAll();
-			a.unsubscribe("startclient");
             WidgetContainer.add(
                     Pos.CENTER,
                     new ErrorPopup(AppContext.getString("connecting-failed") + " " + ip + ":" + port)
@@ -113,7 +111,8 @@ public final class Server {
 				return;
 			}
 
-			WidgetContainer.getCurrentView().transitionPrevious();
+			primary = new ServerView(user, this::sendChallenge);
+			WidgetContainer.getCurrentView().transitionNextCustom(primary, "disconnect", this::disconnect);
 
 			a.unsubscribe("connecting");
 			a.unsubscribe("startclient");
@@ -123,11 +122,11 @@ public final class Server {
 
 			new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, user)).postEvent();
 
-			primary = new ServerView(user, this::sendChallenge, this::disconnect);
-			WidgetContainer.getCurrentView().transitionNext(primary);
-
 			startPopulateScheduler();
 			populateGameList();
+
+			primary.removeViewFromPreviousChain(loading);
+
 		}, false, "startclient")
 				.listen(
                         NetworkEvents.ConnectTry.class,
@@ -147,20 +146,24 @@ public final class Server {
                 )
 				.postEvent();
 
-		eventFlow.listen(NetworkEvents.ChallengeResponse.class, this::handleReceivedChallenge, false)
+		a.listen(NetworkEvents.ChallengeResponse.class, this::handleReceivedChallenge, false, "challenge")
-                .listen(NetworkEvents.GameMatchResponse.class, this::handleMatchResponse, false)
+                .listen(NetworkEvents.GameMatchResponse.class, this::handleMatchResponse, false, "match-response")
-                .listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false)
+                .listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false, "game-result")
-                .listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false)
+                .listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false, "game-move")
-                .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false);
+                .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false, "your-turn");
+
+		connectFlow = a;
 	}
 
 	private void sendChallenge(String opponent) {
 		if (!isPolling) return;
 
-		new SendChallengePopup(this, opponent, (playerInformation, gameType) -> {
+		var a = new SendChallengePopup(this, opponent, (playerInformation, gameType) -> {
 			new EventFlow().addPostEvent(new NetworkEvents.SendChallenge(clientId, opponent, gameType)).postEvent();
             isSingleGame.set(true);
 		});
+
+		a.show(Pos.CENTER);
 	}
 
     private void handleMatchResponse(NetworkEvents.GameMatchResponse response) {
@@ -200,7 +203,7 @@ public final class Server {
 
             switch (type){
                 case TICTACTOE ->{
-                    players[myTurn] = new ArtificialPlayer<>(new TicTacToeAIR(), user);
+                    players[myTurn] = new ArtificialPlayer<>(new TicTacToeAIR(9), user);
                 }
                 case REVERSI ->{
                     players[myTurn] = new ArtificialPlayer<>(new ReversiAIR(), user);
@@ -250,11 +253,13 @@ public final class Server {
 		String challengerName = extractQuotedValue(response.challengerName());
 		String gameType = extractQuotedValue(response.gameType());
 		final String finalGameType = gameType;
-		new ChallengePopup(challengerName, gameType, (playerInformation) -> {
+		var a = new ChallengePopup(challengerName, gameType, (playerInformation) -> {
 			final int challengeId = Integer.parseInt(response.challengeId().replaceAll("\\D", ""));
 			new EventFlow().addPostEvent(new NetworkEvents.SendAcceptChallenge(clientId, challengeId)).postEvent();
             isSingleGame.set(true);
 		});
+
+		a.show(Pos.CENTER);
 	}
 
 	private void sendMessage(String message) {
@@ -265,7 +270,9 @@ public final class Server {
 		new EventFlow().addPostEvent(new NetworkEvents.CloseClient(clientId)).postEvent();
 		isPolling = false;
 		stopScheduler();
-		primary.transitionPrevious();
+		connectFlow.unsubscribeAll();
+
+		WidgetContainer.getCurrentView().transitionPrevious();
 	}
 
 	private void forfeitGame() {

app/src/main/java/org/toop/app/gameControllers/ReversiController.java

@@ -99,7 +99,7 @@ public class ReversiController extends AbstractGameController<ReversiR> {
         });
 
         animation.play();
-        primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName());
+        primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName(), 'R');
     }
 
     @Override

app/src/main/java/org/toop/app/gameControllers/TicTacToeController.java

@@ -39,7 +39,7 @@ public class TicTacToeController extends AbstractGameController<TicTacToeR> {
     public void updateUI() {
         canvas.clearAll();
         // TODO: wtf is even this pile of poop temp fix
-        primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName());
+        primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName(), 'T');
         drawMoves();
     }
 

app/src/main/java/org/toop/app/widget/Widget.java

@@ -2,19 +2,27 @@ package org.toop.app.widget;
 
 import javafx.geometry.Pos;
 import javafx.scene.Node;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public interface Widget {
+    Logger logger = LogManager.getLogger(Widget.class);
+
 	Node getNode();
 
     default void show(Pos position) {
+        logger.debug("Showing Widget: {} at position: {}", this.getNode(), position.toString());
         WidgetContainer.add(position, this);
     }
 
     default void hide() {
+        logger.debug("Hiding Widget: {}", this.getNode());
         WidgetContainer.remove(this);
     }
 
     default void replace(Pos position, Widget widget) {
+        logger.debug("Replacing Widget: {}, with widget: {}, to position: {}",
+                this.getNode(), widget.getNode(), position.toString());
         widget.show(position);
 		hide();
     }

app/src/main/java/org/toop/app/widget/WidgetContainer.java

@@ -1,5 +1,7 @@
 package org.toop.app.widget;
 
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
 import org.toop.app.widget.complex.PopupWidget;
 import org.toop.app.widget.complex.ViewWidget;
 
@@ -7,6 +9,10 @@ import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.layout.StackPane;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+
 public final class WidgetContainer {
 	private static StackPane root;
 	private static ViewWidget currentView;
@@ -38,7 +44,7 @@ public final class WidgetContainer {
 				root.getChildren().addFirst(view.getNode());
 				currentView = view;
 			} else if (widget instanceof PopupWidget popup) {
-				currentView.add(Pos.CENTER, popup);
+				currentView.add(Pos.CENTER, (Widget) popup);
 			} else {
 				root.getChildren().add(widget.getNode());
 			}
@@ -52,13 +58,61 @@ public final class WidgetContainer {
 
 		Platform.runLater(() -> {
 			if (widget instanceof PopupWidget popup) {
-				currentView.remove(popup);
+				currentView.remove((Widget) popup);
 			} else {
 				root.getChildren().remove(widget.getNode());
 			}
 		});
 	}
 
+	public static void remove(Class<? extends Widget> widgetClass) {
+		if (root == null || currentView == null) return;
+
+		Platform.runLater(() ->
+				currentView.getChildren().removeIf(widget -> widget.getClass().isAssignableFrom(widgetClass))
+		);
+	}
+
+	public static void removeFirst(Class<? extends Widget> widgetClass) {
+		if (root == null || currentView == null) return;
+
+		Platform.runLater(() -> {
+			for (Node widget : currentView.getChildren()) {
+				if (widgetClass.isAssignableFrom(widget.getClass())) {
+					currentView.getChildren().remove(widget);
+					break;
+				}
+			}
+		});
+	}
+
+	public static List<Widget> find(Class<? extends Widget> widgetClass) {
+		if (root == null || currentView == null) return null;
+
+		return getAllWidgets()
+				.stream()
+				.filter(widget -> widget.getClass().isAssignableFrom(widgetClass))
+				.toList();
+    }
+
+	public static List<Widget> find(Predicate<Widget> predicate) {
+		if (root == null || currentView == null) return null;
+
+		return getAllWidgets()
+				.stream()
+				.filter(predicate)
+				.toList();
+	}
+
+	public static Widget findFirst(Class<? extends Widget> widgetClass) {
+		if (root == null || currentView == null) return null;
+
+		return getAllWidgets()
+				.stream()
+				.filter(widget -> widget.getClass().isAssignableFrom(widgetClass))
+				.findFirst().orElse(null);
+	}
+
 	public static ViewWidget getCurrentView() {
 		return currentView;
 	}
@@ -74,4 +128,22 @@ public final class WidgetContainer {
             currentView = view;
         });
     }
+
+	public static List<Widget> getAllWidgets() {
+		final List<Widget> children = new ArrayList<>();
+
+		for (var child : root.getChildren()) {
+			if (child instanceof Widget widget) {
+				children.add(widget);
+			}
+		}
+
+		for (var child : currentView.getNode().getChildren()) {
+			if (child instanceof Widget widget) {
+				children.add(widget);
+			}
+		}
+
+		return children;
+	}
 }

app/src/main/java/org/toop/app/widget/complex/LoadingWidget.java

@@ -2,6 +2,7 @@ package org.toop.app.widget.complex;
 
 import javafx.application.Platform;
 import javafx.geometry.Pos;
+import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.ProgressIndicator;
@@ -144,11 +145,11 @@ public class LoadingWidget extends ViewWidget implements Update { // TODO make o
 
         if (successTrigger.call()) {
             triggerSuccess();
-            this.remove(this);
+            this.remove((Node) this);
             return;
         } else if (failureTrigger.call()) {
             triggerFailure();
-            this.remove(this);
+            this.remove((Node) this);
             return;
         }
 

app/src/main/java/org/toop/app/widget/complex/PlayerInfoWidget.java

@@ -5,10 +5,13 @@ import org.toop.app.widget.Primitive;
 
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
 
 public class PlayerInfoWidget {
 	private final GameInformation.Player information;
 	private final VBox container;
+    private Text playerName;
+    private boolean hasSet;
 
 	public PlayerInfoWidget(GameInformation.Player information) {
 		this.information = information;
@@ -16,6 +19,7 @@ public class PlayerInfoWidget {
 			buildToggle().getNode(),
 			buildContent()
 		);
+        this.playerName = null;
 	}
 
 	private ToggleWidget buildToggle() {
@@ -43,11 +47,13 @@ public class PlayerInfoWidget {
 
             return nameInput.getNode();
         } else {
-			if (information.name == null || information.name.isEmpty()) {
+            var AIBox = Primitive.vbox(
-				information.name = "Pism Bot";
+                    makeAIButton(0, 1, "zwartepiet"),
-			}
+                    makeAIButton(2, 1, "sinterklaas"),
+                    makeAIButton(9, 1, "santa")
+            );
 
-			var playerName = Primitive.text("");
+            this.playerName = Primitive.text("");
             playerName.setText(information.name);
 
             var nameDisplay = Primitive.vbox(
@@ -55,29 +61,45 @@ public class PlayerInfoWidget {
                     playerName
             );
 
-			var difficultySlider = new LabeledSliderWidget(
+            if (!hasSet) {
-				"computer-difficulty",
+                doDefault();
-				0, 5,
+                hasSet = true;
-				information.computerDifficulty,
+            }
-				newVal -> information.computerDifficulty = newVal
-			);
-
-			var thinkTimeSlider = new LabeledSliderWidget(
-				"computer-think-time",
-				0, 5,
-				information.computerThinkTime,
-				newVal -> information.computerThinkTime = newVal
-			);
 
             return Primitive.vbox(
-				nameDisplay,
+                    AIBox,
-				difficultySlider.getNode(),
+                    nameDisplay
-				thinkTimeSlider.getNode()
             );
+
         }
     }
 
 	public Node getNode() {
 		return container;
 	}
+
+    private Node makeAIButton(int depth, int thinktime, String name) {
+        return Primitive.button(name, () -> {
+            information.name = getName(name);
+            information.computerDifficulty = depth;
+            information.computerThinkTime = thinktime;
+            this.playerName.setText(getName(name));
+        });
+    }
+
+    private String getName(String name) {
+        return switch (name) {
+            case "sinterklaas" -> "Sint. R. Klaas";
+            case "zwartepiet" -> "Zwarte Piet";
+            case "santa" -> "Santa";
+            default -> "Default";
+        };
+    }
+
+    private void doDefault() {
+        information.name = getName("zwartepiet");
+        information.computerDifficulty = 0;
+        information.computerThinkTime = 1;
+        this.playerName.setText(getName("zwartepiet"));
+    }
 }

app/src/main/java/org/toop/app/widget/complex/StackWidget.java

@@ -7,22 +7,19 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
 
-public abstract class StackWidget implements Widget {
+public abstract class StackWidget extends StackPane implements Widget {
-    private final StackPane container;
-
 	public StackWidget(String cssClass) {
-        container = new StackPane();
+		this.getStyleClass().add(cssClass);
-		container.getStyleClass().add(cssClass);
 	}
 
 	public void add(Pos position, Node node) {
 		Platform.runLater(() -> {
-			if (container.getChildren().contains(node)) {
+			if (this.getChildren().contains(node)) {
 				return;
 			}
 
 			StackPane.setAlignment(node, position);
-			container.getChildren().add(node);
+			this.getChildren().add(node);
 		});
 	}
 
@@ -32,7 +29,7 @@ public abstract class StackWidget implements Widget {
 
 	public void remove(Node node) {
 		Platform.runLater(() -> {
-			container.getChildren().remove(node);
+			this.getChildren().remove(node);
 		});
 	}
 
@@ -41,7 +38,7 @@ public abstract class StackWidget implements Widget {
 	}
 
 	@Override
-	public Node getNode() {
+	public StackPane getNode() {
-		return container;
+		return this;
 	}
 }

app/src/main/java/org/toop/app/widget/complex/ViewWidget.java

@@ -37,6 +37,19 @@ public abstract class ViewWidget extends StackWidget {
 		view.add(Pos.BOTTOM_LEFT, Primitive.vbox(backButton));
 	}
 
+	public void transitionNextCustom(ViewWidget view, String key, Runnable runnable) {
+		view.previous = this;
+
+		replace(Pos.CENTER, view);
+
+		var customButton = Primitive.button(key, () -> {
+			runnable.run();
+			view.transitionPrevious();
+		});
+
+		view.add(Pos.BOTTOM_LEFT, Primitive.vbox(customButton));
+	}
+
 	public void transitionPrevious() {
 		if (previous == null) {
 			return;
@@ -46,6 +59,38 @@ public abstract class ViewWidget extends StackWidget {
 		previous = null;
 	}
 
+	public void removeIndexFromPreviousChain(int index) {
+		ViewWidget view = this;
+
+		while (index > 0 && view != null) {
+			index--;
+
+			if (index == 0) {
+				if (view.previous != null && view.previous.previous != null) {
+					view.previous = view.previous.previous;
+				}
+			}
+
+			view = view.previous;
+		}
+	}
+
+	public void removeViewFromPreviousChain(ViewWidget view) {
+		ViewWidget prev = previous;
+		int index = 0;
+
+		while (prev != null) {
+			index++;
+
+			if (prev == view) {
+				removeIndexFromPreviousChain(index);
+				break;
+			}
+
+			prev = prev.previous;
+		}
+	}
+
 	public void reload(ViewWidget view) {
 		view.previous = previous;
 		replace(Pos.CENTER, view);

app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java

@@ -8,6 +8,7 @@ import org.toop.app.widget.complex.PopupWidget;
 import java.util.function.Consumer;
 
 import javafx.geometry.Pos;
+import org.toop.local.AppContext;
 
 public final class ChallengePopup extends PopupWidget {
 	private final GameInformation.Player playerInformation;
@@ -28,19 +29,22 @@ public final class ChallengePopup extends PopupWidget {
 	private void setupLayout() {
 		var challengeText = Primitive.text("you-were-challenged-by");
 
-		var challengerHeader = Primitive.header("");
+		var challengerHeader = Primitive.header(challenger, false);
-		challengerHeader.setText(challenger);
 
-		var gameText = Primitive.text("to-a-game-of");
+		var toAGameOfText = Primitive.text("to-a-game-of");
-		gameText.setText(gameText.getText() + " " + game);
+		var gameHeader = Primitive.header(game, false);
 
-		var acceptButton = Primitive.button("accept", () -> onAccept.accept(playerInformation));
+		var acceptButton = Primitive.button("accept", () -> {
+			onAccept.accept(playerInformation);
+			this.hide();
+		});
 		var denyButton = Primitive.button("deny", () -> hide());
 
 		var leftSection = Primitive.vbox(
 			challengeText,
 			challengerHeader,
-			gameText,
+			toAGameOfText,
+			gameHeader,
 			Primitive.separator(),
 			Primitive.hbox(
 				acceptButton,

app/src/main/java/org/toop/app/widget/popup/EscapePopup.java

@@ -0,0 +1,31 @@
+package org.toop.app.widget.popup;
+
+import javafx.geometry.Pos;
+import org.toop.app.App;
+import org.toop.app.widget.Primitive;
+import org.toop.app.widget.WidgetContainer;
+import org.toop.app.widget.complex.ConfirmWidget;
+import org.toop.app.widget.complex.PopupWidget;
+import org.toop.app.widget.view.OptionsView;
+
+public class EscapePopup extends PopupWidget {
+    public EscapePopup() {
+        var con = Primitive.button("Continue", this::hide, false); // TODO, localize
+
+        var qui = Primitive.button("quit", () -> {
+            hide();
+            WidgetContainer.add(Pos.CENTER, new QuitPopup());
+        });
+
+        if (!(WidgetContainer.getCurrentView().getClass().isAssignableFrom(OptionsView.class))) {
+            var opt = Primitive.button("options", () -> {
+                hide();
+                WidgetContainer.getCurrentView().transitionNext(new OptionsView());
+            });
+            add(Pos.CENTER, Primitive.vbox(con, opt, qui));
+        } else {
+            add(Pos.CENTER, Primitive.vbox(con, qui));
+        }
+
+    }
+}

app/src/main/java/org/toop/app/widget/popup/QuitPopup.java

@@ -15,14 +15,12 @@ public class QuitPopup extends PopupWidget {
 		});
 
 		confirmWidget.addButton("no", () -> {
-			App.stopQuit();
 			hide();
 		});
 
 		add(Pos.CENTER, confirmWidget);
 
 		setOnPop(() -> {
-			App.stopQuit();
 			hide();
 		});
 	}

app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java

@@ -34,7 +34,7 @@ public final class SendChallengePopup extends PopupWidget {
 		// --- Left side: challenge text and buttons ---
 		var challengeText = Primitive.text("challenge");
 
-		var opponentHeader = Primitive.header(opponent);
+		var opponentHeader = Primitive.header(opponent, false);
 
 		var gameText = Primitive.text("to-a-game-of");
 
@@ -61,7 +61,7 @@ public final class SendChallengePopup extends PopupWidget {
 
 		var sendButton = Primitive.button(
 			"send",
-			() -> onSend.accept(playerInformation, gameChoice.getValue())
+			() -> { onSend.accept(playerInformation, gameChoice.getValue()); this.hide(); }
 		);
 
 		var cancelButton = Primitive.button("cancel", () -> hide());

app/src/main/java/org/toop/app/widget/view/GameView.java

@@ -1,34 +1,44 @@
 package org.toop.app.widget.view;
 
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Circle;
+import javafx.scene.text.Font;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.popup.GameOverPopup;
-
 import java.util.function.Consumer;
-
 import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
 import javafx.scene.text.Text;
-import org.toop.app.widget.tutorial.BaseTutorialWidget;
 import org.toop.app.widget.tutorial.Connect4TutorialWidget;
 import org.toop.app.widget.tutorial.ReversiTutorialWidget;
 import org.toop.app.widget.tutorial.TicTacToeTutorialWidget;
+import org.toop.local.AppContext;
 
 public final class GameView extends ViewWidget {
-	private final Text currentPlayerHeader;
+	private final Text playerHeader;
-	private final Text currentMoveHeader;
+	private final Text turnHeader;
-	private final Text nextPlayerHeader;
+    private final Text player1Header;
+    private final Text player2Header;
+    private Circle player1Icon;
+    private Circle player2Icon;
 	private final Button forfeitButton;
 	private final Button exitButton;
     private final Button tutorialButton;
     private final TextField chatInput;
+    private final Text keyThingy;
+    private boolean hasSet = false;
 
 	public GameView(Runnable onForfeit, Runnable onExit, Consumer<String> onMessage, String gameType) {
-		currentPlayerHeader = Primitive.header("");
+		playerHeader = Primitive.header("");
-		currentMoveHeader = Primitive.header("");
+		turnHeader = Primitive.header("");
-		nextPlayerHeader = Primitive.header("");
+        keyThingy = Primitive.text("turnof");
+        player1Header = Primitive.header("");
+        player2Header = Primitive.header("");
+        player1Icon = new Circle();
+        player2Icon = new Circle();
 
 		if (onForfeit != null) {
 			forfeitButton = Primitive.button("forfeit", () -> onForfeit.run());
@@ -66,17 +76,11 @@ public final class GameView extends ViewWidget {
 	}
 
 	private void setupLayout() {
-		var playerInfo = Primitive.vbox(
+        var turnInfo = Primitive.vbox(
-			currentPlayerHeader,
+                turnHeader
-			Primitive.hbox(
-				Primitive.separator(),
-				currentMoveHeader,
-				Primitive.separator()
-			),
-			nextPlayerHeader
         );
 
-		add(Pos.TOP_RIGHT, playerInfo);
+        add(Pos.TOP_CENTER, turnInfo);
 
 		var buttons = Primitive.vbox(
 			forfeitButton,
@@ -94,16 +98,16 @@ public final class GameView extends ViewWidget {
         }
 	}
 
-	public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer) {
+	public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, char GameType) {
 		Platform.runLater(() -> {
-			currentPlayerHeader.setText(currentPlayer);
+            if (!(hasSet)) {
-			currentMoveHeader.setText(currentMove);
+                playerHeader.setText(currentPlayer + " vs. " + nextPlayer);
-			nextPlayerHeader.setText(nextPlayer);
+                hasSet = true;
-
+                setPlayerHeaders(isMe, currentPlayer, nextPlayer, GameType);
-			if (isMe) {
+            }
-				currentPlayerHeader.getStyleClass().add("my-turn");
+            //TODO idk if theres any way to check this? only EN uses 's and the rest doesnt. if theres a better way to do this pls let me know
-			} else {
+            if (AppContext.getLocale().toLanguageTag().equals("en")) {
-				currentPlayerHeader.getStyleClass().remove("my-turn");
+                turnHeader.setText(currentPlayer + keyThingy.getText());
             }
 		});
 	}
@@ -111,4 +115,69 @@ public final class GameView extends ViewWidget {
 	public void gameOver(boolean iWon, String winner) {
 		new GameOverPopup(iWon, winner).show(Pos.CENTER);
 	}
+
+    private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) {
+        if (GameType == 'T') {
+            if (isMe) {
+                player1Header.setText("X: " + currentPlayer);
+                player2Header.setText("O: " + nextPlayer);
+            }
+            else {
+                player1Header.setText("X: " + nextPlayer);
+                player2Header.setText("O: " + currentPlayer);
+            }
+            setPlayerInfoTTT();
+        }
+        else if (GameType == 'R') {
+            if (isMe) {
+                player1Header.setText(currentPlayer);
+                player2Header.setText(nextPlayer);
+            }
+            else {
+                player1Header.setText(nextPlayer);
+                player2Header.setText(currentPlayer);
+            }
+            setPlayerInfoReversi();
+        }
+    }
+
+    private void setPlayerInfoTTT() {
+        var playerInfo = Primitive.vbox(
+                playerHeader,
+                Primitive.separator(),
+                player1Header,
+                player2Header
+        );
+
+        add(Pos.TOP_RIGHT, playerInfo);
+    }
+
+    private void setPlayerInfoReversi() {
+        var player1box = Primitive.hbox(
+                player1Icon,
+                player1Header
+        );
+
+        player1box.getStyleClass().add("hboxspacing");
+
+        var player2box = Primitive.hbox(
+                player2Icon,
+                player2Header
+        );
+
+        player2box.getStyleClass().add("hboxspacing");
+
+        var playerInfo = Primitive.vbox(
+                playerHeader,
+                Primitive.separator(),
+                player1box,
+                player2box
+        );
+
+        player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue());
+        player2Icon.setRadius(player2Header.fontProperty().map(Font::getSize).getValue());
+        player1Icon.setFill(Color.BLACK);
+        player2Icon.setFill(Color.WHITE);
+        add(Pos.TOP_RIGHT, playerInfo);
+    }
 }

app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java

@@ -6,6 +6,7 @@ import org.toop.app.gameControllers.AbstractGameController;
 import org.toop.app.gameControllers.ReversiController;
 import org.toop.app.gameControllers.TicTacToeController;
 import org.toop.framework.gameFramework.model.player.Player;
+import org.toop.game.games.tictactoe.TicTacToeAIRSleep;
 import org.toop.game.players.ArtificialPlayer;
 import org.toop.game.players.LocalPlayer;
 import org.toop.app.widget.Primitive;
@@ -52,12 +53,12 @@ public class LocalMultiplayerView extends ViewWidget {
                     if (information.players[0].isHuman) {
                         players[0] = new LocalPlayer<>(information.players[0].name);
                     } else {
-                        players[0] = new ArtificialPlayer<>(new TicTacToeAIR(), information.players[0].name);
+                        players[0] = new ArtificialPlayer<>(new TicTacToeAIRSleep(information.players[0].computerDifficulty, information.players[1].computerThinkTime), information.players[0].name);
                     }
                     if (information.players[1].isHuman) {
                         players[1] = new LocalPlayer<>(information.players[1].name);
                     } else {
-                        players[1] = new ArtificialPlayer<>(new TicTacToeAIR(), information.players[1].name);
+                        players[1] = new ArtificialPlayer<>(new TicTacToeAIRSleep(information.players[1].computerDifficulty, information.players[1].computerThinkTime), information.players[1].name);
                     }
                     if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstTTT()) {
                         new ShowEnableTutorialWidget(

app/src/main/java/org/toop/app/widget/view/MainView.java

@@ -4,6 +4,7 @@ import org.toop.app.App;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.ViewWidget;
 import javafx.geometry.Pos;
+import org.toop.app.widget.popup.QuitPopup;
 
 public class MainView extends ViewWidget {
 	public MainView() {
@@ -24,7 +25,8 @@ public class MainView extends ViewWidget {
 		});
 
 		var quitButton = Primitive.button("quit", () -> {
-			App.startQuit();
+			var a = new QuitPopup();
+			a.show(Pos.CENTER);
 		});
 
 		add(Pos.CENTER, Primitive.vbox(

app/src/main/java/org/toop/app/widget/view/ServerView.java

@@ -14,14 +14,12 @@ import javafx.scene.control.ListView;
 public final class ServerView extends ViewWidget {
 	private final String user;
 	private final Consumer<String> onPlayerClicked;
-	private final Runnable onDisconnect;
 
 	private final ListView<Button> listView;
 
-	public ServerView(String user, Consumer<String> onPlayerClicked, Runnable onDisconnect) {
+	public ServerView(String user, Consumer<String> onPlayerClicked) {
 		this.user = user;
 		this.onPlayerClicked = onPlayerClicked;
-		this.onDisconnect = onDisconnect;
 
 		this.listView = new ListView<>();
 
@@ -40,7 +38,6 @@ public final class ServerView extends ViewWidget {
 		add(Pos.CENTER, playerListSection);
 
 		var disconnectButton = Primitive.button("disconnect", () -> {
-			onDisconnect.run();
 			transitionPrevious();
 		});
 

app/src/main/resources/localization/localization_ar.properties

@@ -85,6 +85,11 @@ reversi4=\u0627\u0644\u0644\u0627\u0639\u0628 \u0627\u0644\u0630\u064a \u064a\u0
 tutorialstring=\u0627\u0644\u062f\u0631\u0633 \u0627\u0644\u062a\u0648\u0636\u064a\u062d\u064a
 startgame=\u0627\u0628\u062f\u0623 \u0627\u0644\u0644\u0639\u0628\u0629!
 goback=\u0627\u0631\u062c\u0639
+turnof=\u062F\u0648\u0631\u0647
+zwartepiet=\u0633\u0647\u0644: Zwarte Piet
+sinterklaas=\u0645\u062a\u0648\u0633\u0637: Sint R. Klaas
+santa=\u0635\u0639\u0628: Santa
+
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
 chinese=\u4e2d\u6587 (\u0627\u0644\u0635\u064a\u0646\u064a\u0629)

app/src/main/resources/localization/localization_de.properties

@@ -87,6 +87,10 @@ reversi4=Der Spieler, der am Ende die meisten Steine auf dem Brett hat, gewinnt.
 tutorialstring=Tutorial
 startgame=Spiel starten!
 goback=Zur<EFBFBD>ck
+turnof=ist dran
+zwartepiet=Leicht: Zwarte Piet
+sinterklaas=Mittel: Sint R. Klaas
+santa=Schwer: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabisch)
 chinese=\u4e2d\u6587 (Chinesisch)

app/src/main/resources/localization/localization_en.properties

@@ -24,6 +24,7 @@ error=Error
 exit=Exit
 forfeit=Forfeit
 fullscreen=Fullscreen
+game=REPLACE ME
 game-over=Game Over
 general=General
 high-contrast=High contrast
@@ -88,7 +89,10 @@ reversi4=The player who wins at the end of the game is the one who has the most
 tutorialstring=Tutorial
 startgame=Start game!
 goback=Go back
-
+turnof='s turn
+zwartepiet=Easy: Zwarte Piet
+sinterklaas=Medium: Sint R. Klaas
+santa=Hard:Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabic)
 chinese=\u4e2d\u6587 (Chinese)

app/src/main/resources/localization/localization_es.properties

@@ -86,7 +86,10 @@ reversi4=El jugador que gane al final del juego es quien tenga m
 tutorialstring=Tutorial
 startgame=\u00a1Iniciar juego!
 goback=Volver
-
+turnof=le toca
+zwartepiet=F\u00e1cil: Zwarte Piet
+sinterklaas=Medio: Sint R. Klaas
+santa=Dif\u00edcil: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Ar\u00e1bigo)
 chinese=\u4e2d\u6587 (Chino)

app/src/main/resources/localization/localization_fr.properties

@@ -86,6 +86,10 @@ reversi4=Le joueur qui a le plus de pions
 tutorialstring=Tutoriel
 startgame=D\u00e9marrer le jeu!
 goback=Retour
+turnof=\u00E0 son tour
+zwartepiet=Facile: Zwarte Piet
+sinterklaas=Moyen : Sint R. Klaas
+santa=Difficile: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabe)
 chinese=\u4e2d\u6587 (Chinois)

app/src/main/resources/localization/localization_hi.properties

@@ -86,6 +86,10 @@ reversi4=\u0916\u0941\u092f \u0915\u093f \u0915\u0940 \u0928\u093f\u092e\u0940 \
 tutorialstring=\u0924\u0942\u091f\u0949\u0930\u093f\u092f\u0932
 startgame=\u0916\u0947\u0932 \u0936\u0941\u0930\u0942 \u0915\u0930\u0947\u0902!
 goback=\u0935\u093e\u092a\u0938 \u091c\u093e\u090f\u0901
+turnof=\u0915\u0940 \u092C\u093E\u0930\u0940
+zwartepiet=\u0905\u0938\u093e\u0928: Zwarte Piet
+sinterklaas=\u092e\u0927\u094d\u092f\u092e: Sint R. Klaas
+santa=\u0915\u0924\u093f\u0928: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0905\u0930\u092c\u0940)
 chinese=\u4e2d\u6587 (\u091a\u0940\u0928\u0940)

app/src/main/resources/localization/localization_it.properties

@@ -85,6 +85,10 @@ reversi4=Il giocatore che alla fine del gioco ha pi
 tutorialstring=Tutorial
 startgame=Avvia il gioco!
 goback=Indietro
+turnof=\u00E8 il suo turno
+zwartepiet=Facile: Zwarte Piet
+sinterklaas=Medio: Sint R. Klaas
+santa=Difficile: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabo)
 chinese=\u4e2d\u6587 (Cinese)

app/src/main/resources/localization/localization_ja.properties

@@ -85,6 +85,10 @@ reversi4=\u672c\u6b21\u306b\u30dc\u30fc\u30c9\u4e0a\u3067\u6700\u591a\u306e\u8ca
 tutorialstring=\u30c1\u30e5\u30fc\u30c8\u30ea\u30a2\u30eb
 startgame=\u30b2\u30fc\u30e0\u3092\u958b\u59cb\uff01
 goback=\u623b\u308b
+turnof=\u306E\u756A
+zwartepiet=\u7c21\u5358: Zwarte Piet
+sinterklaas=\u4e2d\u7d1a: Sint R. Klaas
+santa=\u96e3\u3057\u3044: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u30a2\u30e9\u30d3\u30a2\u8a9e)
 chinese=\u4e2d\u6587 (\u4e2d\u6587)

app/src/main/resources/localization/localization_ko.properties

@@ -85,6 +85,10 @@ reversi4=\uacbd\uc6b0 \uc5d0\uc11c \ucd5c\ub300 \ud648\uc744 \uac00\uc838\ub294
 tutorialstring=\ud14c\ud2b8\ub9ad
 startgame=\uac8c\uc784 \uc2dc\uc791!
 goback=\ub4a4\ub85c \uac00\uae30
+turnof=\uC758 \uCC28\uB840
+zwartepiet=\uc218\uc601: Zwarte Piet
+sinterklaas=\ubcf4\ud1b5: Sint R. Klaas
+santa=\uc5d0\uc18c: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0639\u0631\u0628\u064a\u0629)
 chinese=\u4e2d\u6587 (\u4e2d\u6587)

app/src/main/resources/localization/localization_nl.properties

@@ -85,6 +85,10 @@ reversi4=De speler die aan het einde van het spel de meeste stukken op het bord
 tutorialstring=Tutorial
 startgame=Spel starten!
 goback=Ga terug
+turnof=is aan de beurt
+zwartepiet=Makkelijk: Zwarte Piet
+sinterklaas=Gemiddeld: Sint R. Klaas
+santa=Moeilijk: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabisch)
 chinese=\u4e2d\u6587 (Chinees)

app/src/main/resources/localization/localization_ru.properties

@@ -85,6 +85,10 @@ reversi4=\u0418043 \u0433043 \u0440043 \u043e043 \u043a043 \u043e043 \u0442043 \
 tutorialstring=\u0423\u0447\u0435\u0431\u043d\u0438\u043a
 startgame=\u041d\u0430\u0447\u0430\u0442\u044c \u0438\u0433\u0440\u0443!
 goback=\u041d\u0430\u0437\u0430\u0434
+turnof=\u0445\u043E\u0434\u0438\u0442
+zwartepiet=\u041b\u0435\u0433\u043a\u043e: Zwarte Piet
+sinterklaas=\u0421\u0440\u0435\u0434\u043d\u0438\u0439: Sint R. Klaas
+santa=\u0421\u043b\u043e\u0436\u043d\u043e: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0410\u0440\u0430\u0431\u0441\u043a\u0438\u0439)
 chinese=\u4e2d\u6587 (\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439)

app/src/main/resources/localization/localization_zh.properties

@@ -85,6 +85,10 @@ reversi4=\u672c\u6e38\u620f\u7ed3\u675f\u65f6\u8d62\u5f97\u6ee1\u8fc7\u76d8\u976
 tutorialstring=\u6559\u7a0b
 startgame=\u5f00\u59cb\u6e38\u620f\uff01
 goback=\u8fd4\u56de
+turnof=\u7684\u56DE\u5408
+zwartepiet=\u7b80\u5355: Zwarte Piet
+sinterklaas=\u4e2d\u7b49: Sint R. Klaas
+santa=\u56f0\u96be: Santa
 
 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u963f\u62c9\u4f2f\u8bed)
 chinese=\u4e2d\u6587

app/src/main/resources/style/dark.css

@@ -166,7 +166,7 @@
 	-fx-effect: dropshadow(gaussian, #88cc8899, 5, 0, 0, 1);
 }
 
-.my-turn {
+.text.my-turn {
 	-fx-fill: #e05656;
 	-fx-font-weight: bold;
 }

app/src/main/resources/style/high-contrast.css

@@ -164,7 +164,7 @@
 	-fx-effect: dropshadow(gaussian, #70e070cc, 6, 0, 0, 2);
 }
 
-.my-turn {
+.text.my-turn {
 	-fx-fill: #ff4b4b;
 	-fx-font-weight: bold;
 }

app/src/main/resources/style/large.css

@@ -23,6 +23,11 @@
 	-fx-spacing: 14;
 }
 
+.hboxspacing {
+    -fx-padding: 2;
+    -fx-spacing: 10;
+}
+
 .current-player {
 	-fx-font-size: 32px;
 }

app/src/main/resources/style/light.css

@@ -166,7 +166,7 @@
 	-fx-effect: dropshadow(gaussian, #aad3aa99, 4, 0, 0, 1);
 }
 
-.my-turn {
+.text.my-turn {
 	-fx-fill: #d14b4b;
 	-fx-font-weight: bold;
 }

app/src/main/resources/style/medium.css

@@ -23,6 +23,11 @@
 	-fx-spacing: 10;
 }
 
+.hboxspacing {
+    -fx-padding: 2;
+    -fx-spacing: 10;
+}
+
 .current-player {
 	-fx-font-size: 24px;
 }

app/src/main/resources/style/small.css

@@ -23,6 +23,11 @@
 	-fx-spacing: 6;
 }
 
+.hboxspacing {
+    -fx-padding: 2;
+    -fx-spacing: 10;
+}
+
 .current-player {
 	-fx-font-size: 16px;
 }

game/src/main/java/org/toop/game/games/tictactoe/TicTacToeAIR.java

@@ -13,7 +13,7 @@ import org.toop.framework.gameFramework.GameState;
  * opening or when no clear best move is found.
  * </p>
  */
-public final class TicTacToeAIR extends AbstractAI<TicTacToeR> {
+public class TicTacToeAIR extends AbstractAI<TicTacToeR> {
 
     /**
      * Determines the best move for the given Tic-Tac-Toe game state.
@@ -27,8 +27,14 @@ public final class TicTacToeAIR extends AbstractAI<TicTacToeR> {
      * @param depth the depth of lookahead for evaluating moves (non-negative)
      * @return the index of the best move, or -1 if no moves are available
      */
+
+    private int depth;
+
+    public TicTacToeAIR(int depth) {
+        this.depth = depth;
+    }
+
     public int getMove(TicTacToeR game) {
-        int depth = 9;
         assert game != null;
         final int[] legalMoves = game.getLegalMoves();
 

game/src/main/java/org/toop/game/games/tictactoe/TicTacToeAIRSleep.java

@@ -0,0 +1,25 @@
+package org.toop.game.games.tictactoe;
+
+import java.util.Random;
+
+public class TicTacToeAIRSleep extends TicTacToeAIR {
+
+    private int thinkTime;
+
+    public TicTacToeAIRSleep(int depth, int thinkTime) {
+        super(depth);
+        this.thinkTime = thinkTime;
+    }
+
+    @Override
+    public int getMove(TicTacToeR game) {
+        int score = super.getMove(game);
+        try {
+            Random random = new Random();
+            Thread.sleep(this.thinkTime * 1000L +  random.nextInt(1000));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return score;
+    }
+}

game/src/test/java/org/toop/game/tictactoe/TicTacToeAIRTest.java

@@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 final class TicTacToeAIRTest {
 
-    private final TicTacToeAIR ai = new TicTacToeAIR();
+    private final TicTacToeAIR ai = new TicTacToeAIR(9);
 
     // Helper: play multiple moves in sequence on a fresh board
     private TicTacToeR playSequence(int... moves) {