Merge branch 'devel' into feature-abstractgame

android/AndroidManifest.xml

@@ -16,7 +16,7 @@
         <activity
             android:name="cz.nic.tablexia.android.AndroidLauncher"
             android:label="@string/app_name" 
-            android:screenOrientation="landscape"
+            android:screenOrientation="sensorLandscape"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/assets/text/application/application_cs.properties

@@ -10,6 +10,10 @@ mainmenu_preferences=Nastavení
 mainmenu_about=O aplikaci
 mainmenu_logout=Odhlásit
 
+gamedifficulty_easy=Lehká
+gamedifficulty_medium=Střední
+gamedifficulty_hard=Těžká
+
 game_robbery_title=Lupiči
 game_kidnapping_title=Únos
 game_pursuit_title=Pronásledování

android/assets/text/application/application_sk.properties

@@ -10,6 +10,10 @@ mainmenu_preferences=Nastavenie
 mainmenu_about=O aplikácií
 mainmenu_logout=Odhlásiť
 
+gamedifficulty_easy=Ľahká
+gamedifficulty_medium=Stredná
+gamedifficulty_hard=Ťažká
+
 game_robbery_title=Lupiči
 game_kidnapping_title=Únos
 game_pursuit_title=Prenasledovanie

android/build.gradle

@@ -36,9 +36,11 @@ android {
     }
 
     applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            def file = output.outputFile
-            output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", appName))
+        if (!variant.buildType.name.equals("debug")) {
+            variant.outputs.each { output ->
+                def file = output.outputFile
+                output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", appName))
+            }
         }
     }
 

core/src/cz/nic/tablexia/Tablexia.java

@@ -22,11 +22,11 @@ import cz.nic.tablexia.util.Log;
 import cz.nic.tablexia.util.Utility;
 
 public class Tablexia extends TablexiaApplication {
-	
-	private boolean					loadingComplete         = false;
-    private MainMenuContainer       mainMenuContainer;
-    private ZipAssetLoader          zipAssetLoader;
-    private boolean                 resetState;
+
+    private boolean loadingComplete = false;
+    private MainMenuContainer mainMenuContainer;
+    private ZipAssetLoader    zipAssetLoader;
+    private boolean           resetState;
 
     public Tablexia(boolean debug, Locale systemLocale, String versionName, String applicationId, boolean resetState) {
         TablexiaSettings.init(debug, systemLocale, versionName, applicationId);
@@ -37,14 +37,14 @@ public class Tablexia extends TablexiaApplication {
         TablexiaSettings.init(buildTypeKey, systemLocale, versionName, applicationId);
         this.resetState = resetState;
     }
-	
-	private void loadingComplete() {
-		if (!loadingComplete) {
-			loadingComplete = true;
-			showLastOrInitialScreen();
-			ApplicationBus.getInstance().publishAsync(new ApplicationLoadingCompleteEvent());
-		}
-	}
+
+    private void loadingComplete() {
+        if (!loadingComplete) {
+            loadingComplete = true;
+            showLastOrInitialScreen();
+            ApplicationBus.getInstance().publishAsync(new ApplicationLoadingCompleteEvent());
+        }
+    }
 
     private void showLastOrInitialScreen() {
         AbstractTablexiaScreen<?> lastScreen = TablexiaSettings.getInstance().getCurrentScreen();
@@ -58,7 +58,7 @@ public class Tablexia extends TablexiaApplication {
     private void prepareMainMenu() {
         mainMenuContainer = new MainMenuContainer(getStage().getWidth(), getStage().getHeight());
         getStage().addActor(mainMenuContainer);
-	}
+    }
 
     private void startLoading(Locale locale) {
         // sync loaded screen with loader image
@@ -106,13 +106,13 @@ public class Tablexia extends TablexiaApplication {
             }
         });
     }
-	
-	
+
+
 //////////////////////////// LIBGDX LIFECYCLE
-	
-	@Override
-	public void create () {
-		super.create();
+
+    @Override
+    public void create() {
+        super.create();
 
         TablexiaSettings.getInstance().loadPreferences(resetState);
         Log.setLoglevel(TablexiaSettings.getInstance().getLogLevel());
@@ -122,7 +122,7 @@ public class Tablexia extends TablexiaApplication {
 
         // start loading application scope data
         startLoading(TablexiaSettings.getInstance().getLocale());
-	}
+    }
 
     @Override
     public void pause() {
@@ -134,76 +134,77 @@ public class Tablexia extends TablexiaApplication {
     }
 
     @Override
-	public void render () {
-		// render other screens
-		super.render();
-		
-		// process loading
-		if (!loadingComplete) {
+    public void render() {
+        // render other screens
+        super.render();
+
+        // process loading
+        if (!loadingComplete) {
             // load internal assets
             if (!ApplicationFontManager.getInstance().update()) return;
             if (!ApplicationTextManager.getInstance().update()) return;
             // load external assets
             if (!zipAssetLoader.update()) return;
-			if (!ApplicationTextureManager.getInstance().update()) return;
+            if (!ApplicationTextureManager.getInstance().update()) return;
             if (!ApplicationSoundManager.getInstance().update()) return;
-			
-			prepareMainMenu();
-			loadingComplete();
-		}
-	}
-	
-	@Override
-	public void dispose() {
+
+            prepareMainMenu();
+            loadingComplete();
+        }
+    }
+
+    @Override
+    public void dispose() {
         super.dispose();
-		clearLoadedData();
-	}
-	
-	
+        clearLoadedData();
+    }
+
+
 //////////////////////////// APPLICATION LOADING COMPLETE EVENT
-	
-	public static class ApplicationLoadingCompleteEvent implements ApplicationEvent {}
-	
-	
+
+    public static class ApplicationLoadingCompleteEvent implements ApplicationEvent {
+    }
+
+
 //////////////////////////// CHANGE SCREEN EVENT
-	
-	public static class ChangeScreenEvent implements ApplicationEvent {
-		
-		private Class<? extends AbstractTablexiaScreen<?>> 	screen;
-		private ScreenTransaction 							screenTransaction;
 
-		public ChangeScreenEvent(Class<? extends AbstractTablexiaScreen<?>> screen, ScreenTransaction screenTransaction) {
-			this.screen = screen;
-			this.screenTransaction = screenTransaction;
-		}
-		
-		public Class<? extends AbstractTablexiaScreen<?>> getScreen() {
-			return screen;
-		}
-
-		public ScreenTransaction getScreenTransaction() {
-			return screenTransaction;
-		}
-	}
-	
-	@Handler
-	public void handleChangeScreenEvent(final ChangeScreenEvent changeScreenEvent) {
-		final Class<? extends AbstractTablexiaScreen<?>> screenClass = changeScreenEvent.getScreen();
-		if (!loadingComplete) {
-			Log.err(getClass(), "Cannot change screen -> Application loading not complete!");
-			return;
-		}
-		if (screenClass == null) {
-			Log.err(getClass(), "Cannot change screen -> Received empty screen class!");
-			return;
-		}
-		// create new screen on GL thread
-		Gdx.app.postRunnable(new Runnable() {
-			
-			@Override
-			public void run() {
+    public static class ChangeScreenEvent implements ApplicationEvent {
+
+        private Class<? extends AbstractTablexiaScreen<?>> screen;
+        private ScreenTransaction                          screenTransaction;
+
+        public ChangeScreenEvent(Class<? extends AbstractTablexiaScreen<?>> screen, ScreenTransaction screenTransaction) {
+            this.screen = screen;
+            this.screenTransaction = screenTransaction;
+        }
+
+        public Class<? extends AbstractTablexiaScreen<?>> getScreen() {
+            return screen;
+        }
+
+        public ScreenTransaction getScreenTransaction() {
+            return screenTransaction;
+        }
+    }
+
+    @Handler
+    public void handleChangeScreenEvent(final ChangeScreenEvent changeScreenEvent) {
+        final Class<? extends AbstractTablexiaScreen<?>> screenClass = changeScreenEvent.getScreen();
+        if (!loadingComplete) {
+            Log.err(((Object)this).getClass(), "Cannot change screen -> Application loading not complete!");
+            return;
+        }
+        if (screenClass == null) {
+            Log.err(((Object)this).getClass(), "Cannot change screen -> Received empty screen class!");
+            return;
+        }
+        // create new screen on GL thread
+        Gdx.app.postRunnable(new Runnable() {
+
+            @Override
+            public void run() {
                 setScreenIfIsDifferent(Utility.getScreenForScreenClass(screenClass), changeScreenEvent.getScreenTransaction());
-			}
-		});
-	}
+            }
+        });
+    }
 }

core/src/cz/nic/tablexia/TablexiaSettings.java

@@ -19,38 +19,38 @@ import cz.nic.tablexia.util.Utility;
 
 public class TablexiaSettings {
 
-    private static final    int                 DEFAULT_SCREEN_WIDTH        = 1000;
-    private static final    double              MAXIMUM_RATIO               = 9.0 / 16.0;
-    private static final    int                 MIN_SCREEN_HEIGHT           = (int) (DEFAULT_SCREEN_WIDTH * MAXIMUM_RATIO);
-    private static final    boolean 	        DEBUG_SHOW_BOUNDING_BOXES   = true;
+    private static final int     DEFAULT_SCREEN_WIDTH      = 1000;
+    private static final double  MAXIMUM_RATIO             = 9.0 / 16.0;
+    private static final int     MIN_SCREEN_HEIGHT         = (int) (DEFAULT_SCREEN_WIDTH * MAXIMUM_RATIO);
+    private static final boolean DEBUG_SHOW_BOUNDING_BOXES = true;
 
-    public  static final    Class<? extends AbstractTablexiaScreen<?>> 	INITIAL_SCREEN              = GameMenuScreen.class;
+    public  static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = GameMenuScreen.class;
 
-    public static final     String      LOCALE_KEY                  = "locale";
-    public static final     String      CURRENT_SCREEN_KEY          = "current_screen";
+    public static final String LOCALE_KEY         = "locale";
+    public static final String CURRENT_SCREEN_KEY = "current_screen";
 
-    private static final    String      IDE_BUILD_APPLICATION_ID    = "cz.nic.tablexia.debug";
-    private static final    String      IDE_BUILD_VERSION_NAME      = "IDE-BUILD";
+    private static final String IDE_BUILD_APPLICATION_ID = "cz.nic.tablexia.debug";
+    private static final String IDE_BUILD_VERSION_NAME   = "IDE-BUILD";
 
-    private final           BuildType   BUILD_TYPE;
-    private final           String      VERSION_NAME;
-    private final           String      APPLICATION_ID;
+    private final BuildType BUILD_TYPE;
+    private final String    VERSION_NAME;
+    private final String    APPLICATION_ID;
 
-    private                 Preferences         preferences;
-    private                 LocaleDefinition    systemLocale;
-    private                 LocaleDefinition    selectedLocale;
+    private Preferences      preferences;
+    private LocaleDefinition systemLocale;
+    private LocaleDefinition selectedLocale;
 
 
     public static enum BuildType {
 
-        RELEASE ("release", false,  Log.TablexiaLogLevel.ERROR),
-        DEBUG   ("debug",   true,   Log.TablexiaLogLevel.DEBUG);
+        RELEASE("release", false, Log.TablexiaLogLevel.ERROR),
+        DEBUG("debug", true, Log.TablexiaLogLevel.DEBUG);
 
         private final static BuildType FALLBACK_VARIANT = BuildType.DEBUG;
 
-        private final String                key;
-        private final boolean               isDebug;
-        private Log.TablexiaLogLevel        logLevel;
+        private final String               key;
+        private final boolean              isDebug;
+        private       Log.TablexiaLogLevel logLevel;
 
         private BuildType(String key, boolean isDebug, Log.TablexiaLogLevel logLevel) {
             this.key = key;
@@ -67,7 +67,7 @@ public class TablexiaSettings {
         }
 
         public static BuildType getBuildTypeForKey(String key) {
-            for(BuildType buildType : BuildType.values()) {
+            for (BuildType buildType : BuildType.values()) {
                 if (buildType.key.equals(key)) {
                     return buildType;
                 }
@@ -78,12 +78,12 @@ public class TablexiaSettings {
 
     public enum LocaleDefinition {
 
-        SYSTEM  (null,                      "system",   ApplicationTextManager.LANGUAGE_SYSTEM),
-        cs_CZ   (new Locale("cs", "CZ"),    "cs_CZ",    ApplicationTextManager.LANGUAGE_CZECH),
-        sk_SK   (new Locale("sk", "SK"),    "sk_SK",    ApplicationTextManager.LANGUAGE_SLOVAK);
+        SYSTEM(null, "system", ApplicationTextManager.LANGUAGE_SYSTEM),
+        cs_CZ(new Locale("cs", "CZ"), "cs_CZ", ApplicationTextManager.LANGUAGE_CZECH),
+        sk_SK(new Locale("sk", "SK"), "sk_SK", ApplicationTextManager.LANGUAGE_SLOVAK);
 
-        public  final static LocaleDefinition   DEFAULT_LOCALE      = LocaleDefinition.cs_CZ;
-        private final static LocaleDefinition   FALLBACK_VARIANT    = LocaleDefinition.SYSTEM;
+        public final static  LocaleDefinition DEFAULT_LOCALE   = LocaleDefinition.cs_CZ;
+        private final static LocaleDefinition FALLBACK_VARIANT = LocaleDefinition.SYSTEM;
 
         private final Locale locale;
         private final String localeKey;
@@ -113,7 +113,7 @@ public class TablexiaSettings {
         }
 
         public static LocaleDefinition getLocaleDefinitionForKey(String key) {
-            for(LocaleDefinition localeDefinition: LocaleDefinition.values()) {
+            for (LocaleDefinition localeDefinition : LocaleDefinition.values()) {
                 if (localeDefinition.localeKey.equals(key)) {
                     return localeDefinition;
                 }
@@ -122,7 +122,7 @@ public class TablexiaSettings {
         }
 
         public static LocaleDefinition getLocaleDefinitionForLocale(Locale locale) {
-            for(LocaleDefinition localeDefinition: LocaleDefinition.values()) {
+            for (LocaleDefinition localeDefinition : LocaleDefinition.values()) {
                 if (localeDefinition.locale != null && localeDefinition.locale.equals(locale)) {
                     return localeDefinition;
                 }
@@ -137,10 +137,10 @@ public class TablexiaSettings {
     private static TablexiaSettings instance;
 
     private TablexiaSettings(BuildType buildType, Locale systemLocale, String versionName, String applicationId) {
-        BUILD_TYPE          = buildType;
-        VERSION_NAME        = versionName == null ? IDE_BUILD_VERSION_NAME : versionName;
-        APPLICATION_ID      = applicationId == null ? IDE_BUILD_APPLICATION_ID : applicationId;
-        this.systemLocale   = LocaleDefinition.getLocaleDefinitionForLocale(systemLocale);
+        BUILD_TYPE = buildType;
+        VERSION_NAME = versionName == null ? IDE_BUILD_VERSION_NAME : versionName;
+        APPLICATION_ID = applicationId == null ? IDE_BUILD_APPLICATION_ID : applicationId;
+        this.systemLocale = LocaleDefinition.getLocaleDefinitionForLocale(systemLocale);
     }
 
     public static TablexiaSettings getInstance() {
@@ -174,8 +174,8 @@ public class TablexiaSettings {
 //////////////////////////// LIBGDX PREFERENCES
 
     public void loadPreferences(boolean resetState) {
-        preferences     = Gdx.app.getPreferences(getApplicationId());
-        selectedLocale  = LocaleDefinition.getLocaleDefinitionForKey(preferences.getString(LOCALE_KEY));
+        preferences = Gdx.app.getPreferences(getApplicationId());
+        selectedLocale = LocaleDefinition.getLocaleDefinitionForKey(preferences.getString(LOCALE_KEY));
         if (resetState) {
             preferences.remove(CURRENT_SCREEN_KEY);
             preferences.flush();

core/src/cz/nic/tablexia/game/difficulty/GameDifficulty.java

@@ -19,6 +19,8 @@
 package cz.nic.tablexia.game.difficulty;
 
 
+import cz.nic.tablexia.loader.application.ApplicationTextManager;
+
 /**
  * Game difficulty types
  * 
@@ -26,35 +28,29 @@ package cz.nic.tablexia.game.difficulty;
  */
 public enum GameDifficulty {
 
-	// TODO use string resources
-    EASY(1),
-    MEDIUM(2),
-    HARD(3);
+    EASY    ("gamedifficulty_easy"),
+    MEDIUM  ("gamedifficulty_medium"),
+    HARD    ("gamedifficulty_hard");
 
     public static final GameDifficulty DEFAULT_DIFFICULTY = EASY;
 
-    private int descriptionResourceId;
+    private String descriptionResourceKey;
 
-    private GameDifficulty(int descriptionResourceId) {
-        this.descriptionResourceId = descriptionResourceId;
+    private GameDifficulty(String descriptionResourceKey) {
+        this.descriptionResourceKey = descriptionResourceKey;
     }
 
-    /**
-     * Returns id of description for current difficulty
-     * 
-     * @return id of description string resource
-     */
-    public int getDescriptionResourceId() {
-        return descriptionResourceId;
+    public String getTextDescription() {
+        return ApplicationTextManager.getInstance().getText(getDescriptionResourceKey());
     }
 
     /**
-     * Returns string key for intent extra
+     * Returns key of description for current difficulty
      * 
-     * @return string key for intent extra
+     * @return key of description string resource
      */
-    public static String getIntentKey() {
-        return GameDifficulty.class.getName();
+    public String getDescriptionResourceKey() {
+        return descriptionResourceKey;
     }
 
     /**

core/src/cz/nic/tablexia/screen/ScreenDefinition.java

+package cz.nic.tablexia.screen;
+
+import net.engio.mbassy.listener.Handler;
+
+import cz.nic.tablexia.Tablexia.ChangeScreenEvent;
+import cz.nic.tablexia.TablexiaApplication.ScreenTransaction;
+import cz.nic.tablexia.bus.ApplicationBus;
+import cz.nic.tablexia.menu.MainMenuDefinition;
+import cz.nic.tablexia.screen.about.AboutScreen;
+import cz.nic.tablexia.screen.encyclopedia.EncyclopediaScreen;
+import cz.nic.tablexia.screen.gamemenu.GameMenuScreen;
+import cz.nic.tablexia.screen.halloffame.HallOfFameScreen;
+import cz.nic.tablexia.screen.loader.LoaderScreen;
+import cz.nic.tablexia.screen.preferences.PreferencesScreen;
+import cz.nic.tablexia.screen.statistics.StatisticsScreen;
+
+public enum ScreenDefinition {
+    LOADER(LoaderScreen.class, null),
+    GAME_MENU(GameMenuScreen.class, null),
+    HALL_OF_FAME(HallOfFameScreen.class, MainMenuDefinition.HALL_OF_FAME),
+    STATISTICS(StatisticsScreen.class, MainMenuDefinition.STATISTICS),
+    ENCYCLOPEDIA(EncyclopediaScreen.class, MainMenuDefinition.ENCYCLOPEDIA),
+    PREFERENCES(PreferencesScreen.class, MainMenuDefinition.PREFERENCES),
+    ABOUT_APPLICATION(AboutScreen.class, MainMenuDefinition.ABOUT_APPLICATION);
+
+    private        Class<? extends AbstractTablexiaScreen<?>> screenClass;
+    private        MainMenuDefinition                         mainMenuDefinition;
+    private static Object                                     messageHandler;
+
+    private ScreenDefinition(Class<? extends AbstractTablexiaScreen<?>> screenClass, MainMenuDefinition mainMenuDefinition) {
+        this.screenClass = screenClass;
+        this.mainMenuDefinition = mainMenuDefinition;
+    }
+
+    public MainMenuDefinition getMainMenuDefinition() {
+        return mainMenuDefinition;
+    }
+
+    public Class<? extends AbstractTablexiaScreen<?>> getScreenClass() {
+        return screenClass;
+    }
+
+    public void performMenuAction() {
+        ApplicationBus.getInstance().publishAsync(new ChangeScreenEvent(screenClass, ScreenTransaction.FADE));
+    }
+
+    public static ScreenDefinition getScreenDefinitionForMainMenuDefinition(MainMenuDefinition mainMenuDefinition) {
+        for (ScreenDefinition screenDefinition : ScreenDefinition.values()) {
+            if (screenDefinition.getMainMenuDefinition() == mainMenuDefinition) {
+                return screenDefinition;
+            }
+        }
+        return null;
+    }
+
+    public static void initBus() {
+        messageHandler = new Object() {
+
+            @Handler
+            public void handleChangeScreenEvent(MainMenuDefinition mainMenuDefinition) {
+                ScreenDefinition.getScreenDefinitionForMainMenuDefinition(mainMenuDefinition).performMenuAction();
+            }
+        };
+        ApplicationBus.getInstance().subscribe(messageHandler);
+    }
+}

core/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java

@@ -23,6 +23,7 @@ public final class GameMenuAssets {
     public static final String OFFICE               = GAMEMENU_PATH + "office.jpg";
     public static final String OFFICE_CLICKMAP      = GAMEMENU_PATH + "clickablemap.png";
     public static final String OFFICE_HELP          = GAMEMENU_PATH + "helplayer.png";
+    public static final String OVERLAY              = GAMEMENU_PATH + "overlay.png";
     public static final String VIGNETTE             = GAMEMENU_PATH + "vignetting.png";
     public static final String DESK                 = GAMEMENU_PATH + "desk.png";
     public static final String ENCYCLOPEDIA_PRESSED = GAMEMENU_PATH + "encyclopedia_pressed.png";
@@ -54,6 +55,7 @@ public final class GameMenuAssets {
         textures.add(DESK);
         textures.add(OFFICE_HELP);
         textures.add(VIGNETTE);
+        textures.add(OVERLAY);
 
         textures.add(DIFF_BAR);
         textures.add(DIFF_THUMB);

core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java

 package cz.nic.tablexia.screen.gamemenu;
 
+import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 
+import net.engio.mbassy.listener.Handler;
+
 import java.util.List;
 
+import cz.nic.tablexia.bus.ApplicationBus;
 import cz.nic.tablexia.game.GameDefinition;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
 import cz.nic.tablexia.screen.gamemenu.pages.GameMenuPage;
 import cz.nic.tablexia.screen.gamemenu.pages.OfficeMenuPage;
-import cz.nic.tablexia.util.Log;
 import cz.nic.tablexia.util.ui.ViewPager;
 
 public class GameMenuScreen extends AbstractTablexiaScreen<Void> {
 
     private ViewPager vp;
 
-
     @Override
     protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {
         super.prepareScreenTextureAssetNames(textureFileNames);
@@ -26,7 +28,6 @@ public class GameMenuScreen extends AbstractTablexiaScreen<Void> {
     @Override
     protected void screenLoaded() {
         vp = new ViewPager();
-
         vp.addPage(new OfficeMenuPage(this));
 
         for (GameDefinition gd : GameDefinition.getActiveGames()) {
@@ -34,15 +35,25 @@ public class GameMenuScreen extends AbstractTablexiaScreen<Void> {
         }
 
         vp.setSize(getStage().getWidth(), getStage().getHeight());
-
-        Log.info(getClass().getName(), "ViewPager size: " + getStage().getWidth() + "x" + getStage().getHeight());
-
         getStage().addActor(vp);
 
-
         Image im = new Image(getTexture(GameMenuAssets.VIGNETTE));
         im.setTouchable(Touchable.disabled);
         im.setSize(getStage().getWidth(), getStage().getHeight());
         getStage().addActor(im);
+
+        ApplicationBus.getInstance().subscribe(this);
+    }
+
+    @Handler
+    public void handleShowStreet(OfficeMenuPage.ShowStreetEvent message) {
+        vp.scrollToPage(1);
+    }
+
+    @Override
+    public Texture getTexture(String textureName) {
+        Texture texture = super.getTexture(textureName);
+        texture.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear);
+        return texture;
     }
 }

core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java

@@ -3,6 +3,7 @@ package cz.nic.tablexia.screen.gamemenu.pages;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
@@ -10,10 +11,13 @@ import com.badlogic.gdx.scenes.scene2d.actions.AlphaAction;
 import com.badlogic.gdx.scenes.scene2d.actions.MoveToAction;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Stack;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 
 import cz.nic.tablexia.TablexiaSettings;
 import cz.nic.tablexia.game.GameDefinition;
+import cz.nic.tablexia.game.difficulty.GameDifficulty;
+import cz.nic.tablexia.loader.application.ApplicationTextManager;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
 import cz.nic.tablexia.screen.gamemenu.GameMenuAssets;
 import cz.nic.tablexia.util.ui.ViewPager;
@@ -26,6 +30,9 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
     private GameDefinition game;
 
     private float diffEasyX, diffMediumX, diffHardX;
+    private Actor diffEasy, diffMedium, diffHard;
+    private Stack diffStack;
+    private GameDifficulty gameDifficulty = GameDifficulty.EASY;
 
     private float scrollOffset = TablexiaSettings.getDefaultScreenWidth(); // hack to keep paralax layers out of picture before scrolled for first time
 
@@ -33,7 +40,6 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
         super(screen);
         this.game = game;
 
-
         // Title
         Texture title = getScreen().getTexture(GameMenuAssets.getResourcePath(game, GameMenuAssets.GameMenuLayers.TITLE));
         Image titleImage = new Image(title);
@@ -68,7 +74,6 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
 
         addActor(startDownButton);
         addActor(startButton);
-
         startButton.addListener(new ClickListener() {
             @Override
             public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
@@ -93,53 +98,59 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
             }
         });
 
-        // Labels for diffuculty slider
-        Label.LabelStyle labelStyle = new Label.LabelStyle(screen.getDefaultRegularFont(), Color.BLACK);
-        // TODO load texts from GameDifficulty enum
-        Label easy = new Label("Easy", labelStyle);
-        Label medium = new Label("Medium", labelStyle);
-        Label hard = new Label("Hard", labelStyle);
-
-        easy.setPosition((screen.getStage().getWidth() / 2) - (screen.getStage().getWidth() * 0.1f) - easy.getWidth() / 2, screen.getStage().getHeight() * 0.0f);
-        medium.setPosition((screen.getStage().getWidth() / 2) - medium.getWidth() / 2, screen.getStage().getHeight() * 0.0f);
-        hard.setPosition((screen.getStage().getWidth() / 2) + (screen.getStage().getWidth() * 0.1f) - hard.getWidth() / 2, screen.getStage().getHeight() * 0.0f);
-
-        addActor(easy);
-        addActor(medium);
-        addActor(hard);
+        final Texture diff = getScreen().getTexture(GameMenuAssets.DIFF_THUMB_EASY);
+        float diffY = screen.getStage().getHeight() * 0.06f;
+        float diffHeight = screen.getStage().getHeight() * 0.12f;
+        float diffWidth = diffHeight * ((float) diff.getWidth() / (float) diff.getHeight());
 
         // Difficulty bar
         Texture diffBar = getScreen().getTexture(GameMenuAssets.DIFF_BAR);
         Image diffBarImage = new Image(diffBar);
 
-        int diffBarHeight = (int) (screen.getStage().getHeight() * 0.05);
+        int diffBarHeight = (int) (screen.getStage().getHeight() * 0.04f);
         int diffBarWidth = (int) (diffBarHeight * ((float) diffBar.getWidth() / (float) diffBar.getHeight()));
         int diffBarX = (int) screen.getStage().getWidth() / 2 - diffBarWidth / 2;
-        int diffBarY = (int) (screen.getStage().getHeight() * 0.1 - diffBarHeight);
+        int diffBarY = (int) (screen.getStage().getHeight() * 0.1);
         diffBarImage.setPosition(diffBarX, diffBarY);
         diffBarImage.setSize(diffBarWidth, diffBarHeight);
         addActor(diffBarImage);
 
-        // Difficulty button
+        diffMediumX = (screen.getStage().getWidth() / 2) - (diffWidth / 2);
+        diffEasyX = diffMediumX - (diffBarWidth / 2) + (diffWidth * 0.1f);
+        diffHardX = diffMediumX + (diffBarWidth / 2) - (diffWidth * 0.1f);
 
+        // Labels for diffuculty slider
+        BitmapFont font = screen.getDefaultBoldFont();
+        font.setScale(0.5f);
+        Label.LabelStyle labelStyle = new Label.LabelStyle(font, Color.BLACK);
 
-        final Texture diff = getScreen().getTexture(GameMenuAssets.DIFF_THUMB_MEDIUM);
-        final Image diffButton = new Image(diff);
-        float diffY = 0;
-        float diffHeight = screen.getStage().getHeight() * 0.15f;
-        float diffWidth = diffHeight * ((float) diff.getWidth() / (float) diff.getHeight());
+        Label easy = new Label(GameDifficulty.EASY.getTextDescription(), labelStyle);
+        Label medium = new Label(GameDifficulty.MEDIUM.getTextDescription(), labelStyle);
+        Label hard = new Label(GameDifficulty.HARD.getTextDescription(), labelStyle);
 
-        diffEasyX = (screen.getStage().getWidth() / 2 - diffWidth / 2 + (int) (diffWidth * 0.1f)) - diffBarWidth / 2;
-        diffMediumX = screen.getStage().getWidth() / 2 - diffWidth / 2 + (int) (diffWidth * 0.1f);
-        diffHardX = (screen.getStage().getWidth() / 2 - diffWidth / 2 + (int) (diffWidth * 0.1f)) + diffBarWidth / 2;
+        float labelY = screen.getStage().getHeight() * 0.06f;
+        float labelAddX = diffWidth / 2;
+        easy.setPosition(diffEasyX + labelAddX - easy.getWidth() / 2, labelY);
+        medium.setPosition(diffMediumX + labelAddX - medium.getWidth() / 2, labelY);
+        hard.setPosition(diffHardX + labelAddX - hard.getWidth() / 2, labelY);
 
-        float diffX = diffEasyX;
-        diffButton.setSize(diffWidth, diffHeight);
-        diffButton.setPosition(diffX, diffY);
-        addActor(diffButton);
+        addActor(easy);
+        addActor(medium);
+        addActor(hard);
 
+        // Difficulty button
+        diffStack = new Stack();
+        diffStack.addActor(diffEasy = new Image(diff));
+        diffStack.addActor(diffMedium = new Image(getScreen().getTexture(GameMenuAssets.DIFF_THUMB_MEDIUM)));
+        diffStack.addActor(diffHard = new Image(getScreen().getTexture(GameMenuAssets.DIFF_THUMB_HARD)));
+
+        float diffX = diffEasyX;
+        diffStack.setSize(diffWidth, diffHeight);
+        diffStack.setPosition(diffX, diffY);
+        addActor(diffStack);
+        setDifficulty(gameDifficulty);
 
-        diffButton.addListener(new InputListener() {
+        diffStack.addListener(new InputListener() {
             float lastX;
 
             @Override
@@ -153,41 +164,117 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
             @Override
             public void touchDragged(InputEvent event, float x, float y, int pointer) {
                 super.touchDragged(event, x, y, pointer);
-                float bx = diffButton.getX() + (x - lastX);
+                float bx = diffStack.getX() + (x - lastX);
                 if (bx >= diffEasyX && bx <= diffHardX) {
-                    diffButton.setPosition(bx, diffButton.getY());
+                    diffStack.setPosition(bx, diffStack.getY());
                 }
+                showDifficulty(getDifficulty());
                 event.stop();
             }
 
             @Override
             public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
                 super.touchUp(event, x, y, pointer, button);
-                float bx = diffButton.getX() + (x - lastX);
-                MoveToAction ma = new MoveToAction();
-                if (bx < diffMediumX) {
-                    if ((diffEasyX + ((diffMediumX - diffEasyX) / 2)) > bx) {
-                        ma.setPosition(diffEasyX, diffButton.getY());
-                    } else {
-                        ma.setPosition(diffMediumX, diffButton.getY());
-                    }
-                } else {
-                    if ((diffMediumX + ((diffHardX - diffMediumX) / 2)) > bx) {
-                        ma.setPosition(diffMediumX, diffButton.getY());
-                    } else {
-                        ma.setPosition(diffHardX, diffButton.getY());
-                    }
+                float bx = diffStack.getX() + (x - lastX);
+
+                GameDifficulty newDiff = getDifficulty();
+                setDifficulty(newDiff);
+                if (gameDifficulty != newDiff) {
+                    difficultyChanged(newDiff);
                 }
-                diffButton.addAction(ma);
                 event.stop();
             }
         });
     }
 
+    /**
+     * Change selector to custom difficulty
+     *
+     * @param difficulty
+     */
+    public void setDifficulty(GameDifficulty difficulty) {
+        showDifficulty(difficulty);
+        MoveToAction ma = new MoveToAction();
+        switch (difficulty) {
+            case EASY:
+                ma.setPosition(diffEasyX, diffStack.getY());
+                break;
+            case MEDIUM:
+                ma.setPosition(diffMediumX, diffStack.getY());
+                break;
+            case HARD:
+                ma.setPosition(diffHardX, diffStack.getY());
+                break;
+        }
+        diffStack.addAction(ma);
+        if (gameDifficulty != difficulty) {
+            difficultyChanged(difficulty);
+        }
+    }
+
+    /**
+     * Called when difficulty is changed
+     *
+     * @param difficulty
+     */
+    public void difficultyChanged(GameDifficulty difficulty) {
+        gameDifficulty = difficulty;
+        // TODO
+    }
+
+    /**
+     * Get nearest difficulty from current slider position
+     *
+     * @return
+     */
+    private GameDifficulty getDifficulty() {
+        float bx = diffStack.getX();
+        if (bx < diffMediumX) {
+            if ((diffEasyX + ((diffMediumX - diffEasyX) / 2)) > bx) {
+                return GameDifficulty.EASY;
+            } else {
+                return GameDifficulty.MEDIUM;
+            }
+        } else {
+            if ((diffMediumX + ((diffHardX - diffMediumX) / 2)) > bx) {
+                return GameDifficulty.MEDIUM;
+            } else {
+                return GameDifficulty.HARD;
+            }
+        }
+    }
+
+    /**
+     * Check difficulty image and display corresponding image
+     *
+     * @param diff
+     */
+    private void showDifficulty(GameDifficulty diff) {
+        diffEasy.setVisible(false);
+        diffMedium.setVisible(false);
+        diffHard.setVisible(false);
+
+        switch (diff) {
+            case EASY:
+                diffEasy.setVisible(true);
+                break;
+            case MEDIUM:
+                diffMedium.setVisible(true);
+                break;
+            case HARD:
+                diffHard.setVisible(true);
+                break;
+        }
+    }
+
     @Override
     public void draw(Batch batch, float parentAlpha) {
         // Paralax layers
         // Back layer travels half the speed of scroll
+        // needed to make fade work
+        Color color = new Color(this.getColor().r, this.getColor().g, this.getColor().b, this.getColor().a * parentAlpha);
+        batch.setColor(color);
+
         Texture back = getScreen().getTexture(GameMenuAssets.getResourcePath(game, GameMenuAssets.GameMenuLayers.BACK));
         float scrollHalf = (Math.abs(scrollOffset / 2) / getWidth()) * back.getWidth();
         int srcX = (int) scrollHalf;
@@ -200,7 +287,6 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
         batch.draw(getScreen().getTexture(GameMenuAssets.getResourcePath(game, GameMenuAssets.GameMenuLayers.MID)), getX(), getY(), getWidth(), getHeight());
 
         // Foreground layer travels faster and could be wider than screen. Needs to be clipped
-
         Texture fore = getScreen().getTexture(GameMenuAssets.getResourcePath(game, GameMenuAssets.GameMenuLayers.FORE));
         float foreWidth = (getHeight() / fore.getHeight()) * fore.getWidth();
         batch.draw(fore, getX() - ((foreWidth - getWidth()) / 2) + (scrollOffset / 2), getY(), foreWidth, getHeight());

core/src/cz/nic/tablexia/screen/gamemenu/pages/MenuPage.java

 package cz.nic.tablexia.screen.gamemenu.pages;
 
+import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Group;
 
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
@@ -17,4 +18,12 @@ public abstract class MenuPage extends Group {
     protected AbstractTablexiaScreen getScreen() {
         return screen;
     }
+
+    @Override
+    public void setDebug(boolean enabled) {
+        super.setDebug(enabled);
+        for (Actor a : getChildren()) {
+            a.setDebug(enabled);
+        }
+    }
 }

core/src/cz/nic/tablexia/screen/gamemenu/pages/OfficeMenuPage.java

@@ -3,13 +3,24 @@ package cz.nic.tablexia.screen.gamemenu.pages;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.scenes.scene2d.Group;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.InputListener;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Image;
+import com.badlogic.gdx.scenes.scene2d.ui.Stack;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 
+import cz.nic.tablexia.Tablexia;
+import cz.nic.tablexia.TablexiaApplication;
+import cz.nic.tablexia.bus.ApplicationBus;
 import cz.nic.tablexia.menu.MainMenuDefinition;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
+import cz.nic.tablexia.screen.encyclopedia.EncyclopediaScreen;
 import cz.nic.tablexia.screen.gamemenu.GameMenuAssets;
+import cz.nic.tablexia.screen.halloffame.HallOfFameScreen;
+import cz.nic.tablexia.screen.profile.ProfileScreen;
+import cz.nic.tablexia.screen.statistics.StatisticsScreen;
 import cz.nic.tablexia.util.Log;
 
 /**
@@ -23,34 +34,120 @@ public class OfficeMenuPage extends MenuPage {
     public static final Color ENCYCLOPEDIA_COLOR = Color.BLACK;
     public static final Color PROFILE_COLOR      = Color.BLUE;
 
+    private Group help;
+
+    private Image hallOfFame;
+    private Image statistics;
+    private Image encyclopedia;
+    private Image street;
+    private Image profile;
+
 
     public OfficeMenuPage(AbstractTablexiaScreen screen) {
         super(screen);
+        createImageStack();
+
+        // TODO show help layer button
+
+        addListener(new InputListener() {
+            private Color downColor;
+
+            @Override
+            public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
+                super.touchDown(event, x, y, pointer, button);
+                Color color = getTouchedColor(x, y);
+                downColor = color;
+                help.addAction(Actions.fadeOut(0.5f));
+                if (color.equals(ENCYCLOPEDIA_COLOR)) {
+                    encyclopedia.setVisible(true);
+                } else if (color.equals(STATISTICS_COLOR)) {
+                    statistics.setVisible(true);
+                } else if (color.equals(HALLOFFAME_COLOR)) {
+                    hallOfFame.setVisible(true);
+                } else if (color.equals(STREET_COLOR)) {
+                    street.setVisible(true);
+                } else if (color.equals(PROFILE_COLOR)) {
+                    profile.setVisible(true);
+                } else {
+                    return false;
+                }
+                return true;
+            }
+
+            @Override
+            public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
+                super.touchUp(event, x, y, pointer, button);
+                Log.info(((Object) this).getClass().getName(), "Touch up ");
+                hideAllActions();
+            }
+        });
+
         addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent event, float x, float y) {
                 super.clicked(event, x, y);
-
                 Color color = getTouchedColor(x, y);
-
                 if (color.equals(ENCYCLOPEDIA_COLOR)) {
-                    MainMenuDefinition.ENCYCLOPEDIA.performAction();
+                    ApplicationBus.getInstance().publishAsync(new Tablexia.ChangeScreenEvent(EncyclopediaScreen.class, TablexiaApplication.ScreenTransaction.FADE));
                 } else if (color.equals(STATISTICS_COLOR)) {
-                    MainMenuDefinition.STATISTICS.performAction();
+                    ApplicationBus.getInstance().publishAsync(new Tablexia.ChangeScreenEvent(StatisticsScreen.class, TablexiaApplication.ScreenTransaction.FADE));
                 } else if (color.equals(HALLOFFAME_COLOR)) {
-                    MainMenuDefinition.HALL_OF_FAME.performAction();
+                    ApplicationBus.getInstance().publishAsync(new Tablexia.ChangeScreenEvent(HallOfFameScreen.class, TablexiaApplication.ScreenTransaction.FADE));
                 } else if (color.equals(STREET_COLOR)) {
-                    Log.info(((Object) this).getClass().getName(), "Clicked STREET_COLOR");
-                    // TODO go to street
+                    ApplicationBus.getInstance().publishAsync(new ShowStreetEvent());
                 } else if (color.equals(PROFILE_COLOR)) {
-                    // TODO show profile
-                } else {
-                    // TODO hide help layer
+                    ApplicationBus.getInstance().publishAsync(new Tablexia.ChangeScreenEvent(ProfileScreen.class, TablexiaApplication.ScreenTransaction.FADE));
                 }
+                hideAllActions();
             }
         });
     }
 
+    private void createImageStack() {
+        Stack stack = new Stack();
+        stack.setSize(getScreen().getStage().getWidth(), getScreen().getStage().getHeight());
+        stack.setPosition(0, 0);
+        addActor(stack);
+
+        stack.addActor(createImage(GameMenuAssets.OFFICE));
+        stack.addActor(street = createImage(GameMenuAssets.DOOR_PRESSED));
+        stack.addActor(encyclopedia = createImage(GameMenuAssets.ENCYCLOPEDIA_PRESSED));
+        stack.addActor(statistics = createImage(GameMenuAssets.STATISTICS_PRESSED));
+        stack.addActor(hallOfFame = createImage(GameMenuAssets.HALLOFFAME_PRESSED));
+        stack.addActor(createImage(GameMenuAssets.DESK));
+        stack.addActor(profile = createImage(GameMenuAssets.PROFILE_PRESSED));
+
+        hideAllActions();
+
+        help = new Stack();
+        help.setSize(getScreen().getStage().getWidth(), getScreen().getStage().getHeight());
+        help.setPosition(0, 0);
+        stack.addActor(help);
+        Image overlay = createImage(GameMenuAssets.OVERLAY);
+        overlay.getColor().a = 0.5f;
+        help.addActor(overlay);
+        help.addActor(createImage(GameMenuAssets.OFFICE_HELP));
+    }
+
+    private void hideAllActions() {
+        profile.setVisible(false);
+        street.setVisible(false);
+        encyclopedia.setVisible(false);
+        statistics.setVisible(false);
+        hallOfFame.setVisible(false);
+
+    }
+
+    /**
+     * Helper method for creating image instances
+     *
+     * @param texture
+     * @return
+     */
+    private Image createImage(String texture) {
+        Image image = new Image(getScreen().getTexture(texture));
+        return image;
+    }
 
     private Color getTouchedColor(float x, float y) {
         Texture clickmap = getScreen().getTexture(GameMenuAssets.OFFICE_CLICKMAP);
@@ -61,28 +158,12 @@ public class OfficeMenuPage extends MenuPage {
         Pixmap pixmap = clickmap.getTextureData().consumePixmap();
         int clickX = (int) (x / getWidth() * clickmap.getWidth());
         int clickY = clickmap.getHeight() - (int) (y / getHeight() * clickmap.getHeight());
-
-        Log.info(((Object) this).getClass().getName(), "Color map " + clickmap.getWidth() + ":" + clickmap.getHeight() + " at " + clickX + ": " + clickY);
-
         return new Color(pixmap.getPixel(clickX, clickY));
     }
 
-
-    @Override
-    public void draw(Batch batch, float parentAlpha) {
-        batch.disableBlending();
-        batch.draw(getScreen().getTexture(GameMenuAssets.OFFICE), getX(), getY(), getWidth(), getHeight());
-        batch.enableBlending();
-
-        batch.draw(getScreen().getTexture(GameMenuAssets.OFFICE_HELP), getX(), getY(), getWidth(), getHeight());
-        batch.draw(getScreen().getTexture(GameMenuAssets.PROFILE_PRESSED), getX(), getY(), getWidth(), getHeight());
-        batch.draw(getScreen().getTexture(GameMenuAssets.DOOR_PRESSED), getX(), getY(), getWidth(), getHeight());
-        batch.draw(getScreen().getTexture(GameMenuAssets.ENCYCLOPEDIA_PRESSED), getX(), getY(), getWidth(), getHeight());
-        batch.draw(getScreen().getTexture(GameMenuAssets.STATISTICS_PRESSED), getX(), getY(), getWidth(), getHeight());
-        batch.draw(getScreen().getTexture(GameMenuAssets.HALLOFFAME_PRESSED), getX(), getY(), getWidth(), getHeight());
-
-        batch.draw(getScreen().getTexture(GameMenuAssets.DESK), getX(), getY(), getWidth(), getHeight());
-
-        batch.draw(getScreen().getTexture(GameMenuAssets.OFFICE_HELP), getX(), getY(), getWidth(), getHeight());
+    /**
+     * Event fired by clicking on door telling viewpager to page to first game
+     */
+    public static class ShowStreetEvent implements ApplicationBus.ApplicationEvent {
     }
 }

core/src/cz/nic/tablexia/screen/loader/LoaderScreen.java

 package cz.nic.tablexia.screen.loader;
 
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.Texture.TextureFilter;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Image;
 
 import java.util.List;
 
@@ -13,26 +11,8 @@ import cz.nic.tablexia.screen.AbstractTablexiaScreen;
 public class LoaderScreen extends AbstractTablexiaScreen<Void> {
 
     private static final String LOADER_BACKGROUND = "gfx/screen_loader_background.jpg";
-
-    private LoaderBackground background;
-    private Texture backgroundTexture;
-
-    private class LoaderBackground extends Actor {
-
-
-        public LoaderBackground() {
-            backgroundTexture = getTexture(LOADER_BACKGROUND);
-            backgroundTexture.setFilter(TextureFilter.Linear, TextureFilter.Linear);
-        }
-
-        @Override
-        public void draw(Batch batch, float parentAlpha) {
-            batch.disableBlending();
-            batch.draw(backgroundTexture, 0, 0, getWidth(), getHeight());
-            batch.enableBlending();
-        }
-
-    }
+    private static final String LOADER_SMALL_HAND = "gfx/screen_loader_smallhand.png";
+    private static final String LOADER_BIG_HAND   = "gfx/screen_loader_bighand.png";
 
     public LoaderScreen() {
         super(false, false, TablexiaAssetManager.StorageType.INTERNAL);
@@ -41,17 +21,29 @@ public class LoaderScreen extends AbstractTablexiaScreen<Void> {
     @Override
     protected void prepareScreenTextureAssetNames(List<String> textureFileNames) {
         textureFileNames.add(LOADER_BACKGROUND);
+        textureFileNames.add(LOADER_SMALL_HAND);
+        textureFileNames.add(LOADER_BIG_HAND);
     }
 
     @Override
     protected void screenLoaded() {
-        background = new LoaderBackground();
+        Image background = new Image(getTexture(LOADER_BACKGROUND));
+        background.setPosition(0, 0);
         background.setSize(getStage().getWidth(), getStage().getHeight());
         getStage().addActor(background);
-    }
 
-    @Override
-    public void screenResized(int width, int height) {
-        background.setSize(width, height);
+        Image smallhand = new Image(getTexture(LOADER_SMALL_HAND));
+        smallhand.setPosition(getStage().getWidth()*0.22f, getStage().getHeight() * 0.64f);
+        smallhand.setSize(getStage().getWidth()*0.01f, getStage().getHeight()*0.06f);
+        getStage().addActor(smallhand);
+        smallhand.setOrigin(smallhand.getWidth()/2,0);
+        smallhand.addAction(Actions.forever(Actions.rotateBy(-360, 6)));
+
+        Image bighand = new Image(getTexture(LOADER_BIG_HAND));
+        bighand.setPosition(getStage().getWidth()*0.22f, getStage().getHeight() * 0.64f);
+        bighand.setSize(getStage().getWidth()*0.01f, getStage().getHeight()*0.06f);
+        getStage().addActor(bighand);
+        bighand.setOrigin(bighand.getWidth()/2,0);
+        bighand.addAction(Actions.forever(Actions.rotateBy(-360, 0.5f)));
     }
 }