Resolve "MenuState"

Closes #40 (closed)

frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java

@@ -2,42 +2,30 @@ package com.gameware.game.states;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.Button;
 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.ui.TextField;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.gameware.game.GameWare;
 
 public class CreateJoinTournamentState extends State {
 
-    private Stage stage;
     private Table outerTable;
     private Table innerTable;
+    private final float labelSize = 10f;
 
-    private int spacingOnBottom = Gdx.graphics.getHeight()/15;
-    private float fontScaleX = 3f;
-    private float fontScaleY = 3f;
     private String backBtnText = "Back";
     private String enterBtnText = "Enter";
     private String createBtnText = "Create new";
     private String joinBtnText = "Join new";
     private String tournamentText = "Tournament 1";
 
+
     public CreateJoinTournamentState(GameStateManager gsm) {
         super(gsm);
         System.out.println("Du er i create join tournament state :0");
-        stage = new Stage();
-        Gdx.input.setInputProcessor(stage);
-        Skin skin = new Skin(Gdx.files.internal(GameWare.skinFilePath));
-        skin.getFont("font").getData().setScale(fontScaleX,fontScaleY);
-        cam.setToOrtho(false, Gdx.graphics.getWidth()/2, Gdx.graphics.getHeight()/2);
 
         outerTable = new Table();
         outerTable.setFillParent(true);
@@ -48,7 +36,7 @@ public class CreateJoinTournamentState extends State {
         innerTable.row();
 
         Label tournamentLabel = new Label(tournamentText,skin);
-
+        //TODO: autogenerere utifra query og putt dem i en liste
         TextButton enterBtn = new TextButton(enterBtnText, skin);
         enterBtn.addListener(new ClickListener() {
             @Override
@@ -91,13 +79,25 @@ public class CreateJoinTournamentState extends State {
         innerTable.add(enterBtn4);
         innerTable.row();
 
-
-
         ScrollPane tournamentsPane = new ScrollPane(innerTable, skin);
-        outerTable.add(tournamentsPane).pad(10);
+        outerTable.add(tournamentsPane).spaceBottom(spacingOnBottom);
 
         outerTable.row();
+        outerTable.add(makeCreateBtn()).spaceBottom(spacingOnBottom);
+        outerTable.add(makeJoinBtn()).spaceBottom(spacingOnBottom);
+        outerTable.row();
+
+        outerTable.add(makeBackBtn()).spaceBottom(spacingOnBottom);
 
+        //outerTable.row();
+
+        Label tournamentLabel1 = new Label(tournamentText,skin);
+        outerTable.add(tournamentLabel1).size(labelSize);
+
+        stage.addActor(outerTable);
+    }
+
+    private TextButton makeCreateBtn(){
         TextButton createBtn = new TextButton(createBtnText, skin);
         createBtn.addListener(new ClickListener() {
             @Override
@@ -105,8 +105,10 @@ public class CreateJoinTournamentState extends State {
                 handleCreateBtnClick();
             }
         });
-        outerTable.add(createBtn).pad(10);
+        return createBtn;
+    }
 
+    private TextButton makeJoinBtn(){
         TextButton joinBtn = new TextButton(joinBtnText, skin);
         joinBtn.addListener(new ClickListener() {
             @Override
@@ -114,10 +116,10 @@ public class CreateJoinTournamentState extends State {
                 handleJoinBtnClick();
             }
         });
-        outerTable.add(joinBtn).pad(10);
-
-        outerTable.row();
+        return joinBtn;
+    }
 
+    private TextButton makeBackBtn(){
         TextButton backBtn = new TextButton(backBtnText, skin);
         backBtn.addListener(new ClickListener() {
             @Override
@@ -125,14 +127,7 @@ public class CreateJoinTournamentState extends State {
                 handleBackBtnClick();
             }
         });
-        outerTable.add(backBtn).pad(10);
-
-        //outerTable.row();
-
-        Label tournamentLabel1 = new Label(tournamentText,skin);
-        outerTable.add(tournamentLabel1).size(10f);
-
-        stage.addActor(outerTable);
+        return backBtn;
     }
 
     @Override