[client] update haxework. ep8

src/client/haxe/ru/m/tankz/Client.hx

@@ -48,7 +48,7 @@ class Client {
     public function init():Void {
         var font:Font = Font.enumerateFonts()[0];
         resources.text.put('font', 'Bookman Old Style');
-        resources.text.put('version', 'v${Const.VERSION} b${Const.BUILD}');
+        resources.text.put('version', 'v${Const.VERSION} (${Const.BUILD})');
         Provider.set(FrameSwitcher, switcher);
     }
 

src/client/haxe/ru/m/tankz/Style.hx

@@ -19,6 +19,7 @@ class Style {
         resources.skin.put("light", [Skin.color(lightColor)]);
         resources.skin.put("dark", [Skin.color(darkColor)]);
         resources.skin.put("text", [Skin.text(textColor, 16, fontFamily)]);
+        resources.skin.put("text.header", [Skin.text(textColor, 22, fontFamily)]);
         resources.skin.put("button", [
             Skin.buttonColor(lightColor),
             Skin.text(textColor, 18, fontFamily),

src/client/haxe/ru/m/tankz/frame/SettingsFrame.yaml

@@ -4,19 +4,14 @@ layout.hAlign: center
 layout.vAlign: middle
 views:
   - $type: haxework.gui.LabelView
-    skinId: text
-    geometry.size.fixed.height: 20
+    skinId: text.header
     text: Settings
   - $type: haxework.gui.HGroupView
-    geometry.size.width: 100%
+    layout.margin: 20
     views:
       - $type: ru.m.tankz.frame.settings.SettingsEditor
-        geometry.size.percent.width: 50
-        #geometry.size.percent.height: 100
         controlIndex: 0
       - $type: ru.m.tankz.frame.settings.SettingsEditor
-        geometry.size.percent.width: 50
-        #geometry.size.percent.height: 100
         controlIndex: 1
   - id: close
     $type: haxework.gui.ButtonView

src/client/haxe/ru/m/tankz/frame/StartFrame.yaml

@@ -3,43 +3,43 @@ geometry.size.stretch: true
 layout.hAlign: center
 layout.vAlign: middle
 views:
-- $type: haxework.gui.ImageView
-  image: $asset:image:resources/image/ui/logo.png
-  geometry.margin.bottom: 15
-- $type: haxework.gui.VGroupView
-  layout.margin: 3
-  views:
-  - id: classic
+  - $type: haxework.gui.ImageView
+    image: $asset:image:resources/image/ui/logo.png
+    geometry.margin.bottom: 15
+  - $type: haxework.gui.VGroupView
+    layout.margin: 3
+    views:
+      - id: classic
+        $type: haxework.gui.ButtonView
+        skinId: button
+        +onPress: $this:onPress
+        text: Classic
+      - id: dota
+        $type: haxework.gui.ButtonView
+        skinId: button
+        +onPress: $this:onPress
+        text: DotA
+      - id: network
+        $type: haxework.gui.ButtonView
+        skinId: button
+        +onPress: $this:onPress
+        text: Network (in developing)
+        fontColor: 0xff0000
+        visible: false
+  - $type: haxework.gui.LabelView
+    skinId: text
+    geometry.position: absolute
+    geometry.margin.right: 10
+    geometry.margin.bottom: 10
+    geometry.vAlign: bottom
+    geometry.hAlign: right
+    text: $r:text:version
+  - id: settings
     $type: haxework.gui.ButtonView
-    skinId: button
+    geometry.position: absolute
+    geometry.margin.left: 10
+    geometry.margin.bottom: 10
+    geometry.vAlign: bottom
+    geometry.hAlign: left
+    skinId: button.settings
     +onPress: $this:onPress
-    text: Classic
-  - id: dota
-    $type: haxework.gui.ButtonView
-    skinId: button
-    +onPress: $this:onPress
-    text: DotA
-  - id: network
-    $type: haxework.gui.ButtonView
-    skinId: button
-    +onPress: $this:onPress
-    text: Network (in developing)
-    fontColor: 0xff0000
-    visible: false
-- $type: haxework.gui.LabelView
-  skinId: text
-  geometry.position: absolute
-  geometry.margin.right: 10
-  geometry.margin.bottom: 10
-  geometry.vAlign: bottom
-  geometry.hAlign: right
-  text: $r:text:version
-- id: settings
-  $type: haxework.gui.ButtonView
-  geometry.position: absolute
-  geometry.margin.left: 10
-  geometry.margin.bottom: 10
-  geometry.vAlign: bottom
-  geometry.hAlign: left
-  skinId: button.settings
-  +onPress: $this:onPress

src/client/haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.hx

@@ -1,7 +1,8 @@
 package ru.m.tankz.frame.classic;
 
-import haxework.gui.frame.FrameSwitcher;
+import haxework.gui.ButtonView;
 import haxework.gui.DataView;
+import haxework.gui.frame.FrameSwitcher;
 import haxework.gui.ToggleButtonView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.frame.common.LevelFrame;
@@ -10,8 +11,8 @@ import ru.m.tankz.preset.ClassicGame;
 @:template class ClassicLevelFrame extends LevelFrame {
     public static inline var ID = "classic.level";
 
-    @:view var presets(default, null):DataView<GamePreset>;
-    @:view var levels(default, null):DataView<Int>;
+    @:view var presets(default, null):DataView<GamePreset, ToggleButtonView>;
+    @:view var levels(default, null):DataView<Int, ButtonView>;
 
     @:provide var frames:FrameSwitcher;
 

src/client/haxe/ru/m/tankz/frame/classic/ClassicLevelFrame.yaml

@@ -3,8 +3,11 @@ layout:
   $type: haxework.gui.layout.VerticalLayout
   hAlign: center
 views:
+  - $type: haxework.gui.LabelView
+    skinId: text.header
+    text: Classic
   - id: presets
-    $type: haxework.gui.DataView<GamePreset>
+    $type: haxework.gui.DataView
     layout:
       $type: haxework.gui.layout.HorizontalLayout
       hAlign: center
@@ -13,7 +16,7 @@ views:
     +onDataSelect: $code:function(value) preset = value
     geometry.padding: 10
   - id: levels
-    $type: haxework.gui.DataView<Int>
+    $type: haxework.gui.DataView
     layout:
       $type: haxework.gui.layout.TailLayout
       rowSize: 10

src/client/haxe/ru/m/tankz/frame/common/LevelView.hx

@@ -1,20 +0,0 @@
-package ru.m.tankz.frame.common;
-
-import haxework.gui.HGroupView;
-import haxework.gui.LabelView;
-import haxework.gui.list.ListView.IListItemView;
-
-
-@:template class LevelView extends HGroupView implements IListItemView<Int> {
-
-    public var item_index(default, default):Int;
-    public var data(default, set):Int;
-
-    @:view var label(default, null):LabelView;
-
-    private function set_data(value:Int):Int {
-        data = value;
-        label.text = 'Level ${data}';
-        return data;
-    }
-}

src/client/haxe/ru/m/tankz/frame/common/LevelView.yaml

@@ -1,14 +0,0 @@
----
-geometry.size.width: 100%
-geometry.size.height: 44
-geometry.margin: 5
-views:
-  - id: label
-    $type: haxework.gui.LabelView
-    skinId: text
-    geometry.size.stretch: true
-    text: ""
-skin:
-  - $type: haxework.gui.skin.ColorSkin
-    color: 0x000000
-    alpha: 0.2

src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.hx

@@ -1,5 +1,6 @@
 package ru.m.tankz.frame.dota;
 
+import haxework.gui.ButtonView;
 import haxework.gui.DataView;
 import haxework.gui.frame.FrameSwitcher;
 import ru.m.tankz.frame.common.LevelFrame;
@@ -10,8 +11,8 @@ import ru.m.tankz.Type;
 @:template class DotaLevelFrame extends LevelFrame {
     public static inline var ID = "dota.level";
 
-    @:view var levels(default, null):DataView<Int>;
-    @:view var players(default, null):DataView<PlayerId>;
+    @:view var levels(default, null):DataView<Int, ButtonView>;
+    @:view var players(default, null):DataView<PlayerId, PlayerView>;
 
     @:provide var frames:FrameSwitcher;
 

src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.yaml

@@ -1,20 +1,26 @@
 ---
 layout:
-  $type: haxework.gui.layout.HorizontalLayout
+  $type: haxework.gui.layout.VerticalLayout
+  hAlign: center
 views:
-  - id: players
-    $type: haxework.gui.DataView<PlayerId>
-    layout:
-      $type: haxework.gui.layout.VerticalLayout
-      hAlign: center
-    factory: $this:playerViewFactory
-    geometry.padding: 10
-  - id: levels
-    $type: haxework.gui.DataView<Int>
-    layout:
-      $type: haxework.gui.layout.TailLayout
-      rowSize: 5
-      margin: 5
-    factory: $this:levelViewFactory
-    +onDataSelect: $code:function(value) level = value
-    geometry.padding: 10
+  - $type: haxework.gui.LabelView
+    skinId: text.header
+    text: DotA
+  - $type: haxework.gui.HGroupView
+    views:
+      - id: players
+        $type: haxework.gui.DataView
+        layout:
+          $type: haxework.gui.layout.VerticalLayout
+          hAlign: center
+        factory: $this:playerViewFactory
+        geometry.padding: 10
+      - id: levels
+        $type: haxework.gui.DataView
+        layout:
+          $type: haxework.gui.layout.TailLayout
+          rowSize: 5
+          margin: 5
+        factory: $this:levelViewFactory
+        +onDataSelect: $code:function(value) level = value
+        geometry.padding: 10

src/client/haxe/ru/m/tankz/frame/settings/SettingsEditor.hx

@@ -14,7 +14,7 @@ import ru.m.tankz.storage.SettingsStorage;
     public var controlIndex(default, set): Int;
 
     @:view var label:LabelView;
-    @:view var list:DataView<ActionItem>;
+    @:view var list:DataView<ActionItem, ActionView>;
     @:view var change:ButtonView;
     @:view var clear:ButtonView;
     @:view var reset:ButtonView;

src/client/haxe/ru/m/tankz/frame/settings/SettingsEditor.yaml

@@ -23,7 +23,7 @@ views:
         skinId: button.simple
         text: Reset
   - id: list
-    $type: haxework.gui.DataView<ru.m.tankz.control.ActionItem>
+    $type: haxework.gui.DataView
     layout:
       $type: haxework.gui.layout.VerticalLayout
     factory: $this:viewFactory