Поддержка эффектов для окон
This commit is contained in:
parent
e0635c3f00
commit
084fc9810a
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user