From 084fc9810a8f6f4b4a9541e1cacbb46adc1201bc Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Tue, 5 May 2015 12:46:54 +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=D1=8D=D1=84=D1=84=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=BA=D0=BE=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/annimon/everlastingsummer/Parser.java |  4 ++--
 .../everlastingsummer/ViewActivity.java       | 20 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/com/annimon/everlastingsummer/Parser.java b/src/com/annimon/everlastingsummer/Parser.java
index 5b50a99..451653b 100644
--- a/src/com/annimon/everlastingsummer/Parser.java
+++ b/src/com/annimon/everlastingsummer/Parser.java
@@ -197,9 +197,9 @@ public final class Parser {
         
         if (match(token, TokenType.WINDOW)) {
             if (match(TokenType.SHOW))
-                ViewActivity.getInstance().windowShow();
+                return ViewActivity.getInstance().windowShow(matchWithEffect());
             else if (match(TokenType.HIDE))
-                ViewActivity.getInstance().windowHide();
+                return ViewActivity.getInstance().windowHide(matchWithEffect());
             return false;
         }
         
diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java
index 934f32b..84e19f4 100644
--- a/src/com/annimon/everlastingsummer/ViewActivity.java
+++ b/src/com/annimon/everlastingsummer/ViewActivity.java
@@ -264,14 +264,24 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         }
     }
     
-    public void windowShow() {
+    public boolean windowShow(String effect) {
         if (textview.getVisibility() != View.VISIBLE)
             textview.setVisibility(View.VISIBLE);
+        if (!TextUtils.isEmpty(effect)) {
+            background(backgroundType, backgroundName, effect);
+            return true;
+        }
+        return false;
     }
     
-    public void windowHide() {
+    public boolean windowHide(String effect) {
         if (textview.getVisibility() != View.INVISIBLE)
             textview.setVisibility(View.INVISIBLE);
+        if (!TextUtils.isEmpty(effect)) {
+            background(backgroundType, backgroundName, effect);
+            return true;
+        }
+        return false;
     }
     
     private void windowSwitchVisibility() {
@@ -389,9 +399,9 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
     }
     
     public void text(String text) {
-        if (TextUtils.isEmpty(text)) windowHide();
+        if (TextUtils.isEmpty(text)) windowHide("");
         else {
-            windowShow();
+            windowShow("");
             textview.setText(formatString(text));
         }
     }
@@ -400,7 +410,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         if (whoid.equalsIgnoreCase("th")) text("~ " + text + " ~");
         else if (!characters.contains(whoid)) text(text);
         else {
-            windowShow();
+            windowShow("");
             final Characters.NameInfo person = characters.get(whoid);
             final String who = person.name;
             Spannable spannable = formatString(who + "\n" + text);