[view] reorganize packages

src/main/haxework/view/IView.hx

@@ -3,7 +3,8 @@ package haxework.view;
 import flash.display.DisplayObject;
 import flash.geom.Rectangle;
 import haxework.view.core.Geometry;
-import haxework.view.skin.ISkin.SkinSet;
+import haxework.view.group.IGroupView;
+import haxework.view.skin.ISkin;
 
 interface IView<C:DisplayObject> {
     public var id(default, default):String;

src/main/haxework/view/ProgressView.hx

@@ -1,29 +0,0 @@
-package haxework.view;
-
-class ProgressView extends SpriteView {
-
-  public var value(default, set):Int;
-  public var max(default, set):Int;
-
-  public function new() {
-    super();
-    value = 0;
-    max = 1;
-  }
-
-  private function set_value(value:Int):Int {
-    if (this.value != value) {
-      this.value = value;
-      invalidate();
-    }
-    return this.value;
-  }
-
-  private function set_max(value:Int):Int {
-    if (max != value) {
-      max = value;
-      invalidate();
-    }
-    return max;
-  }
-}

src/main/haxework/view/Root.hx

@@ -1,6 +1,5 @@
 package haxework.view;
 
-import haxework.provider.Provider;
 import flash.display.DisplayObject;
 import flash.display.StageAlign;
 import flash.display.StageScaleMode;
@@ -8,7 +7,9 @@ import flash.errors.Error;
 import flash.events.Event;
 import flash.geom.Rectangle;
 import flash.Lib;
+import haxework.provider.Provider;
 import haxework.signal.Signal;
+import haxework.view.group.IGroupView;
 
 class Root {
 

src/main/haxework/view/ScrollView.hx

@@ -5,6 +5,7 @@ import flash.display.Sprite;
 import flash.events.MouseEvent;
 import haxework.signal.Signal;
 import haxework.view.core.Geometry.Position;
+import haxework.view.group.HGroupView;
 import haxework.view.list.ScrollBarView;
 import haxework.view.list.VScrollBarView;
 import haxework.view.skin.Skin;

src/main/haxework/view/View.hx

@@ -4,6 +4,7 @@ import flash.display.DisplayObject;
 import flash.display.InteractiveObject;
 import flash.geom.Rectangle;
 import haxework.view.core.Geometry;
+import haxework.view.group.IGroupView;
 import haxework.view.skin.ISkin;
 import haxework.view.theme.ITheme;
 

src/main/haxework/view/data/ButtonGroup.hx

@@ -1,11 +1,13 @@
-package haxework.view;
+package haxework.view.data;
 
-using haxework.utils.StringUtil;
-import haxework.view.DataView.Factory;
+import haxework.view.form.ToggleButtonView;
+import haxework.view.data.DataView.Factory;
 import haxe.EnumTools;
 import haxework.view.layout.HorizontalLayout;
 import haxework.view.layout.ILayout;
 
+using haxework.utils.StringUtil;
+
 class ButtonGroup<D> extends DataView<D, ToggleButtonView> {
 
     public var selected(default, set):D;

src/main/haxework/view/data/DataView.hx

@@ -1,8 +1,9 @@
-package haxework.view;
+package haxework.view.data;
 
 import flash.display.DisplayObject;
 import flash.events.MouseEvent;
 import haxework.signal.Signal;
+import haxework.view.group.GroupView;
 import haxework.view.layout.ILayout;
 import haxework.view.layout.VerticalLayout;
 

src/main/haxework/view/form/ButtonImageView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.form;
 
 import flash.display.BitmapData;
 import haxework.view.skin.ButtonBitmapSkin;

src/main/haxework/view/form/ButtonView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.form;
 
 import haxework.signal.Signal;
 import flash.events.MouseEvent;

src/main/haxework/view/form/InputView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.form;
 
 import flash.events.Event;
 import flash.events.KeyboardEvent;

src/main/haxework/view/form/LabelView.hx

@@ -1,7 +1,8 @@
-package haxework.view;
+package haxework.view.form;
 
-import haxework.view.core.VAlign;
 import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.text.TextView;
 
 class LabelView extends TextView {
 

src/main/haxework/view/form/SelectView.hx

@@ -1,10 +1,13 @@
-package haxework.view;
+package haxework.view.form;
 
-import haxework.view.core.HAlign;
 import flash.events.MouseEvent;
 import flash.geom.Point;
 import haxework.signal.Signal;
 import haxework.view.core.Geometry.Position;
+import haxework.view.core.HAlign;
+import haxework.view.data.DataView;
+import haxework.view.group.GroupView;
+import haxework.view.group.IGroupView;
 import haxework.view.layout.VerticalLayout;
 import haxework.view.skin.Skin;
 using haxework.utils.StringUtil;

src/main/haxework/view/form/ToggleButtonView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.form;
 
 class ToggleButtonView extends ButtonView {
 

src/main/haxework/view/frame/FrameSwitcher.hx

@@ -2,7 +2,7 @@ package haxework.view.frame;
 
 import haxework.animate.IAnimate;
 import haxework.signal.Signal;
-import haxework.view.GroupView;
+import haxework.view.group.GroupView;
 import haxework.view.IView;
 
 class FrameSwitcher extends GroupView {

src/main/haxework/view/frame/FrameView.hx

@@ -1,5 +1,6 @@
 package haxework.view.frame;
 
+import haxework.view.group.GroupView;
 import haxework.view.layout.ILayout;
 import haxework.view.layout.VerticalLayout;
 

src/main/haxework/view/group/GroupView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.group;
 
 import flash.display.DisplayObjectContainer;
 import haxework.view.layout.DefaultLayout;

src/main/haxework/view/group/HGroupView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.group;
 
 import haxework.view.layout.HorizontalLayout;
 

src/main/haxework/view/group/IGroupView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.group;
 
 import flash.display.DisplayObjectContainer;
 import haxework.view.layout.ILayout;

src/main/haxework/view/group/VGroupView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.group;
 
 import haxework.view.layout.VerticalLayout;
 

src/main/haxework/view/layout/DefaultLayout.hx

@@ -1,8 +1,9 @@
 package haxework.view.layout;
 
 import haxework.view.core.Geometry;
-import haxework.view.core.VAlign;
 import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.group.IGroupView;
 
 class DefaultLayout extends Layout {
 

src/main/haxework/view/layout/HorizontalLayout.hx

@@ -2,6 +2,7 @@ package haxework.view.layout;
 
 import haxework.view.core.Geometry.SizeValue;
 import haxework.view.core.HAlign;
+import haxework.view.group.IGroupView;
 
 class HorizontalLayout extends DefaultLayout {
 

src/main/haxework/view/layout/ILayout.hx

@@ -1,5 +1,6 @@
 package haxework.view.layout;
 
+import haxework.view.group.IGroupView;
 import haxework.view.core.VAlign;
 import haxework.view.core.HAlign;
 

src/main/haxework/view/layout/Layout.hx

@@ -1,7 +1,8 @@
 package haxework.view.layout;
 
-import haxework.view.core.VAlign;
 import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.group.IGroupView;
 
 class Layout implements ILayout {
 

src/main/haxework/view/layout/TailLayout.hx

@@ -1,6 +1,7 @@
 package haxework.view.layout;
 
 import haxework.view.core.VAlign;
+import haxework.view.group.IGroupView;
 
 typedef Row = {
     var width:Float;

src/main/haxework/view/layout/VerticalLayout.hx

@@ -1,7 +1,8 @@
 package haxework.view.layout;
 
-import haxework.view.core.VAlign;
 import haxework.view.core.Geometry.SizeValue;
+import haxework.view.core.VAlign;
+import haxework.view.group.IGroupView;
 
 class VerticalLayout extends DefaultLayout {
 

src/main/haxework/view/list/LabelListItem.hx

@@ -1,6 +1,7 @@
 package haxework.view.list;
 
 import haxework.view.core.HAlign;
+import haxework.view.form.LabelView;
 import haxework.view.list.ListView.IListItemView;
 
 private typedef Formatter<T> = Int -> T -> String;

src/main/haxework/view/list/ListView.hx

@@ -1,13 +1,15 @@
 package haxework.view.list;
 
 import flash.events.MouseEvent;
+import haxework.signal.Signal;
+import haxework.utils.NumberUtil;
 import haxework.view.core.Geometry.Position;
 import haxework.view.core.HAlign;
 import haxework.view.core.VAlign;
+import haxework.view.form.ButtonView;
+import haxework.view.group.GroupView;
 import haxework.view.layout.ILayout;
 import haxework.view.skin.Skin;
-import haxework.signal.Signal;
-import haxework.utils.NumberUtil;
 
 class ListView<D> extends GroupView {
 

src/main/haxework/view/popup/PopupManager.hx

@@ -1,7 +1,7 @@
 package haxework.view.popup;
 
+import haxework.view.group.IGroupView;
 import haxework.animate.IAnimate;
-import haxework.view.IGroupView;
 
 typedef P = PopupView<Dynamic>;
 

src/main/haxework/view/popup/PopupView.hx

@@ -3,7 +3,7 @@ package haxework.view.popup;
 import flash.display.DisplayObject;
 import flash.events.MouseEvent;
 import haxework.view.core.Geometry.Position;
-import haxework.view.GroupView;
+import haxework.view.group.GroupView;
 import haxework.view.skin.Skin;
 import promhx.Deferred;
 import promhx.Promise;

src/main/haxework/view/skin/ButtonBitmapSkin.hx

@@ -2,7 +2,8 @@ package haxework.view.skin;
 
 import flash.display.BitmapData;
 import flash.geom.Rectangle;
-import haxework.view.ButtonView.ButtonState;
+import haxework.view.form.ButtonView.ButtonState;
+import haxework.view.form.ButtonView;
 import haxework.view.utils.BitmapUtil;
 import haxework.view.utils.DrawUtil;
 

src/main/haxework/view/skin/ButtonColorSkin.hx

@@ -5,7 +5,8 @@ import flash.display.Graphics;
 import flash.display.JointStyle;
 import flash.display.LineScaleMode;
 import haxework.color.ColorUtil;
-import haxework.view.ButtonView;
+import haxework.view.form.ButtonView;
+import haxework.view.form.ToggleButtonView;
 
 class ButtonColorSkin implements ISkin<ButtonView> {
 

src/main/haxework/view/skin/LayoutSkin.hx

@@ -2,6 +2,7 @@ package haxework.view.skin;
 
 import haxework.view.core.HAlign;
 import haxework.view.core.VAlign;
+import haxework.view.group.IGroupView;
 import haxework.view.layout.ILayout;
 
 class LayoutSkin implements ISkin<IGroupView> {

src/main/haxework/view/skin/Skin.hx

@@ -1,9 +1,11 @@
 package haxework.view.skin;
 
-import haxework.view.utils.DrawUtil.FillType;
-import haxework.view.layout.ILayout;
-import haxework.view.core.Geometry;
 import flash.display.BitmapData;
+import haxework.view.core.Geometry;
+import haxework.view.form.ButtonView;
+import haxework.view.layout.ILayout;
+import haxework.view.text.ITextView;
+import haxework.view.utils.DrawUtil;
 
 class Skin {
 

src/main/haxework/view/skin/TabColorSkin.hx

@@ -2,6 +2,8 @@ package haxework.view.skin;
 
 import flash.display.Graphics;
 import haxework.color.ColorUtil;
+import haxework.view.form.ButtonView;
+import haxework.view.form.ToggleButtonView;
 
 class TabColorSkin extends ButtonColorSkin {
 

src/main/haxework/view/skin/TextSkin.hx

@@ -1,5 +1,7 @@
 package haxework.view.skin;
 
+import haxework.view.text.ITextView;
+
 class TextSkin implements ISkin<ITextView> {
 
     public var fontColor(default, default):Int;

src/main/haxework/view/text/ITextView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.text;
 
 import flash.text.TextField;
 import haxework.view.IView;

src/main/haxework/view/text/TextView.hx

@@ -1,4 +1,4 @@
-package haxework.view;
+package haxework.view.text;
 
 import haxework.view.layout.ILayout;
 import haxework.view.layout.Layout;

src/main/haxework/view/theme/ITheme.hx

@@ -1,5 +1,6 @@
 package haxework.view.theme;
 
+import haxework.view.text.ITextView;
 import haxework.color.Color;
 import haxework.view.skin.ISkin;
 

src/main/haxework/view/theme/Theme.hx

@@ -1,10 +1,11 @@
 package haxework.view.theme;
 
-import flash.text.FontType;
 import flash.text.Font;
+import flash.text.FontType;
 import haxework.color.Color;
 import haxework.view.skin.ISkin;
 import haxework.view.skin.Skin;
+import haxework.view.text.ITextView;
 import haxework.view.theme.ITheme;
 
 using haxework.color.ColorUtil;