From 86345117f7d6c6a88dc58a80966780cb066c2386 Mon Sep 17 00:00:00 2001 From: shmyga Date: Fri, 17 Apr 2026 11:51:21 +0300 Subject: [PATCH] feat(app): update icons --- src/app/haxe/ru/m/puzzlez/PuzzlezTheme.hx | 19 +++++++++++-------- .../haxe/ru/m/puzzlez/settings/Settings.hx | 9 +++++++-- src/app/haxe/ru/m/puzzlez/view/GameFrame.yaml | 4 +++- src/app/haxe/ru/m/skin/ButtonSVGSkin.hx | 3 ++- .../icon/arrow-alt-circle-left-solid.svg | 1 - .../icon/arrow-alt-circle-right-solid.svg | 1 - src/app/resources/icon/arrow-collapse-all.svg | 4 ++++ src/app/resources/icon/arrow-expand-all.svg | 4 ++++ src/app/resources/icon/bars-solid.svg | 1 - src/app/resources/icon/clone.svg | 1 - src/app/resources/icon/close-circle.svg | 4 ++++ src/app/resources/icon/cog-solid.svg | 1 - src/app/resources/icon/cog.svg | 4 ++++ src/app/resources/icon/compress-solid.svg | 1 - src/app/resources/icon/expand-solid.svg | 1 - .../resources/icon/format-align-justify.svg | 3 +++ src/app/resources/icon/image-polaroid.svg | 6 ------ src/app/resources/icon/image-solid.svg | 1 - src/app/resources/icon/image.svg | 4 ++++ src/app/resources/icon/lock-alt-solid.svg | 6 ------ src/app/resources/icon/lock-open.svg | 4 ++++ src/app/resources/icon/lock.svg | 4 ++++ src/app/resources/icon/shuffle.svg | 4 ++++ src/app/resources/icon/times-circle-solid.svg | 1 - src/app/resources/icon/window-close-solid.svg | 1 - .../resources/icon/window-restore-solid.svg | 6 ------ src/app/resources/icon/window-restore.svg | 3 +++ 27 files changed, 61 insertions(+), 40 deletions(-) delete mode 100644 src/app/resources/icon/arrow-alt-circle-left-solid.svg delete mode 100644 src/app/resources/icon/arrow-alt-circle-right-solid.svg create mode 100644 src/app/resources/icon/arrow-collapse-all.svg create mode 100644 src/app/resources/icon/arrow-expand-all.svg delete mode 100644 src/app/resources/icon/bars-solid.svg delete mode 100644 src/app/resources/icon/clone.svg create mode 100644 src/app/resources/icon/close-circle.svg delete mode 100644 src/app/resources/icon/cog-solid.svg create mode 100644 src/app/resources/icon/cog.svg delete mode 100644 src/app/resources/icon/compress-solid.svg delete mode 100644 src/app/resources/icon/expand-solid.svg create mode 100644 src/app/resources/icon/format-align-justify.svg delete mode 100644 src/app/resources/icon/image-polaroid.svg delete mode 100644 src/app/resources/icon/image-solid.svg create mode 100644 src/app/resources/icon/image.svg delete mode 100644 src/app/resources/icon/lock-alt-solid.svg create mode 100644 src/app/resources/icon/lock-open.svg create mode 100644 src/app/resources/icon/lock.svg create mode 100644 src/app/resources/icon/shuffle.svg delete mode 100644 src/app/resources/icon/times-circle-solid.svg delete mode 100644 src/app/resources/icon/window-close-solid.svg delete mode 100644 src/app/resources/icon/window-restore-solid.svg create mode 100644 src/app/resources/icon/window-restore.svg diff --git a/src/app/haxe/ru/m/puzzlez/PuzzlezTheme.hx b/src/app/haxe/ru/m/puzzlez/PuzzlezTheme.hx index 6c5c53a..b3d967c 100644 --- a/src/app/haxe/ru/m/puzzlez/PuzzlezTheme.hx +++ b/src/app/haxe/ru/m/puzzlez/PuzzlezTheme.hx @@ -11,14 +11,16 @@ import ru.m.skin.ButtonSVGSkin; class PuzzlezTheme extends Theme { private static var ICONS:Map = [ - "close" => "times-circle-solid.svg", - "setting" => "cog-solid.svg", - "image" => "image-polaroid.svg", - "lock" => "lock-alt-solid.svg", - "restore" => "window-restore-solid.svg", - "compress" => "compress-solid.svg", - "expand" => "expand-solid.svg", - "spread" => "clone.svg", + "close" => "close-circle.svg", + "setting" => "cog.svg", + "image" => "image.svg", + "lock" => "lock.svg", + "lock-open" => "lock-open.svg", + "restore" => "window-restore.svg", + "compress" => "arrow-collapse-all.svg", + "expand" => "arrow-expand-all.svg", + "shuffle" => "shuffle.svg", + "spread" => "format-align-justify.svg", ]; public function new() { @@ -41,6 +43,7 @@ class PuzzlezTheme extends Theme { "geometry.height" => SizeValue.fromString("8h"), "skin" => function() return new ButtonSVGSkin(), "skin.color" => colors.light, + "skin.svgScale" => 16.0, ])); for (key in ICONS.keys()) { register(new Style('icon.${key}', ["skin.svg" => Assets.getText('resources/icon/${ICONS.get(key)}'),])); diff --git a/src/app/haxe/ru/m/puzzlez/settings/Settings.hx b/src/app/haxe/ru/m/puzzlez/settings/Settings.hx index d5b9c32..b04fe77 100644 --- a/src/app/haxe/ru/m/puzzlez/settings/Settings.hx +++ b/src/app/haxe/ru/m/puzzlez/settings/Settings.hx @@ -1,6 +1,7 @@ package ru.m.puzzlez.settings; import hw.storage.SharedObjectStorage; +import ru.m.puzzlez.proto.game.ImageId; import ru.m.puzzlez.render.Background; @:provide class Settings extends SharedObjectStorage { @@ -10,8 +11,12 @@ import ru.m.puzzlez.render.Background; public var background(get, set):Background; + private function defaultBackground():Background { + return Background.IMAGE(new ImageId().setSource('asset').setId('resources/texture/pool-table.png')); + } + private inline function get_background():Background { - return exists(BACKGROUND_KEY) ? read(BACKGROUND_KEY) : NONE; + return exists(BACKGROUND_KEY) ? read(BACKGROUND_KEY) : this.defaultBackground(); } private inline function set_background(value:Background):Background { @@ -22,7 +27,7 @@ import ru.m.puzzlez.render.Background; public var locked(get, set):Bool; private inline function get_locked():Bool { - return exists(LOCKED_KEY) ? read(LOCKED_KEY) : false; + return exists(LOCKED_KEY) ? read(LOCKED_KEY) : true; } private inline function set_locked(value:Bool):Bool { diff --git a/src/app/haxe/ru/m/puzzlez/view/GameFrame.yaml b/src/app/haxe/ru/m/puzzlez/view/GameFrame.yaml index 192a6aa..cfb6627 100644 --- a/src/app/haxe/ru/m/puzzlez/view/GameFrame.yaml +++ b/src/app/haxe/ru/m/puzzlez/view/GameFrame.yaml @@ -22,11 +22,13 @@ views: settings.locked = render.manager.locked; cast(button, hw.view.form.ToggleButtonView).on = !render.manager.locked; } + visible: false - $type: hw.view.form.ButtonView style: icon.restore +onPress: ~render.manager.reset() + visible: false - $type: hw.view.form.ButtonView - style: icon.spread + style: icon.shuffle +onPress: ~shuffle() - $type: hw.view.form.ButtonView style: icon.spread diff --git a/src/app/haxe/ru/m/skin/ButtonSVGSkin.hx b/src/app/haxe/ru/m/skin/ButtonSVGSkin.hx index 09c1386..8b2d642 100644 --- a/src/app/haxe/ru/m/skin/ButtonSVGSkin.hx +++ b/src/app/haxe/ru/m/skin/ButtonSVGSkin.hx @@ -13,6 +13,7 @@ using hw.color.ColorUtil; @:style(null) public var svg:String; @:style(0) public var color:Null; @:style(false) public var solid:Null; + @:style(0.8) public var svgScale:Null; private var svgs:Map; private var needUpdate:Bool; @@ -60,7 +61,7 @@ using hw.color.ColorUtil; graphics.lineStyle(2, color.multiply(1.5)); } // ToDo: padding - svg.render(graphics, 0, 0, Std.int(view.width * 0.8), Std.int(view.height * 0.8)); + svg.render(graphics, 0, 0, Std.int(view.width * this.svgScale), Std.int(view.height * this.svgScale)); graphics.lineStyle(); graphics.endFill(); } diff --git a/src/app/resources/icon/arrow-alt-circle-left-solid.svg b/src/app/resources/icon/arrow-alt-circle-left-solid.svg deleted file mode 100644 index 32c31ee..0000000 --- a/src/app/resources/icon/arrow-alt-circle-left-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/arrow-alt-circle-right-solid.svg b/src/app/resources/icon/arrow-alt-circle-right-solid.svg deleted file mode 100644 index 523c283..0000000 --- a/src/app/resources/icon/arrow-alt-circle-right-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/arrow-collapse-all.svg b/src/app/resources/icon/arrow-collapse-all.svg new file mode 100644 index 0000000..8c66dab --- /dev/null +++ b/src/app/resources/icon/arrow-collapse-all.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/arrow-expand-all.svg b/src/app/resources/icon/arrow-expand-all.svg new file mode 100644 index 0000000..f350b8d --- /dev/null +++ b/src/app/resources/icon/arrow-expand-all.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/bars-solid.svg b/src/app/resources/icon/bars-solid.svg deleted file mode 100644 index 8a8b715..0000000 --- a/src/app/resources/icon/bars-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/clone.svg b/src/app/resources/icon/clone.svg deleted file mode 100644 index e85aefc..0000000 --- a/src/app/resources/icon/clone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/close-circle.svg b/src/app/resources/icon/close-circle.svg new file mode 100644 index 0000000..f4eba5f --- /dev/null +++ b/src/app/resources/icon/close-circle.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/cog-solid.svg b/src/app/resources/icon/cog-solid.svg deleted file mode 100644 index 0bc8d22..0000000 --- a/src/app/resources/icon/cog-solid.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/resources/icon/cog.svg b/src/app/resources/icon/cog.svg new file mode 100644 index 0000000..599f6f1 --- /dev/null +++ b/src/app/resources/icon/cog.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/compress-solid.svg b/src/app/resources/icon/compress-solid.svg deleted file mode 100644 index c34dbc6..0000000 --- a/src/app/resources/icon/compress-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/expand-solid.svg b/src/app/resources/icon/expand-solid.svg deleted file mode 100644 index c5eb790..0000000 --- a/src/app/resources/icon/expand-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/format-align-justify.svg b/src/app/resources/icon/format-align-justify.svg new file mode 100644 index 0000000..1e8215b --- /dev/null +++ b/src/app/resources/icon/format-align-justify.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/image-polaroid.svg b/src/app/resources/icon/image-polaroid.svg deleted file mode 100644 index 3827f3f..0000000 --- a/src/app/resources/icon/image-polaroid.svg +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/src/app/resources/icon/image-solid.svg b/src/app/resources/icon/image-solid.svg deleted file mode 100644 index 2f912f9..0000000 --- a/src/app/resources/icon/image-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/image.svg b/src/app/resources/icon/image.svg new file mode 100644 index 0000000..4269412 --- /dev/null +++ b/src/app/resources/icon/image.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/lock-alt-solid.svg b/src/app/resources/icon/lock-alt-solid.svg deleted file mode 100644 index 5b2be98..0000000 --- a/src/app/resources/icon/lock-alt-solid.svg +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/src/app/resources/icon/lock-open.svg b/src/app/resources/icon/lock-open.svg new file mode 100644 index 0000000..9088a0c --- /dev/null +++ b/src/app/resources/icon/lock-open.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/lock.svg b/src/app/resources/icon/lock.svg new file mode 100644 index 0000000..606bdad --- /dev/null +++ b/src/app/resources/icon/lock.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/shuffle.svg b/src/app/resources/icon/shuffle.svg new file mode 100644 index 0000000..e1b549d --- /dev/null +++ b/src/app/resources/icon/shuffle.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/app/resources/icon/times-circle-solid.svg b/src/app/resources/icon/times-circle-solid.svg deleted file mode 100644 index 9046b0f..0000000 --- a/src/app/resources/icon/times-circle-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/window-close-solid.svg b/src/app/resources/icon/window-close-solid.svg deleted file mode 100644 index eaa6802..0000000 --- a/src/app/resources/icon/window-close-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/resources/icon/window-restore-solid.svg b/src/app/resources/icon/window-restore-solid.svg deleted file mode 100644 index 4304e36..0000000 --- a/src/app/resources/icon/window-restore-solid.svg +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/src/app/resources/icon/window-restore.svg b/src/app/resources/icon/window-restore.svg new file mode 100644 index 0000000..6302b7f --- /dev/null +++ b/src/app/resources/icon/window-restore.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file