From 279baa11137bb95a2e85bc04ff1ec5afb98deff8 Mon Sep 17 00:00:00 2001 From: shmyga Date: Tue, 24 Mar 2020 20:58:54 +0300 Subject: [PATCH] [hw] rename haxework package to hw --- README.md | 57 ++++++------ demo/build.hxml | 2 +- demo/project.xml | 4 +- demo/src/demo/AppTheme.hx | 8 +- demo/src/demo/Demo.hx | 33 ++++--- demo/src/demo/DemoView.yaml | 22 ++--- demo/src/demo/Test.hx | 4 +- demo/src/demo/dispatch/DemoDispatcher.hx | 2 +- demo/src/demo/form/DataForm.hx | 4 +- demo/src/demo/form/DataForm.yaml | 4 +- demo/src/demo/form/ListForm.hx | 8 +- demo/src/demo/form/ListForm.yaml | 4 +- demo/src/demo/form/SelectForm.hx | 2 +- demo/src/demo/form/SelectForm.yaml | 4 +- demo/src/demo/form/TailForm.hx | 10 +-- demo/src/demo/form/TailForm.yaml | 4 +- demo/src/demo/form/TestLayoutForm.hx | 4 +- demo/src/demo/form/TestLayoutForm.yaml | 22 ++--- demo/src/demo/popup/ColorPopup.hx | 6 +- demo/src/demo/popup/ColorPopup.yaml | 10 +-- demo/src/demo/popup/FontPopup.hx | 8 +- demo/src/demo/popup/FontPopup.yaml | 10 +-- demo/src/demo/storage/TestStorage.hx | 2 +- demo/src/demo/test/TestView.hx | 2 +- demo/src/demo/test/TestView.yaml | 30 +++---- extraParams.hxml | 2 +- haxelib.json | 2 +- src/main/L.hx | 4 +- src/main/haxework/App.hx | 35 -------- src/main/{haxework => hw}/animate/Animate.hx | 4 +- .../animate/CircleMaskAnimate.hx | 8 +- .../{haxework => hw}/animate/FadeAnimate.hx | 6 +- src/main/{haxework => hw}/animate/IAnimate.hx | 2 +- .../{haxework => hw}/animate/SlideAnimate.hx | 2 +- .../{haxework => hw}/animate/UnFadeAnimate.hx | 4 +- src/main/hw/app/App.hx | 86 +++++++++++++++++++ src/main/hw/app/Const.hx | 22 +++++ src/main/{haxework => hw}/app/LinuxIcon.hx | 2 +- src/main/{haxework => hw}/color/Color.hx | 2 +- src/main/{haxework => hw}/color/ColorUtil.hx | 2 +- src/main/{haxework => hw}/geom/IntPoint.hx | 2 +- src/main/{haxework => hw}/geom/Point.hx | 2 +- src/main/{haxework => hw}/geom/Rectangle.hx | 2 +- src/main/{haxework => hw}/log/AndroidLog.hx | 2 +- src/main/{haxework => hw}/log/BaseLogger.hx | 4 +- src/main/{haxework => hw}/log/ILogger.hx | 4 +- src/main/{haxework => hw}/log/JSLogger.hx | 8 +- src/main/{haxework => hw}/log/SocketLogger.hx | 6 +- .../{haxework => hw}/log/TextFieldLogger.hx | 4 +- src/main/{haxework => hw}/log/TraceLogger.hx | 4 +- .../macro/ClassProvideMacro.hx | 2 +- .../{haxework => hw}/macro/ClassTypeMacro.hx | 2 +- .../{haxework => hw}/macro/DispatcherMacro.hx | 6 +- src/main/{haxework => hw}/macro/FieldMacro.hx | 4 +- src/main/{haxework => hw}/macro/FileUtil.hx | 2 +- src/main/{haxework => hw}/macro/MacroUtil.hx | 2 +- .../macro/PositionJsonParser.hx | 2 +- .../macro/PositionYamlParser.hx | 2 +- .../{haxework => hw}/macro/ProvideMacro.hx | 8 +- .../{haxework => hw}/macro/ResourceMacro.hx | 4 +- .../{haxework => hw}/macro/SingletonMacro.hx | 2 +- src/main/{haxework => hw}/macro/StyleMacro.hx | 10 +-- .../{haxework => hw}/macro/TemplateMacro.hx | 10 +-- src/main/{haxework => hw}/net/BaseLoader.hx | 4 +- .../{haxework => hw}/net/BaseMediaLoader.hx | 4 +- .../{haxework => hw}/net/BaseURLLoader.hx | 2 +- src/main/{haxework => hw}/net/BatchLoader.hx | 4 +- src/main/{haxework => hw}/net/BytesLoader.hx | 2 +- .../net/ExternalImageLoader.hx | 2 +- src/main/{haxework => hw}/net/ILoader.hx | 2 +- src/main/{haxework => hw}/net/ImageLoader.hx | 2 +- src/main/{haxework => hw}/net/JsonLoader.hx | 2 +- src/main/{haxework => hw}/net/SwfLoader.hx | 2 +- src/main/{haxework => hw}/net/TextLoader.hx | 2 +- src/main/{haxework => hw}/net/XmlLoader.hx | 2 +- .../net/manage/ILoaderManager.hx | 2 +- .../net/manage/LoaderManager.hx | 2 +- src/main/{haxework => hw}/parser/Parser.hx | 22 ++--- .../{haxework => hw}/provider/Provider.hx | 4 +- .../{haxework => hw}/resources/IResources.hx | 4 +- .../{haxework => hw}/resources/Resources.hx | 2 +- src/main/{haxework => hw}/signal/Signal.hx | 2 +- src/main/{haxework => hw}/storage/IStorage.hx | 2 +- .../{haxework => hw}/storage/NoStorage.hx | 2 +- .../storage/SharedObjectStorage.hx | 2 +- .../{haxework => hw}/text/BitmapTextField.hx | 4 +- src/main/{haxework => hw}/text/TextUtil.hx | 2 +- .../{haxework => hw}/translate/ITranslate.hx | 2 +- .../{haxework => hw}/translate/Translate.hx | 2 +- .../translate/TranslateString.hx | 4 +- src/main/{haxework => hw}/utils/NumberUtil.hx | 4 +- src/main/{haxework => hw}/utils/ObjectUtil.hx | 2 +- src/main/{haxework => hw}/utils/StringUtil.hx | 2 +- src/main/{haxework => hw}/view/IView.hx | 12 +-- src/main/{haxework => hw}/view/ImageView.hx | 10 +-- src/main/{haxework => hw}/view/MovieView.hx | 4 +- src/main/{haxework => hw}/view/Root.hx | 8 +- src/main/{haxework => hw}/view/SpriteView.hx | 4 +- src/main/{haxework => hw}/view/View.hx | 12 +-- src/main/{haxework => hw}/view/ViewUpdater.hx | 2 +- .../{haxework => hw}/view/data/ButtonGroup.hx | 14 +-- .../{haxework => hw}/view/data/DataView.hx | 10 +-- .../view/form/ButtonImageView.hx | 12 +-- .../{haxework => hw}/view/form/ButtonView.hx | 6 +- .../{haxework => hw}/view/form/InputView.hx | 6 +- .../{haxework => hw}/view/form/LabelView.hx | 8 +- .../{haxework => hw}/view/form/SelectView.hx | 32 +++---- .../view/form/ToggleButtonView.hx | 2 +- .../view/frame/FrameSwitcher.hx | 10 +-- .../{haxework => hw}/view/frame/FrameView.hx | 8 +- .../{haxework => hw}/view/geometry/Box.hx | 2 +- .../view/geometry/Geometry.hx | 2 +- .../{haxework => hw}/view/geometry/HAlign.hx | 2 +- .../view/geometry/Position.hx | 2 +- .../{haxework => hw}/view/geometry/Size.hx | 2 +- .../{haxework => hw}/view/geometry/SizeSet.hx | 2 +- .../view/geometry/SizeValue.hx | 2 +- .../{haxework => hw}/view/geometry/VAlign.hx | 2 +- .../{haxework => hw}/view/group/GroupView.hx | 16 ++-- .../{haxework => hw}/view/group/HGroupView.hx | 4 +- .../{haxework => hw}/view/group/IGroupView.hx | 6 +- .../{haxework => hw}/view/group/Overflow.hx | 2 +- .../{haxework => hw}/view/group/VGroupView.hx | 4 +- .../view/layout/DefaultLayout.hx | 12 +-- .../view/layout/HorizontalLayout.hx | 10 +-- .../{haxework => hw}/view/layout/ILayout.hx | 10 +-- .../{haxework => hw}/view/layout/Layout.hx | 8 +- .../view/layout/TailLayout.hx | 6 +- .../view/layout/VerticalLayout.hx | 10 +-- .../{haxework => hw}/view/list/HListView.hx | 12 +-- .../view/list/HScrollBarView.hx | 4 +- .../view/list/LabelListItem.hx | 8 +- .../{haxework => hw}/view/list/ListView.hx | 22 ++--- .../view/list/ScrollBarView.hx | 6 +- .../{haxework => hw}/view/list/VListView.hx | 12 +-- .../view/list/VScrollBarView.hx | 4 +- .../{haxework => hw}/view/popup/AlertView.hx | 6 +- .../view/popup/AlertView.yaml | 12 +-- .../view/popup/ConfirmView.hx | 6 +- .../view/popup/ConfirmView.yaml | 14 +-- .../view/popup/PopupManager.hx | 6 +- .../{haxework => hw}/view/popup/PopupView.hx | 8 +- .../{haxework => hw}/view/skin/Background.hx | 4 +- .../{haxework => hw}/view/skin/BitmapSkin.hx | 4 +- src/main/{haxework => hw}/view/skin/Border.hx | 4 +- .../view/skin/ButtonBitmapSkin.hx | 10 +-- .../view/skin/ButtonColorSkin.hx | 10 +-- .../view/skin/HScrollBarSkin.hx | 8 +- src/main/{haxework => hw}/view/skin/ISkin.hx | 4 +- src/main/{haxework => hw}/view/skin/Skin.hx | 8 +- .../{haxework => hw}/view/skin/SpriteSkin.hx | 2 +- .../view/skin/TabColorSkin.hx | 8 +- .../view/skin/VScrollBarSkin.hx | 8 +- .../{haxework => hw}/view/text/FontPreset.hx | 4 +- .../{haxework => hw}/view/text/ITextView.hx | 6 +- .../{haxework => hw}/view/text/TextView.hx | 14 +-- .../{haxework => hw}/view/theme/IStylable.hx | 2 +- .../{haxework => hw}/view/theme/ITheme.hx | 6 +- .../{haxework => hw}/view/theme/StyleId.hx | 2 +- src/main/{haxework => hw}/view/theme/Theme.hx | 20 ++--- .../{haxework => hw}/view/utils/BitmapUtil.hx | 4 +- .../{haxework => hw}/view/utils/DrawUtil.hx | 2 +- 162 files changed, 613 insertions(+), 540 deletions(-) delete mode 100644 src/main/haxework/App.hx rename src/main/{haxework => hw}/animate/Animate.hx (96%) rename src/main/{haxework => hw}/animate/CircleMaskAnimate.hx (93%) rename src/main/{haxework => hw}/animate/FadeAnimate.hx (81%) rename src/main/{haxework => hw}/animate/IAnimate.hx (87%) rename src/main/{haxework => hw}/animate/SlideAnimate.hx (94%) rename src/main/{haxework => hw}/animate/UnFadeAnimate.hx (87%) create mode 100644 src/main/hw/app/App.hx create mode 100755 src/main/hw/app/Const.hx rename src/main/{haxework => hw}/app/LinuxIcon.hx (97%) rename src/main/{haxework => hw}/color/Color.hx (98%) rename src/main/{haxework => hw}/color/ColorUtil.hx (97%) rename src/main/{haxework => hw}/geom/IntPoint.hx (97%) rename src/main/{haxework => hw}/geom/Point.hx (97%) rename src/main/{haxework => hw}/geom/Rectangle.hx (99%) rename src/main/{haxework => hw}/log/AndroidLog.hx (94%) rename src/main/{haxework => hw}/log/BaseLogger.hx (96%) rename src/main/{haxework => hw}/log/ILogger.hx (95%) rename src/main/{haxework => hw}/log/JSLogger.hx (88%) rename src/main/{haxework => hw}/log/SocketLogger.hx (96%) rename src/main/{haxework => hw}/log/TextFieldLogger.hx (93%) rename src/main/{haxework => hw}/log/TraceLogger.hx (93%) rename src/main/{haxework => hw}/macro/ClassProvideMacro.hx (96%) rename src/main/{haxework => hw}/macro/ClassTypeMacro.hx (94%) rename src/main/{haxework => hw}/macro/DispatcherMacro.hx (95%) rename src/main/{haxework => hw}/macro/FieldMacro.hx (86%) rename src/main/{haxework => hw}/macro/FileUtil.hx (98%) rename src/main/{haxework => hw}/macro/MacroUtil.hx (99%) rename src/main/{haxework => hw}/macro/PositionJsonParser.hx (99%) rename src/main/{haxework => hw}/macro/PositionYamlParser.hx (98%) rename src/main/{haxework => hw}/macro/ProvideMacro.hx (83%) rename src/main/{haxework => hw}/macro/ResourceMacro.hx (65%) rename src/main/{haxework => hw}/macro/SingletonMacro.hx (97%) rename src/main/{haxework => hw}/macro/StyleMacro.hx (93%) rename src/main/{haxework => hw}/macro/TemplateMacro.hx (96%) rename src/main/{haxework => hw}/net/BaseLoader.hx (98%) rename src/main/{haxework => hw}/net/BaseMediaLoader.hx (97%) rename src/main/{haxework => hw}/net/BaseURLLoader.hx (99%) rename src/main/{haxework => hw}/net/BatchLoader.hx (95%) rename src/main/{haxework => hw}/net/BytesLoader.hx (95%) rename src/main/{haxework => hw}/net/ExternalImageLoader.hx (98%) rename src/main/{haxework => hw}/net/ILoader.hx (96%) rename src/main/{haxework => hw}/net/ImageLoader.hx (94%) rename src/main/{haxework => hw}/net/JsonLoader.hx (97%) rename src/main/{haxework => hw}/net/SwfLoader.hx (94%) rename src/main/{haxework => hw}/net/TextLoader.hx (91%) rename src/main/{haxework => hw}/net/XmlLoader.hx (91%) rename src/main/{haxework => hw}/net/manage/ILoaderManager.hx (91%) rename src/main/{haxework => hw}/net/manage/LoaderManager.hx (96%) rename src/main/{haxework => hw}/parser/Parser.hx (78%) rename src/main/{haxework => hw}/provider/Provider.hx (96%) rename src/main/{haxework => hw}/resources/IResources.hx (87%) rename src/main/{haxework => hw}/resources/Resources.hx (98%) rename src/main/{haxework => hw}/signal/Signal.hx (98%) rename src/main/{haxework => hw}/storage/IStorage.hx (86%) rename src/main/{haxework => hw}/storage/NoStorage.hx (92%) rename src/main/{haxework => hw}/storage/SharedObjectStorage.hx (93%) rename src/main/{haxework => hw}/text/BitmapTextField.hx (99%) rename src/main/{haxework => hw}/text/TextUtil.hx (96%) rename src/main/{haxework => hw}/translate/ITranslate.hx (92%) rename src/main/{haxework => hw}/translate/Translate.hx (98%) rename src/main/{haxework => hw}/translate/TranslateString.hx (93%) rename src/main/{haxework => hw}/utils/NumberUtil.hx (92%) rename src/main/{haxework => hw}/utils/ObjectUtil.hx (89%) rename src/main/{haxework => hw}/utils/StringUtil.hx (88%) rename src/main/{haxework => hw}/view/IView.hx (83%) rename src/main/{haxework => hw}/view/ImageView.hx (91%) rename src/main/{haxework => hw}/view/MovieView.hx (96%) rename src/main/{haxework => hw}/view/Root.hx (95%) rename src/main/{haxework => hw}/view/SpriteView.hx (89%) rename src/main/{haxework => hw}/view/View.hx (94%) rename src/main/{haxework => hw}/view/ViewUpdater.hx (98%) rename src/main/{haxework => hw}/view/data/ButtonGroup.hx (87%) rename src/main/{haxework => hw}/view/data/DataView.hx (91%) rename src/main/{haxework => hw}/view/form/ButtonImageView.hx (78%) rename src/main/{haxework => hw}/view/form/ButtonView.hx (96%) rename src/main/{haxework => hw}/view/form/InputView.hx (96%) rename src/main/{haxework => hw}/view/form/LabelView.hx (69%) rename src/main/{haxework => hw}/view/form/SelectView.hx (88%) rename src/main/{haxework => hw}/view/form/ToggleButtonView.hx (95%) rename src/main/{haxework => hw}/view/frame/FrameSwitcher.hx (93%) rename src/main/{haxework => hw}/view/frame/FrameView.hx (72%) rename src/main/{haxework => hw}/view/geometry/Box.hx (98%) rename src/main/{haxework => hw}/view/geometry/Geometry.hx (98%) rename src/main/{haxework => hw}/view/geometry/HAlign.hx (82%) rename src/main/{haxework => hw}/view/geometry/Position.hx (78%) rename src/main/{haxework => hw}/view/geometry/Size.hx (97%) rename src/main/{haxework => hw}/view/geometry/SizeSet.hx (96%) rename src/main/{haxework => hw}/view/geometry/SizeValue.hx (98%) rename src/main/{haxework => hw}/view/geometry/VAlign.hx (82%) rename src/main/{haxework => hw}/view/group/GroupView.hx (96%) rename src/main/{haxework => hw}/view/group/HGroupView.hx (58%) rename src/main/{haxework => hw}/view/group/IGroupView.hx (88%) rename src/main/{haxework => hw}/view/group/Overflow.hx (93%) rename src/main/{haxework => hw}/view/group/VGroupView.hx (58%) rename src/main/{haxework => hw}/view/layout/DefaultLayout.hx (94%) rename src/main/{haxework => hw}/view/layout/HorizontalLayout.hx (91%) rename src/main/{haxework => hw}/view/layout/ILayout.hx (66%) rename src/main/{haxework => hw}/view/layout/Layout.hx (81%) rename src/main/{haxework => hw}/view/layout/TailLayout.hx (95%) rename src/main/{haxework => hw}/view/layout/VerticalLayout.hx (91%) rename src/main/{haxework => hw}/view/list/HListView.hx (79%) rename src/main/{haxework => hw}/view/list/HScrollBarView.hx (86%) rename src/main/{haxework => hw}/view/list/LabelListItem.hx (86%) rename src/main/{haxework => hw}/view/list/ListView.hx (94%) rename src/main/{haxework => hw}/view/list/ScrollBarView.hx (95%) rename src/main/{haxework => hw}/view/list/VListView.hx (79%) rename src/main/{haxework => hw}/view/list/VScrollBarView.hx (86%) rename src/main/{haxework => hw}/view/popup/AlertView.hx (79%) rename src/main/{haxework => hw}/view/popup/AlertView.yaml (68%) rename src/main/{haxework => hw}/view/popup/ConfirmView.hx (79%) rename src/main/{haxework => hw}/view/popup/ConfirmView.yaml (67%) rename src/main/{haxework => hw}/view/popup/PopupManager.hx (92%) rename src/main/{haxework => hw}/view/popup/PopupView.hx (89%) rename src/main/{haxework => hw}/view/skin/Background.hx (82%) rename src/main/{haxework => hw}/view/skin/BitmapSkin.hx (93%) rename src/main/{haxework => hw}/view/skin/Border.hx (87%) rename src/main/{haxework => hw}/view/skin/ButtonBitmapSkin.hx (90%) rename src/main/{haxework => hw}/view/skin/ButtonColorSkin.hx (90%) rename src/main/{haxework => hw}/view/skin/HScrollBarSkin.hx (88%) rename src/main/{haxework => hw}/view/skin/ISkin.hx (59%) rename src/main/{haxework => hw}/view/skin/Skin.hx (89%) rename src/main/{haxework => hw}/view/skin/SpriteSkin.hx (97%) rename src/main/{haxework => hw}/view/skin/TabColorSkin.hx (83%) rename src/main/{haxework => hw}/view/skin/VScrollBarSkin.hx (89%) rename src/main/{haxework => hw}/view/text/FontPreset.hx (93%) rename src/main/{haxework => hw}/view/text/ITextView.hx (73%) rename src/main/{haxework => hw}/view/text/TextView.hx (94%) rename src/main/{haxework => hw}/view/theme/IStylable.hx (79%) rename src/main/{haxework => hw}/view/theme/ITheme.hx (88%) rename src/main/{haxework => hw}/view/theme/StyleId.hx (97%) rename src/main/{haxework => hw}/view/theme/Theme.hx (95%) rename src/main/{haxework => hw}/view/utils/BitmapUtil.hx (97%) rename src/main/{haxework => hw}/view/utils/DrawUtil.hx (99%) diff --git a/README.md b/README.md index 5a69cf4..f9d6acd 100755 --- a/README.md +++ b/README.md @@ -1,46 +1,45 @@ -# haxework +# HaxeWork -Gui framework for Haxe. +HaXe framework. ## View -`haxework.gui` provides views classes. +`hw.view` provides views classes. ### Example Build form using macro @:template. -form.json: +form.yaml: -```json -{ - "$type": "haxework.gui.VGroupView", - "skin": [{"$type": "haxework.gui.skin.ColorSkin", "color": "0xffff00"}], - "geometry.padding": 20, - "layout.margin": 10, - "views":[ - { - "id": "view1", - "type":"haxework.gui.SpriteView", - "geometry.size.stretch": true, - "skin":[{"$type":"haxework.gui.skin.ColorSkin", "color": "0xff0000"}] - }, - { - "id": "view2", - "type": "haxework.gui.SpriteView", - "geometry.size.width": "100%", - "geometry.size.height": 50, - "skin": [{"$type":"haxework.gui.skin.ColorSkin", "color": "0x00ff00"}] - } - ] -} +```yaml +--- +skin: +- $type: hw.gui.skin.ColorSkin + color: 0xffff00 +geometry.padding: 20 +layout.margin: 10 +views: +- id: view1 + type: hw.view.SpriteView + geometry.size.stretch: true + skin: + - $type: hw.view.skin.ColorSkin + color: 0xff0000 +- id: view2 + type: hw.view.SpriteView + geometry.size.width: 100% + geometry.size.height: 50 + skin: + - "$type": hw.view.skin.ColorSkin + color: 0x00ff00 ``` ```haxe -@:template("form.json") +@:template("form.yaml") class FormView extends VGroupView { @:view public var view1:SpriteView; - @:view("view2") public var anyVarName:SpriteView; + @:view("view2") public var anyVarName:SpriteView; } var form = new FormView(); @@ -51,7 +50,7 @@ trace(form.anyVarName); ## Loader -`haxework.net` provides loaders classes. +`hw.net` provides loaders classes. ### Example diff --git a/demo/build.hxml b/demo/build.hxml index 0d50fb7..9ef0dd9 100755 --- a/demo/build.hxml +++ b/demo/build.hxml @@ -3,7 +3,7 @@ -lib yaml -lib promhx -lib haxework ---macro haxework.parser.Parser.auto() +--macro hw.parser.Parser.auto() -debug -D native_trace #-D dev_layout diff --git a/demo/project.xml b/demo/project.xml index a0aaafc..f859751 100644 --- a/demo/project.xml +++ b/demo/project.xml @@ -1,6 +1,6 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/demo/src/demo/AppTheme.hx b/demo/src/demo/AppTheme.hx index 6a4acdb..72ae0df 100644 --- a/demo/src/demo/AppTheme.hx +++ b/demo/src/demo/AppTheme.hx @@ -1,10 +1,10 @@ package demo; -import haxework.view.geometry.Box; -import haxework.color.Color; -import haxework.view.theme.Theme; +import hw.view.geometry.Box; +import hw.color.Color; +import hw.view.theme.Theme; -using haxework.color.ColorUtil; +using hw.color.ColorUtil; class AppTheme extends Theme { diff --git a/demo/src/demo/Demo.hx b/demo/src/demo/Demo.hx index 4ea3221..8ac7b8a 100644 --- a/demo/src/demo/Demo.hx +++ b/demo/src/demo/Demo.hx @@ -1,18 +1,17 @@ package demo; -import demo.storage.TestStorage; -import haxework.resources.IResources; -import haxework.provider.Provider; import demo.dispatch.DemoDispatcher; import demo.popup.ColorPopup; import demo.popup.FontPopup; -import haxework.App; -import haxework.log.TraceLogger; -import haxework.net.JsonLoader; -import haxework.view.data.ButtonGroup; -import haxework.view.frame.FrameSwitcher; -import haxework.view.frame.FrameView; -import haxework.view.group.VGroupView; +import demo.storage.TestStorage; +import hw.app.App; +import hw.log.TraceLogger; +import hw.net.JsonLoader; +import hw.resources.IResources; +import hw.view.data.ButtonGroup; +import hw.view.frame.FrameSwitcher; +import hw.view.frame.FrameView; +import hw.view.group.VGroupView; @:template class DemoView extends VGroupView { @:view var switcher:FrameSwitcher; @@ -46,16 +45,16 @@ import haxework.view.group.VGroupView; class Demo extends App implements DemoListener { - @:provide static var resources:IResources; @:provide static var storage:TestStorage; public static function main() { L.push(new TraceLogger()); - resources.image.put("logo", HaxeLogo.resolve()); - var app = new Demo(new AppTheme(), resources.image.get("logo")); - app.start(new DemoView()); - + App.resources.image.put("logo", HaxeLogo.resolve()); + var app = new Demo(); + app.theme = new AppTheme(); + app.icon = App.resources.image.get("logo"); + app.view = new DemoView(); trace(storage); storage.write("test", "value"); @@ -73,8 +72,8 @@ class Demo extends App implements DemoListener { new JsonLoader().GET("https://embed.tvbit.co/channel/data2/renova.json") .then(function(data:Array) { - resources.any.put("data", data); - resources.any.put("data50", Util.marray(data, 50)); + App.resources.any.put("data", data); + App.resources.any.put("data50", Util.marray(data, 50)); }) .catchError(function(error) trace(error)); } diff --git a/demo/src/demo/DemoView.yaml b/demo/src/demo/DemoView.yaml index 3ff6442..7c18ff0 100644 --- a/demo/src/demo/DemoView.yaml +++ b/demo/src/demo/DemoView.yaml @@ -1,11 +1,11 @@ --- style: background views: - - $type: haxework.view.ImageView + - $type: hw.view.ImageView geometry.padding: 10 image: $r:image:logo - id: tabs - $type: haxework.view.data.ButtonGroup + $type: hw.view.data.ButtonGroup layout.margin: 5 layout.hAlign: left geometry.width: 100% @@ -20,8 +20,8 @@ views: - "test_layout" - "select" - id: switcher - $type: haxework.view.frame.FrameSwitcher - animateFactory: { $class: haxework.animate.SlideAnimate } + $type: hw.view.frame.FrameSwitcher + animateFactory: { $class: hw.animate.SlideAnimate } +onSwitch: ~onFrameSwitch geometry.stretch: true geometry.padding: 5 @@ -31,24 +31,24 @@ views: _data_: {$class: demo.form.DataForm} _test_layout_: {$class: demo.form.TestLayoutForm} _select_: {$class: demo.form.SelectForm} - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.width: 100% geometry.padding: 10 layout.margin: 10 views: - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Color +onPress: ~choiceColor() - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Font +onPress: ~choiceFont() # separator - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.stretch: true - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: OK - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Apply - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Cancel +onPress: ~flash.system.System.exit(0) diff --git a/demo/src/demo/Test.hx b/demo/src/demo/Test.hx index 53b9bf8..347f69f 100644 --- a/demo/src/demo/Test.hx +++ b/demo/src/demo/Test.hx @@ -1,8 +1,8 @@ package demo; import demo.test.TestView; -import haxework.view.Root; -import haxework.view.SpriteView; +import hw.view.Root; +import hw.view.SpriteView; class Test { public static function main():Void { diff --git a/demo/src/demo/dispatch/DemoDispatcher.hx b/demo/src/demo/dispatch/DemoDispatcher.hx index 261715c..d129531 100644 --- a/demo/src/demo/dispatch/DemoDispatcher.hx +++ b/demo/src/demo/dispatch/DemoDispatcher.hx @@ -1,6 +1,6 @@ package demo.dispatch; -import haxework.App; +import hw.app.App; interface DemoListener { public function onTest1():Void; diff --git a/demo/src/demo/form/DataForm.hx b/demo/src/demo/form/DataForm.hx index 5667772..24c340a 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.text.TextView; +import hw.view.frame.FrameView; +import hw.view.text.TextView; @:template class DataForm extends FrameView { public function new() { diff --git a/demo/src/demo/form/DataForm.yaml b/demo/src/demo/form/DataForm.yaml index 39b63f5..e18a73e 100644 --- a/demo/src/demo/form/DataForm.yaml +++ b/demo/src/demo/form/DataForm.yaml @@ -2,9 +2,9 @@ overflow.y: scroll views: - id: data - $type: haxework.view.data.DataView + $type: hw.view.data.DataView layout: - $type: haxework.view.layout.VerticalLayout + $type: hw.view.layout.VerticalLayout factory: ~factory geometry.width: 100% data: $r:any:data diff --git a/demo/src/demo/form/ListForm.hx b/demo/src/demo/form/ListForm.hx index 621ba21..d31e9a9 100644 --- a/demo/src/demo/form/ListForm.hx +++ b/demo/src/demo/form/ListForm.hx @@ -1,9 +1,9 @@ package demo.form; -import haxework.view.frame.FrameView; -import haxework.view.list.LabelListItem; -import haxework.view.list.ListView.IListItemView; -import haxework.view.list.VListView; +import hw.view.frame.FrameView; +import hw.view.list.LabelListItem; +import hw.view.list.ListView.IListItemView; +import hw.view.list.VListView; @:template class ListForm extends FrameView { @:view public var list(default, null):VListView; diff --git a/demo/src/demo/form/ListForm.yaml b/demo/src/demo/form/ListForm.yaml index 42b4618..5918b55 100644 --- a/demo/src/demo/form/ListForm.yaml +++ b/demo/src/demo/form/ListForm.yaml @@ -1,10 +1,10 @@ --- views: - id: list - $type: haxework.view.list.VListView + $type: hw.view.list.VListView +onItemSelect: ~onItemSelect factory: ~factory geometry.stretch: true scroll: - $type: haxework.view.list.VScrollBarView + $type: hw.view.list.VScrollBarView data: $r:any:data50 diff --git a/demo/src/demo/form/SelectForm.hx b/demo/src/demo/form/SelectForm.hx index a89b7b3..9bfe324 100644 --- a/demo/src/demo/form/SelectForm.hx +++ b/demo/src/demo/form/SelectForm.hx @@ -1,6 +1,6 @@ package demo.form; -import haxework.view.frame.FrameView; +import hw.view.frame.FrameView; @:template class SelectForm extends FrameView { public function new() { diff --git a/demo/src/demo/form/SelectForm.yaml b/demo/src/demo/form/SelectForm.yaml index 3ed61a7..1aef941 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.form.SelectView + - $type: hw.view.form.SelectView layout.margin: 2 dataView.layout.margin: 1 data: @@ -13,7 +13,7 @@ views: selected: "value 1" +onSelect: ~function(value) trace('select', value) - - $type: haxework.view.form.SelectView.SelectIdView<{id:Int,label:String}, Int> + - $type: hw.view.form.SelectView.SelectIdView<{id:Int,label:String}, Int> layout.margin: 2 dataView.layout.margin: 1 labelBuilder: | diff --git a/demo/src/demo/form/TailForm.hx b/demo/src/demo/form/TailForm.hx index e5407c7..1bfaf68 100644 --- a/demo/src/demo/form/TailForm.hx +++ b/demo/src/demo/form/TailForm.hx @@ -1,10 +1,10 @@ package demo.form; -import haxework.view.frame.FrameView; -import haxework.view.ImageView; -import haxework.view.IView; -import haxework.view.text.TextView; -import haxework.view.utils.DrawUtil; +import hw.view.frame.FrameView; +import hw.view.ImageView; +import hw.view.IView; +import hw.view.text.TextView; +import hw.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 2d0b32d..c9e9541 100644 --- a/demo/src/demo/form/TailForm.yaml +++ b/demo/src/demo/form/TailForm.yaml @@ -2,10 +2,10 @@ overflow.y: scroll views: - id: data - $type: haxework.view.data.DataView + $type: hw.view.data.DataView geometry.padding: 4 layout: - $type: haxework.view.layout.TailLayout + $type: hw.view.layout.TailLayout margin: 6 factory: ~factory geometry.width: 100% diff --git a/demo/src/demo/form/TestLayoutForm.hx b/demo/src/demo/form/TestLayoutForm.hx index 53ff66d..b20e98c 100644 --- a/demo/src/demo/form/TestLayoutForm.hx +++ b/demo/src/demo/form/TestLayoutForm.hx @@ -1,8 +1,8 @@ package demo.form; import flash.events.MouseEvent; -import haxework.view.frame.FrameView; -import haxework.view.SpriteView; +import hw.view.frame.FrameView; +import hw.view.SpriteView; @:template class TestLayoutForm extends FrameView { diff --git a/demo/src/demo/form/TestLayoutForm.yaml b/demo/src/demo/form/TestLayoutForm.yaml index 4d2cced..9218381 100644 --- a/demo/src/demo/form/TestLayoutForm.yaml +++ b/demo/src/demo/form/TestLayoutForm.yaml @@ -1,52 +1,52 @@ --- views: - id: main - $type: haxework.view.group.VGroupView + $type: hw.view.group.VGroupView geometry.stretch: true layout.hAlign: center layout.vAlign: middle views: - id: container - $type: haxework.view.group.VGroupView + $type: hw.view.group.VGroupView layout.margin: 10 skin: - $type: [haxework.view.skin.Skin.color, 0xffff00] + $type: [hw.view.skin.Skin.color, 0xffff00] views: - id: top - $type: haxework.view.group.GroupView + $type: hw.view.group.GroupView layout.hAlign: center geometry.width: 100% geometry.height: 20 style: test - id: middle - $type: haxework.view.group.HGroupView + $type: hw.view.group.HGroupView layout.margin: 10 views: - id: left - $type: haxework.view.group.GroupView + $type: hw.view.group.GroupView layout.vAlign: middle geometry.width: 20 geometry.height: 100% style: test - id: render - $type: haxework.view.SpriteView + $type: hw.view.SpriteView #geometry.width: 300 #geometry.height: 200 style: test - id: right - $type: haxework.view.group.GroupView + $type: hw.view.group.GroupView layout.vAlign: middle geometry.width: 20 geometry.height: 100% style: test views: - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.width: 100 geometry.height: 100% skin: - $type: [haxework.view.skin.Skin.color, 0xff0000] + $type: [hw.view.skin.Skin.color, 0xff0000] - id: bottom - $type: haxework.view.group.GroupView + $type: hw.view.group.GroupView layout.hAlign: center style: test geometry.width: 100% diff --git a/demo/src/demo/popup/ColorPopup.hx b/demo/src/demo/popup/ColorPopup.hx index ef89106..4731e46 100644 --- a/demo/src/demo/popup/ColorPopup.hx +++ b/demo/src/demo/popup/ColorPopup.hx @@ -1,8 +1,8 @@ package demo.popup; -import haxework.view.form.ButtonView; -import haxework.view.popup.PopupView; -import haxework.view.skin.Skin; +import hw.view.form.ButtonView; +import hw.view.popup.PopupView; +import hw.view.skin.Skin; @:template class ColorPopup extends PopupView> { diff --git a/demo/src/demo/popup/ColorPopup.yaml b/demo/src/demo/popup/ColorPopup.yaml index 762407b..2896f40 100644 --- a/demo/src/demo/popup/ColorPopup.yaml +++ b/demo/src/demo/popup/ColorPopup.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.view.group.VGroupView + $type: hw.view.group.VGroupView geometry.width: 400 geometry.height: 200 geometry.padding: 10 @@ -9,10 +9,10 @@ view: style: frame views: - id: colors - $type: haxework.view.data.DataView + $type: hw.view.data.DataView geometry.stretch: true layout: - $type: haxework.view.layout.TailLayout + $type: hw.view.layout.TailLayout vAlign: middle margin: 5 factory: ~colorViewFactory @@ -23,11 +23,11 @@ view: - 0xCC33AA - 0x3333AA +onDataSelect: ~close - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.width: 100% layout.hAlign: right layout.margin: 10 views: - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Cancel +onPress: ~reject('cancel') diff --git a/demo/src/demo/popup/FontPopup.hx b/demo/src/demo/popup/FontPopup.hx index a3da228..02a76bd 100644 --- a/demo/src/demo/popup/FontPopup.hx +++ b/demo/src/demo/popup/FontPopup.hx @@ -2,10 +2,10 @@ package demo.popup; import flash.text.Font; import flash.text.FontType; -import haxework.view.list.LabelListItem; -import haxework.view.list.ListView; -import haxework.view.popup.PopupView; -import haxework.view.theme.ITheme; +import hw.view.list.LabelListItem; +import hw.view.list.ListView; +import hw.view.popup.PopupView; +import hw.view.theme.ITheme; class FontLabelView extends LabelListItem { diff --git a/demo/src/demo/popup/FontPopup.yaml b/demo/src/demo/popup/FontPopup.yaml index 7ab6a7b..c1eff4c 100644 --- a/demo/src/demo/popup/FontPopup.yaml +++ b/demo/src/demo/popup/FontPopup.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.view.group.VGroupView + $type: hw.view.group.VGroupView geometry.width: 400 geometry.height: 80% geometry.padding: 10 @@ -9,17 +9,17 @@ view: style: frame views: - id: fonts - $type: haxework.view.list.VListView + $type: hw.view.list.VListView geometry.stretch: true factory: ~fontViewFactory +onItemSelect: ~function(item) close(item.data) scroll: - $type: haxework.view.list.VScrollBarView - - $type: haxework.view.group.HGroupView + $type: hw.view.list.VScrollBarView + - $type: hw.view.group.HGroupView geometry.width: 100% geometry.margin.top: 10 layout.hAlign: right views: - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Cancel +onPress: ~reject('cancel') diff --git a/demo/src/demo/storage/TestStorage.hx b/demo/src/demo/storage/TestStorage.hx index 8e7db14..5c000d8 100644 --- a/demo/src/demo/storage/TestStorage.hx +++ b/demo/src/demo/storage/TestStorage.hx @@ -1,6 +1,6 @@ package demo.storage; -import haxework.storage.SharedObjectStorage; +import hw.storage.SharedObjectStorage; @:provide class TestStorage extends SharedObjectStorage { diff --git a/demo/src/demo/test/TestView.hx b/demo/src/demo/test/TestView.hx index c4e5aa6..3c9fe3a 100644 --- a/demo/src/demo/test/TestView.hx +++ b/demo/src/demo/test/TestView.hx @@ -1,6 +1,6 @@ package demo.test; -import haxework.view.group.GroupView; +import hw.view.group.GroupView; @:template class TestView extends GroupView { diff --git a/demo/src/demo/test/TestView.yaml b/demo/src/demo/test/TestView.yaml index 79110f2..e9ebba0 100644 --- a/demo/src/demo/test/TestView.yaml +++ b/demo/src/demo/test/TestView.yaml @@ -1,61 +1,61 @@ --- geometry.padding: 10 views: - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.padding: 10 geometry.width: 100% layout.margin: 10 layout.vAlign: middle skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0xffff00 background.alpha: 1 views: - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.width: 100 geometry.height: 100 skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0xff0000 background.alpha: 1 - - $type: haxework.view.group.VGroupView + - $type: hw.view.group.VGroupView geometry.padding: 10 layout.margin: 10 skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0x00ffff background.alpha: 1 views: - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.width: 100 geometry.height: 100 size: _test_: [200, 200] skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0xff0000 background.alpha: 1 - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.width: 100 geometry.height: 100 skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0xff0000 background.alpha: 1 - - $type: haxework.view.text.TextView + - $type: hw.view.text.TextView geometry.padding: 20 text: "Azazaza" - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.width: 60% geometry.height: 100% skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0xff0000 background.alpha: 1 - - $type: haxework.view.SpriteView + - $type: hw.view.SpriteView geometry.width: 40% geometry.height: 80% skin: - $type: haxework.view.skin.SpriteSkin + $type: hw.view.skin.SpriteSkin background.color: 0xff0000 background.alpha: 1 diff --git a/extraParams.hxml b/extraParams.hxml index 6c9604f..42acf6f 100644 --- a/extraParams.hxml +++ b/extraParams.hxml @@ -1 +1 @@ ---macro haxework.parser.Parser.auto() \ No newline at end of file +--macro hw.parser.Parser.auto() diff --git a/haxelib.json b/haxelib.json index a344b26..458fe34 100755 --- a/haxelib.json +++ b/haxelib.json @@ -8,7 +8,7 @@ "template" ], "description": "View framework.", - "version": "1.3.0", + "version": "2.0.0", "releasenote": "Update.", "contributors": [ "shmyga" diff --git a/src/main/L.hx b/src/main/L.hx index 21f5b89..5d9307e 100755 --- a/src/main/L.hx +++ b/src/main/L.hx @@ -1,6 +1,6 @@ package; -import haxework.log.ILogger; +import hw.log.ILogger; class L { @@ -25,4 +25,4 @@ class L { public static function e(tag:String, message:String, ?error:Dynamic, ?p:haxe.PosInfos):Void { for (logger in loggers) logger.e(tag, message, error, p); } -} \ No newline at end of file +} diff --git a/src/main/haxework/App.hx b/src/main/haxework/App.hx deleted file mode 100644 index e42f7b4..0000000 --- a/src/main/haxework/App.hx +++ /dev/null @@ -1,35 +0,0 @@ -package haxework; - -import flash.display.BitmapData; -import flash.Lib; -import haxework.animate.Animate; -import haxework.animate.FadeAnimate; -import haxework.animate.UnFadeAnimate; -import haxework.view.IView; -import haxework.view.popup.PopupManager; -import haxework.view.Root; -import haxework.view.theme.ITheme; - -class App { - - @:provide var app:App; - @:provide var theme:ITheme; - @:provide var popupManager:PopupManager; - - public function new(?theme:ITheme, ?icon:BitmapData) { - this.theme = theme; - #if linux - if (icon != null) { - haxework.app.LinuxIcon.value = icon; - } - #end - popupManager.showAnimateFactory = function(v) return new UnFadeAnimate(v); - popupManager.closeAnimateFactory = function(v) return new FadeAnimate(v); - app = this; - } - - public function start(view:IView) { - Animate.bind(Lib.current.stage); - Root.bind(view); - } -} diff --git a/src/main/haxework/animate/Animate.hx b/src/main/hw/animate/Animate.hx similarity index 96% rename from src/main/haxework/animate/Animate.hx rename to src/main/hw/animate/Animate.hx index f0c10f9..34a71ad 100644 --- a/src/main/haxework/animate/Animate.hx +++ b/src/main/hw/animate/Animate.hx @@ -1,9 +1,9 @@ -package haxework.animate; +package hw.animate; import flash.display.DisplayObject; import flash.display.Stage; import flash.events.Event; -import haxework.view.IView; +import hw.view.IView; class Animate implements IAnimate { public static var defaultDuraion = 300; diff --git a/src/main/haxework/animate/CircleMaskAnimate.hx b/src/main/hw/animate/CircleMaskAnimate.hx similarity index 93% rename from src/main/haxework/animate/CircleMaskAnimate.hx rename to src/main/hw/animate/CircleMaskAnimate.hx index 24b51e0..3c80044 100755 --- a/src/main/haxework/animate/CircleMaskAnimate.hx +++ b/src/main/hw/animate/CircleMaskAnimate.hx @@ -1,10 +1,10 @@ -package haxework.animate; +package hw.animate; import flash.display.DisplayObject; import flash.display.Sprite; -import haxework.animate.Animate; -import haxework.animate.IAnimate; -import haxework.view.IView; +import hw.animate.Animate; +import hw.animate.IAnimate; +import hw.view.IView; class CircleMaskAnimate extends Animate { diff --git a/src/main/haxework/animate/FadeAnimate.hx b/src/main/hw/animate/FadeAnimate.hx similarity index 81% rename from src/main/haxework/animate/FadeAnimate.hx rename to src/main/hw/animate/FadeAnimate.hx index 65edddf..3efe072 100755 --- a/src/main/haxework/animate/FadeAnimate.hx +++ b/src/main/hw/animate/FadeAnimate.hx @@ -1,7 +1,7 @@ -package haxework.animate; +package hw.animate; -import haxework.animate.Animate; -import haxework.animate.IAnimate; +import hw.animate.Animate; +import hw.animate.IAnimate; class FadeAnimate extends Animate { diff --git a/src/main/haxework/animate/IAnimate.hx b/src/main/hw/animate/IAnimate.hx similarity index 87% rename from src/main/haxework/animate/IAnimate.hx rename to src/main/hw/animate/IAnimate.hx index 95728e0..bd9f9cf 100644 --- a/src/main/haxework/animate/IAnimate.hx +++ b/src/main/hw/animate/IAnimate.hx @@ -1,4 +1,4 @@ -package haxework.animate; +package hw.animate; interface IAnimate { diff --git a/src/main/haxework/animate/SlideAnimate.hx b/src/main/hw/animate/SlideAnimate.hx similarity index 94% rename from src/main/haxework/animate/SlideAnimate.hx rename to src/main/hw/animate/SlideAnimate.hx index 749df3e..774b101 100644 --- a/src/main/haxework/animate/SlideAnimate.hx +++ b/src/main/hw/animate/SlideAnimate.hx @@ -1,4 +1,4 @@ -package haxework.animate; +package hw.animate; class SlideAnimate extends Animate { diff --git a/src/main/haxework/animate/UnFadeAnimate.hx b/src/main/hw/animate/UnFadeAnimate.hx similarity index 87% rename from src/main/haxework/animate/UnFadeAnimate.hx rename to src/main/hw/animate/UnFadeAnimate.hx index 0737337..0a0e906 100755 --- a/src/main/haxework/animate/UnFadeAnimate.hx +++ b/src/main/hw/animate/UnFadeAnimate.hx @@ -1,6 +1,6 @@ -package haxework.animate; +package hw.animate; -import haxework.animate.Animate; +import hw.animate.Animate; class UnFadeAnimate extends Animate { diff --git a/src/main/hw/app/App.hx b/src/main/hw/app/App.hx new file mode 100644 index 0000000..d06def1 --- /dev/null +++ b/src/main/hw/app/App.hx @@ -0,0 +1,86 @@ +package hw.app; + +import flash.display.BitmapData; +import flash.display.StageDisplayState; +import flash.events.FullScreenEvent; +import flash.Lib; +import hw.animate.Animate; +import hw.animate.FadeAnimate; +import hw.animate.IAnimate; +import hw.animate.UnFadeAnimate; +import hw.resources.IResources; +import hw.signal.Signal; +import hw.view.IView; +import hw.view.popup.PopupManager; +import hw.view.Root; +import hw.view.theme.ITheme; + +class App { + + public var view(default, set):IView; + + private function set_view(value:IView):IView { + view = value; + Root.bind(view); + return view; + } + + public var icon(default, set):BitmapData; + + private function set_icon(value:BitmapData):BitmapData { + icon = value; + #if linux + if (icon != null) { + hw.app.LinuxIcon.value = icon; + } + #end + return icon; + } + + public var fullScreenSupport(get, never):Bool; + + public function get_fullScreenSupport():Bool { + return Lib.current.stage.allowsFullScreen; + } + + public var fullScreen(get, set):Bool; + + private function get_fullScreen():Bool { + return Lib.current.stage.displayState != StageDisplayState.NORMAL; + } + + private function set_fullScreen(value:Bool):Bool { + Lib.current.stage.displayState = value ? StageDisplayState.FULL_SCREEN : StageDisplayState.NORMAL; + return get_fullScreen(); + } + + public var fullScreenSignal(default, null):Signal = new Signal(); + + @:provide static var app:App; + @:provide static var resources:IResources; + @:provide static var popupManager:PopupManager; + + @:provide public var theme:ITheme; + + public function new() { + Lib.current.stage.stageFocusRect = false; + Lib.current.stage.addEventListener(FullScreenEvent.FULL_SCREEN, event -> fullScreenSignal.emit(event.fullScreen)); + Animate.bind(Lib.current.stage); + + popupManager.showAnimateFactory = createShowAnimate; + popupManager.closeAnimateFactory = createCloseAnimate; + + resources.text.put("app.version", Const.instance.VERSION); + resources.text.put("app.name", Const.instance.NAME); + + app = this; + } + + private function createShowAnimate(view:IView):IAnimate { + return new UnFadeAnimate(view); + } + + private function createCloseAnimate(view:IView):IAnimate { + return new FadeAnimate(view); + } +} diff --git a/src/main/hw/app/Const.hx b/src/main/hw/app/Const.hx new file mode 100755 index 0000000..2b88b61 --- /dev/null +++ b/src/main/hw/app/Const.hx @@ -0,0 +1,22 @@ +package hw.app; + +import flash.Lib; +import flash.system.Capabilities; + +@:singleton class Const { + public var FPS(default, null):Int; + public var BUILD(default, null):String; + public var VERSION(default, null):String; + public var NAME(default, null):String; + public var DEBUG(default, null):Bool; + + public function new():Void { + BUILD = CompilationOption.get("build"); + #if lime + FPS = Std.parseInt(Lib.current.stage.application.meta.get("fps")); + VERSION = Lib.current.stage.application.meta.get("version"); + NAME = Lib.current.stage.application.meta.get("name"); + #end + DEBUG = Capabilities.isDebugger; + } +} diff --git a/src/main/haxework/app/LinuxIcon.hx b/src/main/hw/app/LinuxIcon.hx similarity index 97% rename from src/main/haxework/app/LinuxIcon.hx rename to src/main/hw/app/LinuxIcon.hx index 0a448f5..6c556ce 100644 --- a/src/main/haxework/app/LinuxIcon.hx +++ b/src/main/hw/app/LinuxIcon.hx @@ -1,4 +1,4 @@ -package haxework.app; +package hw.app; import flash.display.BitmapData; import flash.filters.ColorMatrixFilter; diff --git a/src/main/haxework/color/Color.hx b/src/main/hw/color/Color.hx similarity index 98% rename from src/main/haxework/color/Color.hx rename to src/main/hw/color/Color.hx index 884baf3..6738baa 100644 --- a/src/main/haxework/color/Color.hx +++ b/src/main/hw/color/Color.hx @@ -1,4 +1,4 @@ -package haxework.color; +package hw.color; abstract Color(Int) { public var alpha(get, never):Int; diff --git a/src/main/haxework/color/ColorUtil.hx b/src/main/hw/color/ColorUtil.hx similarity index 97% rename from src/main/haxework/color/ColorUtil.hx rename to src/main/hw/color/ColorUtil.hx index c8fbf4d..c742cc6 100644 --- a/src/main/haxework/color/ColorUtil.hx +++ b/src/main/hw/color/ColorUtil.hx @@ -1,4 +1,4 @@ -package haxework.color; +package hw.color; class ColorUtil { diff --git a/src/main/haxework/geom/IntPoint.hx b/src/main/hw/geom/IntPoint.hx similarity index 97% rename from src/main/haxework/geom/IntPoint.hx rename to src/main/hw/geom/IntPoint.hx index 8ffd54e..1c2d7ed 100644 --- a/src/main/haxework/geom/IntPoint.hx +++ b/src/main/hw/geom/IntPoint.hx @@ -1,4 +1,4 @@ -package haxework.geom; +package hw.geom; abstract IntPoint(Array) { public var x(get, set):Int; diff --git a/src/main/haxework/geom/Point.hx b/src/main/hw/geom/Point.hx similarity index 97% rename from src/main/haxework/geom/Point.hx rename to src/main/hw/geom/Point.hx index 856d816..fa04f91 100644 --- a/src/main/haxework/geom/Point.hx +++ b/src/main/hw/geom/Point.hx @@ -1,4 +1,4 @@ -package haxework.geom; +package hw.geom; import flash.geom.Point as FlashPoint; diff --git a/src/main/haxework/geom/Rectangle.hx b/src/main/hw/geom/Rectangle.hx similarity index 99% rename from src/main/haxework/geom/Rectangle.hx rename to src/main/hw/geom/Rectangle.hx index fae3fb7..992e98d 100644 --- a/src/main/haxework/geom/Rectangle.hx +++ b/src/main/hw/geom/Rectangle.hx @@ -1,4 +1,4 @@ -package haxework.geom; +package hw.geom; abstract Rectangle(Array) { public var x(get, set):Float; diff --git a/src/main/haxework/log/AndroidLog.hx b/src/main/hw/log/AndroidLog.hx similarity index 94% rename from src/main/haxework/log/AndroidLog.hx rename to src/main/hw/log/AndroidLog.hx index b198a81..cb5b662 100644 --- a/src/main/haxework/log/AndroidLog.hx +++ b/src/main/hw/log/AndroidLog.hx @@ -1,4 +1,4 @@ -package haxework.log; +package hw.log; import cpp.VarArg; import haxe.extern.Rest; diff --git a/src/main/haxework/log/BaseLogger.hx b/src/main/hw/log/BaseLogger.hx similarity index 96% rename from src/main/haxework/log/BaseLogger.hx rename to src/main/hw/log/BaseLogger.hx index 02a52b0..4989979 100755 --- a/src/main/haxework/log/BaseLogger.hx +++ b/src/main/hw/log/BaseLogger.hx @@ -1,6 +1,6 @@ -package haxework.log; +package hw.log; -import haxework.log.ILogger.LogLevel; +import hw.log.ILogger.LogLevel; import haxe.CallStack; diff --git a/src/main/haxework/log/ILogger.hx b/src/main/hw/log/ILogger.hx similarity index 95% rename from src/main/haxework/log/ILogger.hx rename to src/main/hw/log/ILogger.hx index 6ee17d8..988cf5b 100755 --- a/src/main/haxework/log/ILogger.hx +++ b/src/main/hw/log/ILogger.hx @@ -1,4 +1,4 @@ -package haxework.log; +package hw.log; enum LogLevel { DEBUG; INFO; WARNING; ERROR; @@ -10,4 +10,4 @@ interface ILogger { public function i(tag:String, message:String, ?error:Dynamic, ?p:haxe.PosInfos):Void; public function w(tag:String, message:String, ?error:Dynamic, ?p:haxe.PosInfos):Void; public function e(tag:String, message:String, ?error:Dynamic, ?p:haxe.PosInfos):Void; -} \ No newline at end of file +} diff --git a/src/main/haxework/log/JSLogger.hx b/src/main/hw/log/JSLogger.hx similarity index 88% rename from src/main/haxework/log/JSLogger.hx rename to src/main/hw/log/JSLogger.hx index 9c8f02f..742e5ce 100755 --- a/src/main/haxework/log/JSLogger.hx +++ b/src/main/hw/log/JSLogger.hx @@ -1,8 +1,8 @@ -package haxework.log; +package hw.log; -import haxework.log.ILogger.LogLevel; +import hw.log.ILogger.LogLevel; import flash.external.ExternalInterface; -import haxework.log.BaseLogger; +import hw.log.BaseLogger; class JSLogger extends BaseLogger { @@ -26,4 +26,4 @@ class JSLogger extends BaseLogger { try {ExternalInterface.call("console.log", text);} catch (error:Dynamic) {available = false;} } } -} \ No newline at end of file +} diff --git a/src/main/haxework/log/SocketLogger.hx b/src/main/hw/log/SocketLogger.hx similarity index 96% rename from src/main/haxework/log/SocketLogger.hx rename to src/main/hw/log/SocketLogger.hx index 9781f98..4333f99 100755 --- a/src/main/haxework/log/SocketLogger.hx +++ b/src/main/hw/log/SocketLogger.hx @@ -1,6 +1,6 @@ -package haxework.log; +package hw.log; -import haxework.log.BaseLogger; +import hw.log.BaseLogger; #if js class SocketLogger extends BaseLogger {} @@ -58,4 +58,4 @@ class SocketLogger extends BaseLogger { } } -#end \ No newline at end of file +#end diff --git a/src/main/haxework/log/TextFieldLogger.hx b/src/main/hw/log/TextFieldLogger.hx similarity index 93% rename from src/main/haxework/log/TextFieldLogger.hx rename to src/main/hw/log/TextFieldLogger.hx index c93731d..06682e8 100644 --- a/src/main/haxework/log/TextFieldLogger.hx +++ b/src/main/hw/log/TextFieldLogger.hx @@ -1,4 +1,4 @@ -package haxework.log; +package hw.log; import flash.text.TextField; @@ -15,4 +15,4 @@ class TextFieldLogger extends BaseLogger { override private function write(text:String):Void { this.textField.text += ("\n" + text); } -} \ No newline at end of file +} diff --git a/src/main/haxework/log/TraceLogger.hx b/src/main/hw/log/TraceLogger.hx similarity index 93% rename from src/main/haxework/log/TraceLogger.hx rename to src/main/hw/log/TraceLogger.hx index 82988d4..0009b23 100755 --- a/src/main/haxework/log/TraceLogger.hx +++ b/src/main/hw/log/TraceLogger.hx @@ -1,4 +1,4 @@ -package haxework.log; +package hw.log; import haxe.PosInfos; #if cpp @@ -31,7 +31,7 @@ class TraceLogger extends BaseLogger { (untyped console).log(v); //untyped js.Boot.__trace(v, infos); #elseif android - haxework.log.AndroidLog.write(3, "", ConstCharStar.fromString(Std.string(v))); + hw.log.AndroidLog.write(3, "", ConstCharStar.fromString(Std.string(v))); #elseif (php && php7) php.Boot.trace(v); #elseif php diff --git a/src/main/haxework/macro/ClassProvideMacro.hx b/src/main/hw/macro/ClassProvideMacro.hx similarity index 96% rename from src/main/haxework/macro/ClassProvideMacro.hx rename to src/main/hw/macro/ClassProvideMacro.hx index 55108e9..c6ca2e3 100644 --- a/src/main/haxework/macro/ClassProvideMacro.hx +++ b/src/main/hw/macro/ClassProvideMacro.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Expr; import haxe.macro.Type; diff --git a/src/main/haxework/macro/ClassTypeMacro.hx b/src/main/hw/macro/ClassTypeMacro.hx similarity index 94% rename from src/main/haxework/macro/ClassTypeMacro.hx rename to src/main/hw/macro/ClassTypeMacro.hx index 37aeee2..70a5d92 100644 --- a/src/main/haxework/macro/ClassTypeMacro.hx +++ b/src/main/hw/macro/ClassTypeMacro.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Expr; import haxe.macro.Type; diff --git a/src/main/haxework/macro/DispatcherMacro.hx b/src/main/hw/macro/DispatcherMacro.hx similarity index 95% rename from src/main/haxework/macro/DispatcherMacro.hx rename to src/main/hw/macro/DispatcherMacro.hx index da47f81..1268083 100644 --- a/src/main/haxework/macro/DispatcherMacro.hx +++ b/src/main/hw/macro/DispatcherMacro.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import haxe.macro.TypeTools; import haxe.macro.Context; @@ -32,7 +32,7 @@ class DispatcherMacro extends ClassTypeMacro { } var signal = 'Signal${argsTypes.length}'; var type = TPath({ - pack: ['haxework', 'signal'], + pack: ['hw', 'signal'], name: 'Signal', sub: signal, params: argsTypes.map(function(t) return TPType(TypeTools.toComplexType(t))), @@ -41,7 +41,7 @@ class DispatcherMacro extends ClassTypeMacro { name: signalName(field.name), access: [APublic], pos: Context.currentPos(), - kind: FProp('default', 'null', type, Context.parse('new haxework.signal.Signal.${signal}()', Context.currentPos())), + kind: FProp('default', 'null', type, Context.parse('new hw.signal.Signal.${signal}()', Context.currentPos())), }); } result.push({ diff --git a/src/main/haxework/macro/FieldMacro.hx b/src/main/hw/macro/FieldMacro.hx similarity index 86% rename from src/main/haxework/macro/FieldMacro.hx rename to src/main/hw/macro/FieldMacro.hx index 946ba6e..c476375 100644 --- a/src/main/haxework/macro/FieldMacro.hx +++ b/src/main/hw/macro/FieldMacro.hx @@ -1,8 +1,8 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Expr; -using haxework.macro.MacroUtil; +using hw.macro.MacroUtil; class FieldMacro { public var metaName(default, null):String; diff --git a/src/main/haxework/macro/FileUtil.hx b/src/main/hw/macro/FileUtil.hx similarity index 98% rename from src/main/haxework/macro/FileUtil.hx rename to src/main/hw/macro/FileUtil.hx index 7b1fd7e..2473bc2 100644 --- a/src/main/haxework/macro/FileUtil.hx +++ b/src/main/hw/macro/FileUtil.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import yaml.YamlException; import yaml.Parser; diff --git a/src/main/haxework/macro/MacroUtil.hx b/src/main/hw/macro/MacroUtil.hx similarity index 99% rename from src/main/haxework/macro/MacroUtil.hx rename to src/main/hw/macro/MacroUtil.hx index 4f29917..6de9fd2 100644 --- a/src/main/haxework/macro/MacroUtil.hx +++ b/src/main/hw/macro/MacroUtil.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Context; import haxe.macro.ExprTools; diff --git a/src/main/haxework/macro/PositionJsonParser.hx b/src/main/hw/macro/PositionJsonParser.hx similarity index 99% rename from src/main/haxework/macro/PositionJsonParser.hx rename to src/main/hw/macro/PositionJsonParser.hx index 56af5ef..72b7534 100755 --- a/src/main/haxework/macro/PositionJsonParser.hx +++ b/src/main/hw/macro/PositionJsonParser.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; typedef JsonKeyPosition = { var min:Int; diff --git a/src/main/haxework/macro/PositionYamlParser.hx b/src/main/hw/macro/PositionYamlParser.hx similarity index 98% rename from src/main/haxework/macro/PositionYamlParser.hx rename to src/main/hw/macro/PositionYamlParser.hx index a5b8ab3..3ad3e12 100644 --- a/src/main/haxework/macro/PositionYamlParser.hx +++ b/src/main/hw/macro/PositionYamlParser.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import haxe.DynamicAccess; diff --git a/src/main/haxework/macro/ProvideMacro.hx b/src/main/hw/macro/ProvideMacro.hx similarity index 83% rename from src/main/haxework/macro/ProvideMacro.hx rename to src/main/hw/macro/ProvideMacro.hx index 2c1a1e1..5853835 100644 --- a/src/main/haxework/macro/ProvideMacro.hx +++ b/src/main/hw/macro/ProvideMacro.hx @@ -1,9 +1,9 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Context; import haxe.macro.Expr; -using haxework.macro.MacroUtil; +using hw.macro.MacroUtil; class ProvideMacro extends FieldMacro { @@ -35,7 +35,7 @@ class ProvideMacro extends FieldMacro { pos: field.pos, kind: FFun({ args: [], - expr: Context.parse('return haxework.provider.Provider.instance.get(${args.join(',')})', field.pos), + expr: Context.parse('return hw.provider.Provider.instance.get(${args.join(',')})', field.pos), params: [], ret: type, }) @@ -47,7 +47,7 @@ class ProvideMacro extends FieldMacro { pos: field.pos, kind: FFun({ args: [{name: 'value', type: type}], - expr: Context.parse('{haxework.provider.Provider.instance.set(${args.join(',')}); return value;}', field.pos), + expr: Context.parse('{hw.provider.Provider.instance.set(${args.join(',')}); return value;}', field.pos), params: [], ret: type, }) diff --git a/src/main/haxework/macro/ResourceMacro.hx b/src/main/hw/macro/ResourceMacro.hx similarity index 65% rename from src/main/haxework/macro/ResourceMacro.hx rename to src/main/hw/macro/ResourceMacro.hx index 09fb1a1..7b78bc4 100644 --- a/src/main/haxework/macro/ResourceMacro.hx +++ b/src/main/hw/macro/ResourceMacro.hx @@ -1,6 +1,6 @@ -package haxework.macro; +package hw.macro; -using haxework.macro.MacroUtil; +using hw.macro.MacroUtil; class ResourceMacro extends FieldMacro { diff --git a/src/main/haxework/macro/SingletonMacro.hx b/src/main/hw/macro/SingletonMacro.hx similarity index 97% rename from src/main/haxework/macro/SingletonMacro.hx rename to src/main/hw/macro/SingletonMacro.hx index 976ab68..45f44cb 100644 --- a/src/main/haxework/macro/SingletonMacro.hx +++ b/src/main/hw/macro/SingletonMacro.hx @@ -1,4 +1,4 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Context; import haxe.macro.Expr; diff --git a/src/main/haxework/macro/StyleMacro.hx b/src/main/hw/macro/StyleMacro.hx similarity index 93% rename from src/main/haxework/macro/StyleMacro.hx rename to src/main/hw/macro/StyleMacro.hx index d3a8325..aba0c50 100644 --- a/src/main/haxework/macro/StyleMacro.hx +++ b/src/main/hw/macro/StyleMacro.hx @@ -1,11 +1,11 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Context; import haxe.macro.Expr; import haxe.macro.Type; using haxe.macro.ComplexTypeTools; -using haxework.macro.MacroUtil; +using hw.macro.MacroUtil; using haxe.macro.MacroStringTools; typedef TProperty = { @@ -143,7 +143,7 @@ class StyleMacro extends ClassTypeMacro { private static function buildStyleField(properties:Array, styleds:Array, hasOnStyle:Bool, overrideField:Bool):Array { var result:Array = []; - var type:ComplexType = "haxework.view.theme.StyleId".toComplex(); + var type:ComplexType = "hw.view.theme.StyleId".toComplex(); if (!overrideField) { result.push({ name: "style", @@ -162,11 +162,11 @@ class StyleMacro extends ClassTypeMacro { } for (field in properties) { var propertyName = 'theme_${field.name}'; - expr.push(macro $i{propertyName} = haxework.provider.Provider.instance.get(haxework.view.theme.ITheme).resolve((styleKey!=null?(styleKey+"."):"")+$v{field.name}, style)); + expr.push(macro $i{propertyName} = hw.provider.Provider.instance.get(hw.view.theme.ITheme).resolve((styleKey!=null?(styleKey+"."):"")+$v{field.name}, style)); } for (field in styleds) { var propertyName = '${field.name}'; - expr.push(macro $i{propertyName} = haxework.provider.Provider.instance.get(haxework.view.theme.ITheme).resolve((styleKey!=null?(styleKey+"."):"")+$v{field.name}, style)); + expr.push(macro $i{propertyName} = hw.provider.Provider.instance.get(hw.view.theme.ITheme).resolve((styleKey!=null?(styleKey+"."):"")+$v{field.name}, style)); } if (hasOnStyle) { expr.push(macro onStyle()); diff --git a/src/main/haxework/macro/TemplateMacro.hx b/src/main/hw/macro/TemplateMacro.hx similarity index 96% rename from src/main/haxework/macro/TemplateMacro.hx rename to src/main/hw/macro/TemplateMacro.hx index 875c591..d306c84 100644 --- a/src/main/haxework/macro/TemplateMacro.hx +++ b/src/main/hw/macro/TemplateMacro.hx @@ -1,12 +1,12 @@ -package haxework.macro; +package hw.macro; import haxe.macro.Context; import haxe.macro.Expr; import haxe.macro.Type; -import haxework.macro.PositionJsonParser; +import hw.macro.PositionJsonParser; import Lambda; -using haxework.macro.MacroUtil; +using hw.macro.MacroUtil; class TemplateMacro extends ClassTypeMacro { @@ -46,11 +46,11 @@ class TemplateMacro extends ClassTypeMacro { a[2]; } case "resource" | "r": - var bindExpr = 'haxework.provider.Provider.instance.get(haxework.resources.IResources).${a[1]}.bind("${a[2]}", ${name}, "${key}")'; + var bindExpr = 'hw.provider.Provider.instance.get(hw.resources.IResources).${a[1]}.bind("${a[2]}", ${name}, "${key}")'; exprs.push(Context.parse(bindExpr, getPosition(position))); null; case "translate" | "t": - 'new haxework.translate.TranslateString("${a[1]}")'; + 'new hw.translate.TranslateString("${a[1]}")'; case "template": var template = FileUtil.loadFile(a[1]); return createValue(name, key, template, position, exprs); diff --git a/src/main/haxework/net/BaseLoader.hx b/src/main/hw/net/BaseLoader.hx similarity index 98% rename from src/main/haxework/net/BaseLoader.hx rename to src/main/hw/net/BaseLoader.hx index 6cad278..d02b84d 100755 --- a/src/main/haxework/net/BaseLoader.hx +++ b/src/main/hw/net/BaseLoader.hx @@ -1,11 +1,11 @@ -package haxework.net; +package hw.net; import promhx.Deferred; import promhx.Promise; import haxe.Timer; import flash.net.URLRequestMethod; import flash.events.ProgressEvent; -import haxework.net.manage.ILoaderManager; +import hw.net.manage.ILoaderManager; import flash.utils.ByteArray; import flash.events.Event; diff --git a/src/main/haxework/net/BaseMediaLoader.hx b/src/main/hw/net/BaseMediaLoader.hx similarity index 97% rename from src/main/haxework/net/BaseMediaLoader.hx rename to src/main/hw/net/BaseMediaLoader.hx index d8e3254..be31090 100755 --- a/src/main/haxework/net/BaseMediaLoader.hx +++ b/src/main/hw/net/BaseMediaLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.events.ProgressEvent; import flash.system.Security; @@ -6,7 +6,7 @@ import flash.system.SecurityDomain; import flash.system.ApplicationDomain; import flash.system.LoaderContext; import flash.utils.ByteArray; -import haxework.net.BaseLoader; +import hw.net.BaseLoader; import flash.events.SecurityErrorEvent; import flash.events.IOErrorEvent; import flash.events.Event; diff --git a/src/main/haxework/net/BaseURLLoader.hx b/src/main/hw/net/BaseURLLoader.hx similarity index 99% rename from src/main/haxework/net/BaseURLLoader.hx rename to src/main/hw/net/BaseURLLoader.hx index 80c3611..6a59b6b 100755 --- a/src/main/haxework/net/BaseURLLoader.hx +++ b/src/main/hw/net/BaseURLLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.events.ErrorEvent; import haxe.Timer; diff --git a/src/main/haxework/net/BatchLoader.hx b/src/main/hw/net/BatchLoader.hx similarity index 95% rename from src/main/haxework/net/BatchLoader.hx rename to src/main/hw/net/BatchLoader.hx index 8ac2aa6..ed4eb3b 100755 --- a/src/main/haxework/net/BatchLoader.hx +++ b/src/main/hw/net/BatchLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import promhx.Promise; import promhx.Deferred; @@ -17,4 +17,4 @@ class BatchLoader { return loader.GET(url); })); } -} \ No newline at end of file +} diff --git a/src/main/haxework/net/BytesLoader.hx b/src/main/hw/net/BytesLoader.hx similarity index 95% rename from src/main/haxework/net/BytesLoader.hx rename to src/main/hw/net/BytesLoader.hx index 253f9ff..0622afb 100755 --- a/src/main/haxework/net/BytesLoader.hx +++ b/src/main/hw/net/BytesLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.net.URLLoaderDataFormat; import flash.utils.ByteArray; diff --git a/src/main/haxework/net/ExternalImageLoader.hx b/src/main/hw/net/ExternalImageLoader.hx similarity index 98% rename from src/main/haxework/net/ExternalImageLoader.hx rename to src/main/hw/net/ExternalImageLoader.hx index 04d63ed..3f97963 100755 --- a/src/main/haxework/net/ExternalImageLoader.hx +++ b/src/main/hw/net/ExternalImageLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.system.Security; import flash.utils.ByteArray; diff --git a/src/main/haxework/net/ILoader.hx b/src/main/hw/net/ILoader.hx similarity index 96% rename from src/main/haxework/net/ILoader.hx rename to src/main/hw/net/ILoader.hx index 666c41e..336340c 100755 --- a/src/main/haxework/net/ILoader.hx +++ b/src/main/hw/net/ILoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import promhx.Promise; import flash.utils.ByteArray; diff --git a/src/main/haxework/net/ImageLoader.hx b/src/main/hw/net/ImageLoader.hx similarity index 94% rename from src/main/haxework/net/ImageLoader.hx rename to src/main/hw/net/ImageLoader.hx index 997ff59..61a7caa 100755 --- a/src/main/haxework/net/ImageLoader.hx +++ b/src/main/hw/net/ImageLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.display.LoaderInfo; import flash.display.Loader; diff --git a/src/main/haxework/net/JsonLoader.hx b/src/main/hw/net/JsonLoader.hx similarity index 97% rename from src/main/haxework/net/JsonLoader.hx rename to src/main/hw/net/JsonLoader.hx index e3e4dd9..4ae3ddf 100755 --- a/src/main/haxework/net/JsonLoader.hx +++ b/src/main/hw/net/JsonLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.utils.ByteArray; import flash.events.Event; diff --git a/src/main/haxework/net/SwfLoader.hx b/src/main/hw/net/SwfLoader.hx similarity index 94% rename from src/main/haxework/net/SwfLoader.hx rename to src/main/hw/net/SwfLoader.hx index 1ae4743..01482b4 100755 --- a/src/main/haxework/net/SwfLoader.hx +++ b/src/main/hw/net/SwfLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.display.MovieClip; import flash.display.LoaderInfo; diff --git a/src/main/haxework/net/TextLoader.hx b/src/main/hw/net/TextLoader.hx similarity index 91% rename from src/main/haxework/net/TextLoader.hx rename to src/main/hw/net/TextLoader.hx index 76c893d..2738534 100755 --- a/src/main/haxework/net/TextLoader.hx +++ b/src/main/hw/net/TextLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.net.URLLoader; import flash.events.Event; diff --git a/src/main/haxework/net/XmlLoader.hx b/src/main/hw/net/XmlLoader.hx similarity index 91% rename from src/main/haxework/net/XmlLoader.hx rename to src/main/hw/net/XmlLoader.hx index 4cd0127..ecfa322 100755 --- a/src/main/haxework/net/XmlLoader.hx +++ b/src/main/hw/net/XmlLoader.hx @@ -1,4 +1,4 @@ -package haxework.net; +package hw.net; import flash.events.Event; import flash.net.URLLoader; diff --git a/src/main/haxework/net/manage/ILoaderManager.hx b/src/main/hw/net/manage/ILoaderManager.hx similarity index 91% rename from src/main/haxework/net/manage/ILoaderManager.hx rename to src/main/hw/net/manage/ILoaderManager.hx index 43bfbe4..3cd1567 100755 --- a/src/main/haxework/net/manage/ILoaderManager.hx +++ b/src/main/hw/net/manage/ILoaderManager.hx @@ -1,4 +1,4 @@ -package haxework.net.manage; +package hw.net.manage; @:provide(LoaderManager) interface ILoaderManager { public var actives(default, null):Array>; diff --git a/src/main/haxework/net/manage/LoaderManager.hx b/src/main/hw/net/manage/LoaderManager.hx similarity index 96% rename from src/main/haxework/net/manage/LoaderManager.hx rename to src/main/hw/net/manage/LoaderManager.hx index d8082f5..c7b5863 100755 --- a/src/main/haxework/net/manage/LoaderManager.hx +++ b/src/main/hw/net/manage/LoaderManager.hx @@ -1,4 +1,4 @@ -package haxework.net.manage; +package hw.net.manage; class LoaderManager implements ILoaderManager { diff --git a/src/main/haxework/parser/Parser.hx b/src/main/hw/parser/Parser.hx similarity index 78% rename from src/main/haxework/parser/Parser.hx rename to src/main/hw/parser/Parser.hx index ed00214..e24a502 100644 --- a/src/main/haxework/parser/Parser.hx +++ b/src/main/hw/parser/Parser.hx @@ -1,18 +1,18 @@ -package haxework.parser; +package hw.parser; import haxe.macro.Context; import haxe.macro.Expr; import haxe.macro.Type; import haxe.macro.TypeTools; -import haxework.macro.ClassProvideMacro; -import haxework.macro.ClassTypeMacro; -import haxework.macro.DispatcherMacro; -import haxework.macro.FieldMacro; -import haxework.macro.ProvideMacro; -import haxework.macro.ResourceMacro; -import haxework.macro.SingletonMacro; -import haxework.macro.StyleMacro; -import haxework.macro.TemplateMacro; +import hw.macro.ClassProvideMacro; +import hw.macro.ClassTypeMacro; +import hw.macro.DispatcherMacro; +import hw.macro.FieldMacro; +import hw.macro.ProvideMacro; +import hw.macro.ResourceMacro; +import hw.macro.SingletonMacro; +import hw.macro.StyleMacro; +import hw.macro.TemplateMacro; class Parser { @@ -32,7 +32,7 @@ class Parser { private static var processed:Map = new Map(); private static function auto():Void { - haxe.macro.Compiler.addGlobalMetadata("", "@:build(haxework.parser.Parser.autoRun())", true, true, false); + haxe.macro.Compiler.addGlobalMetadata("", "@:build(hw.parser.Parser.autoRun())", true, true, false); } private static macro function autoRun():Array { diff --git a/src/main/haxework/provider/Provider.hx b/src/main/hw/provider/Provider.hx similarity index 96% rename from src/main/haxework/provider/Provider.hx rename to src/main/hw/provider/Provider.hx index 086b9fa..343067b 100755 --- a/src/main/haxework/provider/Provider.hx +++ b/src/main/hw/provider/Provider.hx @@ -1,4 +1,4 @@ -package haxework.provider; +package hw.provider; abstract KeyType(String) { @@ -36,7 +36,7 @@ abstract KeyType(String) { macro static function resolveDefaultFactories() { var result = []; - for (item in haxework.macro.ClassProvideMacro.bundle) { + for (item in hw.macro.ClassProvideMacro.bundle) { // ToDo: ClassType to Expr? var k = haxe.macro.Context.parse(haxe.macro.MacroStringTools.toDotPath(item.key.pack, item.key.name), haxe.macro.Context.currentPos()); var v = haxe.macro.Context.parse(haxe.macro.MacroStringTools.toDotPath(item.value.pack, item.value.name), haxe.macro.Context.currentPos()); diff --git a/src/main/haxework/resources/IResources.hx b/src/main/hw/resources/IResources.hx similarity index 87% rename from src/main/haxework/resources/IResources.hx rename to src/main/hw/resources/IResources.hx index 6de6612..8ead2f5 100755 --- a/src/main/haxework/resources/IResources.hx +++ b/src/main/hw/resources/IResources.hx @@ -1,8 +1,8 @@ -package haxework.resources; +package hw.resources; import flash.display.BitmapData; import flash.display.MovieClip; -import haxework.resources.Resources; +import hw.resources.Resources; @:provide(Resources) interface IResources { public var image(default, null):ResMap; diff --git a/src/main/haxework/resources/Resources.hx b/src/main/hw/resources/Resources.hx similarity index 98% rename from src/main/haxework/resources/Resources.hx rename to src/main/hw/resources/Resources.hx index 52a558b..b812942 100755 --- a/src/main/haxework/resources/Resources.hx +++ b/src/main/hw/resources/Resources.hx @@ -1,4 +1,4 @@ -package haxework.resources; +package hw.resources; import flash.display.BitmapData; import flash.display.MovieClip; diff --git a/src/main/haxework/signal/Signal.hx b/src/main/hw/signal/Signal.hx similarity index 98% rename from src/main/haxework/signal/Signal.hx rename to src/main/hw/signal/Signal.hx index 25b3077..f335f91 100644 --- a/src/main/haxework/signal/Signal.hx +++ b/src/main/hw/signal/Signal.hx @@ -1,4 +1,4 @@ -package haxework.signal; +package hw.signal; typedef Signal = Signal1; diff --git a/src/main/haxework/storage/IStorage.hx b/src/main/hw/storage/IStorage.hx similarity index 86% rename from src/main/haxework/storage/IStorage.hx rename to src/main/hw/storage/IStorage.hx index bddc8aa..a5063e6 100755 --- a/src/main/haxework/storage/IStorage.hx +++ b/src/main/hw/storage/IStorage.hx @@ -1,4 +1,4 @@ -package haxework.storage; +package hw.storage; interface IStorage { public function exists(key:String):Bool; diff --git a/src/main/haxework/storage/NoStorage.hx b/src/main/hw/storage/NoStorage.hx similarity index 92% rename from src/main/haxework/storage/NoStorage.hx rename to src/main/hw/storage/NoStorage.hx index 3856623..2b62bca 100755 --- a/src/main/haxework/storage/NoStorage.hx +++ b/src/main/hw/storage/NoStorage.hx @@ -1,4 +1,4 @@ -package haxework.storage; +package hw.storage; class NoStorage implements IStorage { diff --git a/src/main/haxework/storage/SharedObjectStorage.hx b/src/main/hw/storage/SharedObjectStorage.hx similarity index 93% rename from src/main/haxework/storage/SharedObjectStorage.hx rename to src/main/hw/storage/SharedObjectStorage.hx index 9994e5f..90f91d9 100755 --- a/src/main/haxework/storage/SharedObjectStorage.hx +++ b/src/main/hw/storage/SharedObjectStorage.hx @@ -1,4 +1,4 @@ -package haxework.storage; +package hw.storage; import flash.net.SharedObject; import haxe.Serializer; diff --git a/src/main/haxework/text/BitmapTextField.hx b/src/main/hw/text/BitmapTextField.hx similarity index 99% rename from src/main/haxework/text/BitmapTextField.hx rename to src/main/hw/text/BitmapTextField.hx index 6b2f91a..0b1b12e 100755 --- a/src/main/haxework/text/BitmapTextField.hx +++ b/src/main/hw/text/BitmapTextField.hx @@ -1,4 +1,4 @@ -package haxework.text; +package hw.text; import haxe.Timer; import flash.text.TextFormat; @@ -145,4 +145,4 @@ class BitmapTextField extends TextField { textField.visible = false; return bd; } -} \ No newline at end of file +} diff --git a/src/main/haxework/text/TextUtil.hx b/src/main/hw/text/TextUtil.hx similarity index 96% rename from src/main/haxework/text/TextUtil.hx rename to src/main/hw/text/TextUtil.hx index 1365416..ad70fc5 100644 --- a/src/main/haxework/text/TextUtil.hx +++ b/src/main/hw/text/TextUtil.hx @@ -1,4 +1,4 @@ -package haxework.text; +package hw.text; import flash.geom.Point; import flash.text.TextField; diff --git a/src/main/haxework/translate/ITranslate.hx b/src/main/hw/translate/ITranslate.hx similarity index 92% rename from src/main/haxework/translate/ITranslate.hx rename to src/main/hw/translate/ITranslate.hx index ad00225..a61c8e1 100644 --- a/src/main/haxework/translate/ITranslate.hx +++ b/src/main/hw/translate/ITranslate.hx @@ -1,4 +1,4 @@ -package haxework.translate; +package hw.translate; interface ITranslate { public function get(key:String):String; diff --git a/src/main/haxework/translate/Translate.hx b/src/main/hw/translate/Translate.hx similarity index 98% rename from src/main/haxework/translate/Translate.hx rename to src/main/hw/translate/Translate.hx index dbe35d5..72b306f 100644 --- a/src/main/haxework/translate/Translate.hx +++ b/src/main/hw/translate/Translate.hx @@ -1,4 +1,4 @@ -package haxework.translate; +package hw.translate; class Translate implements ITranslate { diff --git a/src/main/haxework/translate/TranslateString.hx b/src/main/hw/translate/TranslateString.hx similarity index 93% rename from src/main/haxework/translate/TranslateString.hx rename to src/main/hw/translate/TranslateString.hx index 1a4f2ba..9b3590f 100644 --- a/src/main/haxework/translate/TranslateString.hx +++ b/src/main/hw/translate/TranslateString.hx @@ -1,6 +1,6 @@ -package haxework.translate; +package hw.translate; -import haxework.provider.Provider; +import hw.provider.Provider; abstract TranslateString(String) from String to String { diff --git a/src/main/haxework/utils/NumberUtil.hx b/src/main/hw/utils/NumberUtil.hx similarity index 92% rename from src/main/haxework/utils/NumberUtil.hx rename to src/main/hw/utils/NumberUtil.hx index 87137ea..607ad86 100755 --- a/src/main/haxework/utils/NumberUtil.hx +++ b/src/main/hw/utils/NumberUtil.hx @@ -1,4 +1,4 @@ -package haxework.utils; +package hw.utils; class NumberUtil { @@ -9,4 +9,4 @@ class NumberUtil { public static inline function limitFloat(value:Float, min:Float, max:Float):Float { return Math.max(Math.min(max, value), min); } -} \ No newline at end of file +} diff --git a/src/main/haxework/utils/ObjectUtil.hx b/src/main/hw/utils/ObjectUtil.hx similarity index 89% rename from src/main/haxework/utils/ObjectUtil.hx rename to src/main/hw/utils/ObjectUtil.hx index 0cbcdf6..976ba6a 100644 --- a/src/main/haxework/utils/ObjectUtil.hx +++ b/src/main/hw/utils/ObjectUtil.hx @@ -1,4 +1,4 @@ -package haxework.utils; +package hw.utils; import haxe.Unserializer; import haxe.Serializer; diff --git a/src/main/haxework/utils/StringUtil.hx b/src/main/hw/utils/StringUtil.hx similarity index 88% rename from src/main/haxework/utils/StringUtil.hx rename to src/main/hw/utils/StringUtil.hx index 52bc922..d517c9d 100644 --- a/src/main/haxework/utils/StringUtil.hx +++ b/src/main/hw/utils/StringUtil.hx @@ -1,4 +1,4 @@ -package haxework.utils; +package hw.utils; using StringTools; diff --git a/src/main/haxework/view/IView.hx b/src/main/hw/view/IView.hx similarity index 83% rename from src/main/haxework/view/IView.hx rename to src/main/hw/view/IView.hx index 83fa6b5..a33f34b 100755 --- a/src/main/haxework/view/IView.hx +++ b/src/main/hw/view/IView.hx @@ -1,12 +1,12 @@ -package haxework.view; +package hw.view; import flash.display.DisplayObject; import flash.geom.Rectangle; -import haxework.view.geometry.Geometry; -import haxework.view.geometry.SizeSet; -import haxework.view.group.IGroupView; -import haxework.view.skin.ISkin; -import haxework.view.theme.StyleId; +import hw.view.geometry.Geometry; +import hw.view.geometry.SizeSet; +import hw.view.group.IGroupView; +import hw.view.skin.ISkin; +import hw.view.theme.StyleId; interface IView { public var geometry(default, set):Geometry; diff --git a/src/main/haxework/view/ImageView.hx b/src/main/hw/view/ImageView.hx similarity index 91% rename from src/main/haxework/view/ImageView.hx rename to src/main/hw/view/ImageView.hx index 7c3f8ec..cfb85f1 100755 --- a/src/main/haxework/view/ImageView.hx +++ b/src/main/hw/view/ImageView.hx @@ -1,10 +1,10 @@ -package haxework.view; +package hw.view; import flash.display.BitmapData; -import haxework.net.ImageLoader; -import haxework.view.skin.BitmapSkin; -import haxework.view.utils.BitmapUtil; -import haxework.view.utils.DrawUtil.FillType; +import hw.net.ImageLoader; +import hw.view.skin.BitmapSkin; +import hw.view.utils.BitmapUtil; +import hw.view.utils.DrawUtil.FillType; class ImageView extends SpriteView { diff --git a/src/main/haxework/view/MovieView.hx b/src/main/hw/view/MovieView.hx similarity index 96% rename from src/main/haxework/view/MovieView.hx rename to src/main/hw/view/MovieView.hx index 52b0cd5..215d1a4 100755 --- a/src/main/haxework/view/MovieView.hx +++ b/src/main/hw/view/MovieView.hx @@ -1,6 +1,6 @@ -package haxework.view; +package hw.view; -import haxework.net.SwfLoader; +import hw.net.SwfLoader; import flash.display.MovieClip; //ToDo: sprite wrapper? diff --git a/src/main/haxework/view/Root.hx b/src/main/hw/view/Root.hx similarity index 95% rename from src/main/haxework/view/Root.hx rename to src/main/hw/view/Root.hx index b8eda94..356fe64 100755 --- a/src/main/haxework/view/Root.hx +++ b/src/main/hw/view/Root.hx @@ -1,4 +1,4 @@ -package haxework.view; +package hw.view; import flash.display.DisplayObject; import flash.display.StageAlign; @@ -7,9 +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; +import hw.provider.Provider; +import hw.signal.Signal; +import hw.view.group.IGroupView; class Root { diff --git a/src/main/haxework/view/SpriteView.hx b/src/main/hw/view/SpriteView.hx similarity index 89% rename from src/main/haxework/view/SpriteView.hx rename to src/main/hw/view/SpriteView.hx index 1c4e912..e2801ac 100755 --- a/src/main/haxework/view/SpriteView.hx +++ b/src/main/hw/view/SpriteView.hx @@ -1,7 +1,7 @@ -package haxework.view; +package hw.view; import flash.display.Sprite; -import haxework.view.skin.SpriteSkin; +import hw.view.skin.SpriteSkin; class SpriteView extends View { diff --git a/src/main/haxework/view/View.hx b/src/main/hw/view/View.hx similarity index 94% rename from src/main/haxework/view/View.hx rename to src/main/hw/view/View.hx index f2fc235..bd61e57 100755 --- a/src/main/haxework/view/View.hx +++ b/src/main/hw/view/View.hx @@ -1,15 +1,15 @@ -package haxework.view; +package hw.view; import flash.Lib; import flash.display.Stage; import flash.display.DisplayObject; import flash.display.InteractiveObject; import flash.geom.Rectangle; -import haxework.view.geometry.Geometry; -import haxework.view.geometry.SizeSet; -import haxework.view.group.IGroupView; -import haxework.view.skin.ISkin; -import haxework.view.theme.ITheme; +import hw.view.geometry.Geometry; +import hw.view.geometry.SizeSet; +import hw.view.group.IGroupView; +import hw.view.skin.ISkin; +import hw.view.theme.ITheme; @:style class View implements IView { diff --git a/src/main/haxework/view/ViewUpdater.hx b/src/main/hw/view/ViewUpdater.hx similarity index 98% rename from src/main/haxework/view/ViewUpdater.hx rename to src/main/hw/view/ViewUpdater.hx index f69bfaa..1e59536 100644 --- a/src/main/haxework/view/ViewUpdater.hx +++ b/src/main/hw/view/ViewUpdater.hx @@ -1,4 +1,4 @@ -package haxework.view; +package hw.view; import flash.events.Event; import flash.display.Stage; diff --git a/src/main/haxework/view/data/ButtonGroup.hx b/src/main/hw/view/data/ButtonGroup.hx similarity index 87% rename from src/main/haxework/view/data/ButtonGroup.hx rename to src/main/hw/view/data/ButtonGroup.hx index 5899ffc..b98c9b4 100644 --- a/src/main/haxework/view/data/ButtonGroup.hx +++ b/src/main/hw/view/data/ButtonGroup.hx @@ -1,13 +1,13 @@ -package haxework.view.data; +package hw.view.data; -import haxework.view.theme.StyleId; -import haxework.view.form.ToggleButtonView; -import haxework.view.data.DataView.Factory; +import hw.view.theme.StyleId; +import hw.view.form.ToggleButtonView; +import hw.view.data.DataView.Factory; import haxe.EnumTools; -import haxework.view.layout.HorizontalLayout; -import haxework.view.layout.ILayout; +import hw.view.layout.HorizontalLayout; +import hw.view.layout.ILayout; -using haxework.utils.StringUtil; +using hw.utils.StringUtil; class ButtonGroup extends DataView { diff --git a/src/main/haxework/view/data/DataView.hx b/src/main/hw/view/data/DataView.hx similarity index 91% rename from src/main/haxework/view/data/DataView.hx rename to src/main/hw/view/data/DataView.hx index 2658f8c..3b5b9ac 100644 --- a/src/main/haxework/view/data/DataView.hx +++ b/src/main/hw/view/data/DataView.hx @@ -1,11 +1,11 @@ -package haxework.view.data; +package hw.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; +import hw.signal.Signal; +import hw.view.group.GroupView; +import hw.view.layout.ILayout; +import hw.view.layout.VerticalLayout; typedef Factory> = Int -> D -> V diff --git a/src/main/haxework/view/form/ButtonImageView.hx b/src/main/hw/view/form/ButtonImageView.hx similarity index 78% rename from src/main/haxework/view/form/ButtonImageView.hx rename to src/main/hw/view/form/ButtonImageView.hx index 9c0e854..c98a44b 100644 --- a/src/main/haxework/view/form/ButtonImageView.hx +++ b/src/main/hw/view/form/ButtonImageView.hx @@ -1,11 +1,11 @@ -package haxework.view.form; +package hw.view.form; import flash.display.BitmapData; -import haxework.view.skin.ButtonBitmapSkin; -import haxework.view.skin.ISkin; -import haxework.view.utils.BitmapUtil; -import haxework.view.utils.DrawUtil.FillType; -import haxework.net.ImageLoader; +import hw.view.skin.ButtonBitmapSkin; +import hw.view.skin.ISkin; +import hw.view.utils.BitmapUtil; +import hw.view.utils.DrawUtil.FillType; +import hw.net.ImageLoader; class ButtonImageView extends ButtonView { diff --git a/src/main/haxework/view/form/ButtonView.hx b/src/main/hw/view/form/ButtonView.hx similarity index 96% rename from src/main/haxework/view/form/ButtonView.hx rename to src/main/hw/view/form/ButtonView.hx index 551958c..7c37c98 100755 --- a/src/main/haxework/view/form/ButtonView.hx +++ b/src/main/hw/view/form/ButtonView.hx @@ -1,7 +1,7 @@ -package haxework.view.form; +package hw.view.form; -import haxework.view.skin.ButtonColorSkin; -import haxework.signal.Signal; +import hw.view.skin.ButtonColorSkin; +import hw.signal.Signal; import flash.events.MouseEvent; enum ButtonState { diff --git a/src/main/haxework/view/form/InputView.hx b/src/main/hw/view/form/InputView.hx similarity index 96% rename from src/main/haxework/view/form/InputView.hx rename to src/main/hw/view/form/InputView.hx index 54a0301..81474a5 100755 --- a/src/main/haxework/view/form/InputView.hx +++ b/src/main/hw/view/form/InputView.hx @@ -1,6 +1,6 @@ -package haxework.view.form; +package hw.view.form; -import haxework.view.text.TextView; +import hw.view.text.TextView; import flash.events.Event; import flash.events.KeyboardEvent; import flash.text.TextField; @@ -8,7 +8,7 @@ import flash.text.TextFieldAutoSize; import flash.text.TextFieldType; import flash.text.TextFormat; import flash.text.TextFormatAlign; -import haxework.signal.Signal; +import hw.signal.Signal; class InputView extends TextView { diff --git a/src/main/haxework/view/form/LabelView.hx b/src/main/hw/view/form/LabelView.hx similarity index 69% rename from src/main/haxework/view/form/LabelView.hx rename to src/main/hw/view/form/LabelView.hx index 30d564f..1dc75dd 100755 --- a/src/main/haxework/view/form/LabelView.hx +++ b/src/main/hw/view/form/LabelView.hx @@ -1,8 +1,8 @@ -package haxework.view.form; +package hw.view.form; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.text.TextView; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.text.TextView; class LabelView extends TextView { diff --git a/src/main/haxework/view/form/SelectView.hx b/src/main/hw/view/form/SelectView.hx similarity index 88% rename from src/main/haxework/view/form/SelectView.hx rename to src/main/hw/view/form/SelectView.hx index 2f7ee3a..dbc7847 100644 --- a/src/main/haxework/view/form/SelectView.hx +++ b/src/main/hw/view/form/SelectView.hx @@ -1,17 +1,17 @@ -package haxework.view.form; +package hw.view.form; -import haxework.view.theme.StyleId; import flash.events.MouseEvent; import flash.geom.Point; -import haxework.signal.Signal; -import haxework.view.data.DataView; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.Position; -import haxework.view.group.GroupView; -import haxework.view.group.IGroupView; -import haxework.view.layout.VerticalLayout; -import haxework.view.skin.Skin; -using haxework.utils.StringUtil; +import hw.signal.Signal; +import hw.view.data.DataView; +import hw.view.geometry.HAlign; +import hw.view.geometry.Position; +import hw.view.group.GroupView; +import hw.view.group.IGroupView; +import hw.view.layout.VerticalLayout; +import hw.view.skin.Skin; +import hw.view.theme.StyleId; +using hw.utils.StringUtil; class SelectIdView extends SelectView { public var selectedId(get, set):K; @@ -37,10 +37,12 @@ class SelectIdView extends SelectView { private function set_selectedId(value:K):K { if (_selectedId != value) { _selectedId = value; - for (item in data) { - if (idResolver(item) == _selectedId) { - selected = item; - break; + if (data != null) { + for (item in data) { + if (idResolver(item) == _selectedId) { + selected = item; + break; + } } } } diff --git a/src/main/haxework/view/form/ToggleButtonView.hx b/src/main/hw/view/form/ToggleButtonView.hx similarity index 95% rename from src/main/haxework/view/form/ToggleButtonView.hx rename to src/main/hw/view/form/ToggleButtonView.hx index 194f00b..a59f91d 100755 --- a/src/main/haxework/view/form/ToggleButtonView.hx +++ b/src/main/hw/view/form/ToggleButtonView.hx @@ -1,4 +1,4 @@ -package haxework.view.form; +package hw.view.form; class ToggleButtonView extends ButtonView { diff --git a/src/main/haxework/view/frame/FrameSwitcher.hx b/src/main/hw/view/frame/FrameSwitcher.hx similarity index 93% rename from src/main/haxework/view/frame/FrameSwitcher.hx rename to src/main/hw/view/frame/FrameSwitcher.hx index a673f20..8010a64 100755 --- a/src/main/haxework/view/frame/FrameSwitcher.hx +++ b/src/main/hw/view/frame/FrameSwitcher.hx @@ -1,9 +1,9 @@ -package haxework.view.frame; +package hw.view.frame; -import haxework.animate.IAnimate; -import haxework.signal.Signal; -import haxework.view.group.GroupView; -import haxework.view.IView; +import hw.animate.IAnimate; +import hw.signal.Signal; +import hw.view.group.GroupView; +import hw.view.IView; class FrameSwitcher extends GroupView { diff --git a/src/main/haxework/view/frame/FrameView.hx b/src/main/hw/view/frame/FrameView.hx similarity index 72% rename from src/main/haxework/view/frame/FrameView.hx rename to src/main/hw/view/frame/FrameView.hx index c9c64a6..4d8887f 100644 --- a/src/main/haxework/view/frame/FrameView.hx +++ b/src/main/hw/view/frame/FrameView.hx @@ -1,8 +1,8 @@ -package haxework.view.frame; +package hw.view.frame; -import haxework.view.group.GroupView; -import haxework.view.layout.ILayout; -import haxework.view.layout.VerticalLayout; +import hw.view.group.GroupView; +import hw.view.layout.ILayout; +import hw.view.layout.VerticalLayout; class FrameView extends GroupView { public var frameId(default, null):String; diff --git a/src/main/haxework/view/geometry/Box.hx b/src/main/hw/view/geometry/Box.hx similarity index 98% rename from src/main/haxework/view/geometry/Box.hx rename to src/main/hw/view/geometry/Box.hx index 55f1f50..b7fe578 100644 --- a/src/main/haxework/view/geometry/Box.hx +++ b/src/main/hw/view/geometry/Box.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; abstract Box(Array) { public var left(get, set):Float; diff --git a/src/main/haxework/view/geometry/Geometry.hx b/src/main/hw/view/geometry/Geometry.hx similarity index 98% rename from src/main/haxework/view/geometry/Geometry.hx rename to src/main/hw/view/geometry/Geometry.hx index dfc147a..e92a3ed 100644 --- a/src/main/haxework/view/geometry/Geometry.hx +++ b/src/main/hw/view/geometry/Geometry.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; @:style class Geometry { @:style(0) public var width(default, default):SizeValue; diff --git a/src/main/haxework/view/geometry/HAlign.hx b/src/main/hw/view/geometry/HAlign.hx similarity index 82% rename from src/main/haxework/view/geometry/HAlign.hx rename to src/main/hw/view/geometry/HAlign.hx index 1dd21c7..f02d421 100755 --- a/src/main/haxework/view/geometry/HAlign.hx +++ b/src/main/hw/view/geometry/HAlign.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; @:enum abstract HAlign(String) from String to String { var NONE = "none"; diff --git a/src/main/haxework/view/geometry/Position.hx b/src/main/hw/view/geometry/Position.hx similarity index 78% rename from src/main/haxework/view/geometry/Position.hx rename to src/main/hw/view/geometry/Position.hx index 9023960..c7732e3 100644 --- a/src/main/haxework/view/geometry/Position.hx +++ b/src/main/hw/view/geometry/Position.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; @:enum abstract Position(String) from String to String { var LAYOUT = "layout"; diff --git a/src/main/haxework/view/geometry/Size.hx b/src/main/hw/view/geometry/Size.hx similarity index 97% rename from src/main/haxework/view/geometry/Size.hx rename to src/main/hw/view/geometry/Size.hx index 35a495b..25b21dd 100644 --- a/src/main/haxework/view/geometry/Size.hx +++ b/src/main/hw/view/geometry/Size.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; abstract Size(Array) { public var width(get, set):Float; diff --git a/src/main/haxework/view/geometry/SizeSet.hx b/src/main/hw/view/geometry/SizeSet.hx similarity index 96% rename from src/main/haxework/view/geometry/SizeSet.hx rename to src/main/hw/view/geometry/SizeSet.hx index 9229aa1..7102bf3 100644 --- a/src/main/haxework/view/geometry/SizeSet.hx +++ b/src/main/hw/view/geometry/SizeSet.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; import haxe.ds.StringMap; diff --git a/src/main/haxework/view/geometry/SizeValue.hx b/src/main/hw/view/geometry/SizeValue.hx similarity index 98% rename from src/main/haxework/view/geometry/SizeValue.hx rename to src/main/hw/view/geometry/SizeValue.hx index 685ab96..51a9597 100644 --- a/src/main/haxework/view/geometry/SizeValue.hx +++ b/src/main/hw/view/geometry/SizeValue.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; enum SizeType { FIXED; diff --git a/src/main/haxework/view/geometry/VAlign.hx b/src/main/hw/view/geometry/VAlign.hx similarity index 82% rename from src/main/haxework/view/geometry/VAlign.hx rename to src/main/hw/view/geometry/VAlign.hx index 073925c..bc5a35d 100755 --- a/src/main/haxework/view/geometry/VAlign.hx +++ b/src/main/hw/view/geometry/VAlign.hx @@ -1,4 +1,4 @@ -package haxework.view.geometry; +package hw.view.geometry; @:enum abstract VAlign(String) from String to String { var NONE = "none"; diff --git a/src/main/haxework/view/group/GroupView.hx b/src/main/hw/view/group/GroupView.hx similarity index 96% rename from src/main/haxework/view/group/GroupView.hx rename to src/main/hw/view/group/GroupView.hx index daa9f22..426e1a4 100755 --- a/src/main/haxework/view/group/GroupView.hx +++ b/src/main/hw/view/group/GroupView.hx @@ -1,4 +1,4 @@ -package haxework.view.group; +package hw.view.group; import flash.geom.Point; import flash.events.TouchEvent; @@ -6,13 +6,13 @@ import flash.geom.Rectangle; import flash.display.DisplayObjectContainer; import flash.display.Sprite; import flash.events.MouseEvent; -import haxework.signal.Signal; -import haxework.view.geometry.Position; -import haxework.view.layout.DefaultLayout; -import haxework.view.layout.ILayout; -import haxework.view.list.HScrollBarView; -import haxework.view.list.ScrollBarView; -import haxework.view.list.VScrollBarView; +import hw.signal.Signal; +import hw.view.geometry.Position; +import hw.view.layout.DefaultLayout; +import hw.view.layout.ILayout; +import hw.view.list.HScrollBarView; +import hw.view.list.ScrollBarView; +import hw.view.list.VScrollBarView; class OverflowControl { public var overflow(default, set):Float = 0; diff --git a/src/main/haxework/view/group/HGroupView.hx b/src/main/hw/view/group/HGroupView.hx similarity index 58% rename from src/main/haxework/view/group/HGroupView.hx rename to src/main/hw/view/group/HGroupView.hx index bb07513..837541c 100755 --- a/src/main/haxework/view/group/HGroupView.hx +++ b/src/main/hw/view/group/HGroupView.hx @@ -1,6 +1,6 @@ -package haxework.view.group; +package hw.view.group; -import haxework.view.layout.HorizontalLayout; +import hw.view.layout.HorizontalLayout; class HGroupView extends GroupView { diff --git a/src/main/haxework/view/group/IGroupView.hx b/src/main/hw/view/group/IGroupView.hx similarity index 88% rename from src/main/haxework/view/group/IGroupView.hx rename to src/main/hw/view/group/IGroupView.hx index ae45bcd..620f661 100755 --- a/src/main/haxework/view/group/IGroupView.hx +++ b/src/main/hw/view/group/IGroupView.hx @@ -1,8 +1,8 @@ -package haxework.view.group; +package hw.view.group; import flash.display.DisplayObjectContainer; -import haxework.view.group.Overflow.Overflow; -import haxework.view.layout.ILayout; +import hw.view.group.Overflow.Overflow; +import hw.view.layout.ILayout; interface IGroupView extends IView { public var layout(default, set):ILayout; diff --git a/src/main/haxework/view/group/Overflow.hx b/src/main/hw/view/group/Overflow.hx similarity index 93% rename from src/main/haxework/view/group/Overflow.hx rename to src/main/hw/view/group/Overflow.hx index e556b2f..3f785f6 100644 --- a/src/main/haxework/view/group/Overflow.hx +++ b/src/main/hw/view/group/Overflow.hx @@ -1,4 +1,4 @@ -package haxework.view.group; +package hw.view.group; @:enum abstract OverflowType(String) from String to String { var STRETCH = "stretch"; diff --git a/src/main/haxework/view/group/VGroupView.hx b/src/main/hw/view/group/VGroupView.hx similarity index 58% rename from src/main/haxework/view/group/VGroupView.hx rename to src/main/hw/view/group/VGroupView.hx index 3e22501..9e64c89 100755 --- a/src/main/haxework/view/group/VGroupView.hx +++ b/src/main/hw/view/group/VGroupView.hx @@ -1,6 +1,6 @@ -package haxework.view.group; +package hw.view.group; -import haxework.view.layout.VerticalLayout; +import hw.view.layout.VerticalLayout; class VGroupView extends GroupView { diff --git a/src/main/haxework/view/layout/DefaultLayout.hx b/src/main/hw/view/layout/DefaultLayout.hx similarity index 94% rename from src/main/haxework/view/layout/DefaultLayout.hx rename to src/main/hw/view/layout/DefaultLayout.hx index 2a90c67..3be9b1d 100755 --- a/src/main/haxework/view/layout/DefaultLayout.hx +++ b/src/main/hw/view/layout/DefaultLayout.hx @@ -1,10 +1,10 @@ -package haxework.view.layout; +package hw.view.layout; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.Position; -import haxework.view.geometry.VAlign; -import haxework.view.group.IGroupView; -import haxework.view.group.Overflow; +import hw.view.geometry.HAlign; +import hw.view.geometry.Position; +import hw.view.geometry.VAlign; +import hw.view.group.IGroupView; +import hw.view.group.Overflow; class DefaultLayout extends Layout { diff --git a/src/main/haxework/view/layout/HorizontalLayout.hx b/src/main/hw/view/layout/HorizontalLayout.hx similarity index 91% rename from src/main/haxework/view/layout/HorizontalLayout.hx rename to src/main/hw/view/layout/HorizontalLayout.hx index ca1d06d..79c2b22 100755 --- a/src/main/haxework/view/layout/HorizontalLayout.hx +++ b/src/main/hw/view/layout/HorizontalLayout.hx @@ -1,9 +1,9 @@ -package haxework.view.layout; +package hw.view.layout; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.SizeValue; -import haxework.view.geometry.VAlign; -import haxework.view.group.IGroupView; +import hw.view.geometry.HAlign; +import hw.view.geometry.SizeValue; +import hw.view.geometry.VAlign; +import hw.view.group.IGroupView; class HorizontalLayout extends DefaultLayout { diff --git a/src/main/haxework/view/layout/ILayout.hx b/src/main/hw/view/layout/ILayout.hx similarity index 66% rename from src/main/haxework/view/layout/ILayout.hx rename to src/main/hw/view/layout/ILayout.hx index 382225f..c104596 100755 --- a/src/main/haxework/view/layout/ILayout.hx +++ b/src/main/hw/view/layout/ILayout.hx @@ -1,9 +1,9 @@ -package haxework.view.layout; +package hw.view.layout; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.group.IGroupView; -import haxework.view.theme.IStylable; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.group.IGroupView; +import hw.view.theme.IStylable; interface ILayout extends IStylable { public var hAlign(get, set):HAlign; diff --git a/src/main/haxework/view/layout/Layout.hx b/src/main/hw/view/layout/Layout.hx similarity index 81% rename from src/main/haxework/view/layout/Layout.hx rename to src/main/hw/view/layout/Layout.hx index 190d85d..4c5ee80 100644 --- a/src/main/haxework/view/layout/Layout.hx +++ b/src/main/hw/view/layout/Layout.hx @@ -1,8 +1,8 @@ -package haxework.view.layout; +package hw.view.layout; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.group.IGroupView; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.group.IGroupView; @:style class Layout implements ILayout { diff --git a/src/main/haxework/view/layout/TailLayout.hx b/src/main/hw/view/layout/TailLayout.hx similarity index 95% rename from src/main/haxework/view/layout/TailLayout.hx rename to src/main/hw/view/layout/TailLayout.hx index 743af51..c44add9 100644 --- a/src/main/haxework/view/layout/TailLayout.hx +++ b/src/main/hw/view/layout/TailLayout.hx @@ -1,7 +1,7 @@ -package haxework.view.layout; +package hw.view.layout; -import haxework.view.geometry.VAlign; -import haxework.view.group.IGroupView; +import hw.view.geometry.VAlign; +import hw.view.group.IGroupView; typedef Row = { var width:Float; diff --git a/src/main/haxework/view/layout/VerticalLayout.hx b/src/main/hw/view/layout/VerticalLayout.hx similarity index 91% rename from src/main/haxework/view/layout/VerticalLayout.hx rename to src/main/hw/view/layout/VerticalLayout.hx index 4992a38..06daf48 100755 --- a/src/main/haxework/view/layout/VerticalLayout.hx +++ b/src/main/hw/view/layout/VerticalLayout.hx @@ -1,9 +1,9 @@ -package haxework.view.layout; +package hw.view.layout; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.SizeValue; -import haxework.view.geometry.VAlign; -import haxework.view.group.IGroupView; +import hw.view.geometry.HAlign; +import hw.view.geometry.SizeValue; +import hw.view.geometry.VAlign; +import hw.view.group.IGroupView; class VerticalLayout extends DefaultLayout { diff --git a/src/main/haxework/view/list/HListView.hx b/src/main/hw/view/list/HListView.hx similarity index 79% rename from src/main/haxework/view/list/HListView.hx rename to src/main/hw/view/list/HListView.hx index 58db277..d16373c 100755 --- a/src/main/haxework/view/list/HListView.hx +++ b/src/main/hw/view/list/HListView.hx @@ -1,10 +1,10 @@ -package haxework.view.list; +package hw.view.list; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.layout.HorizontalLayout; -import haxework.view.layout.VerticalLayout; -import haxework.view.list.ListView.IListItemView; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.layout.HorizontalLayout; +import hw.view.layout.VerticalLayout; +import hw.view.list.ListView.IListItemView; class HListView extends ListView { diff --git a/src/main/haxework/view/list/HScrollBarView.hx b/src/main/hw/view/list/HScrollBarView.hx similarity index 86% rename from src/main/haxework/view/list/HScrollBarView.hx rename to src/main/hw/view/list/HScrollBarView.hx index b79b1c4..cff0835 100755 --- a/src/main/haxework/view/list/HScrollBarView.hx +++ b/src/main/hw/view/list/HScrollBarView.hx @@ -1,7 +1,7 @@ -package haxework.view.list; +package hw.view.list; import flash.geom.Point; -import haxework.view.skin.HScrollBarSkin; +import hw.view.skin.HScrollBarSkin; class HScrollBarView extends ScrollBarView { diff --git a/src/main/haxework/view/list/LabelListItem.hx b/src/main/hw/view/list/LabelListItem.hx similarity index 86% rename from src/main/haxework/view/list/LabelListItem.hx rename to src/main/hw/view/list/LabelListItem.hx index 03954c4..e8b0ef4 100644 --- a/src/main/haxework/view/list/LabelListItem.hx +++ b/src/main/hw/view/list/LabelListItem.hx @@ -1,8 +1,8 @@ -package haxework.view.list; +package hw.view.list; -import haxework.view.form.LabelView; -import haxework.view.geometry.HAlign; -import haxework.view.list.ListView.IListItemView; +import hw.view.form.LabelView; +import hw.view.geometry.HAlign; +import hw.view.list.ListView.IListItemView; private typedef Formatter = Int -> T -> String; diff --git a/src/main/haxework/view/list/ListView.hx b/src/main/hw/view/list/ListView.hx similarity index 94% rename from src/main/haxework/view/list/ListView.hx rename to src/main/hw/view/list/ListView.hx index be953e8..d0d9c6e 100755 --- a/src/main/haxework/view/list/ListView.hx +++ b/src/main/hw/view/list/ListView.hx @@ -1,16 +1,16 @@ -package haxework.view.list; +package hw.view.list; -import haxework.view.group.Overflow; +import hw.view.group.Overflow; import flash.events.MouseEvent; -import haxework.signal.Signal; -import haxework.utils.NumberUtil; -import haxework.view.geometry.Position; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.form.ButtonView; -import haxework.view.group.GroupView; -import haxework.view.layout.ILayout; -import haxework.view.skin.Skin; +import hw.signal.Signal; +import hw.utils.NumberUtil; +import hw.view.geometry.Position; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.form.ButtonView; +import hw.view.group.GroupView; +import hw.view.layout.ILayout; +import hw.view.skin.Skin; class ListView extends GroupView { diff --git a/src/main/haxework/view/list/ScrollBarView.hx b/src/main/hw/view/list/ScrollBarView.hx similarity index 95% rename from src/main/haxework/view/list/ScrollBarView.hx rename to src/main/hw/view/list/ScrollBarView.hx index 91c3828..69d2601 100755 --- a/src/main/haxework/view/list/ScrollBarView.hx +++ b/src/main/hw/view/list/ScrollBarView.hx @@ -1,7 +1,7 @@ -package haxework.view.list; +package hw.view.list; -import haxework.signal.Signal; -import haxework.utils.NumberUtil; +import hw.signal.Signal; +import hw.utils.NumberUtil; import flash.geom.Point; import flash.events.MouseEvent; diff --git a/src/main/haxework/view/list/VListView.hx b/src/main/hw/view/list/VListView.hx similarity index 79% rename from src/main/haxework/view/list/VListView.hx rename to src/main/hw/view/list/VListView.hx index cb21c03..fc73b86 100755 --- a/src/main/haxework/view/list/VListView.hx +++ b/src/main/hw/view/list/VListView.hx @@ -1,10 +1,10 @@ -package haxework.view.list; +package hw.view.list; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.layout.HorizontalLayout; -import haxework.view.layout.VerticalLayout; -import haxework.view.list.ListView.IListItemView; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.layout.HorizontalLayout; +import hw.view.layout.VerticalLayout; +import hw.view.list.ListView.IListItemView; class VListView extends ListView { diff --git a/src/main/haxework/view/list/VScrollBarView.hx b/src/main/hw/view/list/VScrollBarView.hx similarity index 86% rename from src/main/haxework/view/list/VScrollBarView.hx rename to src/main/hw/view/list/VScrollBarView.hx index 37de770..8171ae0 100755 --- a/src/main/haxework/view/list/VScrollBarView.hx +++ b/src/main/hw/view/list/VScrollBarView.hx @@ -1,7 +1,7 @@ -package haxework.view.list; +package hw.view.list; import flash.geom.Point; -import haxework.view.skin.VScrollBarSkin; +import hw.view.skin.VScrollBarSkin; class VScrollBarView extends ScrollBarView { diff --git a/src/main/haxework/view/popup/AlertView.hx b/src/main/hw/view/popup/AlertView.hx similarity index 79% rename from src/main/haxework/view/popup/AlertView.hx rename to src/main/hw/view/popup/AlertView.hx index b598376..a8e79b2 100644 --- a/src/main/haxework/view/popup/AlertView.hx +++ b/src/main/hw/view/popup/AlertView.hx @@ -1,7 +1,7 @@ -package haxework.view.popup; +package hw.view.popup; -import haxework.view.form.LabelView; -import haxework.view.text.TextView; +import hw.view.form.LabelView; +import hw.view.text.TextView; import promhx.Promise; @:template class AlertView extends PopupView { diff --git a/src/main/haxework/view/popup/AlertView.yaml b/src/main/hw/view/popup/AlertView.yaml similarity index 68% rename from src/main/haxework/view/popup/AlertView.yaml rename to src/main/hw/view/popup/AlertView.yaml index 7c74c44..45a2ddb 100644 --- a/src/main/haxework/view/popup/AlertView.yaml +++ b/src/main/hw/view/popup/AlertView.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.view.group.VGroupView + $type: hw.view.group.VGroupView geometry.width: 400 geometry.height: 200 geometry.padding: 10 @@ -8,24 +8,24 @@ view: geometry.vAlign: middle style: frame views: - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.width: 100% layout.margin: 10 views: - id: header - $type: haxework.view.form.LabelView + $type: hw.view.form.LabelView - id: message - $type: haxework.view.form.LabelView + $type: hw.view.form.LabelView font.align: CENTER layout.hAlign: center layout.vAlign: middle geometry.width: 100% geometry.height: 100% - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.width: 100% layout.hAlign: center layout.margin: 10 views: - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: OK +onPress: ~close('ok') diff --git a/src/main/haxework/view/popup/ConfirmView.hx b/src/main/hw/view/popup/ConfirmView.hx similarity index 79% rename from src/main/haxework/view/popup/ConfirmView.hx rename to src/main/hw/view/popup/ConfirmView.hx index f8374dc..6630711 100644 --- a/src/main/haxework/view/popup/ConfirmView.hx +++ b/src/main/hw/view/popup/ConfirmView.hx @@ -1,7 +1,7 @@ -package haxework.view.popup; +package hw.view.popup; -import haxework.view.form.LabelView; -import haxework.view.text.TextView; +import hw.view.form.LabelView; +import hw.view.text.TextView; import promhx.Promise; @:template class ConfirmView extends PopupView { diff --git a/src/main/haxework/view/popup/ConfirmView.yaml b/src/main/hw/view/popup/ConfirmView.yaml similarity index 67% rename from src/main/haxework/view/popup/ConfirmView.yaml rename to src/main/hw/view/popup/ConfirmView.yaml index cc0f4fd..d2c1c74 100644 --- a/src/main/haxework/view/popup/ConfirmView.yaml +++ b/src/main/hw/view/popup/ConfirmView.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.view.group.VGroupView + $type: hw.view.group.VGroupView geometry.width: 400 geometry.height: 200 geometry.padding: 10 @@ -8,27 +8,27 @@ view: geometry.vAlign: middle style: frame views: - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.width: 100% layout.margin: 10 views: - id: header - $type: haxework.view.form.LabelView + $type: hw.view.form.LabelView - id: message - $type: haxework.view.form.LabelView + $type: hw.view.form.LabelView font.align: CENTER layout.hAlign: center layout.vAlign: middle geometry.width: 100% geometry.height: 100% - - $type: haxework.view.group.HGroupView + - $type: hw.view.group.HGroupView geometry.width: 100% layout.hAlign: center layout.margin: 10 views: - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: Yes +onPress: ~close(true) - - $type: haxework.view.form.ButtonView + - $type: hw.view.form.ButtonView text: No +onPress: ~reject('no') diff --git a/src/main/haxework/view/popup/PopupManager.hx b/src/main/hw/view/popup/PopupManager.hx similarity index 92% rename from src/main/haxework/view/popup/PopupManager.hx rename to src/main/hw/view/popup/PopupManager.hx index c62aa6e..f39609f 100755 --- a/src/main/haxework/view/popup/PopupManager.hx +++ b/src/main/hw/view/popup/PopupManager.hx @@ -1,7 +1,7 @@ -package haxework.view.popup; +package hw.view.popup; -import haxework.view.group.IGroupView; -import haxework.animate.IAnimate; +import hw.view.group.IGroupView; +import hw.animate.IAnimate; typedef P = PopupView; diff --git a/src/main/haxework/view/popup/PopupView.hx b/src/main/hw/view/popup/PopupView.hx similarity index 89% rename from src/main/haxework/view/popup/PopupView.hx rename to src/main/hw/view/popup/PopupView.hx index a1eade9..c6589a8 100755 --- a/src/main/haxework/view/popup/PopupView.hx +++ b/src/main/hw/view/popup/PopupView.hx @@ -1,9 +1,9 @@ -package haxework.view.popup; +package hw.view.popup; import flash.events.MouseEvent; -import haxework.view.geometry.Position; -import haxework.view.group.GroupView; -import haxework.view.skin.Skin; +import hw.view.geometry.Position; +import hw.view.group.GroupView; +import hw.view.skin.Skin; import promhx.Deferred; import promhx.Promise; diff --git a/src/main/haxework/view/skin/Background.hx b/src/main/hw/view/skin/Background.hx similarity index 82% rename from src/main/haxework/view/skin/Background.hx rename to src/main/hw/view/skin/Background.hx index c130216..19e5088 100644 --- a/src/main/haxework/view/skin/Background.hx +++ b/src/main/hw/view/skin/Background.hx @@ -1,6 +1,6 @@ -package haxework.view.skin; +package hw.view.skin; -import haxework.color.Color; +import hw.color.Color; @:style class Background { @:style(null) public var color(default, default):Null; diff --git a/src/main/haxework/view/skin/BitmapSkin.hx b/src/main/hw/view/skin/BitmapSkin.hx similarity index 93% rename from src/main/haxework/view/skin/BitmapSkin.hx rename to src/main/hw/view/skin/BitmapSkin.hx index dfc2607..7eb75ec 100755 --- a/src/main/haxework/view/skin/BitmapSkin.hx +++ b/src/main/hw/view/skin/BitmapSkin.hx @@ -1,8 +1,8 @@ -package haxework.view.skin; +package hw.view.skin; import flash.display.BitmapData; import flash.geom.Rectangle; -import haxework.view.utils.DrawUtil; +import hw.view.utils.DrawUtil; @:style(true) class BitmapSkin extends SpriteSkin { @:style(null) public var image(default, default):BitmapData; diff --git a/src/main/haxework/view/skin/Border.hx b/src/main/hw/view/skin/Border.hx similarity index 87% rename from src/main/haxework/view/skin/Border.hx rename to src/main/hw/view/skin/Border.hx index 5203b7a..a1d9414 100644 --- a/src/main/haxework/view/skin/Border.hx +++ b/src/main/hw/view/skin/Border.hx @@ -1,6 +1,6 @@ -package haxework.view.skin; +package hw.view.skin; -import haxework.color.Color; +import hw.color.Color; @:style class Border { @:style(null) public var color(default, default):Null; diff --git a/src/main/haxework/view/skin/ButtonBitmapSkin.hx b/src/main/hw/view/skin/ButtonBitmapSkin.hx similarity index 90% rename from src/main/haxework/view/skin/ButtonBitmapSkin.hx rename to src/main/hw/view/skin/ButtonBitmapSkin.hx index f3f5827..d430b77 100755 --- a/src/main/haxework/view/skin/ButtonBitmapSkin.hx +++ b/src/main/hw/view/skin/ButtonBitmapSkin.hx @@ -1,11 +1,11 @@ -package haxework.view.skin; +package hw.view.skin; import flash.display.BitmapData; import flash.geom.Rectangle; -import haxework.view.form.ButtonView.ButtonState; -import haxework.view.form.ButtonView; -import haxework.view.utils.BitmapUtil; -import haxework.view.utils.DrawUtil; +import hw.view.form.ButtonView.ButtonState; +import hw.view.form.ButtonView; +import hw.view.utils.BitmapUtil; +import hw.view.utils.DrawUtil; @:style class ButtonBitmapSkin implements ISkin { diff --git a/src/main/haxework/view/skin/ButtonColorSkin.hx b/src/main/hw/view/skin/ButtonColorSkin.hx similarity index 90% rename from src/main/haxework/view/skin/ButtonColorSkin.hx rename to src/main/hw/view/skin/ButtonColorSkin.hx index 7381ed4..b4b6332 100644 --- a/src/main/haxework/view/skin/ButtonColorSkin.hx +++ b/src/main/hw/view/skin/ButtonColorSkin.hx @@ -1,14 +1,14 @@ -package haxework.view.skin; +package hw.view.skin; import flash.display.CapsStyle; import flash.display.Graphics; import flash.display.JointStyle; import flash.display.LineScaleMode; -import haxework.color.Color; -import haxework.view.form.ButtonView; -import haxework.view.form.ToggleButtonView; +import hw.color.Color; +import hw.view.form.ButtonView; +import hw.view.form.ToggleButtonView; -using haxework.color.ColorUtil; +using hw.color.ColorUtil; @:style class ButtonColorSkin implements ISkin { diff --git a/src/main/haxework/view/skin/HScrollBarSkin.hx b/src/main/hw/view/skin/HScrollBarSkin.hx similarity index 88% rename from src/main/haxework/view/skin/HScrollBarSkin.hx rename to src/main/hw/view/skin/HScrollBarSkin.hx index 456326e..9b83bb5 100644 --- a/src/main/haxework/view/skin/HScrollBarSkin.hx +++ b/src/main/hw/view/skin/HScrollBarSkin.hx @@ -1,8 +1,8 @@ -package haxework.view.skin; +package hw.view.skin; -import haxework.color.Color; -import haxework.color.ColorUtil; -import haxework.view.list.ScrollBarView; +import hw.color.Color; +import hw.color.ColorUtil; +import hw.view.list.ScrollBarView; @:style class HScrollBarSkin implements ISkin { @:style(0) public var foreColor(default, default):Null; diff --git a/src/main/haxework/view/skin/ISkin.hx b/src/main/hw/view/skin/ISkin.hx similarity index 59% rename from src/main/haxework/view/skin/ISkin.hx rename to src/main/hw/view/skin/ISkin.hx index f1dcd3b..ca6fb14 100644 --- a/src/main/haxework/view/skin/ISkin.hx +++ b/src/main/hw/view/skin/ISkin.hx @@ -1,6 +1,6 @@ -package haxework.view.skin; +package hw.view.skin; -import haxework.view.theme.IStylable; +import hw.view.theme.IStylable; interface ISkin> extends IStylable { public function draw(view:V):Void; diff --git a/src/main/haxework/view/skin/Skin.hx b/src/main/hw/view/skin/Skin.hx similarity index 89% rename from src/main/haxework/view/skin/Skin.hx rename to src/main/hw/view/skin/Skin.hx index 5ffce3a..af75868 100644 --- a/src/main/haxework/view/skin/Skin.hx +++ b/src/main/hw/view/skin/Skin.hx @@ -1,9 +1,9 @@ -package haxework.view.skin; +package hw.view.skin; import flash.display.BitmapData; -import haxework.color.Color; -import haxework.view.form.ButtonView; -import haxework.view.utils.DrawUtil; +import hw.color.Color; +import hw.view.form.ButtonView; +import hw.view.utils.DrawUtil; class Skin { diff --git a/src/main/haxework/view/skin/SpriteSkin.hx b/src/main/hw/view/skin/SpriteSkin.hx similarity index 97% rename from src/main/haxework/view/skin/SpriteSkin.hx rename to src/main/hw/view/skin/SpriteSkin.hx index 8931cf0..528d0f4 100644 --- a/src/main/haxework/view/skin/SpriteSkin.hx +++ b/src/main/hw/view/skin/SpriteSkin.hx @@ -1,4 +1,4 @@ -package haxework.view.skin; +package hw.view.skin; import flash.display.Graphics; diff --git a/src/main/haxework/view/skin/TabColorSkin.hx b/src/main/hw/view/skin/TabColorSkin.hx similarity index 83% rename from src/main/haxework/view/skin/TabColorSkin.hx rename to src/main/hw/view/skin/TabColorSkin.hx index 0e0f1d4..161dcaf 100644 --- a/src/main/haxework/view/skin/TabColorSkin.hx +++ b/src/main/hw/view/skin/TabColorSkin.hx @@ -1,9 +1,9 @@ -package haxework.view.skin; +package hw.view.skin; import flash.display.Graphics; -import haxework.color.ColorUtil; -import haxework.view.form.ButtonView; -import haxework.view.form.ToggleButtonView; +import hw.color.ColorUtil; +import hw.view.form.ButtonView; +import hw.view.form.ToggleButtonView; class TabColorSkin extends ButtonColorSkin { diff --git a/src/main/haxework/view/skin/VScrollBarSkin.hx b/src/main/hw/view/skin/VScrollBarSkin.hx similarity index 89% rename from src/main/haxework/view/skin/VScrollBarSkin.hx rename to src/main/hw/view/skin/VScrollBarSkin.hx index 015aec8..e82314e 100644 --- a/src/main/haxework/view/skin/VScrollBarSkin.hx +++ b/src/main/hw/view/skin/VScrollBarSkin.hx @@ -1,8 +1,8 @@ -package haxework.view.skin; +package hw.view.skin; -import haxework.color.Color; -import haxework.color.ColorUtil; -import haxework.view.list.ScrollBarView; +import hw.color.Color; +import hw.color.ColorUtil; +import hw.view.list.ScrollBarView; @:style class VScrollBarSkin implements ISkin { @:style(0) public var foreColor(default, default):Null; diff --git a/src/main/haxework/view/text/FontPreset.hx b/src/main/hw/view/text/FontPreset.hx similarity index 93% rename from src/main/haxework/view/text/FontPreset.hx rename to src/main/hw/view/text/FontPreset.hx index aa9c199..9749a34 100644 --- a/src/main/haxework/view/text/FontPreset.hx +++ b/src/main/hw/view/text/FontPreset.hx @@ -1,6 +1,6 @@ -package haxework.view.text; +package hw.view.text; -import haxework.color.Color; +import hw.color.Color; import flash.text.TextFormatAlign; @:style class FontPreset { diff --git a/src/main/haxework/view/text/ITextView.hx b/src/main/hw/view/text/ITextView.hx similarity index 73% rename from src/main/haxework/view/text/ITextView.hx rename to src/main/hw/view/text/ITextView.hx index 1c7961e..a7b851e 100755 --- a/src/main/haxework/view/text/ITextView.hx +++ b/src/main/hw/view/text/ITextView.hx @@ -1,8 +1,8 @@ -package haxework.view.text; +package hw.view.text; import flash.text.TextField; -import haxework.view.IView; -import haxework.view.layout.ILayout; +import hw.view.IView; +import hw.view.layout.ILayout; interface ITextView extends IView { public var font(default, set):FontPreset; diff --git a/src/main/haxework/view/text/TextView.hx b/src/main/hw/view/text/TextView.hx similarity index 94% rename from src/main/haxework/view/text/TextView.hx rename to src/main/hw/view/text/TextView.hx index 7f1f104..38d9a9a 100755 --- a/src/main/haxework/view/text/TextView.hx +++ b/src/main/hw/view/text/TextView.hx @@ -1,15 +1,15 @@ -package haxework.view.text; +package hw.view.text; import flash.text.TextField; import flash.text.TextFieldAutoSize; import flash.text.TextFormat; import flash.text.TextFormatAlign; -import haxework.text.BitmapTextField; -import haxework.text.TextUtil; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.VAlign; -import haxework.view.layout.ILayout; -import haxework.view.layout.Layout; +import hw.text.BitmapTextField; +import hw.text.TextUtil; +import hw.view.geometry.HAlign; +import hw.view.geometry.VAlign; +import hw.view.layout.ILayout; +import hw.view.layout.Layout; @:style(true) class TextView extends SpriteView implements ITextView { @:style public var font(default, default):FontPreset; diff --git a/src/main/haxework/view/theme/IStylable.hx b/src/main/hw/view/theme/IStylable.hx similarity index 79% rename from src/main/haxework/view/theme/IStylable.hx rename to src/main/hw/view/theme/IStylable.hx index 40dad61..5d40858 100644 --- a/src/main/haxework/view/theme/IStylable.hx +++ b/src/main/hw/view/theme/IStylable.hx @@ -1,4 +1,4 @@ -package haxework.view.theme; +package hw.view.theme; interface IStylable { public var styleKey(default, set):String; diff --git a/src/main/haxework/view/theme/ITheme.hx b/src/main/hw/view/theme/ITheme.hx similarity index 88% rename from src/main/haxework/view/theme/ITheme.hx rename to src/main/hw/view/theme/ITheme.hx index 37e7f20..1660710 100644 --- a/src/main/haxework/view/theme/ITheme.hx +++ b/src/main/hw/view/theme/ITheme.hx @@ -1,7 +1,7 @@ -package haxework.view.theme; +package hw.view.theme; -import haxework.signal.Signal; -import haxework.color.Color; +import hw.signal.Signal; +import hw.color.Color; typedef ThemeFont = { @:optional var name:String; diff --git a/src/main/haxework/view/theme/StyleId.hx b/src/main/hw/view/theme/StyleId.hx similarity index 97% rename from src/main/haxework/view/theme/StyleId.hx rename to src/main/hw/view/theme/StyleId.hx index 61ed3c5..c895d73 100644 --- a/src/main/haxework/view/theme/StyleId.hx +++ b/src/main/hw/view/theme/StyleId.hx @@ -1,4 +1,4 @@ -package haxework.view.theme; +package hw.view.theme; abstract StyleId(Array) { diff --git a/src/main/haxework/view/theme/Theme.hx b/src/main/hw/view/theme/Theme.hx similarity index 95% rename from src/main/haxework/view/theme/Theme.hx rename to src/main/hw/view/theme/Theme.hx index 6f43bc7..6b5ac60 100644 --- a/src/main/haxework/view/theme/Theme.hx +++ b/src/main/hw/view/theme/Theme.hx @@ -1,17 +1,17 @@ -package haxework.view.theme; +package hw.view.theme; import flash.text.Font; import flash.text.FontType; -import haxework.color.Color; -import haxework.signal.Signal; -import haxework.view.geometry.Box; -import haxework.view.geometry.HAlign; -import haxework.view.geometry.SizeValue; -import haxework.view.geometry.VAlign; -import haxework.view.skin.TabColorSkin; -import haxework.view.theme.ITheme; +import hw.color.Color; +import hw.signal.Signal; +import hw.view.geometry.Box; +import hw.view.geometry.HAlign; +import hw.view.geometry.SizeValue; +import hw.view.geometry.VAlign; +import hw.view.skin.TabColorSkin; +import hw.view.theme.ITheme; -using haxework.color.ColorUtil; +using hw.color.ColorUtil; class Style { public var id(default, null):StyleId; diff --git a/src/main/haxework/view/utils/BitmapUtil.hx b/src/main/hw/view/utils/BitmapUtil.hx similarity index 97% rename from src/main/haxework/view/utils/BitmapUtil.hx rename to src/main/hw/view/utils/BitmapUtil.hx index 1498b6d..f2e972b 100755 --- a/src/main/haxework/view/utils/BitmapUtil.hx +++ b/src/main/hw/view/utils/BitmapUtil.hx @@ -1,11 +1,11 @@ -package haxework.view.utils; +package hw.view.utils; import flash.display.BitmapData; import flash.filters.ColorMatrixFilter; import flash.geom.ColorTransform; import flash.geom.Point; import flash.geom.Rectangle; -import haxework.color.Color; +import hw.color.Color; class BitmapUtil { diff --git a/src/main/haxework/view/utils/DrawUtil.hx b/src/main/hw/view/utils/DrawUtil.hx similarity index 99% rename from src/main/haxework/view/utils/DrawUtil.hx rename to src/main/hw/view/utils/DrawUtil.hx index 7fcf06e..af228ee 100755 --- a/src/main/haxework/view/utils/DrawUtil.hx +++ b/src/main/hw/view/utils/DrawUtil.hx @@ -1,4 +1,4 @@ -package haxework.view.utils; +package hw.view.utils; import flash.display.BitmapData; import flash.display.Graphics;