From 3ba4b7d1abb868af2c62af6a8a7c28ed2774155f Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 5 May 2015 12:58:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=84=D1=84=D0=B5=D0=BA=D1=82=D1=8B=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D0=B5=20?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/annimon/everlastingsummer/ViewActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java index 84e19f4..7a1b75d 100644 --- a/src/com/annimon/everlastingsummer/ViewActivity.java +++ b/src/com/annimon/everlastingsummer/ViewActivity.java @@ -64,7 +64,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch private MapPlaces places; private Characters characters; - private Map spriteInContainer; + private Map spriteInContainer; private DisplayMetrics displayMetrics; private boolean blockTap; @@ -93,7 +93,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch background.setOnTouchListener(new TouchGesture(this, this)); - spriteInContainer = new HashMap(); + spriteInContainer = new HashMap(); characters = new CharactersES(); characters.makeNamesKnown(); @@ -321,12 +321,12 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch } public void sprite(String whoid, String params, String position, String alias, String effect) { - ImageView img; + AnimatableImageView img; final String key = TextUtils.isEmpty(alias) ? whoid : alias; if (spriteInContainer.containsKey(key)) { img = spriteInContainer.get(key); } else { - img = new ImageView(this); + img = new AnimatableImageView(this); spriteInContainer.put(key, img); } final FrameLayout.LayoutParams flp = new FrameLayout.LayoutParams( @@ -334,7 +334,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch setSpritePosition(img, flp, position); final String path = PathResolver.sprite(whoid, params); try { - img.setImageBitmap(IOUtil.readBitmap(path)); + img.setImageBitmap(IOUtil.readBitmap(path), effect); if (container != img.getParent()) container.addView(img, flp); } catch (Exception ioe) {