Commit 197702b4 authored by Thomas's avatar Thomas
Browse files

Fix profiles

parent a9712d45

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -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());

app/src/main/java/app/fedilab/android/activities/AboutActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -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<String> ids = new ArrayList<>();

app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -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<String> ids = new ArrayList<>();

app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java

+2 −10
Original line number Diff line number Diff line
@@ -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());

            }

app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java

+1 −3
Original line number Diff line number Diff line
@@ -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);