Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit cb6c4a7

Browse files
Sam1301kunall17
authored andcommitted
Use ActivityTransitionAnim during login/logout.
1 parent 8d7b14d commit cb6c4a7

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

app/src/main/java/com/zulip/android/activities/LoginActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.zulip.android.networking.response.LoginResponse;
4040
import com.zulip.android.networking.response.ZulipBackendResponse;
4141
import com.zulip.android.networking.util.DefaultCallback;
42+
import com.zulip.android.util.ActivityTransitionAnim;
4243
import com.zulip.android.util.AnimationHelper;
4344
import com.zulip.android.util.Constants;
4445
import com.zulip.android.util.CommonProgressDialog;
@@ -432,6 +433,10 @@ public void openHome() {
432433
commonProgressDialog.dismiss();
433434
Intent i = new Intent(this, ZulipActivity.class);
434435
startActivity(i);
436+
437+
// activity transition animation
438+
ActivityTransitionAnim.transition(this);
439+
435440
finish();
436441
}
437442

app/src/main/java/com/zulip/android/activities/RecyclerMessageAdapter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.zulip.android.activities;
22

3-
import android.app.Activity;
43
import android.content.Context;
54
import android.content.Intent;
65
import android.content.res.ColorStateList;
@@ -34,6 +33,7 @@
3433
import com.zulip.android.models.Person;
3534
import com.zulip.android.models.Stream;
3635
import com.zulip.android.util.ConvertDpPx;
36+
import com.zulip.android.util.ActivityTransitionAnim;
3737
import com.zulip.android.util.MutedTopics;
3838
import com.zulip.android.util.OnItemClickListener;
3939
import com.zulip.android.util.UrlHelper;
@@ -397,7 +397,9 @@ public void onClick(View view) {
397397
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
398398
i.putExtra(Intent.EXTRA_TEXT , url);
399399
zulipApp.startActivity(i);
400-
((Activity) context).overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
400+
401+
// activity transition animation
402+
ActivityTransitionAnim.transition(context);
401403
}
402404
});
403405
} else {

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2150,6 +2150,10 @@ private void openLogin(String serverUrl) {
21502150
Intent i = new Intent(this, LoginActivity.class);
21512151
i.putExtra(Constants.SERVER_URL, serverUrl);
21522152
startActivity(i);
2153+
2154+
// activity transition animation
2155+
ActivityTransitionAnim.transition(this);
2156+
21532157
finish();
21542158
}
21552159

0 commit comments

Comments
 (0)