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

Commit 8d7b14d

Browse files
Sam1301kunall17
authored andcommitted
Use ActivityTransitionAnim in photos features.
1 parent 0bfde78 commit 8d7b14d

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.bumptech.glide.request.animation.GlideAnimation;
2323
import com.bumptech.glide.request.target.SimpleTarget;
2424
import com.zulip.android.R;
25+
import com.zulip.android.util.ActivityTransitionAnim;
2526
import com.zulip.android.util.DrawCustomView;
2627
import com.zulip.android.util.PhotoHelper;
2728

@@ -132,6 +133,9 @@ public void onClick(View v) {
132133
cropIntent.putExtra(PhotoEditActivity.class.getSimpleName(), true);
133134
cropIntent.putExtra(Intent.EXTRA_TEXT, mPhotoPath);
134135
startActivity(cropIntent);
136+
137+
// activity transition animation
138+
ActivityTransitionAnim.transition(PhotoEditActivity.this);
135139
} else {
136140
// do nothing
137141
// wait for layout to be constructed
@@ -158,6 +162,9 @@ public void onClick(View view) {
158162

159163
sendIntent.putExtra(Intent.EXTRA_TEXT, mPhotoPath);
160164
startActivity(sendIntent);
165+
166+
// activity transition animation
167+
ActivityTransitionAnim.transition(PhotoEditActivity.this);
161168
} else {
162169
// do nothing
163170
// wait for layout to be constructed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.bumptech.glide.request.target.SimpleTarget;
2222
import com.theartofdev.edmodo.cropper.CropImageView;
2323
import com.zulip.android.R;
24+
import com.zulip.android.util.ActivityTransitionAnim;
2425
import com.zulip.android.util.PhotoHelper;
2526

2627
import java.io.File;
@@ -67,6 +68,9 @@ public void onClick(View view) {
6768

6869
// go back to ZulipActivity to start camera intent
6970
startActivity(sendIntent);
71+
72+
// activity transition animation
73+
ActivityTransitionAnim.transition(PhotoSendActivity.this);
7074
}
7175
});
7276

@@ -139,6 +143,9 @@ public void onClick(View view) {
139143
// add the file path of cropped image
140144
sendIntent.putExtra(Intent.EXTRA_TEXT, mPhotoPath);
141145
startActivity(sendIntent);
146+
147+
// activity transition animation
148+
ActivityTransitionAnim.transition(PhotoSendActivity.this);
142149
}
143150
});
144151

@@ -168,6 +175,9 @@ public void onClick(View view) {
168175
Intent intent = new Intent(PhotoSendActivity.this, PhotoEditActivity.class);
169176
intent.putExtra(Intent.EXTRA_TEXT, mPhotoPath);
170177
startActivity(intent);
178+
179+
// activity transition animation
180+
ActivityTransitionAnim.transition(PhotoSendActivity.this);
171181
}
172182
});
173183

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
import com.zulip.android.networking.AsyncStatusUpdate;
9999
import com.zulip.android.networking.ZulipAsyncPushTask;
100100
import com.zulip.android.networking.response.UploadResponse;
101+
import com.zulip.android.util.ActivityTransitionAnim;
101102
import com.zulip.android.util.AnimationHelper;
102103
import com.zulip.android.util.Constants;
103104
import com.zulip.android.util.CommonProgressDialog;
@@ -827,6 +828,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
827828
Intent photoSendIntent = new Intent(this, PhotoSendActivity.class);
828829
photoSendIntent.putExtra(Intent.EXTRA_TEXT, mCurrentPhotoPath);
829830
startActivity(photoSendIntent);
831+
832+
// activity transition animation
833+
ActivityTransitionAnim.transition(ZulipActivity.this);
830834
}
831835
}
832836

@@ -912,6 +916,9 @@ private void dispatchTakePictureIntent() {
912916
}
913917

914918
startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
919+
920+
// activity transition animation
921+
ActivityTransitionAnim.transition(ZulipActivity.this);
915922
}
916923
}
917924
}

0 commit comments

Comments
 (0)