diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java index 6fe1e4364c6e6099f0eea41ce2ad707ff09c8cb5..b82d89cd1c0302ce5058d9e6f2077e6c59e421ba 100644 --- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java @@ -250,7 +250,7 @@ public class CreateJoinTournamentState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java index cc462f9c3af707ae92c36f96de3bc54f6c465d2d..5382c444b82b751ee83e8705cc892012037bcd2d 100644 --- a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java @@ -57,7 +57,7 @@ public class CreateNewTournamentState extends State { // Texts private final String backBtnText = "Back"; private final String createBtnText = "Create"; - private final String nextBtnText = "Next"; + private final String nextBtnText = "Select games"; private final String noNameText = "No name given"; private final String noGamesSelectedText = "No games selected"; @@ -169,7 +169,7 @@ public class CreateNewTournamentState extends State { rootTable.add(makeBackBtn()).expand().bottom().left(); TextButton nextBtn = makeNextBtn(); - rootTable.add(nextBtn).size(buttonWidth, buttonHeight).expand().bottom().right(); + rootTable.add(nextBtn).size(buttonWidth*1.2f, buttonHeight).expand().bottom().right(); } private void makePageTwo(){ @@ -235,7 +235,7 @@ public class CreateNewTournamentState extends State { } private TextButton makeCreateBtn() { - TextButton createBtn = new TextButton(createBtnText, skin); + TextButton createBtn = new TextButton(createBtnText, makeTextButtonStyle(greenColor)); createBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ @@ -274,7 +274,7 @@ public class CreateNewTournamentState extends State { } private TextButton makeBackBtn() { - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java b/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java index 48ccee6b0104e7df073a8b9335fc16c582f78a97..a5f01b8532ec15a31cdab6ac5a3613b4572a5fce 100644 --- a/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/FinishedTournamentState.java @@ -135,7 +135,7 @@ public class FinishedTournamentState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/LoginState.java b/frontend/core/src/com/gameware/game/states/LoginState.java index 78fc4da2675dd5ac29154a1ebbff2ab988c3ab66..efa7a6bb8b24f8f48a5b58459b0a257590906a99 100644 --- a/frontend/core/src/com/gameware/game/states/LoginState.java +++ b/frontend/core/src/com/gameware/game/states/LoginState.java @@ -1,6 +1,8 @@ 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.g2d.SpriteBatch; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; @@ -196,14 +198,11 @@ public class LoginState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backText, skin); + TextButton backBtn = new TextButton(backText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ - page --; - errorLabel.setText(""); - stage.clear(); - makeStage(); + handleBackBtnClicked(); } }); return backBtn; @@ -274,6 +273,13 @@ public class LoginState extends State { } } + private void handleBackBtnClicked(){ + page --; + errorLabel.setText(""); + stage.clear(); + makeStage(); + } + // Adds listener to stage that removes keyboard on touch private void removeKeyPadAtTouch(){ stage.getRoot().addCaptureListener(new InputListener() { @@ -327,6 +333,13 @@ public class LoginState extends State { this.loadingText.setLoading(); } + @Override + protected void handleInput() { + if (Gdx.input.isKeyJustPressed(Input.Keys.BACK) && page == 1){ + handleBackBtnClicked(); + } + } + @Override public void dispose() { stage.dispose(); diff --git a/frontend/core/src/com/gameware/game/states/MenuState.java b/frontend/core/src/com/gameware/game/states/MenuState.java index 69541d1029e9b9a742bf10828fd61ff83b02374c..99d0ed7b6ef9978ea08f06764b70c1032892f81d 100644 --- a/frontend/core/src/com/gameware/game/states/MenuState.java +++ b/frontend/core/src/com/gameware/game/states/MenuState.java @@ -2,6 +2,7 @@ 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.graphics.g2d.TextureRegion; @@ -140,7 +141,7 @@ public class MenuState extends State{ Table table = new Table(); table.add(new Image(logOut)).width(logOutWidth).height(buttonHeight/3f).spaceRight(spacingLittle/2); table.add(new Label(logOutBtnText, skin, "big")).spaceRight(spacingLittle/2); - Button btn = new Button(table, skin); + Button btn = new Button(table, makeTextButtonStyle(backColor)); btn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/OptionsState.java b/frontend/core/src/com/gameware/game/states/OptionsState.java index 1a98dade542bbfbb70e75b61b4528e9c492ede9c..0a4071e0049c4b777dc23f8de6eff7d587490bcc 100644 --- a/frontend/core/src/com/gameware/game/states/OptionsState.java +++ b/frontend/core/src/com/gameware/game/states/OptionsState.java @@ -98,7 +98,7 @@ public class OptionsState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java index 3a22e66d2f3b31bd332465432c803b8ad03f29b0..d59a1dd801e35d74421c1b232a1b51a9e64a3bab 100644 --- a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java +++ b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java @@ -84,7 +84,7 @@ public class SinglePlayerSelectGameState extends State { innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle); innerInnerTable.row(); - TextButton gameBtn = new TextButton(playBtnText, skin); + TextButton gameBtn = new TextButton(playBtnText, makeTextButtonStyle(greenColor)); gameBtn.addListener(new SinglePlayerSelectGameState.MyClickListener(g)); innerInnerTable.add(gameBtn); @@ -96,7 +96,7 @@ public class SinglePlayerSelectGameState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ handleBackBtnClick(); } diff --git a/frontend/core/src/com/gameware/game/states/State.java b/frontend/core/src/com/gameware/game/states/State.java index a4fdc7d4ea042292c551dd1ed45b407de60a744c..b743fa6583b665dc7b70ee4e8a50e928f6a9ef86 100644 --- a/frontend/core/src/com/gameware/game/states/State.java +++ b/frontend/core/src/com/gameware/game/states/State.java @@ -15,6 +15,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Label; 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.badlogic.gdx.utils.Align; @@ -56,6 +57,8 @@ public abstract class State { protected TextureRegionDrawable backgroundTableBlueRounded = new TextureRegionDrawable(new TextureRegion(new Texture("state/tableBGRounded.png"))); protected TextureRegionDrawable questionMark = new TextureRegionDrawable(new TextureRegion(new Texture("state/questionMarkIcon.png"))); + protected Color backColor = Color.VIOLET; + protected Color greenColor = Color.GREEN; // Sound Effects protected Sound buttonPressSound; @@ -165,4 +168,14 @@ public abstract class State { return dialog; } + protected TextButton.TextButtonStyle makeTextButtonStyle(Color background){ + TextButton.TextButtonStyle textButtonStyle = new TextButton.TextButtonStyle(); + textButtonStyle.up = skin.newDrawable("button", background); + textButtonStyle.down = skin.newDrawable("button-down", background); + textButtonStyle.font = skin.getFont("font-big"); + textButtonStyle.fontColor = Color.WHITE; + return textButtonStyle; + } + + } diff --git a/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java b/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java index ef7d3b4bcec0a36cb55a15c9eb24bd6b070487a4..b53cea0bf1a07b7d07cb1f35410574f81d32a78b 100644 --- a/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java +++ b/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java @@ -109,7 +109,7 @@ public class TournamentHighScoreState extends State{ } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/ViewHighScoreForGameState.java b/frontend/core/src/com/gameware/game/states/ViewHighScoreForGameState.java index 1e6d082009bc5932817b800e75f6f92234a8b4cb..3aec47fc13a8f1031d864f13ad4f91827bd14fc8 100644 --- a/frontend/core/src/com/gameware/game/states/ViewHighScoreForGameState.java +++ b/frontend/core/src/com/gameware/game/states/ViewHighScoreForGameState.java @@ -96,7 +96,7 @@ public class ViewHighScoreForGameState extends State { // Make widgets methods private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ diff --git a/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java b/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java index 053d3c55bf21d0c3e0f717bf5598c673ad897d4c..e4bbbea929cd478e315b8f010d2f4fb7d28997f9 100644 --- a/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java +++ b/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java @@ -106,7 +106,7 @@ public class ViewHighScoreState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ handleBackBtnClick(); } diff --git a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java index 0e145fe1379439c3507a1606bbf307e70574693c..74e15c91b729767e74e093a62c1fb775de544fcb 100644 --- a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java @@ -154,7 +154,7 @@ public class ViewTournamentState extends State { } private TextButton makeBackBtn(){ - TextButton backBtn = new TextButton(backBtnText, skin); + TextButton backBtn = new TextButton(backBtnText, makeTextButtonStyle(backColor)); backBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){ @@ -168,8 +168,8 @@ public class ViewTournamentState extends State { TextButton playBtn; if(round.isPlayed()){ TextButton.TextButtonStyle textButtonStyle = new TextButton.TextButtonStyle(); - textButtonStyle.up = skin.newDrawable("button", Color.GRAY); - textButtonStyle.down = skin.newDrawable("button", Color.GRAY); + textButtonStyle.up = skin.newDrawable("button", new Color(0x207b20a0)); + textButtonStyle.down = skin.newDrawable("button", new Color(0x207b20a0)); textButtonStyle.font = skin.getFont("font-big"); textButtonStyle.fontColor = Color.LIGHT_GRAY; @@ -185,7 +185,7 @@ public class ViewTournamentState extends State { }); } else{ - playBtn = new TextButton(playBtnText, skin); + playBtn = new TextButton(playBtnText, makeTextButtonStyle(greenColor)); playBtn.addListener(new ClickListener() { @Override public void clicked(InputEvent e, float x, float y){