Merge remote-tracking branch 'origin/UI' into UI

# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/GameInformation.java
#	app/src/main/java/org/toop/app/canvas/GameCanvas.java
#	app/src/main/java/org/toop/app/canvas/TicTacToeCanvas.java
#	app/src/main/java/org/toop/app/layer/Container.java
#	app/src/main/java/org/toop/app/layer/Layer.java
#	app/src/main/java/org/toop/app/layer/NodeBuilder.java
#	app/src/main/java/org/toop/app/layer/Popup.java
#	app/src/main/java/org/toop/app/layer/containers/HorizontalContainer.java
#	app/src/main/java/org/toop/app/layer/containers/VerticalContainer.java
#	app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
#	app/src/main/java/org/toop/app/layer/layers/CreditsPopup.java
#	app/src/main/java/org/toop/app/layer/layers/MainLayer.java
#	app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java
#	app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
#	app/src/main/java/org/toop/app/layer/layers/QuitPopup.java
#	app/src/main/java/org/toop/app/layer/layers/game/GameFinishedPopup.java
#	app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
#	app/src/main/java/org/toop/local/AppSettings.java

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

@@ -1,21 +1,21 @@
 package org.toop;
 
 import org.toop.app.App;
-import org.toop.framework.asset.ResourceLoader;
-import org.toop.framework.asset.ResourceManager;
 import org.toop.framework.audio.SoundManager;
 import org.toop.framework.networking.NetworkingClientManager;
 import org.toop.framework.networking.NetworkingInitializationException;
+import org.toop.framework.resource.ResourceLoader;
+import org.toop.framework.resource.ResourceManager;
 
 public final class Main {
-	public static void main(String[] args) {
-		initSystems();
-		App.run(args);
-	}
+    static void main(String[] args) {
+        initSystems();
+        App.run(args);
+    }
 
-	private static void initSystems() throws NetworkingInitializationException {
-		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets"));
-		new Thread(NetworkingClientManager::new).start();
-		new Thread(SoundManager::new).start();
-	}
-}
+    private static void initSystems() throws NetworkingInitializationException {
+        ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets"));
+        new Thread(NetworkingClientManager::new).start();
+        new Thread(SoundManager::new).start();
+    }
+}

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

@@ -1,28 +1,27 @@
 package org.toop.local;
 
-import org.toop.framework.asset.ResourceManager;
-import org.toop.framework.asset.resources.LocalizationAsset;
-
 import java.util.Locale;
+import org.toop.framework.resource.ResourceManager;
+import org.toop.framework.resource.resources.LocalizationAsset;
 
 public class AppContext {
-	private static final LocalizationAsset localization = ResourceManager.get("localization");
-	private static Locale locale = Locale.forLanguageTag("en");
+    private static final LocalizationAsset localization = ResourceManager.get("localization");
+    private static Locale locale = Locale.forLanguageTag("en");
 
-	public static LocalizationAsset getLocalization() {
-		return localization;
-	}
+    public static LocalizationAsset getLocalization() {
+        return localization;
+    }
 
-	public static void setLocale(Locale locale) {
-		AppContext.locale = locale;
-	}
+    public static void setLocale(Locale locale) {
+        AppContext.locale = locale;
+    }
 
-	public static Locale getLocale() {
-		return locale;
-	}
+    public static Locale getLocale() {
+        return locale;
+    }
 
-	public static String getString(String key) {
-		assert localization != null;
-		return localization.getString(key, locale);
-	}
-}
+    public static String getString(String key) {
+        assert localization != null;
+        return localization.getString(key, locale);
+    }
+}

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

@@ -1,9 +1,14 @@
 package org.toop.local;
 
+import java.io.File;
+import java.util.Locale;
 import org.toop.app.App;
 import org.toop.framework.asset.resources.SettingsAsset;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.resource.ResourceManager;
+import org.toop.framework.resource.ResourceMeta;
+import org.toop.framework.resource.resources.SettingsAsset;
 import org.toop.framework.settings.Settings;
 
 import java.io.File;
@@ -12,19 +17,32 @@ import java.util.Locale;
 public class AppSettings {
     private static SettingsAsset settingsAsset;
 
+    private SettingsAsset settingsAsset;
+
+    public void applySettings() {
+        this.settingsAsset = getPath();
+        if (!this.settingsAsset.isLoaded()) {
+            this.settingsAsset.load();
     public static void applySettings() {
         SettingsAsset settings = getPath();
         if (!settings.isLoaded()) {
             settings.load();
         }
-        Settings settingsData = settings.getContent();
+
+        Settings settingsData = this.settingsAsset.getContent();
 
         AppContext.setLocale(Locale.of(settingsData.locale));
         App.setFullscreen(settingsData.fullScreen);
-        new EventFlow().addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume)).asyncPostEvent();
-        new EventFlow().addPostEvent(new AudioEvents.ChangeFxVolume(settingsData.fxVolume)).asyncPostEvent();
-        new EventFlow().addPostEvent(new AudioEvents.ChangeMusicVolume(settingsData.musicVolume)).asyncPostEvent();
-		App.setStyle(settingsAsset.getTheme(), settingsAsset.getLayoutSize());
+        new EventFlow()
+                .addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume))
+                .asyncPostEvent();
+        new EventFlow()
+                .addPostEvent(new AudioEvents.ChangeFxVolume(settingsData.fxVolume))
+                .asyncPostEvent();
+        new EventFlow()
+                .addPostEvent(new AudioEvents.ChangeMusicVolume(settingsData.musicVolume))
+                .asyncPostEvent();
+        App.setStyle(settingsAsset.getTheme(), settingsAsset.getLayoutSize());
     }
 
     public static SettingsAsset getPath() {
@@ -43,10 +61,12 @@ public class AppSettings {
                 basePath = System.getProperty("user.home") + "/.config";
             }
 
-            File settingsFile = new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
-            settingsAsset = new SettingsAsset(settingsFile);
+            File settingsFile =
+                    new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
+//            this.settingsAsset = new SettingsAsset(settingsFile);
+            ResourceManager.addAsset(new ResourceMeta<>("settings.json", new SettingsAsset(settingsFile)));
         }
-        return settingsAsset;
+        return ResourceManager.get("settings.json");
     }
 
 	public static SettingsAsset getSettings() {