From 8f30eff1dd900c8ac6d65833bad68d0dc755f463 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Sun, 7 Jul 2024 15:16:16 +0300
Subject: [PATCH] fix(translate): fix provider usage

---
 haxelib.json                             |  2 +-
 src/main/hw/translate/TranslateString.hx | 13 ++++++++-----
 src/main/hw/view/form/ButtonImageView.hx |  9 ++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/haxelib.json b/haxelib.json
index 7e41049..8f0b551 100755
--- a/haxelib.json
+++ b/haxelib.json
@@ -4,7 +4,7 @@
     "license": "MIT",
     "tags": ["view", "layout", "template"],
     "description": "View framework.",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "releasenote": "Update.",
     "contributors": ["shmyga"],
     "classPath": "src/main",
diff --git a/src/main/hw/translate/TranslateString.hx b/src/main/hw/translate/TranslateString.hx
index 9b3590f..ae2b538 100644
--- a/src/main/hw/translate/TranslateString.hx
+++ b/src/main/hw/translate/TranslateString.hx
@@ -3,30 +3,33 @@ package hw.translate;
 import hw.provider.Provider;
 
 abstract TranslateString(String) from String to String {
+    @:provide var translate:ITranslate;
 
     inline public function new(value:String, args:Array<Dynamic> = null) {
         if (args != null) {
-            this = Provider.get(ITranslate).format(value, args);
+            this = translate.format(value, args);
         } else {
-            this = Provider.get(ITranslate).get(value);
+            this = translate.get(value);
         }
     }
 }
 
 abstract TranslateArrayString(String) from String to String {
+    @:provide var translate:ITranslate;
 
     inline public function new(value:String, index:Int) {
-        this = Provider.get(ITranslate).getArray(value)[index];
+        this = translate.getArray(value)[index];
     }
 }
 
 abstract TranslatePluralString(String) from String to String {
+    @:provide var translate:ITranslate;
 
     inline public function new(value:String, num:Int, args:Array<Dynamic> = null) {
         if (args != null) {
-            this = Provider.get(ITranslate).formatPlurar(value, num, args);
+            this = translate.formatPlurar(value, num, args);
         } else {
-            this = Provider.get(ITranslate).getPlural(value, num);
+            this = translate.getPlural(value, num);
         }
     }
 }
diff --git a/src/main/hw/view/form/ButtonImageView.hx b/src/main/hw/view/form/ButtonImageView.hx
index c98a44b..a8b51a1 100644
--- a/src/main/hw/view/form/ButtonImageView.hx
+++ b/src/main/hw/view/form/ButtonImageView.hx
@@ -14,20 +14,15 @@ class ButtonImageView extends ButtonView {
 
     public function new(image:BitmapData = null) {
         super();
+        skin = bitmapSkin;
         if (image != null) {
             this.image = image;
         }
     }
 
-    override private function set_skin(value:SkinSet):SkinSet {
-        value = value.slice(0);
-        value.unshift(bitmapSkin);
-        return super.set_skin(value);
-    }
-
     private function set_image(value:BitmapData):BitmapData {
         if (image != value) {
-            setContentSize(value.width, value.height, "image");
+            setSize(value.width, value.height, "image");
             image = value;
             bitmapSkin.image = image;
             toRedraw();