From 4608135ee5ab62c0f37894d55b325af983077d8b Mon Sep 17 00:00:00 2001 From: lieght <49651652+BAFGdeJong@users.noreply.github.com> Date: Thu, 4 Dec 2025 20:46:59 +0100 Subject: [PATCH] Challenge popups "Fixed" --- app/src/main/java/org/toop/app/Server.java | 8 ++++++-- .../java/org/toop/app/widget/popup/ChallengePopup.java | 7 +++---- .../org/toop/app/widget/popup/SendChallengePopup.java | 2 +- .../resources/localization/localization_en.properties | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/toop/app/Server.java b/app/src/main/java/org/toop/app/Server.java index 217823a..408982d 100644 --- a/app/src/main/java/org/toop/app/Server.java +++ b/app/src/main/java/org/toop/app/Server.java @@ -158,10 +158,12 @@ public final class Server { 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) { @@ -251,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) { diff --git a/app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java b/app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java index 1a2f755..e3a712c 100644 --- a/app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java +++ b/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,11 +29,9 @@ public final class ChallengePopup extends PopupWidget { private void setupLayout() { var challengeText = Primitive.text("you-were-challenged-by"); - var challengerHeader = Primitive.header(""); - challengerHeader.setText(challenger); + var challengerHeader = Primitive.header(challenger, false); - var gameText = Primitive.text("to-a-game-of"); - gameText.setText(gameText.getText() + " " + game); + var gameText = Primitive.text(AppContext.getString("to-a-game-of") + " " + game, false); var acceptButton = Primitive.button("accept", () -> onAccept.accept(playerInformation)); var denyButton = Primitive.button("deny", () -> hide()); diff --git a/app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java b/app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java index 6299fdc..412e858 100644 --- a/app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java +++ b/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"); diff --git a/app/src/main/resources/localization/localization_en.properties b/app/src/main/resources/localization/localization_en.properties index 2fa4442..de4f4ba 100644 --- a/app/src/main/resources/localization/localization_en.properties +++ b/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