move base ui widgets into core/src/ch/asynk/tankontank/ui

25 files changed, 38 insertions, 23 deletions

diff --git a/core/src/ch/asynk/tankontank/game/Battle.java b/core/src/ch/asynk/tankontank/game/Battle.java
index 0c2c3e3..9f69d4c 100644
--- a/core/src/ch/asynk/tankontank/game/Battle.java
+++ b/core/src/ch/asynk/tankontank/game/Battle.java
@@ -3,7 +3,7 @@ package ch.asynk.tankontank.game;
 import ch.asynk.tankontank.game.Zone;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Player;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 
 public interface Battle
 {
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index b150cd9..8d73df9 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -3,7 +3,7 @@ package ch.asynk.tankontank.game;
 import com.badlogic.gdx.utils.Disposable;
 
 import ch.asynk.tankontank.TankOnTank;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.game.State.StateType;
 import ch.asynk.tankontank.game.states.StateSelect;
 import ch.asynk.tankontank.game.states.StateMove;
diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java
index 6d8961a..6b7b8a6 100644
--- a/core/src/ch/asynk/tankontank/game/Hud.java
+++ b/core/src/ch/asynk/tankontank/game/Hud.java
@@ -13,14 +13,14 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 
 import ch.asynk.tankontank.engine.gfx.Animation;
 import ch.asynk.tankontank.game.State.StateType;
-import ch.asynk.tankontank.game.hud.Position;
-import ch.asynk.tankontank.game.hud.Msg;
+import ch.asynk.tankontank.ui.Position;
+import ch.asynk.tankontank.ui.Msg;
+import ch.asynk.tankontank.ui.OkCancel;
+import ch.asynk.tankontank.ui.Widget;
 import ch.asynk.tankontank.game.hud.PlayerInfo;
 import ch.asynk.tankontank.game.hud.ActionButtons;
-import ch.asynk.tankontank.game.hud.OkCancel;
 import ch.asynk.tankontank.game.hud.Statistics;
 import ch.asynk.tankontank.game.hud.Engagement;
-import ch.asynk.tankontank.game.hud.Widget;
 
 import ch.asynk.tankontank.TankOnTank;
 
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 6ccffce..2cd2f71 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -26,7 +26,7 @@ import ch.asynk.tankontank.engine.gfx.animations.DestroyAnimation;
 import ch.asynk.tankontank.engine.gfx.animations.SoundAnimation;
 import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation;
 
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 
 public abstract class Map extends Board
 {
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java b/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java
index 324f187..646e31d 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java
@@ -7,7 +7,7 @@ import ch.asynk.tankontank.game.Map;
 import ch.asynk.tankontank.game.Zone;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 
 public class BattleCounterAttack extends BattleCommon
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
index 653052b..861e93e 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.HexSet;
 import ch.asynk.tankontank.game.Zone;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 
 public class BattleFrontalAssault extends BattleCommon
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
index 52868a2..ed25465 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.Hex;
 import ch.asynk.tankontank.game.HexSet;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 
 public class BattleHeadToHead extends BattleCommon
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java
index 234ceed..e284ab3 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.Hex;
 import ch.asynk.tankontank.game.HexSet;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 
 public class BattleLastStand extends BattleCommon
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java b/core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java
index e712e65..8a942e9 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.Hex;
 import ch.asynk.tankontank.game.HexSet;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 import ch.asynk.tankontank.engine.Meteorology;
 
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java b/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java
index 1f9ef72..91d2ced 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.Hex;
 import ch.asynk.tankontank.game.HexSet;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 
 public class BattleStabToTheFlank extends BattleCommon
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleTest.java b/core/src/ch/asynk/tankontank/game/battles/BattleTest.java
index ebeea53..f0128f7 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleTest.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.HexSet;
 import ch.asynk.tankontank.game.Zone;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Unit.UnitId;
-import ch.asynk.tankontank.game.hud.Position;
+import ch.asynk.tankontank.ui.Position;
 import ch.asynk.tankontank.engine.Orientation;
 
 public class BattleTest extends BattleCommon
diff --git a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java
index d943ae8..ff9034e 100644
--- a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java
+++ b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java
@@ -7,6 +7,9 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 
 import ch.asynk.tankontank.game.Ctrl;
 import ch.asynk.tankontank.game.State.StateType;
+import ch.asynk.tankontank.ui.Widget;
+import ch.asynk.tankontank.ui.Bg;
+import ch.asynk.tankontank.ui.Position;
 
 public class ActionButtons extends Widget
 {
diff --git a/core/src/ch/asynk/tankontank/game/hud/Engagement.java b/core/src/ch/asynk/tankontank/game/hud/Engagement.java
index 63facca..9a70688 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Engagement.java
+++ b/core/src/ch/asynk/tankontank/game/hud/Engagement.java
@@ -10,6 +10,10 @@ import ch.asynk.tankontank.game.Map;
 import ch.asynk.tankontank.game.Army;
 import ch.asynk.tankontank.engine.gfx.Animation;
 import ch.asynk.tankontank.engine.gfx.animations.DiceAnimation;
+import ch.asynk.tankontank.ui.Bg;
+import ch.asynk.tankontank.ui.Label;
+import ch.asynk.tankontank.ui.Patch;
+import ch.asynk.tankontank.ui.Position;
 
 public class Engagement extends Patch implements Animation
 {
diff --git a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java b/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java
index d858d7d..6125517 100644
--- a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java
+++ b/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java
@@ -17,6 +17,8 @@ import ch.asynk.tankontank.game.Hud;
 import ch.asynk.tankontank.game.Army;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.Player;
+import ch.asynk.tankontank.ui.LabelImage;
+import ch.asynk.tankontank.ui.Position;
 
 public class PlayerInfo implements Disposable, Drawable, Animation
 {
diff --git a/core/src/ch/asynk/tankontank/game/hud/Statistics.java b/core/src/ch/asynk/tankontank/game/hud/Statistics.java
index 6a91161..d481fae 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Statistics.java
+++ b/core/src/ch/asynk/tankontank/game/hud/Statistics.java
@@ -6,6 +6,10 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 
 import ch.asynk.tankontank.game.Player;
+import ch.asynk.tankontank.ui.Bg;
+import ch.asynk.tankontank.ui.Label;
+import ch.asynk.tankontank.ui.Patch;
+import ch.asynk.tankontank.ui.Position;
 
 public class Statistics extends Patch
 {
diff --git a/core/src/ch/asynk/tankontank/game/hud/UnitDock.java b/core/src/ch/asynk/tankontank/game/hud/UnitDock.java
index 4f3dfaf..e0b997b 100644
--- a/core/src/ch/asynk/tankontank/game/hud/UnitDock.java
+++ b/core/src/ch/asynk/tankontank/game/hud/UnitDock.java
@@ -13,6 +13,8 @@ import ch.asynk.tankontank.engine.Orientation;
 import ch.asynk.tankontank.game.Ctrl;
 import ch.asynk.tankontank.game.Unit;
 import ch.asynk.tankontank.game.UnitList;
+import ch.asynk.tankontank.ui.Bg;
+import ch.asynk.tankontank.ui.Position;
 
 public class UnitDock extends Bg implements Animation
 {
diff --git a/core/src/ch/asynk/tankontank/game/hud/Bg.java b/core/src/ch/asynk/tankontank/ui/Bg.java
index 8e0bc4e..7a87c26 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Bg.java
+++ b/core/src/ch/asynk/tankontank/ui/Bg.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
diff --git a/core/src/ch/asynk/tankontank/game/hud/Label.java b/core/src/ch/asynk/tankontank/ui/Label.java
index a2cbbf4..eae4b15 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Label.java
+++ b/core/src/ch/asynk/tankontank/ui/Label.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
diff --git a/core/src/ch/asynk/tankontank/game/hud/LabelImage.java b/core/src/ch/asynk/tankontank/ui/LabelImage.java
index 832c859..4f28924 100644
--- a/core/src/ch/asynk/tankontank/game/hud/LabelImage.java
+++ b/core/src/ch/asynk/tankontank/ui/LabelImage.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
diff --git a/core/src/ch/asynk/tankontank/game/hud/LabelStack.java b/core/src/ch/asynk/tankontank/ui/LabelStack.java
index cbdcacf..f730d0d 100644
--- a/core/src/ch/asynk/tankontank/game/hud/LabelStack.java
+++ b/core/src/ch/asynk/tankontank/ui/LabelStack.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import java.util.ArrayDeque;
 
diff --git a/core/src/ch/asynk/tankontank/game/hud/Msg.java b/core/src/ch/asynk/tankontank/ui/Msg.java
index 2df6957..c2069b7 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Msg.java
+++ b/core/src/ch/asynk/tankontank/ui/Msg.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
diff --git a/core/src/ch/asynk/tankontank/game/hud/OkCancel.java b/core/src/ch/asynk/tankontank/ui/OkCancel.java
index f48bcd4..4a8507f 100644
--- a/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
+++ b/core/src/ch/asynk/tankontank/ui/OkCancel.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
diff --git a/core/src/ch/asynk/tankontank/game/hud/Patch.java b/core/src/ch/asynk/tankontank/ui/Patch.java
index 4ea0764..4056a3c 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Patch.java
+++ b/core/src/ch/asynk/tankontank/ui/Patch.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.NinePatch;
diff --git a/core/src/ch/asynk/tankontank/game/hud/Position.java b/core/src/ch/asynk/tankontank/ui/Position.java
index 6f8e520..f1708c6 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Position.java
+++ b/core/src/ch/asynk/tankontank/ui/Position.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.Gdx;
 import ch.asynk.tankontank.game.Hud;
diff --git a/core/src/ch/asynk/tankontank/game/hud/Widget.java b/core/src/ch/asynk/tankontank/ui/Widget.java
index 08d90f5..e49833a 100644
--- a/core/src/ch/asynk/tankontank/game/hud/Widget.java
+++ b/core/src/ch/asynk/tankontank/ui/Widget.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.game.hud;
+package ch.asynk.tankontank.ui;
 
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.math.Rectangle;