Alpha UI update (#95)

* added localization options
//todo add all the strings

* broken push

* merge to UI

* broken push

* Alpha rebase complete, added asset loader for UI branch

* merge to UI

* UI now uses assetmanager

* added NL and EN for all strings currently in UI

* fix small merge error

---------

Co-authored-by: Ticho Hidding <tichohidding@gmail.com>
Co-authored-by: ramollia <@>

app/src/main/java/org/toop/app/App.java

@@ -8,12 +8,19 @@ import javafx.application.Application;
 import javafx.scene.layout.StackPane;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import org.toop.local.AppContext;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
 
 public class App extends Application {
 	private static Stage stage;
 	private static Scene scene;
 	private static StackPane root;
 
+    private Locale currentLocale = AppContext.getLocale();
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("Localization", currentLocale);
+
 	public static void run(String[] args) {
 		launch(args);
 	}
@@ -23,7 +30,7 @@ public class App extends Application {
 		final StackPane root = new StackPane(new MainMenu().getPane());
 		final Scene scene = new Scene(root);
 
-		stage.setTitle("pism");
+		stage.setTitle(resourceBundle.getString("windowTitle"));
 		stage.setMinWidth(1080);
 		stage.setMinHeight(720);
 

app/src/main/java/org/toop/app/menu/CreditsMenu.java

@@ -1,6 +1,13 @@
 package org.toop.app.menu;
 
+import org.toop.local.AppContext;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
 public final class CreditsMenu extends Menu {
-	public CreditsMenu() {
+    private Locale currentLocale = AppContext.getLocale();
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("Localization", currentLocale);
+    public CreditsMenu() {
 	}
 }

app/src/main/java/org/toop/app/menu/MainMenu.java

@@ -4,28 +4,46 @@ import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.*;
+import org.toop.local.AppContext;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+import org.toop.framework.asset.AssetManager;
+import org.toop.framework.asset.resources.CssAsset;
+import org.toop.framework.asset.resources.ImageAsset;
 
 public final class MainMenu extends Menu {
-	public MainMenu() {
-		final ImageView background = new ImageView();
+	private Locale currentLocale = AppContext.getLocale();
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("Localization", currentLocale);
 
-		final Button tictactoe = createButton("Tic Tac Toe", () -> {});
-		final Button reversi = createButton("Reversi", () -> {});
-		final Button sudoku = createButton("Sudoku", () -> {});
-		final Button battleship = createButton("Battleship", () -> {});
-		final Button other = createButton("Other", () -> {});
+    public MainMenu() {
+		final Button tictactoe = createButton(resourceBundle.getString("mainMenuSelectTicTacToe"), () -> {});
+		final Button reversi = createButton(resourceBundle.getString("mainMenuSelectReversi"), () -> {});
+		final Button sudoku = createButton(resourceBundle.getString("mainMenuSelectSudoku"), () -> {});
+		final Button battleship = createButton(resourceBundle.getString("mainMenuSelectBattleship"), () -> {});
+		final Button other = createButton(resourceBundle.getString("mainMenuSelectOther"), () -> {});
 
-		final VBox gamesBox = new VBox(tictactoe, reversi, sudoku, background, other);
+		final VBox gamesBox = new VBox(tictactoe, reversi, sudoku, battleship, other);
 		gamesBox.setAlignment(Pos.TOP_CENTER);
 
-		final Button credits = createButton("Credits", () -> {});
-		final Button options = createButton("Options", () -> {});
-		final Button quit = createButton("Quit", () -> {});
+		final Button credits = createButton(resourceBundle.getString("mainMenuSelectCredits"), () -> {});
+		final Button options = createButton(resourceBundle.getString("mainMenuSelectOptions"), () -> {});
+		final Button quit = createButton(resourceBundle.getString("mainMenuSelectQuit"), () -> {});
 
-		final VBox creditsBox = new VBox(10, credits, options, quit);
+		final VBox creditsBox = new VBox(credits, options, quit);
 		creditsBox.setAlignment(Pos.BOTTOM_CENTER);
 
-		//pane = new StackPane(background, grid);
-		pane.getStylesheets().add(getClass().getResource("/style/main.css").toExternalForm());
+		VBox grid = new VBox(20, gamesBox, creditsBox);
+		grid.setAlignment(Pos.CENTER);
+
+		ImageAsset backgroundImage = (ImageAsset) AssetManager.getByName("background.jpg").getResource();
+		ImageView background = new ImageView(backgroundImage.getImage());
+		background.setPreserveRatio(false);
+		background.fitWidthProperty().bind(grid.widthProperty());
+		background.fitHeightProperty().bind(grid.heightProperty());
+
+		pane = new StackPane(background, grid);
+		CssAsset css = (CssAsset) AssetManager.getByName("main.css").getResource();
+		pane.getStylesheets().add(css.getUrl());
 	}
 }

app/src/main/java/org/toop/app/menu/Menu.java

@@ -6,10 +6,16 @@ import javafx.animation.FadeTransition;
 import javafx.scene.control.Button;
 import javafx.scene.layout.Pane;
 import javafx.util.Duration;
+import org.toop.local.AppContext;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
 
 public abstract class Menu {
 	protected Pane pane;
 	public Pane getPane() { return pane; }
+    private Locale currentLocale = AppContext.getLocale();
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("Localization", currentLocale);
 
 	public void fadeBackgroundImage(String imagePath, float from, float to, float milliseconds) {
 		final FadeTransition fade = new FadeTransition(Duration.millis(milliseconds), App.getRoot());

app/src/main/java/org/toop/app/menu/OptionsMenu.java

@@ -1,6 +1,13 @@
 package org.toop.app.menu;
 
+import org.toop.local.AppContext;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
 public final class OptionsMenu extends Menu {
-	public OptionsMenu() {
+    private Locale currentLocale = AppContext.getLocale();
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("Localization", currentLocale);
+    public OptionsMenu() {
 	}
 }

app/src/main/java/org/toop/app/menu/QuitMenu.java

@@ -8,23 +8,31 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import org.toop.app.App;
+import org.toop.framework.asset.AssetManager;
+import org.toop.framework.asset.resources.CssAsset;
+import org.toop.local.AppContext;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
 
 public final class QuitMenu extends Menu {
-	public QuitMenu() {
+    private Locale currentLocale = AppContext.getLocale();
+    private ResourceBundle resourceBundle = ResourceBundle.getBundle("Localization", currentLocale);
+    public QuitMenu() {
 		final Region background = new Region();
 		background.getStyleClass().add("quit-background");
 		background.setPrefSize(Double.MAX_VALUE, Double.MAX_VALUE);
 
-		final Text sure = new Text("Are you sure?");
+		final Text sure = new Text(resourceBundle.getString("quitMenuTextSure"));
 		sure.getStyleClass().add("quit-text");
 
-		final Button yes = new Button("Yes");
+		final Button yes = new Button(resourceBundle.getString("quitMenuButtonYes"));
 		yes.getStyleClass().add("quit-button");
 		yes.setOnAction(_ -> {
 			App.quit();
 		});
 
-		final Button no = new Button("No");
+		final Button no = new Button(resourceBundle.getString("quitMenuButtonNo"));
 		no.getStyleClass().add("quit-button");
 		no.setOnAction(_ -> {
 			App.pop();
@@ -43,6 +51,7 @@ public final class QuitMenu extends Menu {
 		StackPane.setAlignment(box, Pos.CENTER);
 
 		pane = modalContainer;
-		pane.getStylesheets().add(getClass().getResource("/style/quit.css").toExternalForm());
+		CssAsset css = (CssAsset) AssetManager.getByName("quit.css").getResource();
+		pane.getStylesheets().add(css.getUrl());
 	}
 }

app/src/main/java/org/toop/local/AppContext.java

@@ -0,0 +1,14 @@
+package org.toop.local;
+
+import java.util.Locale;
+
+public class AppContext {
+    private static Locale currentLocale = Locale.getDefault();
+
+    public static void setCurrentLocale(Locale locale) {
+        currentLocale = locale;
+    }
+    public static Locale getLocale() {
+        return currentLocale;
+    }
+}