aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-05-05 22:28:32 +0200
committerChristian Schneppe <christian@pix-art.de>2018-05-05 22:28:32 +0200
commitac70233fa49c8fb2477a5b3d8752aa126791e372 (patch)
tree29883656ecb813c3145ad57c3c16029bd5cdec56 /src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
parent89cca15e77130eae3b1c79b054b72de01debeb57 (diff)
add animators for more activities
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationsActivity.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 17227ff83..686d435bb 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -183,6 +183,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
restartintent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
restartintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(restartintent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
System.exit(0);
}
@@ -228,6 +229,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
final Intent intent = getRedirectionIntent(noAnimation);
runOnUiThread(() -> {
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
if (noAnimation) {
overridePendingTransition(0, 0);
}
@@ -681,6 +683,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
intent.putExtra("uuid", conversation.getUuid());
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
}
});
abtitle.setSelected(true);
@@ -697,6 +700,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
intent.putExtra("uuid", conversation.getUuid());
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
}
});
} else {
@@ -712,6 +716,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
intent.putExtra("uuid", conversation.getUuid());
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
}
});
} else {
@@ -729,6 +734,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
intent.putExtra("uuid", conversation.getUuid());
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
}
});
}
@@ -774,6 +780,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
intent.putExtra("uuid", conversation.getUuid());
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
}
});
} else {
@@ -787,6 +794,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
intent.putExtra("uuid", conversation.getUuid());
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
}
});
}
@@ -829,6 +837,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
break;
}
startActivity(intent);
+ overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
});