From fe33ce341361459f85d989bf55548ab9489944c8 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Tue, 29 Sep 2020 12:03:32 -0300 Subject: [PATCH] Various groups V2 dialog copy changes. --- .../securesms/groups/ui/LeaveGroupDialog.java | 15 ++++--- .../ui/addmembers/AddMembersActivity.java | 2 +- .../ui/addtogroup/AddToGroupsActivity.java | 2 +- .../dialogs/GroupRightsDialog.java | 4 +- .../RecipientDialogRepository.java | 6 --- .../bottomsheet/RecipientDialogViewModel.java | 31 +++++++------- .../main/res/layout/group_manage_fragment.xml | 41 ++++--------------- app/src/main/res/values/strings.xml | 23 +++++++---- 8 files changed, 48 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java index 99bb0e7ac4..99c89e6a1d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java @@ -77,27 +77,26 @@ public final class LeaveGroupDialog { private void showSelectNewAdminDialog() { new AlertDialog.Builder(activity) - .setTitle(R.string.ConversationActivity_choose_new_admin) - .setMessage(R.string.ConversationActivity_before_you_leave_you_must_choose_at_least_one_new_admin_for_this_group) + .setTitle(R.string.LeaveGroupDialog_choose_new_admin) + .setMessage(R.string.LeaveGroupDialog_before_you_leave_you_must_choose_at_least_one_new_admin_for_this_group) .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(R.string.ConversationActivity_choose_admin, (d,w) -> activity.startActivity(ChooseNewAdminActivity.createIntent(activity, groupId.requireV2()))) + .setPositiveButton(R.string.LeaveGroupDialog_choose_admin, (d,w) -> activity.startActivity(ChooseNewAdminActivity.createIntent(activity, groupId.requireV2()))) .show(); } private void showLeaveDialog() { new AlertDialog.Builder(activity) - .setTitle(R.string.ConversationActivity_leave_group) - .setIconAttribute(R.attr.dialog_info_icon) + .setTitle(R.string.LeaveGroupDialog_leave_group) .setCancelable(true) - .setMessage(R.string.ConversationActivity_are_you_sure_you_want_to_leave_this_group) - .setPositiveButton(R.string.yes, (dialog, which) -> { + .setMessage(R.string.LeaveGroupDialog_you_will_no_longer_be_able_to_send_or_receive_messages_in_this_group) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton(R.string.LeaveGroupDialog_leave, (dialog, which) -> { AlertDialog progressDialog = SimpleProgressDialog.show(activity); SimpleTask.run(activity.getLifecycle(), this::leaveGroup, result -> { progressDialog.dismiss(); handleLeaveGroupResult(result); }); }) - .setNegativeButton(R.string.no, null) .show(); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java index dae818edf0..c1926ccdc7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java @@ -103,7 +103,7 @@ public class AddMembersActivity extends PushContactSelectionActivity { return new AlertDialog.Builder(this) .setMessage(" ") .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel()) - .setPositiveButton(android.R.string.ok, (dialog, which) -> { + .setPositiveButton(R.string.AddMembersActivity__add, (dialog, which) -> { dialog.dismiss(); onFinishedSelection(); }) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.java index 6cd16ea6c1..61bcad5bec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.java @@ -88,7 +88,7 @@ public final class AddToGroupsActivity extends ContactSelectionActivity { new AlertDialog.Builder(this) .setTitle(addEvent.getTitle()) .setMessage(addEvent.getMessage()) - .setPositiveButton(android.R.string.ok, (dialog, which) -> viewModel.onAddToGroupsConfirmed(addEvent)) + .setPositiveButton(R.string.AddToGroupActivity_add, (dialog, which) -> viewModel.onAddToGroupsConfirmed(addEvent)) .setNegativeButton(android.R.string.cancel, null) .show(); } else if (event instanceof Event.LegacyGroupDenialEvent) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupRightsDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupRightsDialog.java index 09afdbfc1d..d59f3880a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupRightsDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupRightsDialog.java @@ -47,10 +47,10 @@ public final class GroupRightsDialog { public enum Type { - MEMBERSHIP(R.string.ManageGroupActivity_choose_who_can_add_or_invite_new_members, + MEMBERSHIP(R.string.ManageGroupActivity_who_can_add_new_members, R.array.GroupManagement_edit_group_membership_choices), - ATTRIBUTES(R.string.ManageGroupActivity_choose_who_can_edit_the_group_name_avatar_and_disappearing_messages, + ATTRIBUTES(R.string.ManageGroupActivity_who_can_edit_this_groups_info, R.array.GroupManagement_edit_group_info_choices); @StringRes private final int message; diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java index b5ff52bf7e..0dd06e6be3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java @@ -74,12 +74,6 @@ final class RecipientDialogRepository { }); } - void getGroupName(@NonNull Consumer stringConsumer) { - SimpleTask.run(SignalExecutors.BOUNDED, - () -> DatabaseFactory.getGroupDatabase(context).requireGroup(Objects.requireNonNull(groupId)).getTitle(), - stringConsumer::accept); - } - void removeMember(@NonNull Consumer onComplete, @NonNull GroupChangeErrorCallback error) { SimpleTask.run(SignalExecutors.UNBOUNDED, () -> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java index f872bfea18..34bc50e672 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java @@ -178,22 +178,21 @@ final class RecipientDialogViewModel extends ViewModel { } void onRemoveFromGroupClicked(@NonNull Activity activity, @NonNull Runnable onSuccess) { - recipientDialogRepository.getGroupName(title -> - new AlertDialog.Builder(activity) - .setMessage(context.getString(R.string.RecipientBottomSheet_remove_s_from_s, Objects.requireNonNull(recipient.getValue()).getDisplayName(context), title)) - .setPositiveButton(R.string.RecipientBottomSheet_remove, - (dialog, which) -> { - adminActionBusy.setValue(true); - recipientDialogRepository.removeMember(result -> { - adminActionBusy.setValue(false); - if (result) { - onSuccess.run(); - } - }, - this::showErrorToast); - }) - .setNegativeButton(android.R.string.cancel, (dialog, which) -> {}) - .show()); + new AlertDialog.Builder(activity) + .setMessage(context.getString(R.string.RecipientBottomSheet_remove_s_from_the_group, Objects.requireNonNull(recipient.getValue()).getDisplayName(context))) + .setPositiveButton(R.string.RecipientBottomSheet_remove, + (dialog, which) -> { + adminActionBusy.setValue(true); + recipientDialogRepository.removeMember(result -> { + adminActionBusy.setValue(false); + if (result) { + onSuccess.run(); + } + }, + this::showErrorToast); + }) + .setNegativeButton(android.R.string.cancel, (dialog, which) -> {}) + .show(); } void onAddedToContacts() { diff --git a/app/src/main/res/layout/group_manage_fragment.xml b/app/src/main/res/layout/group_manage_fragment.xml index 5028f579bb..ff1a2854cd 100644 --- a/app/src/main/res/layout/group_manage_fragment.xml +++ b/app/src/main/res/layout/group_manage_fragment.xml @@ -445,10 +445,10 @@ - @@ -456,53 +456,28 @@ + android:textAppearance="@style/Signal.Text.Body" /> - - - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 532d813581..ccd7a4fbf5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,11 +236,6 @@ Added to home screen Calls not supported This device does not appear to support dial actions. - Leave group? - Are you sure you want to leave this group? - Choose new admin - Before you leave, you must choose at least one new admin for this group. - Choose admin Insecure SMS Insecure MMS Signal @@ -466,6 +461,7 @@ Add to group Add to groups This person can\'t be added to legacy groups. + Add Choose new admin @@ -504,6 +500,14 @@ Learn more These users can’t be automatically added to this group by you.\n\nThey’ve been invited to join the group, and won’t see any group messages until they accept. + + Leave group? + You will no longer be able to send or receive messages in this group. + Leave + Choose new admin + Before you leave, you must choose at least one new admin for this group. + Choose admin + Disable Preview any link @@ -555,6 +559,7 @@ Add \"%1$s\" to \"%2$s\"? Add %3$d members to \"%2$s\"? + Add Name this group @@ -588,8 +593,8 @@ Member requests & invites Add members Edit group info - Choose who can edit the group name, avatar, and disappearing messages. - Choose who can add or invite new members. + Who can add new members? + Who can edit this group\'s info? Group link Block group Unblock group @@ -2644,9 +2649,9 @@ Video call Remove %1$s as group admin? - %1$s will be able to edit this group and its members + "%1$s" will be able to edit this group and its members. - Remove %1$s from "%2$s"? + Remove %1$s from the group? Remove Copied to clipboard