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

feat: show confirmation dialog on unfollow

Browse Source
This commit is contained in:
FineFindus
2023-05-16 17:07:13 +02:00
parent 0f0291074e
commit 4843d574ca
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,12 +390,16 @@ public class UiUtils {
showConfirmationAlert(context, context.getString(title), context.getString(message), context.getString(confirmButton), icon, onConfirmed); showConfirmationAlert(context, context.getString(title), context.getString(message), context.getString(confirmButton), icon, onConfirmed);
} }
public static void showConfirmationAlert(Context context, CharSequence title, CharSequence message, CharSequence confirmButton, int icon, Runnable onConfirmed){ public static void showConfirmationAlert(Context context, CharSequence title, CharSequence message, CharSequence confirmButton, int icon, Runnable onConfirmed) {
showConfirmationAlert(context, title, message, confirmButton, icon, onConfirmed, null);
}
public static void showConfirmationAlert(Context context, CharSequence title, CharSequence message, CharSequence confirmButton, int icon, Runnable onConfirmed, Runnable onDenied){
new M3AlertDialogBuilder(context) new M3AlertDialogBuilder(context)
.setTitle(title) .setTitle(title)
.setMessage(message) .setMessage(message)
.setPositiveButton(confirmButton, (dlg, i)->onConfirmed.run()) .setPositiveButton(confirmButton, (dlg, i)->onConfirmed.run())
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, (dialog, which) -> onDenied.run())
.setIcon(icon) .setIcon(icon)
.show(); .show();
} }
@@ -779,7 +783,17 @@ public class UiUtils {
} }
progressCallback.accept(true); progressCallback.accept(true);
follow(activity, accountID, account, !relationship.following && !relationship.requested, progressCallback, resultCallback); if (!relationship.following && !relationship.requested) {
follow(activity, accountID, account, true, progressCallback, resultCallback);
} else {
showConfirmationAlert(activity,
activity.getString(R.string.mo_confirm_unfollow_title),
activity.getString(R.string.mo_confirm_unfollow, account.getDisplayUsername()),
activity.getString(R.string.unfollow),
0,
() -> follow(activity, accountID, account, false, progressCallback, resultCallback),
() -> progressCallback.accept(false));
}
} }
@@ -801,7 +815,8 @@ public class UiUtils {
progressCallback.accept(false); progressCallback.accept(false);
} }
}) })
.exec(accountID); } .exec(accountID);
}
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<Relationship> resultCallback) {

3
mastodon/src/main/res/values/strings_mo.xml
View File

@@ -54,5 +54,6 @@
<string name="mo_swap_bookmark_with_reblog">Use reblog action instead of bookmark action on notifications</string> <string name="mo_swap_bookmark_with_reblog">Use reblog action instead of bookmark action on notifications</string>
<string name="mo_download_latest_nightly_release">Download latest nightly release</string> <string name="mo_download_latest_nightly_release">Download latest nightly release</string>
<string name="mo_load_remote_followers">Load remote profile follows and followers</string> <string name="mo_load_remote_followers">Load remote profile follows and followers</string>
<string name="mo_mention_reblogger_automatically">Automatically mention account who reblogged the post in replies</string> <string name="mo_confirm_unfollow_title">Unfollow Account</string>
<string name="mo_confirm_unfollow">Confirm to unfollow %s</string>
</resources> </resources>