From a00d25f24a7e1e33fe12ccc23cb700120a302af7 Mon Sep 17 00:00:00 2001
From: michiel301b <m.brands.3@st.hanze.nl>
Date: Wed, 3 Dec 2025 23:16:03 +0100
Subject: [PATCH] smalle fixes aan turn updates

---
 app/src/main/java/org/toop/app/Server.java         |  2 --
 .../java/org/toop/app/widget/view/GameView.java    | 14 ++++----------
 app/src/main/resources/style/dark.css              |  2 +-
 app/src/main/resources/style/high-contrast.css     |  2 +-
 app/src/main/resources/style/large.css             |  5 +++++
 app/src/main/resources/style/light.css             |  2 +-
 app/src/main/resources/style/medium.css            |  5 +++++
 app/src/main/resources/style/small.css             |  5 +++++
 8 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/toop/app/Server.java b/app/src/main/java/org/toop/app/Server.java
index 4b149d2..7681da0 100644
--- a/app/src/main/java/org/toop/app/Server.java
+++ b/app/src/main/java/org/toop/app/Server.java
@@ -151,8 +151,6 @@ public final class Server {
                 .listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false)
                 .listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false)
                 .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false);
-        startPopulateScheduler();
-        populateGameList();
 	}
 
 	private void sendChallenge(String opponent) {
diff --git a/app/src/main/java/org/toop/app/widget/view/GameView.java b/app/src/main/java/org/toop/app/widget/view/GameView.java
index bf1d2f0..84cdf14 100644
--- a/app/src/main/java/org/toop/app/widget/view/GameView.java
+++ b/app/src/main/java/org/toop/app/widget/view/GameView.java
@@ -108,16 +108,6 @@ public final class GameView extends ViewWidget {
             //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
             if (AppContext.getLocale().toLanguageTag().equals("en")) {
                 turnHeader.setText(currentPlayer + keyThingy.getText());
-            }
-            else {
-                turnHeader.setText(currentPlayer + " " + keyThingy.getText());
-            }
-
-            if (isMe) {
-                turnHeader.getStyleClass().add("my-turn");
-            }
-            else {
-                turnHeader.getStyleClass().remove("my-turn");
             }
 		});
 	}
@@ -168,11 +158,15 @@ public final class GameView extends ViewWidget {
                 player1Header
         );
 
+        player1box.getStyleClass().add("hboxspacing");
+
         var player2box = Primitive.hbox(
                 player2Icon,
                 player2Header
         );
 
+        player2box.getStyleClass().add("hboxspacing");
+
         var playerInfo = Primitive.vbox(
                 playerHeader,
                 Primitive.separator(),
diff --git a/app/src/main/resources/style/dark.css b/app/src/main/resources/style/dark.css
index da30eb0..a9f77f4 100644
--- a/app/src/main/resources/style/dark.css
+++ b/app/src/main/resources/style/dark.css
@@ -155,7 +155,7 @@
 	-fx-effect: dropshadow(gaussian, #88cc8899, 5, 0, 0, 1);
 }
 
-.my-turn {
+.text.my-turn {
 	-fx-fill: #e05656;
 	-fx-font-weight: bold;
 }
diff --git a/app/src/main/resources/style/high-contrast.css b/app/src/main/resources/style/high-contrast.css
index 111449d..085f1d2 100644
--- a/app/src/main/resources/style/high-contrast.css
+++ b/app/src/main/resources/style/high-contrast.css
@@ -155,7 +155,7 @@
 	-fx-effect: dropshadow(gaussian, #70e070cc, 6, 0, 0, 2);
 }
 
-.my-turn {
+.text.my-turn {
 	-fx-fill: #ff4b4b;
 	-fx-font-weight: bold;
 }
diff --git a/app/src/main/resources/style/large.css b/app/src/main/resources/style/large.css
index ef89cfa..863bbb1 100644
--- a/app/src/main/resources/style/large.css
+++ b/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;
 }
diff --git a/app/src/main/resources/style/light.css b/app/src/main/resources/style/light.css
index 0428f04..abbaafc 100644
--- a/app/src/main/resources/style/light.css
+++ b/app/src/main/resources/style/light.css
@@ -156,7 +156,7 @@
 	-fx-effect: dropshadow(gaussian, #aad3aa99, 4, 0, 0, 1);
 }
 
-.my-turn {
+.text.my-turn {
 	-fx-fill: #d14b4b;
 	-fx-font-weight: bold;
 }
diff --git a/app/src/main/resources/style/medium.css b/app/src/main/resources/style/medium.css
index dfbc668..b6b1576 100644
--- a/app/src/main/resources/style/medium.css
+++ b/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;
 }
diff --git a/app/src/main/resources/style/small.css b/app/src/main/resources/style/small.css
index 6b0e3cc..0fcedcc 100644
--- a/app/src/main/resources/style/small.css
+++ b/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;
 }