From 0bb26b9d066b3e54294a33bacd2a24fbf9f1b475 Mon Sep 17 00:00:00 2001 From: Turid Dahl <turidcd@stud.ntnu.no> Date: Fri, 3 Apr 2020 14:36:34 +0200 Subject: [PATCH] MR fixes --- .../game/states/SinglePlayerSelectGameState.java | 10 ++++------ .../gameware/game/states/ViewHighScoreState.java | 14 ++++---------- .../gameware/game/states/ViewTournamentState.java | 11 +++-------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java index a1c5c4f..908a666 100644 --- a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java +++ b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java @@ -18,11 +18,9 @@ import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.gameware.game.GameWare; import com.gameware.game.QueryIntermediate; import com.gameware.game.models.Game; -import com.gameware.game.models.Tournament; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,7 +28,7 @@ public class SinglePlayerSelectGameState extends State { private Table table; private Table innerTable; - private ScrollPane tournamentsPane; + private ScrollPane scrollPane; private List<Game> games = new ArrayList<>(); private final String backBtnText = "Back"; @@ -81,9 +79,9 @@ public class SinglePlayerSelectGameState extends State { innerTable.row(); } - tournamentsPane = new ScrollPane(innerTable, skin); - table.add(tournamentsPane).spaceBottom(spacingOnBottom); - table.getCell(tournamentsPane).size(Gdx.graphics.getWidth()/1.3f, Gdx.graphics.getHeight()/3f); + scrollPane = new ScrollPane(innerTable, skin); + table.add(scrollPane).spaceBottom(spacingOnBottom); + table.getCell(scrollPane).size(Gdx.graphics.getWidth()/1.3f, Gdx.graphics.getHeight()/3f); table.row(); stage.addActor(table); diff --git a/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java b/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java index b19a173..05f2590 100644 --- a/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java +++ b/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java @@ -13,25 +13,19 @@ import java.util.List; import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; -import com.gameware.game.QueryIntermediate; import com.gameware.game.GameWare; import com.gameware.game.models.Game; import java.io.IOException; - - -import java.io.IOException; - public class ViewHighScoreState extends State { private Table table; private Table innerTable; - private ScrollPane tournamentsPane; + private ScrollPane scrollPane; private List<Game> games; private String backBtnText = "Back"; @@ -85,9 +79,9 @@ public class ViewHighScoreState extends State { innerTable.row(); } - tournamentsPane = new ScrollPane(innerTable, skin); - table.add(tournamentsPane).spaceBottom(spacingOnBottom); - table.getCell(tournamentsPane).size(Gdx.graphics.getWidth()/1.2f, Gdx.graphics.getHeight()/3f); + scrollPane = new ScrollPane(innerTable, skin); + table.add(scrollPane).spaceBottom(spacingOnBottom); + table.getCell(scrollPane).size(Gdx.graphics.getWidth()/1.2f, Gdx.graphics.getHeight()/3f); table.row(); stage.addActor(table); diff --git a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java index 4739f3c..7921084 100644 --- a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java @@ -25,8 +25,6 @@ public class ViewTournamentState extends State { private Round round; private Dialog dialog; - TextButton playBtn; - private int padding = 50; private Label stateNameText; @@ -61,11 +59,8 @@ public class ViewTournamentState extends State { table.add(stateNameText).spaceBottom(spacingOnBottomInputFIeld); table.row(); -// if(round.isPlayed()){ -// table.add(new Label("You have aldready played\nWait for others to finish", skin)).spaceBottom(spacingOnBottom); -// }else { - table.add(makePlayBtn()).size(buttonWidth*1.4f, buttonHeight*1.2f).spaceBottom(spacingOnBottom); -// } + + table.add(makePlayBtn()).size(buttonWidth*1.4f, buttonHeight*1.2f).spaceBottom(spacingOnBottom); table.row(); PlayStateTemplate state = GameWare.getInstance().getGameIdToPlayState().get(round.getGameId()); @@ -126,7 +121,7 @@ public class ViewTournamentState extends State { } private TextButton makePlayBtn(){ - + TextButton playBtn; if(round.isPlayed()){ TextButton.TextButtonStyle textButtonStyle = new TextButton.TextButtonStyle(); textButtonStyle.up = skin.newDrawable("button", Color.GRAY); -- GitLab