From 4f3a6c51747363beac99804339fba52168e3b1b4 Mon Sep 17 00:00:00 2001 From: shmyga Date: Tue, 9 Jul 2019 22:09:32 +0300 Subject: [PATCH] [view] reorganize packages --- demo/src/demo/Demo.hx | 18 ++++++------ demo/src/demo/DemoView.yaml | 12 ++++---- demo/src/demo/form/DataForm.hx | 2 +- demo/src/demo/form/DataForm.yaml | 2 +- demo/src/demo/form/SelectForm.yaml | 4 +-- demo/src/demo/form/TailForm.hx | 2 +- demo/src/demo/form/TailForm.yaml | 2 +- demo/src/demo/form/TestLayoutForm.yaml | 14 ++++----- demo/src/demo/popup/ColorPopup.hx | 2 +- demo/src/demo/popup/ColorPopup.yaml | 8 ++--- src/main/haxework/view/IView.hx | 3 +- src/main/haxework/view/ProgressView.hx | 29 ------------------- src/main/haxework/view/Root.hx | 3 +- src/main/haxework/view/ScrollView.hx | 1 + src/main/haxework/view/View.hx | 1 + .../haxework/view/{ => data}/ButtonGroup.hx | 8 +++-- src/main/haxework/view/{ => data}/DataView.hx | 3 +- .../view/{ => form}/ButtonImageView.hx | 2 +- .../haxework/view/{ => form}/ButtonView.hx | 2 +- .../haxework/view/{ => form}/InputView.hx | 2 +- .../haxework/view/{ => form}/LabelView.hx | 5 ++-- .../haxework/view/{ => form}/SelectView.hx | 7 +++-- .../view/{ => form}/ToggleButtonView.hx | 2 +- src/main/haxework/view/frame/FrameSwitcher.hx | 2 +- src/main/haxework/view/frame/FrameView.hx | 1 + .../haxework/view/{ => group}/GroupView.hx | 2 +- .../haxework/view/{ => group}/HGroupView.hx | 2 +- .../haxework/view/{ => group}/IGroupView.hx | 2 +- .../haxework/view/{ => group}/VGroupView.hx | 2 +- .../haxework/view/layout/DefaultLayout.hx | 3 +- .../haxework/view/layout/HorizontalLayout.hx | 1 + src/main/haxework/view/layout/ILayout.hx | 1 + src/main/haxework/view/layout/Layout.hx | 3 +- src/main/haxework/view/layout/TailLayout.hx | 1 + .../haxework/view/layout/VerticalLayout.hx | 3 +- src/main/haxework/view/list/LabelListItem.hx | 1 + src/main/haxework/view/list/ListView.hx | 6 ++-- src/main/haxework/view/popup/PopupManager.hx | 2 +- src/main/haxework/view/popup/PopupView.hx | 2 +- .../haxework/view/skin/ButtonBitmapSkin.hx | 3 +- .../haxework/view/skin/ButtonColorSkin.hx | 3 +- src/main/haxework/view/skin/LayoutSkin.hx | 1 + src/main/haxework/view/skin/Skin.hx | 8 +++-- src/main/haxework/view/skin/TabColorSkin.hx | 2 ++ src/main/haxework/view/skin/TextSkin.hx | 2 ++ .../haxework/view/{ => text}/ITextView.hx | 2 +- src/main/haxework/view/{ => text}/TextView.hx | 2 +- src/main/haxework/view/theme/ITheme.hx | 1 + src/main/haxework/view/theme/Theme.hx | 3 +- 49 files changed, 99 insertions(+), 96 deletions(-) delete mode 100755 src/main/haxework/view/ProgressView.hx rename src/main/haxework/view/{ => data}/ButtonGroup.hx (94%) rename src/main/haxework/view/{ => data}/DataView.hx (96%) rename src/main/haxework/view/{ => form}/ButtonImageView.hx (97%) rename src/main/haxework/view/{ => form}/ButtonView.hx (99%) rename src/main/haxework/view/{ => form}/InputView.hx (98%) rename src/main/haxework/view/{ => form}/LabelView.hx (85%) rename src/main/haxework/view/{ => form}/SelectView.hx (96%) rename src/main/haxework/view/{ => form}/ToggleButtonView.hx (95%) rename src/main/haxework/view/{ => group}/GroupView.hx (98%) rename src/main/haxework/view/{ => group}/HGroupView.hx (84%) rename src/main/haxework/view/{ => group}/IGroupView.hx (95%) rename src/main/haxework/view/{ => group}/VGroupView.hx (83%) rename src/main/haxework/view/{ => text}/ITextView.hx (94%) rename src/main/haxework/view/{ => text}/TextView.hx (99%) diff --git a/demo/src/demo/Demo.hx b/demo/src/demo/Demo.hx index a5feb94..bf62b14 100644 --- a/demo/src/demo/Demo.hx +++ b/demo/src/demo/Demo.hx @@ -1,15 +1,15 @@ package demo; import demo.dispatch.DemoDispatcher; -import haxework.net.JsonLoader; import demo.popup.ColorPopup; import haxework.App; -import haxework.view.frame.FrameSwitcher; -import haxework.view.IGroupView; -import haxework.view.IView; -import haxework.view.ToggleButtonView; -import haxework.view.VGroupView; import haxework.log.TraceLogger; +import haxework.net.JsonLoader; +import haxework.view.form.ToggleButtonView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.group.IGroupView; +import haxework.view.group.VGroupView; +import haxework.view.IView; @:template class DemoView extends VGroupView { @:view var switcher:FrameSwitcher; @@ -25,9 +25,9 @@ import haxework.log.TraceLogger; private function choiceColor():Void { // ToDo: update Theme - /*new ColorPopup() - .show() - .then(function(color) AppTheme.setColor(color)) + new ColorPopup() + .show(); + /*.then(function(color) AppTheme.setColor(color)) .catchError(function(e) {});*/ } } diff --git a/demo/src/demo/DemoView.yaml b/demo/src/demo/DemoView.yaml index 8958d61..b46c1a6 100644 --- a/demo/src/demo/DemoView.yaml +++ b/demo/src/demo/DemoView.yaml @@ -6,7 +6,7 @@ views: geometry.padding: 10 image: $r:image:logo - id: tabs - $type: haxework.view.ButtonGroup + $type: haxework.view.data.ButtonGroup layout.margin: 5 layout.hAlign: left geometry.size.width: 100% @@ -34,12 +34,12 @@ views: _data_: {$class: demo.form.DataForm} _test_layout_: {$class: demo.form.TestLayoutForm} _select_: {$class: demo.form.SelectForm} - - $type: haxework.view.HGroupView + - $type: haxework.view.group.HGroupView geometry.size.percent.width: 100 geometry.padding: 10 layout.margin: 10 views: - - $type: haxework.view.ButtonView + - $type: haxework.view.form.ButtonView geometry.padding: [25, 8] skinId: button text: Color @@ -47,15 +47,15 @@ views: # separator - $type: haxework.view.SpriteView geometry.size.stretch: true - - $type: haxework.view.ButtonView + - $type: haxework.view.form.ButtonView geometry.padding: [25, 8] skinId: button text: OK - - $type: haxework.view.ButtonView + - $type: haxework.view.form.ButtonView geometry.padding: [25, 8] skinId: button text: Apply - - $type: haxework.view.ButtonView + - $type: haxework.view.form.ButtonView geometry.padding: [25, 8] skinId: button text: Cancel diff --git a/demo/src/demo/form/DataForm.hx b/demo/src/demo/form/DataForm.hx index 3415753..01019f9 100644 --- a/demo/src/demo/form/DataForm.hx +++ b/demo/src/demo/form/DataForm.hx @@ -1,7 +1,7 @@ package demo.form; import haxework.view.frame.FrameView; -import haxework.view.TextView; +import haxework.view.text.TextView; @:template class DataForm extends FrameView { diff --git a/demo/src/demo/form/DataForm.yaml b/demo/src/demo/form/DataForm.yaml index 14cd890..4831853 100644 --- a/demo/src/demo/form/DataForm.yaml +++ b/demo/src/demo/form/DataForm.yaml @@ -5,7 +5,7 @@ views: scroll.skinId: scroll view: id: data - $type: haxework.view.DataView + $type: haxework.view.data.DataView layout: $type: haxework.view.layout.VerticalLayout factory: ~factory diff --git a/demo/src/demo/form/SelectForm.yaml b/demo/src/demo/form/SelectForm.yaml index 2cedf95..7454835 100644 --- a/demo/src/demo/form/SelectForm.yaml +++ b/demo/src/demo/form/SelectForm.yaml @@ -2,7 +2,7 @@ geometry.padding: 10 layout.margin: 5 views: - - $type: haxework.view.SelectView + - $type: haxework.view.form.SelectView layout.margin: 2 dataView.layout.margin: 1 labelSkinId: text @@ -14,7 +14,7 @@ views: selected: "value 1" +onSelect: ~function(value) trace('select', value) - - $type: haxework.view.SelectView.SelectIdView<{id:Int,label:String}, Int> + - $type: haxework.view.form.SelectView.SelectIdView<{id:Int,label:String}, Int> layout.margin: 2 dataView.layout.margin: 1 labelSkinId: text diff --git a/demo/src/demo/form/TailForm.hx b/demo/src/demo/form/TailForm.hx index 4aa1a7f..f224805 100644 --- a/demo/src/demo/form/TailForm.hx +++ b/demo/src/demo/form/TailForm.hx @@ -3,7 +3,7 @@ package demo.form; import haxework.view.frame.FrameView; import haxework.view.ImageView; import haxework.view.IView; -import haxework.view.TextView; +import haxework.view.text.TextView; import haxework.view.utils.DrawUtil; @:template class TailForm extends FrameView { diff --git a/demo/src/demo/form/TailForm.yaml b/demo/src/demo/form/TailForm.yaml index 6ad4794..9974fe9 100644 --- a/demo/src/demo/form/TailForm.yaml +++ b/demo/src/demo/form/TailForm.yaml @@ -5,7 +5,7 @@ views: scroll.skinId: scroll view: id: data - $type: haxework.view.DataView + $type: haxework.view.data.DataView layout: $type: haxework.view.layout.TailLayout margin: 2 diff --git a/demo/src/demo/form/TestLayoutForm.yaml b/demo/src/demo/form/TestLayoutForm.yaml index d415990..36970cb 100644 --- a/demo/src/demo/form/TestLayoutForm.yaml +++ b/demo/src/demo/form/TestLayoutForm.yaml @@ -1,29 +1,29 @@ --- views: - id: main - $type: haxework.view.VGroupView + $type: haxework.view.group.VGroupView geometry.size.stretch: true layout.hAlign: center layout.vAlign: middle views: - id: container - $type: haxework.view.VGroupView + $type: haxework.view.group.VGroupView layout.margin: 10 skin: - $type: [haxework.view.skin.Skin.color, 0xffff00] views: - id: top - $type: haxework.view.GroupView + $type: haxework.view.group.GroupView layout.hAlign: center geometry.size.width: 100% geometry.size.height: 20 skinId: test - id: middle - $type: haxework.view.HGroupView + $type: haxework.view.group.HGroupView layout.margin: 10 views: - id: left - $type: haxework.view.GroupView + $type: haxework.view.group.GroupView layout.vAlign: middle geometry.size.width: 20 geometry.size.height: 100% @@ -34,7 +34,7 @@ views: #geometry.size.height: 200 skinId: test - id: right - $type: haxework.view.GroupView + $type: haxework.view.group.GroupView layout.vAlign: middle geometry.size.width: 20 geometry.size.height: 100% @@ -46,7 +46,7 @@ views: skin: - $type: [haxework.view.skin.Skin.color, 0xff0000] - id: bottom - $type: haxework.view.GroupView + $type: haxework.view.group.GroupView layout.hAlign: center skinId: test geometry.size.width: 100% diff --git a/demo/src/demo/popup/ColorPopup.hx b/demo/src/demo/popup/ColorPopup.hx index 3320c11..7933012 100644 --- a/demo/src/demo/popup/ColorPopup.hx +++ b/demo/src/demo/popup/ColorPopup.hx @@ -1,6 +1,6 @@ package demo.popup; -import haxework.view.ButtonView; +import haxework.view.form.ButtonView; import haxework.view.popup.PopupView; import haxework.view.skin.Skin; diff --git a/demo/src/demo/popup/ColorPopup.yaml b/demo/src/demo/popup/ColorPopup.yaml index 79d637b..d9693da 100644 --- a/demo/src/demo/popup/ColorPopup.yaml +++ b/demo/src/demo/popup/ColorPopup.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.view.VGroupView + $type: haxework.view.group.VGroupView geometry.size.width: 400 geometry.size.height: 200 geometry.padding: 10 @@ -9,7 +9,7 @@ view: skinId: panel views: - id: colors - $type: haxework.view.DataView + $type: haxework.view.data.DataView geometry.size.stretch: true layout: $type: haxework.view.layout.TailLayout @@ -23,12 +23,12 @@ view: - 0xCC33AA - 0x3333AA +onDataSelect: ~close - - $type: haxework.view.HGroupView + - $type: haxework.view.group.HGroupView geometry.size.width: 100% layout.hAlign: right layout.margin: 10 views: - - $type: haxework.view.ButtonView + - $type: haxework.view.form.ButtonView geometry.padding: [25, 8] skinId: button text: Cancel diff --git a/src/main/haxework/view/IView.hx b/src/main/haxework/view/IView.hx index cf438dd..45056a8 100755 --- a/src/main/haxework/view/IView.hx +++ b/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 { public var id(default, default):String; diff --git a/src/main/haxework/view/ProgressView.hx b/src/main/haxework/view/ProgressView.hx deleted file mode 100755 index c89844c..0000000 --- a/src/main/haxework/view/ProgressView.hx +++ /dev/null @@ -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; - } -} diff --git a/src/main/haxework/view/Root.hx b/src/main/haxework/view/Root.hx index a5662aa..b78bff1 100755 --- a/src/main/haxework/view/Root.hx +++ b/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 { diff --git a/src/main/haxework/view/ScrollView.hx b/src/main/haxework/view/ScrollView.hx index 040bdd3..68bfb15 100644 --- a/src/main/haxework/view/ScrollView.hx +++ b/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; diff --git a/src/main/haxework/view/View.hx b/src/main/haxework/view/View.hx index bfb6570..d0c996f 100755 --- a/src/main/haxework/view/View.hx +++ b/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; diff --git a/src/main/haxework/view/ButtonGroup.hx b/src/main/haxework/view/data/ButtonGroup.hx similarity index 94% rename from src/main/haxework/view/ButtonGroup.hx rename to src/main/haxework/view/data/ButtonGroup.hx index 6d1df28..de058ce 100644 --- a/src/main/haxework/view/ButtonGroup.hx +++ b/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 extends DataView { public var selected(default, set):D; diff --git a/src/main/haxework/view/DataView.hx b/src/main/haxework/view/data/DataView.hx similarity index 96% rename from src/main/haxework/view/DataView.hx rename to src/main/haxework/view/data/DataView.hx index 754301b..41961d0 100644 --- a/src/main/haxework/view/DataView.hx +++ b/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; diff --git a/src/main/haxework/view/ButtonImageView.hx b/src/main/haxework/view/form/ButtonImageView.hx similarity index 97% rename from src/main/haxework/view/ButtonImageView.hx rename to src/main/haxework/view/form/ButtonImageView.hx index b86c4e5..9c0e854 100644 --- a/src/main/haxework/view/ButtonImageView.hx +++ b/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; diff --git a/src/main/haxework/view/ButtonView.hx b/src/main/haxework/view/form/ButtonView.hx similarity index 99% rename from src/main/haxework/view/ButtonView.hx rename to src/main/haxework/view/form/ButtonView.hx index 138c84d..e52c6ec 100755 --- a/src/main/haxework/view/ButtonView.hx +++ b/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; diff --git a/src/main/haxework/view/InputView.hx b/src/main/haxework/view/form/InputView.hx similarity index 98% rename from src/main/haxework/view/InputView.hx rename to src/main/haxework/view/form/InputView.hx index 8939046..b602640 100755 --- a/src/main/haxework/view/InputView.hx +++ b/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; diff --git a/src/main/haxework/view/LabelView.hx b/src/main/haxework/view/form/LabelView.hx similarity index 85% rename from src/main/haxework/view/LabelView.hx rename to src/main/haxework/view/form/LabelView.hx index e4e1638..cdbc3be 100755 --- a/src/main/haxework/view/LabelView.hx +++ b/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 { diff --git a/src/main/haxework/view/SelectView.hx b/src/main/haxework/view/form/SelectView.hx similarity index 96% rename from src/main/haxework/view/SelectView.hx rename to src/main/haxework/view/form/SelectView.hx index d2a59b3..b5886fa 100644 --- a/src/main/haxework/view/SelectView.hx +++ b/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; diff --git a/src/main/haxework/view/ToggleButtonView.hx b/src/main/haxework/view/form/ToggleButtonView.hx similarity index 95% rename from src/main/haxework/view/ToggleButtonView.hx rename to src/main/haxework/view/form/ToggleButtonView.hx index d4685b0..194f00b 100755 --- a/src/main/haxework/view/ToggleButtonView.hx +++ b/src/main/haxework/view/form/ToggleButtonView.hx @@ -1,4 +1,4 @@ -package haxework.view; +package haxework.view.form; class ToggleButtonView extends ButtonView { diff --git a/src/main/haxework/view/frame/FrameSwitcher.hx b/src/main/haxework/view/frame/FrameSwitcher.hx index b6bd510..f3323b0 100755 --- a/src/main/haxework/view/frame/FrameSwitcher.hx +++ b/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 { diff --git a/src/main/haxework/view/frame/FrameView.hx b/src/main/haxework/view/frame/FrameView.hx index 2ebf881..072d54b 100644 --- a/src/main/haxework/view/frame/FrameView.hx +++ b/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; diff --git a/src/main/haxework/view/GroupView.hx b/src/main/haxework/view/group/GroupView.hx similarity index 98% rename from src/main/haxework/view/GroupView.hx rename to src/main/haxework/view/group/GroupView.hx index 636cc90..adadcab 100755 --- a/src/main/haxework/view/GroupView.hx +++ b/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; diff --git a/src/main/haxework/view/HGroupView.hx b/src/main/haxework/view/group/HGroupView.hx similarity index 84% rename from src/main/haxework/view/HGroupView.hx rename to src/main/haxework/view/group/HGroupView.hx index 706922e..bb07513 100755 --- a/src/main/haxework/view/HGroupView.hx +++ b/src/main/haxework/view/group/HGroupView.hx @@ -1,4 +1,4 @@ -package haxework.view; +package haxework.view.group; import haxework.view.layout.HorizontalLayout; diff --git a/src/main/haxework/view/IGroupView.hx b/src/main/haxework/view/group/IGroupView.hx similarity index 95% rename from src/main/haxework/view/IGroupView.hx rename to src/main/haxework/view/group/IGroupView.hx index 9b35c53..a8a90c6 100755 --- a/src/main/haxework/view/IGroupView.hx +++ b/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; diff --git a/src/main/haxework/view/VGroupView.hx b/src/main/haxework/view/group/VGroupView.hx similarity index 83% rename from src/main/haxework/view/VGroupView.hx rename to src/main/haxework/view/group/VGroupView.hx index 68eefd7..3e22501 100755 --- a/src/main/haxework/view/VGroupView.hx +++ b/src/main/haxework/view/group/VGroupView.hx @@ -1,4 +1,4 @@ -package haxework.view; +package haxework.view.group; import haxework.view.layout.VerticalLayout; diff --git a/src/main/haxework/view/layout/DefaultLayout.hx b/src/main/haxework/view/layout/DefaultLayout.hx index 968ccd3..2658989 100755 --- a/src/main/haxework/view/layout/DefaultLayout.hx +++ b/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 { diff --git a/src/main/haxework/view/layout/HorizontalLayout.hx b/src/main/haxework/view/layout/HorizontalLayout.hx index 197cd37..6f7884f 100755 --- a/src/main/haxework/view/layout/HorizontalLayout.hx +++ b/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 { diff --git a/src/main/haxework/view/layout/ILayout.hx b/src/main/haxework/view/layout/ILayout.hx index d587045..b92afa8 100755 --- a/src/main/haxework/view/layout/ILayout.hx +++ b/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; diff --git a/src/main/haxework/view/layout/Layout.hx b/src/main/haxework/view/layout/Layout.hx index 15e23e4..26f54b3 100644 --- a/src/main/haxework/view/layout/Layout.hx +++ b/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 { diff --git a/src/main/haxework/view/layout/TailLayout.hx b/src/main/haxework/view/layout/TailLayout.hx index d5fec10..acf0416 100644 --- a/src/main/haxework/view/layout/TailLayout.hx +++ b/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; diff --git a/src/main/haxework/view/layout/VerticalLayout.hx b/src/main/haxework/view/layout/VerticalLayout.hx index 2a4023a..10d289e 100755 --- a/src/main/haxework/view/layout/VerticalLayout.hx +++ b/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 { diff --git a/src/main/haxework/view/list/LabelListItem.hx b/src/main/haxework/view/list/LabelListItem.hx index 15cf5bc..8d935fa 100644 --- a/src/main/haxework/view/list/LabelListItem.hx +++ b/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 = Int -> T -> String; diff --git a/src/main/haxework/view/list/ListView.hx b/src/main/haxework/view/list/ListView.hx index b7c7e19..fcb8faf 100755 --- a/src/main/haxework/view/list/ListView.hx +++ b/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 extends GroupView { diff --git a/src/main/haxework/view/popup/PopupManager.hx b/src/main/haxework/view/popup/PopupManager.hx index 3344931..10c3d3d 100755 --- a/src/main/haxework/view/popup/PopupManager.hx +++ b/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; diff --git a/src/main/haxework/view/popup/PopupView.hx b/src/main/haxework/view/popup/PopupView.hx index c8a5a3d..0f610f4 100755 --- a/src/main/haxework/view/popup/PopupView.hx +++ b/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; diff --git a/src/main/haxework/view/skin/ButtonBitmapSkin.hx b/src/main/haxework/view/skin/ButtonBitmapSkin.hx index e789194..d23db94 100755 --- a/src/main/haxework/view/skin/ButtonBitmapSkin.hx +++ b/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; diff --git a/src/main/haxework/view/skin/ButtonColorSkin.hx b/src/main/haxework/view/skin/ButtonColorSkin.hx index f009cba..87a7374 100644 --- a/src/main/haxework/view/skin/ButtonColorSkin.hx +++ b/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 { diff --git a/src/main/haxework/view/skin/LayoutSkin.hx b/src/main/haxework/view/skin/LayoutSkin.hx index 165b3a1..849f6a5 100644 --- a/src/main/haxework/view/skin/LayoutSkin.hx +++ b/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 { diff --git a/src/main/haxework/view/skin/Skin.hx b/src/main/haxework/view/skin/Skin.hx index c45a45e..f160882 100644 --- a/src/main/haxework/view/skin/Skin.hx +++ b/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 { diff --git a/src/main/haxework/view/skin/TabColorSkin.hx b/src/main/haxework/view/skin/TabColorSkin.hx index cac437e..ff6a367 100644 --- a/src/main/haxework/view/skin/TabColorSkin.hx +++ b/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 { diff --git a/src/main/haxework/view/skin/TextSkin.hx b/src/main/haxework/view/skin/TextSkin.hx index 268557a..4dac2bf 100644 --- a/src/main/haxework/view/skin/TextSkin.hx +++ b/src/main/haxework/view/skin/TextSkin.hx @@ -1,5 +1,7 @@ package haxework.view.skin; +import haxework.view.text.ITextView; + class TextSkin implements ISkin { public var fontColor(default, default):Int; diff --git a/src/main/haxework/view/ITextView.hx b/src/main/haxework/view/text/ITextView.hx similarity index 94% rename from src/main/haxework/view/ITextView.hx rename to src/main/haxework/view/text/ITextView.hx index e23a7e1..fcb5cab 100755 --- a/src/main/haxework/view/ITextView.hx +++ b/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; diff --git a/src/main/haxework/view/TextView.hx b/src/main/haxework/view/text/TextView.hx similarity index 99% rename from src/main/haxework/view/TextView.hx rename to src/main/haxework/view/text/TextView.hx index 6680103..ab4fba8 100755 --- a/src/main/haxework/view/TextView.hx +++ b/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; diff --git a/src/main/haxework/view/theme/ITheme.hx b/src/main/haxework/view/theme/ITheme.hx index 0a9f703..b5c6102 100644 --- a/src/main/haxework/view/theme/ITheme.hx +++ b/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; diff --git a/src/main/haxework/view/theme/Theme.hx b/src/main/haxework/view/theme/Theme.hx index d195f06..e0bee88 100644 --- a/src/main/haxework/view/theme/Theme.hx +++ b/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;