UI (#106)

* 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

* Removed no more needed files.

* JDK25

* Removed files no longer in use

* Removed need for manual typecast

* Added ability to load in BundledResource for localization

* Docs and easy font loading. Added interfaces for PreloadResource's

* added German, French, Spanish, Italian and Mandarin Chinese

---------

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

.idea/misc.xml

@@ -13,7 +13,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/resourceBundles.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ResourceBundleManager">
+    <custom-resource-bundle>
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_de.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_es.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_fr.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_it.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_nl.properties" />
+      <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_zh.properties" />
+      <base-name>localization</base-name>
+    </custom-resource-bundle>
+  </component>
+</project>

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

@@ -10,7 +10,6 @@ import javafx.scene.Scene;
 import javafx.stage.Stage;
 import org.toop.framework.asset.AssetManager;
 import org.toop.framework.asset.resources.LocalizationAsset;
-import org.toop.framework.audio.SoundManager;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
 import org.toop.local.AppContext;

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

@@ -12,9 +12,10 @@ import java.util.Locale;
 import org.toop.framework.asset.AssetManager;
 import org.toop.framework.asset.resources.CssAsset;
 import org.toop.framework.asset.resources.ImageAsset;
+import org.toop.local.AppContext;
 
 public final class MainMenu extends Menu {
-	private final Locale currentLocale = Locale.of("nl");
+	private final Locale currentLocale = AppContext.getLocale();
 	private final LocalizationAsset loc = AssetManager.get("localization.properties");
 
     public MainMenu() {

app/src/main/resources/Localization.properties

@@ -1,17 +0,0 @@
-# Window title
-windowTitle=ISY Games Selector
-
-# Main Menu buttons
-mainMenuSelectTicTacToe=Tic Tac Toe
-mainMenuSelectReversi=Reversi
-mainMenuSelectSudoku=Sudoku
-mainMenuSelectBattleship=Battleship
-mainMenuSelectOther=Other
-mainMenuSelectCredits=Credits
-mainMenuSelectOptions=Options
-mainMenuSelectQuit=Quit
-
-# Quit Menu text and buttons
-quitMenuTextSure=Are you sure?
-quitMenuButtonYes=Yes
-quitMenuButtonNo=No

app/src/main/resources/Localization_nl.properties

@@ -1,17 +0,0 @@
-# Window title
-windowTitle=ISY Spellen Kiezer
-
-# Main Menu buttons
-mainMenuSelectTicTacToe=Boter Kaas En Eieren
-mainMenuSelectReversi=Reversi
-mainMenuSelectSudoku=Sudoku
-mainMenuSelectBattleship=Zeeslag
-mainMenuSelectOther=Anders
-mainMenuSelectCredits=Credits
-mainMenuSelectOptions=Opties
-mainMenuSelectQuit=Afsluiten
-
-# Quit Menu text and buttons
-quitMenuTextSure=Weet je het zeker?
-quitMenuButtonYes=Ja
-quitMenuButtonNo=Nee

app/src/main/resources/assets/localization/localization.properties

@@ -2,8 +2,8 @@
 windowTitle=ISY Games Selector
 
 # Main Menu buttons
-mainMenuSelectTicTacToe=Tic Tac Toe
+mainMenuSelectTicTacToe=Tic Tac Toe\u5426
-mainMenuSelectReversi=Reversi
+mainMenuSelectReversi=Reversi\u5426
 mainMenuSelectSudoku=Sudoku
 mainMenuSelectBattleship=Battleship
 mainMenuSelectOther=Other

app/src/main/resources/assets/localization/localization_de.properties

@@ -0,0 +1,17 @@
+# Window title
+windowTitle=ISY Spiele-Auswahl
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Tic Tac Toe
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Flottenman\u00F6ver
+mainMenuSelectOther=Andere
+mainMenuSelectCredits=Credits
+mainMenuSelectOptions=Optionen
+mainMenuSelectQuit=Beenden
+
+# Quit Menu text and buttons
+quitMenuTextSure=Bist du sicher?
+quitMenuButtonYes=Ja
+quitMenuButtonNo=Nein

app/src/main/resources/assets/localization/localization_es.properties

@@ -0,0 +1,17 @@
+# Window title
+windowTitle=Selector de juegos ISY
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Tres en raya
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Batalla naval
+mainMenuSelectOther=Otros
+mainMenuSelectCredits=Cr\u00E9ditos
+mainMenuSelectOptions=Opciones
+mainMenuSelectQuit=Salir
+
+# Quit Menu text and buttons
+quitMenuTextSure=\u00BFEst\u00E1s seguro?
+quitMenuButtonYes=S\u00ED
+quitMenuButtonNo=No

app/src/main/resources/assets/localization/localization_fr.properties

@@ -0,0 +1,17 @@
+# Window title
+windowTitle=S\u00E9lecteur de jeux ISY
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Morpion
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Bataille navale
+mainMenuSelectOther=Autres
+mainMenuSelectCredits=Cr\u00E9dits
+mainMenuSelectOptions=Options
+mainMenuSelectQuit=Quitter
+
+# Quit Menu text and buttons
+quitMenuTextSure=\u00CAtes-vous s\u00FBr?
+quitMenuButtonYes=Oui
+quitMenuButtonNo=Non

app/src/main/resources/assets/localization/localization_it.properties

@@ -0,0 +1,17 @@
+# Window title
+windowTitle=Selettore giochi ISY
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=Tris
+mainMenuSelectReversi=Reversi
+mainMenuSelectSudoku=Sudoku
+mainMenuSelectBattleship=Battaglia navale
+mainMenuSelectOther=Altro
+mainMenuSelectCredits=Crediti
+mainMenuSelectOptions=Opzioni
+mainMenuSelectQuit=Esci
+
+# Quit Menu text and buttons
+quitMenuTextSure=Sei sicuro?
+quitMenuButtonYes=S\u00EC
+quitMenuButtonNo=No

app/src/main/resources/assets/localization/localization_zh.properties

@@ -0,0 +1,30 @@
+# suppress inspection "LossyEncoding" for whole file
+# Window title
+windowTitle=ISY \u6E38\u620F\u9009\u62E9\u5668
+# ?????
+
+# Main Menu buttons
+mainMenuSelectTicTacToe=\u4E95\u5B57\u68CB
+# ???
+mainMenuSelectReversi=\u9ED1\u767D\u68CB
+# ???
+mainMenuSelectSudoku=\u6570\u72EC
+# ??
+mainMenuSelectBattleship=\u6D77\u6218\u68CB
+# ???
+mainMenuSelectOther=\u5176\u4ED6
+# ??
+mainMenuSelectCredits=\u5236\u4F5C\u4EBA\u5458
+# ????
+mainMenuSelectOptions=\u9009\u9879
+# ??
+mainMenuSelectQuit=\u9000\u51FA
+# ??
+
+# Quit Menu text and buttons
+quitMenuTextSure=\u4F60\u786E\u5B9A\u5417\uFF1F
+# ?????
+quitMenuButtonYes=\u662F
+# ?
+quitMenuButtonNo=\u5426
+# ?

framework/src/main/java/org/toop/framework/asset/AssetLoader.java

@@ -144,6 +144,7 @@ public class AssetLoader {
                     "File " + file.getName() + " is not of type " + type.getSimpleName()
             );
         }
+
         return type.cast(resource);
     }
 
@@ -242,4 +243,4 @@ public class AssetLoader {
         int i = name.lastIndexOf('.');
         return (i > 0) ? name.substring(i + 1) : "";
     }
-}
+}

framework/src/main/java/org/toop/framework/asset/AssetManager.java

@@ -147,4 +147,4 @@ public class AssetManager {
     public static void addAsset(Asset<? extends BaseResource> asset) {
         assets.put(asset.getName(), asset);
     }
-}
+}