notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix(account-cards): add the progressbar for the accept and decline follow request actions

Browse source
This commit is contained in:
LucasGGamerM 2024-07-26 14:54:21 -03:00
parent ca07240a70
commit 9f5c420e66
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
View file

@ -319,7 +319,18 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
private void onFollowRequestButtonClick(View v) { private void onFollowRequestButtonClick(View v) {
itemView.setHasTransientState(true); itemView.setHasTransientState(true);
UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, accountID, null, v == acceptButton, relationship, rel -> { UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, accountID, null, v == acceptButton, relationship, (Boolean visible) -> {
if(v==acceptButton){
acceptButton.setTextVisible(!visible);
acceptProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
acceptButton.setClickable(!visible);
}else{
rejectButton.setTextVisible(!visible);
rejectProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
rejectButton.setClickable(!visible);
}
itemView.setHasTransientState(false);
}, rel -> {
if(getContext()==null) return; if(getContext()==null) return;
itemView.setHasTransientState(false); itemView.setHasTransientState(false);
relationships.put(item.account.id, rel); relationships.put(item.account.id, rel);

13
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java
View file

@ -172,7 +172,18 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
private void onFollowRequestButtonClick(View v) { private void onFollowRequestButtonClick(View v) {
itemView.setHasTransientState(true); itemView.setHasTransientState(true);
UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), null, v == acceptButton, relationship, rel -> { UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), null, v == acceptButton, relationship, (Boolean visible) -> {
if(v==acceptButton){
acceptButton.setTextVisible(!visible);
acceptProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
acceptButton.setClickable(!visible);
}else{
rejectButton.setTextVisible(!visible);
rejectProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
rejectButton.setClickable(!visible);
}
itemView.setHasTransientState(false);
}, rel -> {
if(v.getContext()==null || rel==null) return; if(v.getContext()==null || rel==null) return;
itemView.setHasTransientState(false); itemView.setHasTransientState(false);
item.parentFragment.putRelationship(item.account.id, rel); item.parentFragment.putRelationship(item.account.id, rel);

7
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View file

@ -934,17 +934,20 @@ public class UiUtils {
} }
public static void handleFollowRequest(Activity activity, Account account, String accountID, @Nullable String notificationID, boolean accepted, Relationship relationship, Consumer<Relationship> resultCallback) { public static void handleFollowRequest(Activity activity, Account account, String accountID, @Nullable String notificationID, boolean accepted, Relationship relationship, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback) {
progressCallback.accept(true);
if (accepted) { if (accepted) {
new AuthorizeFollowRequest(account.id).setCallback(new Callback<>() { new AuthorizeFollowRequest(account.id).setCallback(new Callback<>() {
@Override @Override
public void onSuccess(Relationship rel) { public void onSuccess(Relationship rel) {
E.post(new FollowRequestHandledEvent(accountID, true, account, rel)); E.post(new FollowRequestHandledEvent(accountID, true, account, rel));
progressCallback.accept(false);
resultCallback.accept(rel); resultCallback.accept(rel);
} }
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error) {
progressCallback.accept(false);
resultCallback.accept(relationship); resultCallback.accept(relationship);
error.showToast(activity); error.showToast(activity);
} }
@ -956,11 +959,13 @@ public class UiUtils {
E.post(new FollowRequestHandledEvent(accountID, false, account, rel)); E.post(new FollowRequestHandledEvent(accountID, false, account, rel));
if (notificationID != null) if (notificationID != null)
E.post(new NotificationDeletedEvent(notificationID)); E.post(new NotificationDeletedEvent(notificationID));
progressCallback.accept(false);
resultCallback.accept(rel); resultCallback.accept(rel);
} }
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error) {
progressCallback.accept(false);
resultCallback.accept(relationship); resultCallback.accept(relationship);
error.showToast(activity); error.showToast(activity);
} }