added running flag to SessionData

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/IconList.java

@@ -0,0 +1,53 @@
+package eu.jonahbauer.wizard.client.libgdx.actors;
+
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.scenes.scene2d.ui.List;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
+import lombok.Getter;
+import lombok.Setter;
+
+public abstract class IconList<T> extends List<T> {
+    @Getter
+    @Setter
+    private float iconWidth = -1;
+
+    @Getter
+    @Setter
+    private float iconPadding = 8;
+
+    @SuppressWarnings("unused")
+    public IconList(Skin skin) {
+        super(skin);
+    }
+
+    @SuppressWarnings("unused")
+    public IconList(Skin skin, String styleName) {
+        super(skin, styleName);
+    }
+
+    @SuppressWarnings("unused")
+    public IconList(ListStyle style) {
+        super(style);
+    }
+
+    public abstract Drawable getIcon(T item);
+
+    @Override
+    @Deprecated
+    public void setAlignment(int alignment) {}
+
+    @Override
+    protected GlyphLayout drawItem(Batch batch, BitmapFont font, int index, T item, float x, float y, float width) {
+        var text = toString(item);
+        var icon = getIcon(item);
+        var height = font.getCapHeight();
+        var iconWidth = this.iconWidth < 0 ? height : this.iconWidth;
+
+        icon.draw(batch, x, y - height, iconWidth, height);
+        return font.draw(batch, text, x + iconWidth + iconPadding, y, 0, text.length(), width - iconWidth - iconPadding, Align.left, false, "...");
+    }
+}

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/LobbyScreen.java

@@ -3,7 +3,10 @@ package eu.jonahbauer.wizard.client.libgdx.screens;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.*;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import eu.jonahbauer.wizard.client.libgdx.UiskinAtlas;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;
+import eu.jonahbauer.wizard.client.libgdx.actors.IconList;
 import eu.jonahbauer.wizard.client.libgdx.listeners.KeyboardFocusManager;
 import eu.jonahbauer.wizard.client.libgdx.listeners.ResetErrorListener;
 import eu.jonahbauer.wizard.client.libgdx.state.Lobby;
@@ -17,7 +20,6 @@ public class LobbyScreen extends MenuScreen {
     
     private TextButton buttonBack;
     private TextButton buttonJoin;
-    private TextButton buttonRejoin;
     private TextButton buttonCreate;
     
     private TextField playerName;
@@ -26,6 +28,7 @@ public class LobbyScreen extends MenuScreen {
     private Label labelSessionConfiguration;
 
     private UUID selectedSession;
+    private boolean rejoin = false;
     private List<SessionData> sessions;
     private ScrollPane sessionListContainer;
     
@@ -36,14 +39,15 @@ public class LobbyScreen extends MenuScreen {
                 game.getClient().execute(Lobby.class, Lobby::disconnect);
                 sfxClick();
             } else if (actor == buttonJoin) {
-                join();
+                if (rejoin) {
+                    game.getClient().execute(Lobby.class, Lobby::showRejoinScreen);
+                } else {
+                    join();
+                }
                 sfxClick();
             } else if (actor == buttonCreate) {
                 game.getClient().execute(Lobby.class, Lobby::showCreateScreen);
                 sfxClick();
-            } else if (actor == buttonRejoin) {
-                game.getClient().execute(Lobby.class, Lobby::showRejoinScreen);
-                sfxClick();
             }
         }
     };
@@ -64,21 +68,26 @@ public class LobbyScreen extends MenuScreen {
         buttonCreate.addListener(listener);
         getButtonGroup().addActor(buttonCreate);
 
-        buttonRejoin = new TextButton(messages.get("menu.lobby.rejoin"), skin);
-        buttonRejoin.addListener(listener);
-        getButtonGroup().addActor(buttonRejoin);
-
         buttonJoin = new TextButton(messages.get("menu.lobby.join"), skin);
         buttonJoin.addListener(listener);
         getButtonGroup().addActor(buttonJoin);
 
         getButtonGroup().setWidth(0.55f * WizardGame.WIDTH);
         
-        sessions = new List<>(skin) {
+        sessions = new IconList<>(skin) {
+            // TODO better icons
+            private final Drawable running = skin.getDrawable(UiskinAtlas.NOT_READY);
+            private final Drawable notRunning = skin.getDrawable(UiskinAtlas.READY);
+
             @Override
             public String toString(SessionData session) {
                 return session.getName();
             }
+
+            @Override
+            public Drawable getIcon(SessionData item) {
+                return item.isRunning() ? running : notRunning;
+            }
         };
         sessions.addListener(new ChangeListener() {
             @Override
@@ -102,12 +111,11 @@ public class LobbyScreen extends MenuScreen {
 
         stage.addActor(content);
         stage.addCaptureListener(new KeyboardFocusManager(
-                sessions, playerName, buttonBack, buttonCreate, buttonRejoin, buttonJoin
+                sessions, playerName, buttonBack, buttonCreate, buttonJoin
         ));
 
         buttonBack.setName("button_back");
         buttonJoin.setName("button_join");
-        buttonJoin.setName("button_rejoin");
         buttonCreate.setName("button_create");
         sessions.setName("session_list");
         playerName.setName("player_name");
@@ -194,14 +202,21 @@ public class LobbyScreen extends MenuScreen {
             labelSessionPlayerCount.setText(Integer.toString(data.getPlayerCount()));
             labelSessionConfiguration.setText(data.getConfiguration().toString());
             selectedSession = data.getUuid();
+            updateRejoin(data.isRunning());
         } else {
             labelSessionName.setText("");
             labelSessionPlayerCount.setText("");
             labelSessionConfiguration.setText("");
             selectedSession = null;
+            updateRejoin(false);
         }
     }
 
+    private void updateRejoin(boolean rejoin) {
+        this.rejoin = rejoin;
+        buttonJoin.setText(messages.get("menu.lobby." + (rejoin ? "rejoin" : "join")));
+    }
+
     private void join() {
         boolean error = false;
 

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/SessionScreen.java

@@ -1,15 +1,12 @@
 package eu.jonahbauer.wizard.client.libgdx.screens;
 
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.GlyphLayout;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.*;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import eu.jonahbauer.wizard.client.libgdx.UiskinAtlas;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;
+import eu.jonahbauer.wizard.client.libgdx.actors.IconList;
 import eu.jonahbauer.wizard.client.libgdx.listeners.KeyboardFocusManager;
 import eu.jonahbauer.wizard.client.libgdx.state.Session;
 import eu.jonahbauer.wizard.common.messages.data.PlayerData;
@@ -60,9 +57,9 @@ public class SessionScreen extends MenuScreen {
 
         getButtonGroup().setWidth(0.55f * WizardGame.WIDTH);
 
-        players = new List<>(skin) {
-            private final TextureRegion ready = skin.getRegion(UiskinAtlas.READY);
-            private final TextureRegion notReady = skin.getRegion(UiskinAtlas.NOT_READY);
+        players = new IconList<>(skin) {
+            private final Drawable ready = skin.getDrawable(UiskinAtlas.READY);
+            private final Drawable notReady = skin.getDrawable(UiskinAtlas.NOT_READY);
 
             @Override
             public String toString(PlayerData player) {
@@ -70,16 +67,8 @@ public class SessionScreen extends MenuScreen {
             }
 
             @Override
-            @SuppressWarnings("SuspiciousNameCombination")
-            protected GlyphLayout drawItem(Batch batch, BitmapFont font, int index, PlayerData item, float x, float y, float width) {
-                String string = toString(item);
-                var height = font.getCapHeight();
-                if (item.isReady()) {
-                    batch.draw(ready, x, y - height, height, height);
-                } else {
-                    batch.draw(notReady, x, y - height, height, height);
-                }
-                return font.draw(batch, string, x + height + 8, y, 0, string.length(), width - height - 8, Align.left, false, "...");
+            public Drawable getIcon(PlayerData item) {
+                return item.isReady() ? ready : notReady;
             }
         };
 

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java

@@ -6,7 +6,6 @@ import eu.jonahbauer.wizard.client.libgdx.screens.GameScreen;
 import eu.jonahbauer.wizard.client.libgdx.util.Pair;
 import eu.jonahbauer.wizard.common.messages.client.InteractionMessage;
 import eu.jonahbauer.wizard.common.messages.data.PlayerData;
-import eu.jonahbauer.wizard.common.messages.data.SessionData;
 import eu.jonahbauer.wizard.common.messages.observer.*;
 import eu.jonahbauer.wizard.common.messages.player.*;
 import eu.jonahbauer.wizard.common.messages.server.AckMessage;