From 0ef53cb243dbb245ab8144b52f6edbae7a71b55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Mon, 1 Feb 2016 13:16:54 +0100
Subject: [PATCH] #123 Fix of small issues
---
core/src/cz/nic/tablexia/Tablexia.java | 2 +-
core/src/cz/nic/tablexia/TablexiaApplication.java | 2 +-
core/src/cz/nic/tablexia/TablexiaSettings.java | 5 +----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index d33f288e5..2cb6fa1b4 100644
--- a/core/src/cz/nic/tablexia/Tablexia.java
+++ b/core/src/cz/nic/tablexia/Tablexia.java
@@ -122,7 +122,7 @@ public class Tablexia extends TablexiaApplication {
private void startLoading(Locale locale) {
// sync loaded screen with loader image
- setScreenIfIsDifferent(Utility.getScreenForScreenClass(TablexiaSettings.LOADER_SCREEN, null));
+ setScreen(Utility.getScreenForScreenClass(TablexiaSettings.LOADER_SCREEN, null));
// async internal assets loading
ApplicationFontManager.getInstance().load();
diff --git a/core/src/cz/nic/tablexia/TablexiaApplication.java b/core/src/cz/nic/tablexia/TablexiaApplication.java
index f68dbbfcf..c06675820 100644
--- a/core/src/cz/nic/tablexia/TablexiaApplication.java
+++ b/core/src/cz/nic/tablexia/TablexiaApplication.java
@@ -512,7 +512,7 @@ public abstract class TablexiaApplication implements ApplicationListener {
*/
public void setScreenIfIsDifferent(AbstractTablexiaScreen<?> newScreen, ScreenTransaction screenTransaction) {
if (newScreen != null) {
- if (getScreen() == null || getScreen().getClass() != newScreen.getClass() || LoaderScreen.class.equals(newScreen.getClass())) {
+ if (getScreen() == null || getScreen().getClass() != newScreen.getClass() || TablexiaSettings.LOADER_SCREEN.equals(newScreen.getClass())) {
setScreen(newScreen, screenTransaction);
}
}
diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java
index 6320c21a0..e2d34fbd9 100644
--- a/core/src/cz/nic/tablexia/TablexiaSettings.java
+++ b/core/src/cz/nic/tablexia/TablexiaSettings.java
@@ -14,12 +14,10 @@ import cz.nic.tablexia.game.GameDefinition;
import cz.nic.tablexia.game.difficulty.GameDifficulty;
import cz.nic.tablexia.loader.application.ApplicationTextManager;
import cz.nic.tablexia.model.UserDAO;
-import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
import cz.nic.tablexia.screen.gamemenu.GameMenuScreen;
import cz.nic.tablexia.screen.loader.LoaderScreen;
-import cz.nic.tablexia.sync.work.PushDataToServer;
-import cz.nic.tablexia.sync.RestSynchronizationService;
+import cz.nic.tablexia.shared.model.User;
import cz.nic.tablexia.util.Log;
public class TablexiaSettings {
@@ -361,7 +359,6 @@ public class TablexiaSettings {
preferences.flush();
if (!lastLocale.getLocale().getLanguage().equals(localeDefinition.getLocale().getLanguage())) {
ApplicationBus.getInstance().post(new LocaleChangedEvent(localeDefinition)).asynchronously();
- ApplicationBus.getInstance().post(new Tablexia.ChangeScreenEvent(LOADER_SCREEN, null)).asynchronously();
}
}
--
GitLab