stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixt wrong view order

Browse Source
This commit is contained in:
lieght
2025-12-04 19:26:01 +01:00
parent a7b9484aa4
commit b1224ba6af
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/toop/app/Server.java
View File

@@ -48,6 +48,8 @@ public final class Server {
private ScheduledExecutorService scheduler; private ScheduledExecutorService scheduler;
private EventFlow connectFlow;
public static GameInformation.Type gameToType(String game) { public static GameInformation.Type gameToType(String game) {
if (game.equalsIgnoreCase("tic-tac-toe")) { if (game.equalsIgnoreCase("tic-tac-toe")) {
return GameInformation.Type.TICTACTOE; return GameInformation.Type.TICTACTOE;
@@ -110,7 +112,8 @@ public final class Server {
return; return;
} }
WidgetContainer.getCurrentView().transitionPrevious(); primary = new ServerView(user, this::sendChallenge);
WidgetContainer.getCurrentView().transitionNextCustom(primary, "disconnect", this::disconnect);
a.unsubscribe("connecting"); a.unsubscribe("connecting");
a.unsubscribe("startclient"); a.unsubscribe("startclient");
@@ -120,11 +123,11 @@ public final class Server {
new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, user)).postEvent(); new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, user)).postEvent();
primary = new ServerView(user, this::sendChallenge);
WidgetContainer.getCurrentView().transitionNextCustom(primary, "disconnect", this::disconnect);
startPopulateScheduler(); startPopulateScheduler();
populateGameList(); populateGameList();
primary.removeViewFromPreviousChain(loading);
}, false, "startclient") }, false, "startclient")
.listen( .listen(
NetworkEvents.ConnectTry.class, NetworkEvents.ConnectTry.class,
@@ -149,6 +152,8 @@ public final class Server {
.listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false, "game-result") .listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false, "game-result")
.listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false, "game-move") .listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false, "game-move")
.listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false, "your-turn"); .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false, "your-turn");
connectFlow = a;
} }
private void sendChallenge(String opponent) { private void sendChallenge(String opponent) {
@@ -262,7 +267,9 @@ public final class Server {
new EventFlow().addPostEvent(new NetworkEvents.CloseClient(clientId)).postEvent(); new EventFlow().addPostEvent(new NetworkEvents.CloseClient(clientId)).postEvent();
isPolling = false; isPolling = false;
stopScheduler(); stopScheduler();
primary.transitionPrevious(); connectFlow.unsubscribeAll();
WidgetContainer.getCurrentView().transitionPrevious();
} }
private void forfeitGame() { private void forfeitGame() {