InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[client] update to haxework

Browse Source
This commit is contained in:
shmyga
2019-07-10 19:59:02 +03:00
parent 1ec1c3baae
commit 670a11d6ba
50 changed files with 187 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/haxe/ru/m/skin/ButtonSVGSkin.hx
View File

@@ -3,7 +3,7 @@ package ru.m.skin;
import format.SVG; import format.SVG;
import haxework.color.Color; import haxework.color.Color;
import haxework.color.ColorUtil; import haxework.color.ColorUtil;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.skin.ISkin; import haxework.view.skin.ISkin;
class ButtonSVGSkin implements ISkin<ButtonView> { class ButtonSVGSkin implements ISkin<ButtonView> {

51
src/client/haxe/ru/m/tankz/AppTheme.hx
View File

@@ -23,88 +23,87 @@ class AppTheme extends Theme {
public function new() { public function new() {
super({embed: true}, COLORS); super({embed: true}, COLORS);
data.set("light", [ }
override private function reload():Void {
super.reload();
data.put("light", [
Skin.color(colors.light), Skin.color(colors.light),
]); ]);
data.set("dark", [ data.put("dark", [
Skin.color(colors.dark), Skin.color(colors.dark),
]); ]);
data.set("font", [ data.put("font", [
Skin.text(colors.text, 0, font.name, font.embed), Skin.text(colors.text, 0, font.name, font.embed),
]); ]);
data.set("text", [ data.put("text", [
Skin.text(colors.text, baseFontSize, font.name, font.embed), Skin.text(colors.text, baseFontSize, font.name, font.embed),
]); ]);
data.set("scroll.vertical", [ data.put("scroll.vertical", [
Skin.scrollVertical(colors.light, colors.dark), Skin.scrollVertical(colors.light, colors.dark),
]); ]);
data.set("text.header", [ data.put("text.header", [
Skin.color(0x000000, 0.1), Skin.color(0x000000, 0.1),
Skin.border(colors.light, 1, 2), Skin.border(colors.light, 1, 2),
Skin.text(colors.text, bigFontSize, font.name, font.embed), Skin.text(colors.text, bigFontSize, font.name, font.embed),
Skin.geometry(new Geometry().setPadding([50, 8]).setMargin([0, 0, 0, 30])), Skin.geometry(new Geometry().setPadding([50, 8]).setMargin([0, 0, 0, 30])),
]); ]);
data.set("button", [ data.put("button.menu", [
Skin.buttonColor(colors.light), Skin.buttonColor(colors.light),
Skin.text(colors.text, bigFontSize, font.name, font.embed), Skin.text(colors.text, bigFontSize, font.name, font.embed),
Skin.size(250, 50), Skin.size(250, 50),
]); ]);
data.set("text.box", [ data.put("text.box", [
Skin.color(0x000000, 0.1), Skin.color(0x000000, 0.1),
Skin.border(colors.light, 1, 2), Skin.border(colors.light, 1, 2),
Skin.text(colors.text, baseFontSize, font.name, font.embed), Skin.text(colors.text, baseFontSize, font.name, font.embed),
]); ]);
data.set("text.box.active", [ data.put("text.box.active", [
Skin.color(0x55aa55), Skin.color(0x55aa55),
Skin.border(0x88dd88, 1, 2), Skin.border(0x88dd88, 1, 2),
Skin.text(colors.text, baseFontSize, font.name, font.embed), Skin.text(colors.text, baseFontSize, font.name, font.embed),
]); ]);
data.set("button.simple", [ data.put("button.active", [
Skin.buttonColor(colors.light),
Skin.text(colors.text, baseFontSize, font.name, font.embed),
Skin.geometry(new Geometry().setPadding([25, 8])),
]);
data.set("button.simple.active", [
Skin.buttonColor(colors.light, colors.active), Skin.buttonColor(colors.light, colors.active),
Skin.text(colors.active, baseFontSize, font.name, font.embed), Skin.text(colors.active, baseFontSize, font.name, font.embed),
Skin.geometry(new Geometry().setPadding([25, 8])), Skin.geometry(new Geometry().setPadding([25, 8])),
]); ]);
data.set("button.tab", [ data.put("button.tab", [
Skin.tabColor(colors.light), Skin.tabColor(colors.light),
Skin.text(colors.text, baseFontSize, font.name, font.embed), Skin.text(colors.text, baseFontSize, font.name, font.embed),
Skin.geometry(new Geometry().setPadding([25, 8])), Skin.geometry(new Geometry().setPadding([25, 8])),
]); ]);
data.set("border", [ data.put("border", [
Skin.border(colors.border, 1, 2), Skin.border(colors.border, 1, 2),
]); ]);
data.set("scroll", [ data.put("scroll", [
Skin.scrollVertical(colors.light, colors.light.diff(128)), Skin.scrollVertical(colors.light, colors.light.diff(128)),
]); ]);
data.set("button.level", [ data.put("button.level", [
Skin.buttonColor(colors.light), Skin.buttonColor(colors.light),
Skin.text(colors.text, veryBigFontSize, font.name, font.embed), Skin.text(colors.text, veryBigFontSize, font.name, font.embed),
Skin.size(64, 64), Skin.size(64, 64),
]); ]);
data.set("container", [ data.put("container", [
Skin.geometry(new Geometry().setSize("100%", "100%")), Skin.geometry(new Geometry().setSize("100%", "100%")),
Skin.layout(new Layout().setAlign(CENTER, MIDDLE)), Skin.layout(new Layout().setAlign(CENTER, MIDDLE)),
Skin.color(colors.dark), Skin.color(colors.dark),
]); ]);
data.set("panel", [ data.put("panel", [
Skin.geometry(new Geometry().setSize("100%", -1).setPadding([10, 5])), Skin.geometry(new Geometry().setSize("100%", -1).setPadding([10, 5])),
Skin.layout(new Layout().setAlign(NONE, MIDDLE)), Skin.layout(new Layout().setAlign(NONE, MIDDLE)),
Skin.color(colors.light), Skin.color(colors.light),
]); ]);
data.set("window", [ data.put("window", [
Skin.color(colors.dark), Skin.color(colors.dark),
Skin.border(colors.border, 1, 2), Skin.border(colors.border, 1, 2),
Skin.geometry(new Geometry().setPadding(2)), Skin.geometry(new Geometry().setPadding(2)),
]); ]);
data.set("line", [ data.put("line", [
Skin.color(colors.border), Skin.color(colors.border),
]); ]);
data.set("window.close", [ data.put("window.close", [
Skin.size(36, 36), Skin.size(36, 36),
new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"), colors.light), new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"), colors.light),
]); ]);
@@ -117,11 +116,11 @@ class AppTheme extends Theme {
} }
private function registerButton(name:String, resource:String):Void { private function registerButton(name:String, resource:String):Void {
data.set('button.$name', [ data.put('button.$name', [
Skin.size(42, 42), Skin.size(42, 42),
new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light), new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light),
]); ]);
data.set('button.$name.small', [ data.put('button.$name.small', [
Skin.size(32, 32), Skin.size(32, 32),
new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light), new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light),
]); ]);

2
src/client/haxe/ru/m/tankz/render/Render.hx
View File

@@ -5,7 +5,7 @@ import flash.display.Graphics;
import flash.display.Sprite; import flash.display.Sprite;
import flash.events.Event; import flash.events.Event;
import haxe.Timer; import haxe.Timer;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.SpriteView; import haxework.view.SpriteView;
import promhx.Promise; import promhx.Promise;
import ru.m.animate.Animate; import ru.m.animate.Animate;

6
src/client/haxe/ru/m/tankz/view/ClientView.hx
View File

@@ -3,10 +3,10 @@ package ru.m.tankz.view;
import flash.events.KeyboardEvent; import flash.events.KeyboardEvent;
import flash.ui.Keyboard; import flash.ui.Keyboard;
import haxework.resources.IResources; import haxework.resources.IResources;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.VGroupView; import haxework.view.group.VGroupView;
import ru.m.tankz.game.IGame; import ru.m.tankz.game.IGame;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.sound.SoundManager; import ru.m.tankz.sound.SoundManager;

12
src/client/haxe/ru/m/tankz/view/ClientView.yaml
View File

@@ -13,31 +13,31 @@ views:
_record_: {$class: ru.m.tankz.view.RecordFrame} _record_: {$class: ru.m.tankz.view.RecordFrame}
_room_list_: {$class: ru.m.tankz.view.network.RoomListFrame} _room_list_: {$class: ru.m.tankz.view.network.RoomListFrame}
_room_: {$class: ru.m.tankz.view.network.RoomFrame} _room_: {$class: ru.m.tankz.view.network.RoomFrame}
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
skinId: panel skinId: panel
layout.margin: 10 layout.margin: 10
views: views:
- id: settings - id: settings
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.settings skinId: button.settings
+onPress: ~switcher.change('settings') +onPress: ~switcher.change('settings')
- $type: haxework.view.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 50% geometry.size.width: 50%
- id: username - id: username
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text skinId: text
- id: login - id: login
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.login skinId: button.login
+onPress: ~login() +onPress: ~login()
- id: logout - id: logout
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.logout skinId: button.logout
+onPress: ~logout() +onPress: ~logout()
visible: false visible: false
- $type: haxework.view.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 50% geometry.size.width: 50%
- id: close - id: close
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.close skinId: button.close
+onPress: ~close() +onPress: ~close()

2
src/client/haxe/ru/m/tankz/view/GameFrame.yaml
View File

@@ -3,7 +3,7 @@ geometry.size.stretch: true
layout: layout:
$type: haxework.view.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
layout.overflow: true layout.overflow: true
views: views:

6
src/client/haxe/ru/m/tankz/view/LevelFrame.hx
View File

@@ -1,10 +1,10 @@
package ru.m.tankz.view; package ru.m.tankz.view;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.view.frame.FrameView; import haxework.view.frame.FrameView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;
import ru.m.tankz.control.Controller; import ru.m.tankz.control.Controller;

6
src/client/haxe/ru/m/tankz/view/LevelFrame.yaml
View File

@@ -1,18 +1,18 @@
--- ---
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
geometry.padding: 20 geometry.padding: 20
views: views:
- id: header - id: header
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.header skinId: text.header
- $type: haxework.view.ScrollView - $type: haxework.view.ScrollView
geometry.size.stretch: true geometry.size.stretch: true
scroll.skinId: scroll.vertical scroll.skinId: scroll.vertical
view: view:
id: levels id: levels
$type: haxework.view.DataView $type: haxework.view.data.DataView
geometry.size.width: 100% geometry.size.width: 100%
layout: layout:
$type: haxework.view.layout.TailLayout $type: haxework.view.layout.TailLayout

4
src/client/haxe/ru/m/tankz/view/RecordFrame.yaml
View File

@@ -1,10 +1,10 @@
--- ---
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
geometry.padding: 20 geometry.padding: 20
views: views:
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
skinId: text.header skinId: text.header
text: Records text: Records
- id: data - id: data

6
src/client/haxe/ru/m/tankz/view/ResultFrame.hx
View File

@@ -1,10 +1,10 @@
package ru.m.tankz.view; package ru.m.tankz.view;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.view.frame.FrameView; import haxework.view.frame.FrameView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import ru.m.tankz.bundle.ILevelBundle; import ru.m.tankz.bundle.ILevelBundle;
import ru.m.tankz.game.GameEvent; import ru.m.tankz.game.GameEvent;
import ru.m.tankz.game.GameInit; import ru.m.tankz.game.GameInit;

17
src/client/haxe/ru/m/tankz/view/ResultFrame.yaml
View File

@@ -1,36 +1,33 @@
--- ---
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
views: views:
- id: level - id: level
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.header skinId: text.header
align: center align: center
- id: result - id: result
$type: haxework.view.DataView $type: haxework.view.data.DataView
factory: ~playerViewFactory factory: ~playerViewFactory
geometry.margin.top: 20 geometry.margin.top: 20
layout: layout:
$type: haxework.view.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
hAlign: right hAlign: right
margin: 10 margin: 10
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
layout.margin: 10 layout.margin: 10
geometry.padding: 10 geometry.padding: 10
views: views:
- id: levels - id: levels
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.simple
text: Levels text: Levels
+onPress: ~levels() +onPress: ~levels()
- id: restart - id: restart
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.simple
text: Restart text: Restart
+onPress: ~restart() +onPress: ~restart()
- id: next - id: next
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.simple
text: Next text: Next
+onPress: ~next() +onPress: ~next()

6
src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml
View File

@@ -1,17 +1,17 @@
--- ---
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
geometry.padding: 20 geometry.padding: 20
views: views:
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
skinId: text.header skinId: text.header
text: Settings text: Settings
- $type: haxework.view.ScrollView - $type: haxework.view.ScrollView
geometry.size.stretch: true geometry.size.stretch: true
scroll.skinId: scroll.vertical scroll.skinId: scroll.vertical
view: view:
$type: haxework.view.GroupView $type: haxework.view.group.GroupView
geometry.size.stretch: true geometry.size.stretch: true
layout: layout:
$type: haxework.view.layout.TailLayout $type: haxework.view.layout.TailLayout

14
src/client/haxe/ru/m/tankz/view/StartFrame.hx
View File

@@ -9,7 +9,6 @@ import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.Type; import ru.m.tankz.Type;
import ru.m.tankz.view.network.RoomFrame; import ru.m.tankz.view.network.RoomFrame;
import ru.m.tankz.view.network.RoomListFrame; import ru.m.tankz.view.network.RoomListFrame;
import ru.m.tankz.view.popup.FontPopup;
import ru.m.tankz.view.popup.LoginPopup; import ru.m.tankz.view.popup.LoginPopup;
@:template class StartFrame extends FrameView<Void> { @:template class StartFrame extends FrameView<Void> {
@@ -21,8 +20,6 @@ import ru.m.tankz.view.popup.LoginPopup;
@:provide var network:NetworkManager; @:provide var network:NetworkManager;
@:provide var levelBundle:ILevelBundle; @:provide var levelBundle:ILevelBundle;
private var fontPopup:FontPopup;
public function new() { public function new() {
super(ID); super(ID);
} }
@@ -50,15 +47,4 @@ import ru.m.tankz.view.popup.LoginPopup;
case _: case _:
} }
} }
private function choiceFont():Void {
if (fontPopup == null) {
fontPopup = new FontPopup();
}
// ToDo: update Them
/*fontPopup
.show()
.then(function(font) AppTheme.register(font))
.catchError(function(e) {});*/
}
} }

27
src/client/haxe/ru/m/tankz/view/StartFrame.yaml
View File

@@ -1,37 +1,36 @@
--- ---
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
layout.margin: 10 layout.margin: 10
views: views:
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
text: Tank'z text: Tank'z
skinId: font skinId: font
fontSize: 100 fontSize: 100
geometry.margin.bottom: 30 geometry.margin.bottom: 30
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button skinId: button.menu
+onPress: ~startGame('classic') +onPress: ~startGame('classic')
text: Classic text: Classic
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button skinId: button.menu
+onPress: ~startGame('dota') +onPress: ~startGame('dota')
text: DotA text: DotA
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button skinId: button.menu
+onPress: ~startGame('death') +onPress: ~startGame('death')
text: DeathMatch text: DeathMatch
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button skinId: button.menu
+onPress: ~switcher.change('record') +onPress: ~switcher.change('record')
text: Records text: Records
- id: network - id: network
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button skinId: button.menu
+onPress: ~startNetwork() +onPress: ~startNetwork()
text: Network text: Network
#disabled: true - $type: haxework.view.form.LabelView
- $type: haxework.view.LabelView
geometry.hAlign: right geometry.hAlign: right
geometry.vAlign: top geometry.vAlign: top
geometry.padding: [20, 5] geometry.padding: [20, 5]

4
src/client/haxe/ru/m/tankz/view/common/LifeView.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.common; package ru.m.tankz.view.common;
import haxework.color.Color; import haxework.color.Color;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.ImageView; import haxework.view.ImageView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import openfl.Assets; import openfl.Assets;
import ru.m.tankz.game.GameState; import ru.m.tankz.game.GameState;
import ru.m.tankz.Type; import ru.m.tankz.Type;

4
src/client/haxe/ru/m/tankz/view/common/LifeView.yaml
View File

@@ -4,10 +4,10 @@ views:
- id: tank - id: tank
$type: haxework.view.ImageView $type: haxework.view.ImageView
- id: life - id: life
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [50, 38] geometry.size.fixed: [50, 38]
- id: score - id: score
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [100, 38] geometry.size.fixed: [100, 38]

4
src/client/haxe/ru/m/tankz/view/common/RecordView.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.common; package ru.m.tankz.view.common;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.list.ListView; import haxework.view.list.ListView;
import ru.m.tankz.game.GameInit; import ru.m.tankz.game.GameInit;
import ru.m.tankz.game.record.GameRecord; import ru.m.tankz.game.record.GameRecord;

12
src/client/haxe/ru/m/tankz/view/common/RecordView.yaml
View File

@@ -4,26 +4,26 @@ layout.margin: 5
layout.vAlign: middle layout.vAlign: middle
views: views:
- id: play - id: play
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.start.small skinId: button.start.small
+onPress: ~play() +onPress: ~play()
- id: date - id: date
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [250, 38] geometry.size.fixed: [250, 38]
- id: type - id: type
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [250, 38] geometry.size.fixed: [250, 38]
- id: level - id: level
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [50, 38] geometry.size.fixed: [50, 38]
- id: preset - id: preset
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [50, 38] geometry.size.fixed: [50, 38]
- id: delete - id: delete
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.close.small skinId: button.close.small
+onPress: ~delete() +onPress: ~delete()

6
src/client/haxe/ru/m/tankz/view/common/SlotView.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.common; package ru.m.tankz.view.common;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.SelectView; import haxework.view.form.SelectView;
import ru.m.tankz.control.Controller; import ru.m.tankz.control.Controller;
import ru.m.tankz.control.PlayerControl; import ru.m.tankz.control.PlayerControl;

5
src/client/haxe/ru/m/tankz/view/common/SlotView.yaml
View File

@@ -4,13 +4,12 @@ geometry.padding: 2
layout.margin: 10 layout.margin: 10
views: views:
- id: slot - id: slot
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 100% geometry.size.height: 100%
geometry.size.width: 150 geometry.size.width: 150
- id: select - id: select
$type: haxework.view.SelectView<ru.m.tankz.control.Controller> $type: haxework.view.form.SelectView<ru.m.tankz.control.Controller>
labelSkinId: text.box
labelBuilder: | labelBuilder: |
~function(controller) { ~function(controller) {
var result = ControllerParser.defaultName(controller); var result = ControllerParser.defaultName(controller);

4
src/client/haxe/ru/m/tankz/view/game/ClassicGamePanel.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.game; package ru.m.tankz.view.game;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.VGroupView; import haxework.view.group.VGroupView;
import ru.m.geom.Direction; import ru.m.geom.Direction;
import ru.m.tankz.game.GameEvent; import ru.m.tankz.game.GameEvent;
import ru.m.tankz.game.GameState; import ru.m.tankz.game.GameState;

2
src/client/haxe/ru/m/tankz/view/game/ClassicGamePanel.yaml
View File

@@ -5,7 +5,7 @@ layout.margin: 5
layout.hAlign: left layout.hAlign: left
views: views:
- id: level - id: level
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 38 geometry.size.height: 38
geometry.size.width: 100% geometry.size.width: 100%

6
src/client/haxe/ru/m/tankz/view/game/DeathGamePanel.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.game; package ru.m.tankz.view.game;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.VGroupView; import haxework.view.group.VGroupView;
import ru.m.geom.Direction; import ru.m.geom.Direction;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.game.GameEvent; import ru.m.tankz.game.GameEvent;

4
src/client/haxe/ru/m/tankz/view/game/DeathGamePanel.yaml
View File

@@ -5,14 +5,14 @@ layout.margin: 5
layout.hAlign: right layout.hAlign: right
views: views:
- id: level - id: level
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 38 geometry.size.height: 38
geometry.size.width: 100% geometry.size.width: 100%
- $type: haxework.view.SpriteView - $type: haxework.view.SpriteView
geometry.size.height: 50% geometry.size.height: 50%
- id: players - id: players
$type: haxework.view.DataView $type: haxework.view.data.DataView
layout: layout:
$type: haxework.view.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
factory: ~ru.m.tankz.view.common.LifeView.factory factory: ~ru.m.tankz.view.common.LifeView.factory

4
src/client/haxe/ru/m/tankz/view/game/DotaGamePanel.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.game; package ru.m.tankz.view.game;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import ru.m.geom.Direction; import ru.m.geom.Direction;
import ru.m.tankz.game.GameEvent; import ru.m.tankz.game.GameEvent;
import ru.m.tankz.game.GameState; import ru.m.tankz.game.GameState;

2
src/client/haxe/ru/m/tankz/view/game/DotaGamePanel.yaml
View File

@@ -9,7 +9,7 @@ views:
- $type: haxework.view.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 25% geometry.size.width: 25%
- id: level - id: level
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 38 geometry.size.height: 38
geometry.size.width: 50% geometry.size.width: 50%

4
src/client/haxe/ru/m/tankz/view/game/GameView.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.game; package ru.m.tankz.view.game;
import haxework.view.IGroupView; import haxework.view.group.IGroupView;
import haxework.view.VGroupView; import haxework.view.group.VGroupView;
import ru.m.geom.Direction; import ru.m.geom.Direction;
import ru.m.tankz.preset.ClassicGame; import ru.m.tankz.preset.ClassicGame;
import ru.m.tankz.preset.DeathGame; import ru.m.tankz.preset.DeathGame;

10
src/client/haxe/ru/m/tankz/view/game/GameView.yaml
View File

@@ -1,22 +1,22 @@
--- ---
views: views:
- id: top - id: top
$type: haxework.view.GroupView $type: haxework.view.group.GroupView
layout.hAlign: center layout.hAlign: center
geometry.size.width: 100% geometry.size.width: 100%
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
views: views:
- id: left - id: left
$type: haxework.view.GroupView $type: haxework.view.group.GroupView
layout.vAlign: middle layout.vAlign: middle
geometry.size.height: 100% geometry.size.height: 100%
- id: render - id: render
$type: ru.m.tankz.render.Render $type: ru.m.tankz.render.Render
- id: right - id: right
$type: haxework.view.GroupView $type: haxework.view.group.GroupView
layout.vAlign: middle layout.vAlign: middle
geometry.size.height: 100% geometry.size.height: 100%
- id: bottom - id: bottom
$type: haxework.view.GroupView $type: haxework.view.group.GroupView
layout.hAlign: center layout.hAlign: center
geometry.size.width: 100% geometry.size.width: 100%

4
src/client/haxe/ru/m/tankz/view/network/RoomFrame.hx
View File

@@ -1,10 +1,10 @@
package ru.m.tankz.view.network; package ru.m.tankz.view.network;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.view.frame.FrameView; import haxework.view.frame.FrameView;
import haxework.view.list.VListView; import haxework.view.list.VListView;
import haxework.view.TextView; import haxework.view.text.TextView;
import ru.m.tankz.game.GameInit; import ru.m.tankz.game.GameInit;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.room.RoomProto; import ru.m.tankz.proto.room.RoomProto;

14
src/client/haxe/ru/m/tankz/view/network/RoomFrame.yaml
View File

@@ -3,32 +3,30 @@ geometry.size.stretch: true
layout: layout:
$type: haxework.view.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
geometry.padding: 20 geometry.padding: 20
layout.margin: 10 layout.margin: 10
views: views:
- id: header - id: header
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.margin.bottom: 20 geometry.margin.bottom: 20
skinId: text.header skinId: text.header
text: Game Room text: Game Room
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
layout.margin: 10 layout.margin: 10
views: views:
- id: info - id: info
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.padding: [30, 10] geometry.padding: [30, 10]
skinId: text.box skinId: text.box
- id: start - id: start
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.simple
text: Start text: Start
+onPress: ~network.startGame() +onPress: ~network.startGame()
visible: false visible: false
- id: leave - id: leave
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.simple
text: Leave text: Leave
+onPress: ~network.leaveGame() +onPress: ~network.leaveGame()
- $type: haxework.view.SpriteView - $type: haxework.view.SpriteView

6
src/client/haxe/ru/m/tankz/view/network/RoomItemView.hx
View File

@@ -2,9 +2,9 @@ package ru.m.tankz.view.network;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;
import ru.m.tankz.proto.room.RoomSlotProto; import ru.m.tankz.proto.room.RoomSlotProto;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.list.ListView; import haxework.view.list.ListView;
import ru.m.tankz.proto.room.RoomProto; import ru.m.tankz.proto.room.RoomProto;

9
src/client/haxe/ru/m/tankz/view/network/RoomItemView.yaml
View File

@@ -5,23 +5,22 @@ layout.margin: 10
layout.hAlign: center layout.hAlign: center
views: views:
- id: creator - id: creator
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.height: 100% geometry.size.height: 100%
geometry.size.width: 200 geometry.size.width: 200
skinId: text.box skinId: text.box
- id: type - id: type
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.height: 100% geometry.size.height: 100%
geometry.size.width: 200 geometry.size.width: 200
skinId: text.box skinId: text.box
- id: users - id: users
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.height: 100% geometry.size.height: 100%
geometry.size.width: 150 geometry.size.width: 150
skinId: text.box skinId: text.box
- id: join - id: join
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
geometry.size.height: 100% geometry.size.height: 100%
skinId: button.simple
text: Join text: Join
+onPress: ~join() +onPress: ~join()

7
src/client/haxe/ru/m/tankz/view/network/RoomListFrame.yaml
View File

@@ -3,17 +3,16 @@ geometry.size.stretch: true
layout: layout:
$type: haxework.view.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
views: views:
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
skinId: container skinId: container
geometry.padding: 20 geometry.padding: 20
views: views:
- id: header - id: header
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.margin.bottom: 20 geometry.margin.bottom: 20
skinId: text.header skinId: text.header
text: Games List text: Games List
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button.simple
text: Create text: Create
+onPress: ~create() +onPress: ~create()
- id: games - id: games

6
src/client/haxe/ru/m/tankz/view/network/SlotItemView.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.network; package ru.m.tankz.view.network;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.list.ListView; import haxework.view.list.ListView;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;

9
src/client/haxe/ru/m/tankz/view/network/SlotItemView.yaml
View File

@@ -4,22 +4,21 @@ geometry.padding: 2
layout.margin: 10 layout.margin: 10
views: views:
- id: type - id: type
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 100% geometry.size.height: 100%
geometry.size.width: 150 geometry.size.width: 150
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
layout.hAlign: center layout.hAlign: center
layout.vAlign: middle layout.vAlign: middle
geometry.size.height: 100% geometry.size.height: 100%
geometry.size.width: 300 geometry.size.width: 300
views: views:
- id: user - id: user
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.stretch: true geometry.size.stretch: true
skinId: text.box skinId: text.box
- id: select - id: select
$type: haxework.view.ButtonView $type: haxework.view.form.ButtonView
skinId: button.simple
text: Select text: Select
+onPress: ~select() +onPress: ~select()

5
src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.popup; package ru.m.tankz.view.popup;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.popup.PopupView; import haxework.view.popup.PopupView;
import haxework.view.ToggleButtonView; import haxework.view.form.ToggleButtonView;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.bundle.ILevelBundle; import ru.m.tankz.bundle.ILevelBundle;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;
@@ -35,7 +35,6 @@ private typedef Result = {
private function gameTypeViewFactory(index:Int, type:GameType):ToggleButtonView { private function gameTypeViewFactory(index:Int, type:GameType):ToggleButtonView {
var result = new ToggleButtonView(); var result = new ToggleButtonView();
result.skinId = "button.simple";
result.text = type; result.text = type;
result.on = type == this.type; result.on = type == this.type;
return result; return result;

23
src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml
View File

@@ -2,39 +2,39 @@
layout.hAlign: center layout.hAlign: center
layout.vAlign: middle layout.vAlign: middle
view: view:
$type: haxework.view.VGroupView $type: haxework.view.group.VGroupView
layout.hAlign: center layout.hAlign: center
geometry.size.stretch: true geometry.size.stretch: true
geometry.margin: 10 geometry.margin: 10
skinId: window skinId: window
views: views:
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
geometry.size.width: 100% geometry.size.width: 100%
geometry.padding: 10 geometry.padding: 10
layout.vAlign: middle layout.vAlign: middle
views: views:
- id: name - id: name
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
geometry.margin.left: 10 geometry.margin.left: 10
layout.hAlign: left layout.hAlign: left
skinId: text skinId: text
text: New game text: New game
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: window.close skinId: window.close
+onPress: ~reject('close') +onPress: ~reject('close')
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
geometry.size.stretch: true geometry.size.stretch: true
geometry.padding: [5, 20] geometry.padding: [5, 20]
layout.margin: 5 layout.margin: 5
layout.hAlign: center layout.hAlign: center
views: views:
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
skinId: text skinId: text
text: Type text: Type
- id: type - id: type
$type: haxework.view.DataView $type: haxework.view.data.DataView
geometry.size.width: 100% geometry.size.width: 100%
layout: layout:
$type: haxework.view.layout.TailLayout $type: haxework.view.layout.TailLayout
@@ -45,7 +45,7 @@ view:
- "classic" - "classic"
- "dota" - "dota"
- "death" - "death"
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
skinId: text skinId: text
text: Level text: Level
@@ -54,7 +54,7 @@ view:
scroll.skinId: scroll.vertical scroll.skinId: scroll.vertical
view: view:
id: level id: level
$type: haxework.view.DataView $type: haxework.view.data.DataView
geometry.size.width: 100% geometry.size.width: 100%
layout: layout:
$type: haxework.view.layout.TailLayout $type: haxework.view.layout.TailLayout
@@ -63,12 +63,11 @@ view:
factory: ~levelViewFactory factory: ~levelViewFactory
+onItemSelect: ~onLevelSelect +onItemSelect: ~onLevelSelect
geometry.padding: 10 geometry.padding: 10
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
layout.hAlign: center layout.hAlign: center
layout.margin: 5 layout.margin: 5
skinId: panel skinId: panel
views: views:
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button.simple
text: Create text: Create
+onPress: ~submit() +onPress: ~submit()

41
src/client/haxe/ru/m/tankz/view/popup/FontPopup.hx
View File

@@ -1,41 +0,0 @@
package ru.m.tankz.view.popup;
import flash.text.Font;
import flash.text.FontType;
import haxework.view.list.LabelListItem;
import haxework.view.list.ListView;
import haxework.view.popup.PopupView;
class FontLabelView extends LabelListItem<Font> {
override private function set_data(value:Font):Font {
skinId = item_index % 2 == 0 ? "light" : "dark";
data = value;
text = value.fontName;
fontFamily = value.fontName;
fontEmbed = switch value.fontType {
case DEVICE: false;
case _: true;
};
return data;
}
}
@:template class FontPopup extends PopupView<Font> {
@:view var fonts:ListView<Font>;
private function init():Void {
var values = Font.enumerateFonts(true);
values.sort(function(a:Font, b:Font) {
return switch [a.fontType, b.fontType] {
case [DEVICE, _]: 1;
case [_, DEVICE]: -1;
case _: 0;
}
});
fonts.data = values;
}
private function fontViewFactory() return new FontLabelView();
}

27
src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml
View File

@@ -1,27 +0,0 @@
---
view:
$type: haxework.view.VGroupView
geometry.size.width: 400
geometry.size.height: 80%
geometry.padding: 10
geometry.hAlign: center
geometry.vAlign: middle
skinId: dark
views:
- id: fonts
$type: haxework.view.list.VListView
geometry.size.stretch: true
factory: ~fontViewFactory
+onItemSelect: ~function(item) close(item.data)
scroll:
$type: haxework.view.list.VScrollBarView
skinId: scroll.vertical
- $type: haxework.view.HGroupView
geometry.size.width: 100%
geometry.margin.top: 10
layout.hAlign: right
views:
- $type: haxework.view.ButtonView
skinId: button.simple
text: Cancel
+onPress: ~reject('cancel')

8
src/client/haxe/ru/m/tankz/view/popup/LevelPopup.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.popup; package ru.m.tankz.view.popup;
using haxe.EnumTools.EnumValueTools; using haxe.EnumTools.EnumValueTools;
import haxework.view.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.popup.PopupView; import haxework.view.popup.PopupView;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;
import ru.m.tankz.control.Controller; import ru.m.tankz.control.Controller;
@@ -62,7 +62,7 @@ private typedef Result = {
private function presetViewFactory(index:Int, value:GamePreset):ButtonView { private function presetViewFactory(index:Int, value:GamePreset):ButtonView {
var result = new ButtonView(); var result = new ButtonView();
result.skinId = 'button.simple${!progress.isPresetCompleted(level.id, value.id) ? ".active" : ""}'; result.skinId = 'button${!progress.isPresetCompleted(level.id, value.id) ? ".active" : ""}';
result.text = value.name; result.text = value.name;
result.disabled = !progress.isPresetAvailable(level.id, value.id); result.disabled = !progress.isPresetAvailable(level.id, value.id);
return result; return result;

12
src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml
View File

@@ -2,25 +2,25 @@
layout.hAlign: center layout.hAlign: center
layout.vAlign: middle layout.vAlign: middle
view: view:
$type: haxework.view.VGroupView $type: haxework.view.group.VGroupView
layout.hAlign: center layout.hAlign: center
geometry.size.width: 400 geometry.size.width: 400
geometry.size.height: 400 geometry.size.height: 400
geometry.margin: 10 geometry.margin: 10
skinId: window skinId: window
views: views:
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
geometry.size.width: 100% geometry.size.width: 100%
geometry.padding: 10 geometry.padding: 10
layout.vAlign: middle layout.vAlign: middle
views: views:
- id: name - id: name
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
geometry.margin.left: 10 geometry.margin.left: 10
layout.hAlign: left layout.hAlign: left
skinId: text skinId: text
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: window.close skinId: window.close
+onPress: ~reject('close') +onPress: ~reject('close')
- $type: haxework.view.ScrollView - $type: haxework.view.ScrollView
@@ -29,7 +29,7 @@ view:
scroll.skinId: scroll.vertical scroll.skinId: scroll.vertical
view: view:
id: slots id: slots
$type: haxework.view.DataView $type: haxework.view.data.DataView
geometry.padding: 10 geometry.padding: 10
factory: ~slotViewFactory factory: ~slotViewFactory
layout: layout:
@@ -37,7 +37,7 @@ view:
# $type: haxework.view.layout.TailLayout # $type: haxework.view.layout.TailLayout
margin: 5 margin: 5
- id: presets - id: presets
$type: haxework.view.DataView $type: haxework.view.data.DataView
factory: ~presetViewFactory factory: ~presetViewFactory
+onDataSelect: ~onPresetSelect +onDataSelect: ~onPresetSelect
layout: layout:

4
src/client/haxe/ru/m/tankz/view/popup/LoginPopup.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.popup; package ru.m.tankz.view.popup;
import haxework.log.BaseLogger.LoggerUtil; import haxework.log.BaseLogger.LoggerUtil;
import haxework.view.InputView; import haxework.view.form.InputView;
import haxework.view.popup.PopupView; import haxework.view.popup.PopupView;
import haxework.view.TextView; import haxework.view.text.TextView;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;
@:template class LoginPopup extends PopupView<User> { @:template class LoginPopup extends PopupView<User> {

25
src/client/haxe/ru/m/tankz/view/popup/LoginPopup.yaml
View File

@@ -2,65 +2,64 @@
layout.hAlign: center layout.hAlign: center
layout.vAlign: middle layout.vAlign: middle
view: view:
$type: haxework.view.VGroupView $type: haxework.view.group.VGroupView
layout.hAlign: center layout.hAlign: center
geometry.size.width: 400 geometry.size.width: 400
# geometry.size.height: 400 # geometry.size.height: 400
skinId: window skinId: window
views: views:
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
geometry.size.width: 100% geometry.size.width: 100%
geometry.padding: 10 geometry.padding: 10
layout.vAlign: middle layout.vAlign: middle
views: views:
- id: name - id: name
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
geometry.margin.left: 10 geometry.margin.left: 10
layout.hAlign: left layout.hAlign: left
skinId: text skinId: text
text: Login text: Login
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: window.close skinId: window.close
+onPress: ~reject('close') +onPress: ~reject('close')
- $type: haxework.view.VGroupView - $type: haxework.view.group.VGroupView
geometry.size.width: 100% geometry.size.width: 100%
# geometry.size.stretch: true # geometry.size.stretch: true
geometry.padding: 20 geometry.padding: 20
layout.margin: 5 layout.margin: 5
views: views:
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
skinId: text skinId: text
text: Username text: Username
- id: username - id: username
$type: haxework.view.InputView $type: haxework.view.form.InputView
geometry.size.width: 100% geometry.size.width: 100%
geometry.size.height: 28 geometry.size.height: 28
skinId: text.box skinId: text.box
- $type: haxework.view.LabelView - $type: haxework.view.form.LabelView
geometry.size.width: 100% geometry.size.width: 100%
skinId: text skinId: text
text: Password text: Password
visible: false visible: false
- id: password - id: password
$type: haxework.view.InputView $type: haxework.view.form.InputView
textField.displayAsPassword: true textField.displayAsPassword: true
geometry.size.width: 100% geometry.size.width: 100%
geometry.size.height: 28 geometry.size.height: 28
skinId: text.box skinId: text.box
visible: false visible: false
- id: error - id: error
$type: haxework.view.TextView $type: haxework.view.text.TextView
geometry.size.width: 100% geometry.size.width: 100%
skinId: text skinId: text
fill: false fill: false
- $type: haxework.view.HGroupView - $type: haxework.view.group.HGroupView
layout.hAlign: center layout.hAlign: center
layout.margin: 5 layout.margin: 5
skinId: panel skinId: panel
views: views:
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
skinId: button.simple
text: Submit text: Submit
+onPress: ~submit() +onPress: ~submit()

4
src/client/haxe/ru/m/tankz/view/settings/ActionView.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.settings; package ru.m.tankz.view.settings;
import haxework.view.HGroupView; import haxework.view.group.HGroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.list.ListView; import haxework.view.list.ListView;
import openfl.Assets; import openfl.Assets;
import ru.m.control.DeviceAction; import ru.m.control.DeviceAction;

4
src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml
View File

@@ -3,10 +3,10 @@ geometry.margin: 5
layout.margin: 5 layout.margin: 5
views: views:
- id: action - id: action
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.fixed: [180, 38] geometry.size.fixed: [180, 38]
skinId: text.box skinId: text.box
- id: key - id: key
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
geometry.size.fixed: [250, 38] geometry.size.fixed: [250, 38]
skinId: text.box skinId: text.box

8
src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.settings; package ru.m.tankz.view.settings;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.GroupView; import haxework.view.group.GroupView;
import haxework.view.LabelView; import haxework.view.form.LabelView;
import haxework.view.VGroupView; import haxework.view.group.VGroupView;
import promhx.Deferred; import promhx.Deferred;
import promhx.Promise; import promhx.Promise;
import ru.m.control.DeviceAction; import ru.m.control.DeviceAction;

18
src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml
View File

@@ -3,34 +3,30 @@ layout.hAlign: center
geometry.size.width: 400 geometry.size.width: 400
views: views:
- id: label - id: label
$type: haxework.view.LabelView $type: haxework.view.form.LabelView
skinId: text skinId: text
- id: panel - id: panel
$type: haxework.view.GroupView $type: haxework.view.group.GroupView
layout: layout:
$type: haxework.view.layout.TailLayout $type: haxework.view.layout.TailLayout
rowSize: 2 rowSize: 2
margin: 10 margin: 10
geometry.size.width: 100% geometry.size.width: 100%
views: views:
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
+onPress: ~screen() +onPress: ~screen()
skinId: button.simple
text: Screen text: Screen
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
+onPress: ~change() +onPress: ~change()
skinId: button.simple
text: Change text: Change
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
+onPress: ~clear() +onPress: ~clear()
skinId: button.simple
text: Clear text: Clear
- $type: haxework.view.ButtonView - $type: haxework.view.form.ButtonView
+onPress: ~default_() +onPress: ~default_()
skinId: button.simple
text: Default text: Default
- id: list - id: list
$type: haxework.view.DataView $type: haxework.view.data.DataView
layout: layout:
$type: haxework.view.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
factory: ~viewFactory factory: ~viewFactory

2
src/editor/haxe/ru/m/tankz/editor/view/EditorView.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.editor.view; package ru.m.tankz.editor.view;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.view.VGroupView; import haxework.view.group.VGroupView;
@:template class EditorView extends VGroupView { @:template class EditorView extends VGroupView {
@:view public var switcher(default, null):FrameSwitcher; @:view public var switcher(default, null):FrameSwitcher;

4
src/editor/haxe/ru/m/tankz/editor/view/MapFrame.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.editor.view; package ru.m.tankz.editor.view;
import haxework.view.DataView; import haxework.view.data.DataView;
import haxework.view.frame.FrameView; import haxework.view.frame.FrameView;
import haxework.view.InputView; import haxework.view.form.InputView;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;
import ru.m.tankz.editor.FileUtil; import ru.m.tankz.editor.FileUtil;

2
src/editor/haxe/ru/m/tankz/editor/view/TankFrame.hx
View File

@@ -3,7 +3,7 @@ package ru.m.tankz.editor.view;
import haxework.color.Color; import haxework.color.Color;
import haxework.view.frame.FrameView; import haxework.view.frame.FrameView;
import haxework.view.IGroupView; import haxework.view.IGroupView;
import haxework.view.InputView; import haxework.view.form.InputView;
import ru.m.tankz.editor.view.tank.TankView; import ru.m.tankz.editor.view.tank.TankView;
@:template class TankFrame extends FrameView<Dynamic> { @:template class TankFrame extends FrameView<Dynamic> {