From b89e094f9f4785fe84ee9d5b3b5cfc9623da49bf Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 31 Aug 2024 00:12:58 +0200 Subject: [PATCH] improve account deletion dialog --- .../AccountSelectionListFragment.java | 27 ++++++++++++++-- .../layout/contact_selection_list_item.xml | 1 + src/main/res/layout/dialog_delete_profile.xml | 31 +++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/main/res/layout/dialog_delete_profile.xml diff --git a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java index 3c0a31ef9..70c68753e 100644 --- a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java @@ -4,10 +4,12 @@ import android.app.Activity; import android.app.Dialog; import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; @@ -16,13 +18,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.b44t.messenger.DcAccounts; +import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; import org.thoughtcrime.securesms.ConnectivityActivity; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.components.AvatarView; import org.thoughtcrime.securesms.connect.AccountManager; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.mms.GlideApp; +import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -113,9 +118,27 @@ public class AccountSelectionListFragment extends DialogFragment AccountSelectionListFragment.this.dismiss(); if (activity == null) return; DcAccounts accounts = DcHelper.getAccounts(activity); + + View dialogView = View.inflate(activity, R.layout.dialog_delete_profile, null); + AvatarView avatar = dialogView.findViewById(R.id.avatar); + TextView nameView = dialogView.findViewById(R.id.name); + TextView addrView = dialogView.findViewById(R.id.number); + TextView description = dialogView.findViewById(R.id.description); + DcContext dcContext = accounts.getAccount(accountId); + String name = dcContext.getConfig("displayname"); + DcContact contact = dcContext.getContact(DcContact.DC_CONTACT_ID_SELF); + if (TextUtils.isEmpty(name)) { + name = contact.getAddr(); + } + Recipient recipient = new Recipient(getContext(), contact, name); + avatar.setAvatar(GlideApp.with(activity), recipient, false); + nameView.setText(name); + addrView.setText(contact.getAddr()); + description.setText(activity.getString(R.string.delete_account_explain_with_name, name)); + AlertDialog dialog = new AlertDialog.Builder(activity) - .setTitle(accounts.getAccount(accountId).getNameNAddr()) - .setMessage(R.string.forget_login_confirmation_desktop) + .setTitle(R.string.delete_account) + .setView(dialogView) .setNegativeButton(R.string.cancel, (d, which) -> AccountManager.getInstance().showSwitchAccountMenu(activity)) .setPositiveButton(R.string.delete, (d2, which2) -> { boolean selected = accountId == accounts.getSelectedAccount().getAccountId(); diff --git a/src/main/res/layout/contact_selection_list_item.xml b/src/main/res/layout/contact_selection_list_item.xml index bb4aee0bf..4761e95e4 100644 --- a/src/main/res/layout/contact_selection_list_item.xml +++ b/src/main/res/layout/contact_selection_list_item.xml @@ -76,6 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:visibility="gone" android:focusable="false" android:clickable="false" /> diff --git a/src/main/res/layout/dialog_delete_profile.xml b/src/main/res/layout/dialog_delete_profile.xml new file mode 100644 index 000000000..d44a4e241 --- /dev/null +++ b/src/main/res/layout/dialog_delete_profile.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + +