From 656af4ae39dfd0282866e9bd3fde0e788dc6ca67 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sun, 3 May 2015 22:10:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B0=D0=BD=D0=B8=D0=BC=D0=B0=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=84=D0=BE=D0=BD=D0=BE=D0=B2=D1=8B=D1=85?=
 =?UTF-8?q?=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/layout/main.xml                                 |  2 +-
 src/com/annimon/everlastingsummer/ViewActivity.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/layout/main.xml b/res/layout/main.xml
index e5fd761..df49f74 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@android:color/black" >
 
-    <ImageView
+    <com.annimon.everlastingsummer.AnimatableImageView
         android:id="@+id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java
index 4c88c45..052b09a 100644
--- a/src/com/annimon/everlastingsummer/ViewActivity.java
+++ b/src/com/annimon/everlastingsummer/ViewActivity.java
@@ -56,7 +56,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
     private String scriptPath;
     
     private String backgroundName, backgroundType;
-    private ImageView background;
+    private AnimatableImageView background;
     private FrameLayout container;
     private TextView textview;
     private MediaPlayer musicPlayer, soundPlayer;
@@ -84,7 +84,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         setContentView(R.layout.main);
         instance = this;
         
-        background = (ImageView) findViewById(R.id.background);
+        background = (AnimatableImageView) findViewById(R.id.background);
         container = (FrameLayout) findViewById(R.id.container);
         textview = (TextView) findViewById(R.id.text);
         
@@ -285,11 +285,11 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         backgroundName = name;
         text("");
         spritesClear();
-        if (name.equalsIgnoreCase("black")) background.setImageResource(android.R.color.black);
-        else if (name.equalsIgnoreCase("white")) background.setImageResource(android.R.color.white);
+        if (name.equalsIgnoreCase("black")) background.setImageResource(android.R.color.black, effect);
+        else if (name.equalsIgnoreCase("white")) background.setImageResource(android.R.color.white, effect);
         else {
             try {
-                background.setImageBitmap(IOUtil.readBitmap(PathResolver.background(type, name)));
+                background.setImageBitmap(IOUtil.readBitmap(PathResolver.background(type, name)), effect);
             } catch (Exception ioe) {
                 if (Logger.DEBUG) Logger.log("background: " + type + ", " + name, ioe);
                 background.setImageResource(android.R.color.black);