Merge branch 'feature-crimescenegame-devel' into 'V3.3'

#476 New buttons for crime scene



See merge request !427

core/src/cz/nic/tablexia/game/games/crime_scene/CrimeSceneGame.java

@@ -33,12 +33,13 @@ import cz.nic.tablexia.game.games.crime_scene.gameobject.GameObjectType;
 import cz.nic.tablexia.game.games.crime_scene.model.*;
 import cz.nic.tablexia.game.games.crime_scene.model.LevelDefinition;
 import cz.nic.tablexia.loader.application.ApplicationAtlasManager;
+import cz.nic.tablexia.loader.application.ApplicationInternalTextureManager;
 import cz.nic.tablexia.shared.model.GameScore;
 import cz.nic.tablexia.util.ScaleUtil;
 import cz.nic.tablexia.util.ui.AnimatedImage;
 import cz.nic.tablexia.util.ui.actionwidget.Action;
 import cz.nic.tablexia.util.ui.actionwidget.ActionContainer;
-import cz.nic.tablexia.util.ui.button.StandardTablexiaButton;
+import cz.nic.tablexia.util.ui.button.GameImageTablexiaButton;
 import cz.nic.tablexia.util.ui.button.TablexiaButton;
 import cz.nic.tablexia.util.ui.actionwidget.ActionsStripWidget;
 import cz.nic.tablexia.loader.application.ApplicationTextManager;
@@ -89,7 +90,8 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
     private Image                   gameMapTexture;
     private Image                   stripWidgetBackground;
     private ActionsStripWidget      actionsStripWidget;
-    private TablexiaButton          startButton, replayButton;
+
+    private GameImageTablexiaButton startButton, replayButton;
     private PlaySoundScreen         playSoundScreen;
     private GameObject              highlightedGameObject;
     private Music                   actualPlayingMusic;
@@ -305,17 +307,13 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
     }
 
     private void createStartButton() {
-        startButton = new StandardTablexiaButton(getText(CrimeSceneAssets.DONE_TEXT)) {
-            @Override
-            protected void adjustBounds() {
-                super.adjustBounds();
-                setUpSizeAndPositionOfComponents();
-            }
-        };
+        startButton = new GameImageTablexiaButton(
+            getText(CrimeSceneAssets.DONE_TEXT),
+            new Image(ApplicationInternalTextureManager.getInstance().getTexture(ApplicationInternalTextureManager.BUTTON_YES_ICON))
+        );
         startButton.setButtonSize(START_BUTTON_WIDTH, START_BUTTON_HEIGHT)
                 .setButtonPosition(getViewportWidth() - actionsStripWidget.getWidth() - START_BUTTON_WIDTH - START_BUTTON_OFFSET_X,
                         getViewportBottomY() + BOTTOM_OFFSET_Y)
-                .adaptiveSizePositionFix(false)
                 .setDisabled()
                 .setInputListener(new ClickListener() {
                     @Override
@@ -329,18 +327,13 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
     }
 
     private void createReplayButton() {
-        replayButton = new StandardTablexiaButton("") {
-            @Override
-            protected void adjustBounds() {
-                super.adjustBounds();
-                setUpSizeAndPositionOfComponents();
-            }
-        };
-        setUpReplayButtonText();
+        replayButton = new GameImageTablexiaButton(
+            getText(CrimeSceneAssets.REPLAY),
+            new Image(ApplicationInternalTextureManager.getInstance().getTexture(ApplicationInternalTextureManager.BUTTON_REPEAT_ICON))
+        );
         replayButton.setButtonSize(REPLAY_BUTTON_WIDTH, REPLAY_BUTTON_HEIGHT)
                 .setButtonPosition(getViewportWidth() - actionsStripWidget.getWidth() - START_BUTTON_WIDTH - REPLAY_BUTTON_WIDTH - START_BUTTON_OFFSET_X * 2,
                         getViewportBottomY() + BOTTOM_OFFSET_Y)
-                .adaptiveSizePositionFix(false)
                 .setEnabled()
                 .setInputListener(new ClickListener() {
                     @Override
@@ -348,17 +341,12 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
                         hideLastTouchedAction();
                         playAllSounds();
                         repeatTaskCount++;
-                        setUpReplayButtonText();
                         if(getReplayCountLeft() == 0) replayButton.setDisabled();
                     }
                 });
         contentGroup.addActor(replayButton);
     }
 
-    private void setUpReplayButtonText() {
-        replayButton.text(getText(CrimeSceneAssets.REPLAY) + getReplayCountText());
-    }
-
     private void setUpDimmer() {
         dimmer = new Image(ApplicationAtlasManager.getInstance().getColorTexture(Color.BLACK));
         Color color = dimmer.getColor();
@@ -500,7 +488,6 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
                 public void run() {
                     resetActionsStripWidget();
                     generateGameObjects();
-                    setUpReplayButtonText();
                     setHighlightedGameObject(null);
                     if(getReplayCountLeft() > 0) replayButton.setEnabled();
                 }

core/src/cz/nic/tablexia/util/ui/button/GameImageTablexiaButton.java

@@ -19,6 +19,7 @@ package cz.nic.tablexia.util.ui.button;
 
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 
+import cz.nic.tablexia.TablexiaSettings;
 import cz.nic.tablexia.util.ui.ComponentScaleUtil;
 
 /**
@@ -47,10 +48,12 @@ public class GameImageTablexiaButton extends ImageTablexiaButton {
         if(ComponentScaleUtil.isUnderThreshold()) {
             underThreshold = true;
             getLabel().setText(null);
+            getLabel().setVisible(false);
             setDefaultThresholdSize();
         } else {
             underThreshold = false;
             getLabel().setText(text);
+            getLabel().setVisible(true);
         }
     }