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

update

Browse Source
This commit is contained in:
shmyga
2020-02-13 22:31:43 +03:00
parent 8667336c12
commit 19f564c996
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "puzzlez", "name": "puzzlez",
"version": "0.3.0", "version": "0.3.1",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"dateformat": "^3.0.3", "dateformat": "^3.0.3",

6
src/haxe/ru/m/puzzlez/PuzzlezApp.hx
View File

@@ -2,7 +2,6 @@ package ru.m.puzzlez;
import haxework.App; import haxework.App;
import haxework.log.TraceLogger; import haxework.log.TraceLogger;
import haxework.provider.Provider;
import ru.m.puzzlez.storage.GameStorage; import ru.m.puzzlez.storage.GameStorage;
import ru.m.puzzlez.storage.ImageStorage; import ru.m.puzzlez.storage.ImageStorage;
import ru.m.puzzlez.view.PuzzlezAppView; import ru.m.puzzlez.view.PuzzlezAppView;
@@ -11,9 +10,8 @@ class PuzzlezApp extends App {
public static function main() { public static function main() {
// ToDo: fix @:provide macro // ToDo: fix @:provide macro
Provider.instance.setFactory(ImageStorage, ImageStorage); GameStorage;
Provider.instance.setFactory(GameStorage, GameStorage); ImageStorage;
L.push(new TraceLogger()); L.push(new TraceLogger());
var app = new PuzzlezApp(new PuzzlezTheme(), openfl.Assets.getBitmapData("resources/icon.png")); var app = new PuzzlezApp(new PuzzlezTheme(), openfl.Assets.getBitmapData("resources/icon.png"));
var view = new PuzzlezAppView(); var view = new PuzzlezAppView();

7
src/haxe/ru/m/puzzlez/view/StartFrame.hx
View File

@@ -1,5 +1,6 @@
package ru.m.puzzlez.view; package ru.m.puzzlez.view;
import haxe.DynamicAccess;
import haxework.view.data.DataView; import haxework.view.data.DataView;
import haxework.view.form.ButtonView; import haxework.view.form.ButtonView;
import haxework.view.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
@@ -15,6 +16,8 @@ import ru.m.puzzlez.storage.ImageStorage;
public static var ID = "start"; public static var ID = "start";
@:view var sources:DataView<ImageListSource<Dynamic>, ButtonView>; @:view var sources:DataView<ImageListSource<Dynamic>, ButtonView>;
@:view("load") var loadButton:ButtonView;
@:provide var storage:ImageStorage; @:provide var storage:ImageStorage;
@:provide var switcher:FrameSwitcher; @:provide var switcher:FrameSwitcher;
@:provide var gameStorage:GameStorage; @:provide var gameStorage:GameStorage;
@@ -30,6 +33,10 @@ import ru.m.puzzlez.storage.ImageStorage;
sources.data = data; sources.data = data;
} }
override public function onShow(data:Dynamic):Void {
loadButton.text = 'Load (${gameStorage.list().length})';
}
private function sourceViewFactory(index:Int, source:ImageListSource<Dynamic>):ButtonView { private function sourceViewFactory(index:Int, source:ImageListSource<Dynamic>):ButtonView {
var result = new ButtonView(); var result = new ButtonView();
result.text = Std.string(source.type != null ? source.type : "custom"); result.text = Std.string(source.type != null ? source.type : "custom");

3
src/haxe/ru/m/puzzlez/view/StartFrame.yaml
View File

@@ -22,7 +22,8 @@ views:
geometry.width: 100% geometry.width: 100%
layout.vAlign: middle layout.vAlign: middle
views: views:
- $type: haxework.view.form.ButtonView - id: load
$type: haxework.view.form.ButtonView
text: Load text: Load
+onPress: ~switcher.change('game_list') +onPress: ~switcher.change('game_list')
- $type: haxework.view.SpriteView - $type: haxework.view.SpriteView