mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-22 16:50:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix profiles

Browse source
This commit is contained in:
Thomas 2023-12-16 18:38:19 +01:00
parent a9712d45b3
commit 197702b461
11 changed files with 22 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View file

@ -1419,9 +1419,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, currentAccount.mastodon_account); b.putSerializable(Helper.ARG_ACCOUNT, currentAccount.mastodon_account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat startActivity(intent);
.makeSceneTransitionAnimation(BaseMainActivity.this, headerMainBinding.instanceInfoContainer, getString(R.string.activity_porfile_pp));
startActivity(intent, options.toBundle());
}); });
headerMainBinding.accountAcc.setOnClickListener(v -> headerMainBinding.changeAccount.callOnClick()); headerMainBinding.accountAcc.setOnClickListener(v -> headerMainBinding.changeAccount.callOnClick());

4
app/src/main/java/app/fedilab/android/activities/AboutActivity.java
View file

@ -103,9 +103,7 @@ public class AboutActivity extends BaseBarActivity {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat startActivity(intent);
.makeSceneTransitionAnimation(AboutActivity.this, binding.accountPp, getString(R.string.activity_porfile_pp));
startActivity(intent, options.toBundle());
}); });
AccountsVM accountsVM = new ViewModelProvider(AboutActivity.this).get(AccountsVM.class); AccountsVM accountsVM = new ViewModelProvider(AboutActivity.this).get(AccountsVM.class);
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();

4
app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java
View file

@ -81,9 +81,7 @@ public class PartnerShipActivity extends BaseBarActivity {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat startActivity(intent);
.makeSceneTransitionAnimation(PartnerShipActivity.this, binding.accountPp, getString(R.string.activity_porfile_pp));
startActivity(intent, options.toBundle());
}); });
AccountsVM accountsVM = new ViewModelProvider(PartnerShipActivity.this).get(AccountsVM.class); AccountsVM accountsVM = new ViewModelProvider(PartnerShipActivity.this).get(AccountsVM.class);
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();

12
app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java
View file

@ -168,7 +168,6 @@ public class ProfileActivity extends BaseActivity {
if (!checkRemotely) { if (!checkRemotely) {
checkRemotely = sharedpreferences.getBoolean(getString(R.string.SET_PROFILE_REMOTELY), false); checkRemotely = sharedpreferences.getBoolean(getString(R.string.SET_PROFILE_REMOTELY), false);
} }
ActivityCompat.postponeEnterTransition(ProfileActivity.this);
//Remove title //Remove title
if (actionBar != null) { if (actionBar != null) {
actionBar.setDisplayShowTitleEnabled(false); actionBar.setDisplayShowTitleEnabled(false);
@ -363,21 +362,18 @@ public class ProfileActivity extends BaseActivity {
binding.accountPp.animate(); binding.accountPp.animate();
((Animatable) resource).start(); ((Animatable) resource).start();
} }
ActivityCompat.startPostponedEnterTransition(ProfileActivity.this);
} }
@Override @Override
public void onLoadFailed(@Nullable Drawable errorDrawable) { public void onLoadFailed(@Nullable Drawable errorDrawable) {
binding.profilePicture.setImageResource(R.drawable.ic_person); binding.profilePicture.setImageResource(R.drawable.ic_person);
binding.accountPp.setImageResource(R.drawable.ic_person); binding.accountPp.setImageResource(R.drawable.ic_person);
ActivityCompat.startPostponedEnterTransition(ProfileActivity.this);
} }
@Override @Override
public void onLoadCleared(@Nullable Drawable placeholder) { public void onLoadCleared(@Nullable Drawable placeholder) {
binding.profilePicture.setImageResource(R.drawable.ic_person); binding.profilePicture.setImageResource(R.drawable.ic_person);
binding.accountPp.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_ACCOUNT, account);
b.putSerializable(Helper.ARG_CHECK_REMOTELY, true); b.putSerializable(Helper.ARG_CHECK_REMOTELY, true);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat startActivity(intent);
.makeSceneTransitionAnimation(ProfileActivity.this, binding.profilePicture, getString(R.string.activity_porfile_pp));
startActivity(intent, options.toBundle());
finish(); finish();
}); });
//Fields for profile //Fields for profile
@ -630,10 +624,8 @@ public class ProfileActivity extends BaseActivity {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation(ProfileActivity.this, notificationsRelatedAccountsBinding.profilePicture, getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
startActivity(intent, options.toBundle()); startActivity(intent);
}); });
binding.relatedAccounts.addView(notificationsRelatedAccountsBinding.getRoot()); binding.relatedAccounts.addView(notificationsRelatedAccountsBinding.getRoot());
} }

4
app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
View file

@ -1911,9 +1911,7 @@ public class Helper {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat activity.startActivity(intent);
.makeSceneTransitionAnimation(activity, binding.accountPp, activity.getString(R.string.activity_porfile_pp));
activity.startActivity(intent, options.toBundle());
}); });
AccountsVM accountsVM = new ViewModelProvider((ViewModelStoreOwner) activity).get(AccountsVM.class); AccountsVM accountsVM = new ViewModelProvider((ViewModelStoreOwner) activity).get(AccountsVM.class);

8
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountAdapter.java
View file

@ -114,10 +114,8 @@ public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, accountViewHolder.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} else { } else {
Toasty.info(context, context.getString(R.string.retrieve_remote_account), Toasty.LENGTH_SHORT).show(); Toasty.info(context, context.getString(R.string.retrieve_remote_account), Toasty.LENGTH_SHORT).show();
SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get(SearchVM.class); SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get(SearchVM.class);
@ -129,10 +127,8 @@ public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, accountSearch); b.putSerializable(Helper.ARG_ACCOUNT, accountSearch);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, accountViewHolder.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} else { } else {
Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show(); Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show();
} }

4
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountFollowRequestAdapter.java
View file

@ -106,10 +106,8 @@ public class AccountFollowRequestAdapter extends RecyclerView.Adapter<RecyclerVi
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holderFollow.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
} }

4
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/AccountsSearchTopBarAdapter.java
View file

@ -69,10 +69,8 @@ public class AccountsSearchTopBarAdapter extends SimpleCursorAdapter {
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, accountList.get(position)); b.putSerializable(Helper.ARG_ACCOUNT, accountList.get(position));
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, account_pp, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} }
}); });
} }

20
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/NotificationAdapter.java
View file

@ -275,10 +275,8 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, notification.account); b.putSerializable(Helper.ARG_ACCOUNT, notification.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holderFollow.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
if (notification.isFetchMore && fetchMoreCallBack != null) { if (notification.isFetchMore && fetchMoreCallBack != null) {
holderFollow.binding.layoutFetchMore.fetchMoreContainer.setVisibility(View.VISIBLE); holderFollow.binding.layoutFetchMore.fetchMoreContainer.setVisibility(View.VISIBLE);
@ -388,10 +386,8 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, notification.account); b.putSerializable(Helper.ARG_ACCOUNT, notification.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holderStatus.bindingNotification.status.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
holderStatus.bindingNotification.status.mainContainer.setAlpha(.8f); holderStatus.bindingNotification.status.mainContainer.setAlpha(.8f);
} }
@ -437,10 +433,8 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, relativeNotif.account); b.putSerializable(Helper.ARG_ACCOUNT, relativeNotif.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, notificationsRelatedAccountsBinding.profilePicture, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
holderStatus.bindingNotification.relatedAccounts.addView(notificationsRelatedAccountsBinding.getRoot()); holderStatus.bindingNotification.relatedAccounts.addView(notificationsRelatedAccountsBinding.getRoot());
} }
@ -453,20 +447,16 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, notification.account); b.putSerializable(Helper.ARG_ACCOUNT, notification.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holderStatus.bindingNotification.status.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
holderStatus.bindingNotification.status.statusUserInfo.setOnClickListener(v -> { holderStatus.bindingNotification.status.statusUserInfo.setOnClickListener(v -> {
Intent intent = new Intent(context, ProfileActivity.class); Intent intent = new Intent(context, ProfileActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, notification.account); b.putSerializable(Helper.ARG_ACCOUNT, notification.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holderStatus.bindingNotification.status.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
holderStatus.bindingNotification.status.displayName.setText( holderStatus.bindingNotification.status.displayName.setText(

24
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View file

@ -962,10 +962,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, fetchedStatus.reblog != null ? fetchedStatus.reblog.account : fetchedStatus.account); b.putSerializable(Helper.ARG_ACCOUNT, fetchedStatus.reblog != null ? fetchedStatus.reblog.account : fetchedStatus.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holder.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} else { } else {
Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show(); Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show();
} }
@ -975,10 +973,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, status.reblog != null ? status.reblog.account : status.account); b.putSerializable(Helper.ARG_ACCOUNT, status.reblog != null ? status.reblog.account : status.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holder.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} }
}); });
holder.binding.statusBoosterInfo.setOnClickListener(v -> { holder.binding.statusBoosterInfo.setOnClickListener(v -> {
@ -992,10 +988,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, fetchedStatus.account); b.putSerializable(Helper.ARG_ACCOUNT, fetchedStatus.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holder.binding.statusBoosterAvatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} else { } else {
Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show(); Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show();
} }
@ -1005,10 +999,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, status.account); b.putSerializable(Helper.ARG_ACCOUNT, status.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holder.binding.statusBoosterAvatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
} }
}); });
//---> REBLOG/UNREBLOG //---> REBLOG/UNREBLOG
@ -3174,9 +3166,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, status.account); b.putSerializable(Helper.ARG_ACCOUNT, status.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat context.startActivity(intent);
.makeSceneTransitionAnimation((Activity) context, holder.bindingArt.artPp, context.getString(R.string.activity_porfile_pp));
context.startActivity(intent, options.toBundle());
}); });
holder.bindingArt.artMedia.setOnClickListener(v -> { holder.bindingArt.artMedia.setOnClickListener(v -> {
if (status.art_attachment != null) { if (status.art_attachment != null) {
@ -3228,9 +3218,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, statusToDeal.account); b.putSerializable(Helper.ARG_ACCOUNT, statusToDeal.account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat context.startActivity(intent);
.makeSceneTransitionAnimation((Activity) context, holder.bindingPixelfed.artPp, context.getString(R.string.activity_porfile_pp));
context.startActivity(intent, options.toBundle());
}); });
holder.bindingPixelfed.bottomBanner.setOnClickListener(v -> { holder.bindingPixelfed.bottomBanner.setOnClickListener(v -> {
Intent intent = new Intent(context, ContextActivity.class); Intent intent = new Intent(context, ContextActivity.class);

4
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/SuggestionAdapter.java
View file

@ -90,10 +90,8 @@ public class SuggestionAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable(Helper.ARG_ACCOUNT, account); b.putSerializable(Helper.ARG_ACCOUNT, account);
intent.putExtras(b); intent.putExtras(b);
ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holder.binding.avatar, context.getString(R.string.activity_porfile_pp));
// start the new activity // start the new activity
context.startActivity(intent, options.toBundle()); context.startActivity(intent);
}); });
holder.binding.followAction.setIconResource(R.drawable.ic_baseline_person_add_24); holder.binding.followAction.setIconResource(R.drawable.ic_baseline_person_add_24);
if (account == null) { if (account == null) {