diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index a2be8f943..4cadc14f2 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -1419,9 +1419,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, currentAccount.mastodon_account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(BaseMainActivity.this, headerMainBinding.instanceInfoContainer, getString(R.string.activity_porfile_pp)); - startActivity(intent, options.toBundle()); + startActivity(intent); }); headerMainBinding.accountAcc.setOnClickListener(v -> headerMainBinding.changeAccount.callOnClick()); diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java index 78adc8ec0..2ea60818d 100644 --- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java @@ -103,9 +103,7 @@ public class AboutActivity extends BaseBarActivity { Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(AboutActivity.this, binding.accountPp, getString(R.string.activity_porfile_pp)); - startActivity(intent, options.toBundle()); + startActivity(intent); }); AccountsVM accountsVM = new ViewModelProvider(AboutActivity.this).get(AccountsVM.class); List ids = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java index c1dd47835..24b5a3ea1 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java @@ -81,9 +81,7 @@ public class PartnerShipActivity extends BaseBarActivity { Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(PartnerShipActivity.this, binding.accountPp, getString(R.string.activity_porfile_pp)); - startActivity(intent, options.toBundle()); + startActivity(intent); }); AccountsVM accountsVM = new ViewModelProvider(PartnerShipActivity.this).get(AccountsVM.class); List ids = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java index 08ef759b2..ddc779bb8 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java @@ -168,7 +168,6 @@ public class ProfileActivity extends BaseActivity { if (!checkRemotely) { checkRemotely = sharedpreferences.getBoolean(getString(R.string.SET_PROFILE_REMOTELY), false); } - ActivityCompat.postponeEnterTransition(ProfileActivity.this); //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); @@ -363,21 +362,18 @@ public class ProfileActivity extends BaseActivity { binding.accountPp.animate(); ((Animatable) resource).start(); } - ActivityCompat.startPostponedEnterTransition(ProfileActivity.this); } @Override public void onLoadFailed(@Nullable Drawable errorDrawable) { binding.profilePicture.setImageResource(R.drawable.ic_person); binding.accountPp.setImageResource(R.drawable.ic_person); - ActivityCompat.startPostponedEnterTransition(ProfileActivity.this); } @Override public void onLoadCleared(@Nullable Drawable placeholder) { binding.profilePicture.setImageResource(R.drawable.ic_person); binding.accountPp.setImageResource(R.drawable.ic_person); - ActivityCompat.startPostponedEnterTransition(ProfileActivity.this); } } ); @@ -445,9 +441,7 @@ public class ProfileActivity extends BaseActivity { b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_CHECK_REMOTELY, true); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(ProfileActivity.this, binding.profilePicture, getString(R.string.activity_porfile_pp)); - startActivity(intent, options.toBundle()); + startActivity(intent); finish(); }); //Fields for profile @@ -630,10 +624,8 @@ public class ProfileActivity extends BaseActivity { Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(ProfileActivity.this, notificationsRelatedAccountsBinding.profilePicture, getString(R.string.activity_porfile_pp)); // start the new activity - startActivity(intent, options.toBundle()); + startActivity(intent); }); binding.relatedAccounts.addView(notificationsRelatedAccountsBinding.getRoot()); } diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java index 2a7c224ee..940f587d9 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java @@ -1911,9 +1911,7 @@ public class Helper { Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation(activity, binding.accountPp, activity.getString(R.string.activity_porfile_pp)); - activity.startActivity(intent, options.toBundle()); + activity.startActivity(intent); }); AccountsVM accountsVM = new ViewModelProvider((ViewModelStoreOwner) activity).get(AccountsVM.class); diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountAdapter.java index 901275982..428048fa6 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountAdapter.java @@ -114,10 +114,8 @@ public class AccountAdapter extends RecyclerView.Adapter { Intent intent = new Intent(context, ProfileActivity.class); Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, notification.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holderStatus.bindingNotification.status.avatar, context.getString(R.string.activity_porfile_pp)); // start the new activity - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); }); holderStatus.bindingNotification.status.displayName.setText( diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index 633d1f92d..a554defab 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -962,10 +962,8 @@ public class StatusAdapter extends RecyclerView.Adapter Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, fetchedStatus.reblog != null ? fetchedStatus.reblog.account : fetchedStatus.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holder.binding.avatar, context.getString(R.string.activity_porfile_pp)); // start the new activity - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); } else { Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show(); } @@ -975,10 +973,8 @@ public class StatusAdapter extends RecyclerView.Adapter Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, status.reblog != null ? status.reblog.account : status.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holder.binding.avatar, context.getString(R.string.activity_porfile_pp)); // start the new activity - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); } }); holder.binding.statusBoosterInfo.setOnClickListener(v -> { @@ -992,10 +988,8 @@ public class StatusAdapter extends RecyclerView.Adapter Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, fetchedStatus.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holder.binding.statusBoosterAvatar, context.getString(R.string.activity_porfile_pp)); // start the new activity - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); } else { Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show(); } @@ -1005,10 +999,8 @@ public class StatusAdapter extends RecyclerView.Adapter Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, status.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holder.binding.statusBoosterAvatar, context.getString(R.string.activity_porfile_pp)); // start the new activity - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); } }); //---> REBLOG/UNREBLOG @@ -3174,9 +3166,7 @@ public class StatusAdapter extends RecyclerView.Adapter Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, status.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holder.bindingArt.artPp, context.getString(R.string.activity_porfile_pp)); - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); }); holder.bindingArt.artMedia.setOnClickListener(v -> { if (status.art_attachment != null) { @@ -3228,9 +3218,7 @@ public class StatusAdapter extends RecyclerView.Adapter Bundle b = new Bundle(); b.putSerializable(Helper.ARG_ACCOUNT, statusToDeal.account); intent.putExtras(b); - ActivityOptionsCompat options = ActivityOptionsCompat - .makeSceneTransitionAnimation((Activity) context, holder.bindingPixelfed.artPp, context.getString(R.string.activity_porfile_pp)); - context.startActivity(intent, options.toBundle()); + context.startActivity(intent); }); holder.bindingPixelfed.bottomBanner.setOnClickListener(v -> { Intent intent = new Intent(context, ContextActivity.class); diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SuggestionAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SuggestionAdapter.java index 80119bec8..55bbc9857 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SuggestionAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SuggestionAdapter.java @@ -90,10 +90,8 @@ public class SuggestionAdapter extends RecyclerView.Adapter