Merge branch 'feature-dialog' into 'devel'

Feature dialog



See merge request !117

core/src/cz/nic/tablexia/loader/application/ApplicationAtlasManager.java

@@ -60,15 +60,30 @@ public class ApplicationAtlasManager extends TablexiaAtlasManager implements IAp
 
     public static final String DIALOG_PATH                           = "dialog/";
     public static final String DIALOG_BUBBLE_CLASSIC                 = DIALOG_PATH + "bubble_classic";
-    public static final String DIALOG_BUBBLE_CLASSIC_PURE            = DIALOG_PATH + "bubble_classic_pure";
-    public static final String DIALOG_BUBBLE_CLASSIC_BOTTOM          = DIALOG_PATH + "bubble_classic_bottom";
+    public static final String DIALOG_BUBBLE_CLASSIC_ROUND           = DIALOG_PATH + "bubble_classic_round";
+    public static final String DIALOG_BUBBLE_CLASSIC_SQUARE          = DIALOG_PATH + "bubble_classic_square";
     public static final String DIALOG_BUBBLE_ARROW_DOWN              = DIALOG_PATH + "bubble_arrow_down";
-    public static final String DIALOG_BUBBLE_ARROW_LEFT              = DIALOG_PATH + "bubble_arrow_left";
+    public static final String DIALOG_BUBBLE_ARROW_BEND_LEFT         = DIALOG_PATH + "bubble_arrow_bend_left";
     public static final String DIALOG_BUBBLE_CLASSIC_CONTINUE_BUTTON = DIALOG_PATH + "bubble_classic_continue_button";
     public static final String DIALOG_RECTANGLE                      = DIALOG_PATH + "dialog_rectangle";
     public static final String DIALOG_SQUARE                         = DIALOG_PATH + "dialog_square";
     public static final String DIALOG_SQUARE_BORDER_LINES            = DIALOG_PATH + "dialog_square_borderlines";
 
+    public static final String DIALOG_BUBBLE_ARROW_BOTTOM            = DIALOG_PATH + "bubble_arrow_bottom";
+    public static final String DIALOG_BUBBLE_ARROW_TOP               = DIALOG_PATH + "bubble_arrow_top";
+    public static final String DIALOG_BUBBLE_ARROW_LEFT              = DIALOG_PATH + "bubble_arrow_left";
+    public static final String DIALOG_BUBBLE_ARROW_RIGHT             = DIALOG_PATH + "bubble_arrow_right";
+
+    public static final String DIALOG_BUBBLE_ARROW_BEND_LEFT_BOTTOM  = DIALOG_PATH + "bubble_arrow_bend_left_bottom";
+    public static final String DIALOG_BUBBLE_ARROW_BEND_LEFT_TOP     = DIALOG_PATH + "bubble_arrow_bend_left_top";
+    public static final String DIALOG_BUBBLE_ARROW_BEND_LEFT_LEFT    = DIALOG_PATH + "bubble_arrow_bend_left_left";
+    public static final String DIALOG_BUBBLE_ARROW_BEND_LEFT_RIGHT   = DIALOG_PATH + "bubble_arrow_bend_left_right";
+
+    public static final String DIALOG_BUBBLE_CLASSIC_BOTTOM          = DIALOG_PATH + "bubble_classic_bottom";
+    public static final String DIALOG_BUBBLE_CLASSIC_TOP             = DIALOG_PATH + "bubble_classic_top";
+    public static final String DIALOG_BUBBLE_CLASSIC_LEFT            = DIALOG_PATH + "bubble_classic_left";
+    public static final String DIALOG_BUBBLE_CLASSIC_RIGHT           = DIALOG_PATH + "bubble_classic_right";
+
     public static final String BUTTON_PATH            = "button/";
     public static final String BUTTON_BLUE_PART       = "tablexiabutton_blank_blue";
     public static final String BUTTON_GREEN_PART      = "tablexiabutton_blank_green";

core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java

@@ -53,11 +53,9 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti
     private static final int    TROPHY_DIALOG_HEIGHT = 300;
     private static final int    BACKGROUND_TILE_REPEAT_COUNT = 22;
     private static final float  TILE_SCREE_WIDTH_RATIO = 0.25f;
-    private static final int    MOUSE_DIALOG_Y = 190;
-    private static final int    MOUSE_DIALOG_SCREEN_BORDER_PADDING = 20;
     private static final int    MOUSE_DIALOG_WIDTH = 300;
     private static final int    MOUSE_DIALOG_HEIGHT = 50;
-    private static final int    MOUSE_DIALOG_DEFAULT_OFFSET_X = 410;
+    private static final float  MOUSE_IMAGE_DIALOG_POINT_HEIGHT = 3f / 5f;
 
     private static final String SCREEN_STATE_SCROLL_POSITION_X = "scrollPositionX";
     public static final String SCROLL_TO_TROPHY_KEY = "scrollToTrophy";
@@ -290,18 +288,12 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti
                 TextureRegion mousePressedTexture = getScreenTextureRegion(HallOfFameAssets.HALL_OF_FAME_MOUSE_PRESSED);
                 mouseImage.setDrawable(new SpriteDrawable(new Sprite(mousePressedTexture)));
                 mouseImage.setTouchable(Touchable.disabled);
-                // dialog position
-                float dialogX = MOUSE_DIALOG_DEFAULT_OFFSET_X - scrollPane.getScrollX();
-                if (dialogX < MOUSE_DIALOG_SCREEN_BORDER_PADDING) {
-                    dialogX = MOUSE_DIALOG_SCREEN_BORDER_PADDING;
-                }
 
-                // bottom dialog arrow position
-                float bottomOffsetX = mouseImage.getX() - scrollPane.getScrollX() - MOUSE_DIALOG_SCREEN_BORDER_PADDING;
-                if (bottomOffsetX < MOUSE_DIALOG_SCREEN_BORDER_PADDING * 2) {
-                    bottomOffsetX = MOUSE_DIALOG_SCREEN_BORDER_PADDING * 2;
-                }
-                final DynamicBubbleDialog mouseDialog = DialogFactory.createDynamicBubbleDialog(getText(TrophyHelper.MouseTexts.getMouseText(threeStarsCount)), dialogX, MOUSE_DIALOG_Y, MOUSE_DIALOG_WIDTH, MOUSE_DIALOG_HEIGHT, bottomOffsetX);
+                // dialog position related to mouse image
+                float dialogX = mouseImage.getX() - scrollPane.getScrollX();
+                float dialogY = mouseImage.getY() + (mouseImage.getImageHeight() * MOUSE_POSITION_PROPERTIES.getThird() * MOUSE_IMAGE_DIALOG_POINT_HEIGHT);
+
+                final DynamicBubbleDialog mouseDialog = new MouseDialog(getText(TrophyHelper.MouseTexts.getMouseText(threeStarsCount)), dialogX, dialogY, MOUSE_DIALOG_WIDTH, MOUSE_DIALOG_HEIGHT);
                 mouseDialog.addClickListener(new DynamicBubbleDialog.ClickCallback() {
                     @Override
                     public void doClick() {

core/src/cz/nic/tablexia/screen/halloffame/MouseDialog.java

+package cz.nic.tablexia.screen.halloffame;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+
+import cz.nic.tablexia.util.ui.dialog.DynamicBubbleDialog;
+import cz.nic.tablexia.util.ui.dialog.text.DialogTextContent;
+
+/**
+ * Created by frantisek on 1.12.15.
+ */
+public class MouseDialog extends DynamicBubbleDialog {
+
+    public MouseDialog(String text, float x, float y, float width, float height) {
+        super(x, y, width, height, new DialogTextContent(text), BackGroundType.BUBBLE_CLASSIC_ROUND, ArrowType.BUBBLE_CLASSIC_BOTTOM);
+    }
+
+    @Override
+    protected void transformArrowBeforeRender(TextureRegion arrowTexture) {
+        super.transformArrowBeforeRender(arrowTexture);
+        // target of bubble arrow is on edge of screen -> flip arrow image to point to that direction
+        if (getX() < 0) {
+            arrowTexture.flip(true, false);
+        }
+    }
+
+    @Override
+    public void refreshDialogPosition() {
+        super.refreshDialogPosition();
+
+        if (getDialogArrowImage().getX() < getDialogArrow().getArrowOffsetX(getBackGroundType())) {
+            getDialogArrowImage().setX(getDialogArrow().getArrowOffsetX(getBackGroundType()));
+        }
+    }
+}

core/src/cz/nic/tablexia/util/ui/dialog/DialogFactory.java

@@ -75,8 +75,13 @@ public class DialogFactory {
         return dialog;
     }
 
-    public static DynamicBubbleDialog createDynamicBubbleDialog(String text, float x, float y, float width, float height, float bubbleArrowOffsetX) {
-        DynamicBubbleDialog dialog = new DynamicBubbleDialog(x, y, width, height, TablexiaDialog.BackGroundType.BUBBLE_CLASSIC_PURE, new DialogTextContent(text), bubbleArrowOffsetX);
+    public static DynamicBubbleDialog createDynamicBubbleDialog(String text, float x, float y, float width, float height) {
+        DynamicBubbleDialog dialog = new DynamicBubbleDialog(x, y, width, height, new DialogTextContent(text));
+        return dialog;
+    }
+
+    public static DynamicBubbleDialog createDynamicBubbleDialog(String text, float x, float y, float width, float height, TablexiaDialog.BackGroundType backGroundType, DynamicBubbleDialog.ArrowType arrowType) {
+        DynamicBubbleDialog dialog = new DynamicBubbleDialog(x, y, width, height, new DialogTextContent(text), backGroundType, arrowType);
         return dialog;
     }