owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add the new block confirmation sheet from upstream

Browse Source
This commit is contained in:
LucasGGamerM
2024-03-04 20:25:24 -03:00
parent 20d0acc88c
commit ec02aed557
1 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -126,6 +126,7 @@ import org.joinmastodon.android.model.Searchable;
import org.joinmastodon.android.model.Status; import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.M3AlertDialogBuilder;
import org.joinmastodon.android.ui.Snackbar; import org.joinmastodon.android.ui.Snackbar;
import org.joinmastodon.android.ui.sheets.BlockAccountConfirmationSheet;
import org.joinmastodon.android.ui.sheets.MuteAccountConfirmationSheet; import org.joinmastodon.android.ui.sheets.MuteAccountConfirmationSheet;
import org.joinmastodon.android.ui.text.CustomEmojiSpan; import org.joinmastodon.android.ui.text.CustomEmojiSpan;
import org.joinmastodon.android.ui.text.HtmlParser; import org.joinmastodon.android.ui.text.HtmlParser;
@@ -501,30 +502,44 @@ public class UiUtils {
} }
public static void confirmToggleBlockUser(Activity activity, String accountID, Account account, boolean currentlyBlocked, Consumer<Relationship> resultCallback) { public static void confirmToggleBlockUser(Activity activity, String accountID, Account account, boolean currentlyBlocked, Consumer<Relationship> resultCallback) {
showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_title : R.string.confirm_block_title), if(!currentlyBlocked){
activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, account.getDisplayName()), new BlockAccountConfirmationSheet(activity, account, (onSuccess, onError)->{
activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block), new SetAccountBlocked(account.id, true)
R.drawable.ic_fluent_person_prohibited_28_regular, .setCallback(new Callback<>(){
() -> { @Override
new SetAccountBlocked(account.id, !currentlyBlocked) public void onSuccess(Relationship result){
.setCallback(new Callback<>() { resultCallback.accept(result);
@Override onSuccess.run();
public void onSuccess(Relationship result) { E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
if (activity == null) return; }
resultCallback.accept(result);
if (!currentlyBlocked) {
E.post(new RemoveAccountPostsEvent(accountID, account.id, false));
}
}
@Override @Override
public void onError(ErrorResponse error) { public void onError(ErrorResponse error){
error.showToast(activity); error.showToast(activity);
} onError.run();
}) }
.wrapProgress(activity, R.string.loading, false) })
.exec(accountID); .exec(accountID);
}); }).show();
}else{
new SetAccountBlocked(account.id, false)
.setCallback(new Callback<>(){
@Override
public void onSuccess(Relationship result){
resultCallback.accept(result);
new Snackbar.Builder(activity)
.setText(activity.getString(R.string.unblocked_user_x, account.getDisplayUsername()))
.show();
}
@Override
public void onError(ErrorResponse error){
error.showToast(activity);
}
})
.wrapProgress(activity, R.string.loading, false)
.exec(accountID);
}
} }
public static void confirmSoftBlockUser(Activity activity, String accountID, Account account, Consumer<Relationship> resultCallback) { public static void confirmSoftBlockUser(Activity activity, String accountID, Account account, Consumer<Relationship> resultCallback) {