diff --git a/frontend/android/assets/glassy/raw/button-disabled.png b/frontend/android/assets/glassy/raw/button-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..18ca2b35d0546b22a4aa1e3cffce547ab08a6605 Binary files /dev/null and b/frontend/android/assets/glassy/raw/button-disabled.png differ diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java index 291c70a1093a006b7342039517016d2b85dee545..1a75b4467e6eec4c9a0fb39949273af76766954c 100644 --- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java @@ -302,7 +302,7 @@ public class CreateJoinTournamentState extends State { } private void handleLeaveBtnClick(Tournament t){ - dialog.text("Do you want do leave\n"+t.getName()+"?").pad(padding); + dialog.text("Do you want to leave\n"+t.getName()+"?").pad(padding); dialog.show(stage); tournamentTryingToLeave = t; } diff --git a/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java b/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java index a8976ad9fd68e62a46ec974dca6569c8e61a9362..42968c34050412fe51f550f40828051941e9a6f5 100644 --- a/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java +++ b/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java @@ -50,11 +50,12 @@ public abstract class PlayStateTemplate extends State { }catch(Exception e){ e.printStackTrace(); } + + //TODO: if (tournamentpoints != null && currentRoundNr == (tournament.totalGames) -> gå til finished state if(round == null) { gsm.set(new ScoreState(gsm, this.score, new SinglePlayerSelectGameState(gsm))); } else{ gsm.set(new ScoreState(gsm, this.score, new ViewTournamentState(gsm, tournament, nextRound))); -// gsm.set(new ScoreState(gsm, this.score, new CreateJoinTournamentState(gsm))); } } diff --git a/frontend/core/src/com/gameware/game/states/State.java b/frontend/core/src/com/gameware/game/states/State.java index a728c96fea3c353bab73af70f93878f3f39cc293..0f589726ac0745b8ab1de111d7ba321eed64a4a9 100644 --- a/frontend/core/src/com/gameware/game/states/State.java +++ b/frontend/core/src/com/gameware/game/states/State.java @@ -30,6 +30,7 @@ public abstract class State { protected TextureRegionDrawable background = new TextureRegionDrawable(new TextureRegion(new Texture("bg1.jpg"))); protected TextureRegionDrawable backgroundLighter = new TextureRegionDrawable(new TextureRegion(new Texture("bg1_lighter.jpg"))); protected TextureRegionDrawable backgroundScore = new TextureRegionDrawable(new TextureRegion(new Texture("bg_score.jpg"))); + protected TextureRegionDrawable buttonDisabledDrawable = new TextureRegionDrawable(new TextureRegion(new Texture(Gdx.files.internal("glassy/raw/button-disabled.png")))); protected State(GameStateManager gsm){ this.gsm = gsm; diff --git a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java index d630a24b7f3be5689b9e5fda9f7856b9a237dfd8..4739f3cc560df48792549970025a4d58553e00b6 100644 --- a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java @@ -2,8 +2,11 @@ package com.gameware.game.states; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.scenes.scene2d.InputEvent; +import com.badlogic.gdx.scenes.scene2d.Touchable; import com.badlogic.gdx.scenes.scene2d.ui.Dialog; import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Label; @@ -22,6 +25,8 @@ public class ViewTournamentState extends State { private Round round; private Dialog dialog; + TextButton playBtn; + private int padding = 50; private Label stateNameText; @@ -29,11 +34,10 @@ public class ViewTournamentState extends State { private String leaveBtnText = "Leave"; private String playBtnText = "Play Round"; private String viewPointsBtnText = "View Points"; - private String nrPlayersText = "Players in tournament"; - private String roundsLeftText = "Rounds left"; + private String nrPlayersText = "Players in tournament:"; + private String roundsLeftText = "Rounds left:"; public class LeaveClickListener extends ClickListener{ - //TODO: if (tournamentpoints != null && currentRoundNr == (tournament.totalGames) -> gå til finished state public void clicked(InputEvent event, float x, float y) { handleLeaveBtnClick(); @@ -57,11 +61,11 @@ 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 { +// 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.row(); PlayStateTemplate state = GameWare.getInstance().getGameIdToPlayState().get(round.getGameId()); @@ -104,7 +108,7 @@ public class ViewTournamentState extends State { } }; - dialog.text("Do you want do leave\n"+tournament.getName()+"?").pad(padding); + dialog.text("Do you want to leave\n"+tournament.getName()+"?").pad(padding); dialog.button("Yes", true).pad(padding); //sends "true" as the result dialog.button("No", false).pad(padding); //sends "false" as the result } @@ -122,15 +126,27 @@ public class ViewTournamentState extends State { } private TextButton makePlayBtn(){ - TextButton playBtn = new TextButton(playBtnText, skin); - playBtn.addListener(new ClickListener() { - @Override - public void clicked(InputEvent e, float x, float y){ - handlePlayBtnClick(); - } - }); + if(round.isPlayed()){ - playBtn.setDisabled(true); + TextButton.TextButtonStyle textButtonStyle = new TextButton.TextButtonStyle(); + textButtonStyle.up = skin.newDrawable("button", Color.GRAY); + textButtonStyle.down = skin.newDrawable("button", Color.DARK_GRAY); + textButtonStyle.checked = skin.newDrawable("button", Color.DARK_GRAY); + textButtonStyle.over = skin.newDrawable("button", Color.LIGHT_GRAY); + textButtonStyle.font = skin.getFont("font-big"); + textButtonStyle.fontColor = Color.LIGHT_GRAY; + + playBtn = new TextButton(playBtnText, textButtonStyle); + playBtn.setTouchable(Touchable.disabled); + } + else{ + playBtn = new TextButton(playBtnText, skin); + playBtn.addListener(new ClickListener() { + @Override + public void clicked(InputEvent e, float x, float y){ + handlePlayBtnClick(); + } + }); } return playBtn; }