[view] reorganize packages

demo/src/demo/Demo.hx

@@ -1,15 +1,15 @@
 package demo;
 
 import demo.dispatch.DemoDispatcher;
-import haxework.net.JsonLoader;
 import demo.popup.ColorPopup;
 import haxework.App;
-import haxework.view.frame.FrameSwitcher;
-import haxework.view.IGroupView;
-import haxework.view.IView;
-import haxework.view.ToggleButtonView;
-import haxework.view.VGroupView;
 import haxework.log.TraceLogger;
+import haxework.net.JsonLoader;
+import haxework.view.form.ToggleButtonView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.group.IGroupView;
+import haxework.view.group.VGroupView;
+import haxework.view.IView;
 
 @:template class DemoView extends VGroupView {
     @:view var switcher:FrameSwitcher;
@@ -25,9 +25,9 @@ import haxework.log.TraceLogger;
 
     private function choiceColor():Void {
         // ToDo: update Theme
-        /*new ColorPopup()
-        .show()
-        .then(function(color) AppTheme.setColor(color))
+        new ColorPopup()
+        .show();
+        /*.then(function(color) AppTheme.setColor(color))
         .catchError(function(e) {});*/
     }
 }

demo/src/demo/DemoView.yaml

@@ -6,7 +6,7 @@ views:
       geometry.padding: 10
       image: $r:image:logo
     - id: tabs
-      $type: haxework.view.ButtonGroup<String>
+      $type: haxework.view.data.ButtonGroup<String>
       layout.margin: 5
       layout.hAlign: left
       geometry.size.width: 100%
@@ -34,12 +34,12 @@ views:
         _data_: {$class: demo.form.DataForm}
         _test_layout_: {$class: demo.form.TestLayoutForm}
         _select_: {$class: demo.form.SelectForm}
-    - $type: haxework.view.HGroupView
+    - $type: haxework.view.group.HGroupView
       geometry.size.percent.width: 100
       geometry.padding: 10
       layout.margin: 10
       views:
-          - $type: haxework.view.ButtonView
+          - $type: haxework.view.form.ButtonView
             geometry.padding: [25, 8]
             skinId: button
             text: Color
@@ -47,15 +47,15 @@ views:
               # separator
           - $type: haxework.view.SpriteView
             geometry.size.stretch: true
-          - $type: haxework.view.ButtonView
+          - $type: haxework.view.form.ButtonView
             geometry.padding: [25, 8]
             skinId: button
             text: OK
-          - $type: haxework.view.ButtonView
+          - $type: haxework.view.form.ButtonView
             geometry.padding: [25, 8]
             skinId: button
             text: Apply
-          - $type: haxework.view.ButtonView
+          - $type: haxework.view.form.ButtonView
             geometry.padding: [25, 8]
             skinId: button
             text: Cancel

demo/src/demo/form/DataForm.hx

@@ -1,7 +1,7 @@
 package demo.form;
 
 import haxework.view.frame.FrameView;
-import haxework.view.TextView;
+import haxework.view.text.TextView;
 
 
 @:template class DataForm extends FrameView<Dynamic> {

demo/src/demo/form/DataForm.yaml

@@ -5,7 +5,7 @@ views:
     scroll.skinId: scroll
     view:
       id: data
-      $type: haxework.view.DataView
+      $type: haxework.view.data.DataView
       layout:
         $type: haxework.view.layout.VerticalLayout
       factory: ~factory

demo/src/demo/form/SelectForm.yaml

@@ -2,7 +2,7 @@
 geometry.padding: 10
 layout.margin: 5
 views:
-    -   $type: haxework.view.SelectView<String>
+    -   $type: haxework.view.form.SelectView<String>
         layout.margin: 2
         dataView.layout.margin: 1
         labelSkinId: text
@@ -14,7 +14,7 @@ views:
         selected: "value 1"
         +onSelect: ~function(value) trace('select', value)
 
-    -   $type: haxework.view.SelectView.SelectIdView<{id:Int,label:String}, Int>
+    -   $type: haxework.view.form.SelectView.SelectIdView<{id:Int,label:String}, Int>
         layout.margin: 2
         dataView.layout.margin: 1
         labelSkinId: text

demo/src/demo/form/TailForm.hx

@@ -3,7 +3,7 @@ package demo.form;
 import haxework.view.frame.FrameView;
 import haxework.view.ImageView;
 import haxework.view.IView;
-import haxework.view.TextView;
+import haxework.view.text.TextView;
 import haxework.view.utils.DrawUtil;
 
 @:template class TailForm extends FrameView<Dynamic> {

demo/src/demo/form/TailForm.yaml

@@ -5,7 +5,7 @@ views:
     scroll.skinId: scroll
     view:
       id: data
-      $type: haxework.view.DataView
+      $type: haxework.view.data.DataView
       layout:
         $type: haxework.view.layout.TailLayout
         margin: 2

demo/src/demo/form/TestLayoutForm.yaml

@@ -1,29 +1,29 @@
 ---
 views:
   - id: main
-    $type: haxework.view.VGroupView
+    $type: haxework.view.group.VGroupView
     geometry.size.stretch: true
     layout.hAlign: center
     layout.vAlign: middle
     views:
       - id: container
-        $type: haxework.view.VGroupView
+        $type: haxework.view.group.VGroupView
         layout.margin: 10
         skin:
           - $type: [haxework.view.skin.Skin.color, 0xffff00]
         views:
           - id: top
-            $type: haxework.view.GroupView
+            $type: haxework.view.group.GroupView
             layout.hAlign: center
             geometry.size.width: 100%
             geometry.size.height: 20
             skinId: test
           - id: middle
-            $type: haxework.view.HGroupView
+            $type: haxework.view.group.HGroupView
             layout.margin: 10
             views:
               - id: left
-                $type: haxework.view.GroupView
+                $type: haxework.view.group.GroupView
                 layout.vAlign: middle
                 geometry.size.width: 20
                 geometry.size.height: 100%
@@ -34,7 +34,7 @@ views:
                 #geometry.size.height: 200
                 skinId: test
               - id: right
-                $type: haxework.view.GroupView
+                $type: haxework.view.group.GroupView
                 layout.vAlign: middle
                 geometry.size.width: 20
                 geometry.size.height: 100%
@@ -46,7 +46,7 @@ views:
                     skin:
                       - $type: [haxework.view.skin.Skin.color, 0xff0000]
           - id: bottom
-            $type: haxework.view.GroupView
+            $type: haxework.view.group.GroupView
             layout.hAlign: center
             skinId: test
             geometry.size.width: 100%

demo/src/demo/popup/ColorPopup.hx

@@ -1,6 +1,6 @@
 package demo.popup;
 
-import haxework.view.ButtonView;
+import haxework.view.form.ButtonView;
 import haxework.view.popup.PopupView;
 import haxework.view.skin.Skin;
 

demo/src/demo/popup/ColorPopup.yaml

@@ -1,6 +1,6 @@
 ---
 view:
-    $type: haxework.view.VGroupView
+    $type: haxework.view.group.VGroupView
     geometry.size.width: 400
     geometry.size.height: 200
     geometry.padding: 10
@@ -9,7 +9,7 @@ view:
     skinId: panel
     views:
         - id: colors
-          $type: haxework.view.DataView
+          $type: haxework.view.data.DataView
           geometry.size.stretch: true
           layout:
               $type: haxework.view.layout.TailLayout
@@ -23,12 +23,12 @@ view:
               - 0xCC33AA
               - 0x3333AA
           +onDataSelect: ~close
-        - $type: haxework.view.HGroupView
+        - $type: haxework.view.group.HGroupView
           geometry.size.width: 100%
           layout.hAlign: right
           layout.margin: 10
           views:
-            - $type: haxework.view.ButtonView
+            - $type: haxework.view.form.ButtonView
               geometry.padding: [25, 8]
               skinId: button
               text: Cancel