TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 14:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refer to yourself as 'you' in reactions and group membership.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-02-20 00:41:14 -05:00
parent 9e5f64c431
commit fda8f3e1ce
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java
View File

@ -102,7 +102,7 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
for (Recipient recipient : members) { for (Recipient recipient : members) {
if (recipient.isLocalNumber()) { if (recipient.isLocalNumber()) {
recipientStrings.add(context.getString(R.string.GroupMembersDialog_me)); recipientStrings.add(context.getString(R.string.GroupMembersDialog_you));
} else { } else {
String name = getRecipientName(recipient); String name = getRecipientName(recipient);
recipientStrings.add(name); recipientStrings.add(name);

3
app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
View File

@ -60,13 +60,14 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter<ReactionRecip
} }
void bind(@NonNull Reaction reaction) { void bind(@NonNull Reaction reaction) {
this.recipient.setText(reaction.getSender().getDisplayName(itemView.getContext()));
this.emoji.setText(reaction.getEmoji()); this.emoji.setText(reaction.getEmoji());
if (reaction.getSender().isLocalNumber()) { if (reaction.getSender().isLocalNumber()) {
this.recipient.setText(R.string.ReactionsRecipientAdapter_you);
this.avatar.setAvatar(GlideApp.with(avatar), null, false); this.avatar.setAvatar(GlideApp.with(avatar), null, false);
AvatarUtil.loadIconIntoImageView(reaction.getSender(), avatar); AvatarUtil.loadIconIntoImageView(reaction.getSender(), avatar);
} else { } else {
this.recipient.setText(reaction.getSender().getDisplayName(itemView.getContext()));
this.avatar.setAvatar(GlideApp.with(avatar), reaction.getSender(), false); this.avatar.setAvatar(GlideApp.with(avatar), reaction.getSender(), false);
} }
} }

5
app/src/main/res/values/strings.xml
View File

@ -448,7 +448,7 @@
<string name="GroupShareProfileView_make_visible">Make visible</string> <string name="GroupShareProfileView_make_visible">Make visible</string>
<!-- GroupMembersDialog --> <!-- GroupMembersDialog -->
<string name="GroupMembersDialog_me">Me</string> <string name="GroupMembersDialog_you">You</string>
<!-- CropImageActivity --> <!-- CropImageActivity -->
<string name="CropImageActivity_group_avatar">Group avatar</string> <string name="CropImageActivity_group_avatar">Group avatar</string>
@ -680,6 +680,9 @@
<!-- ReactionsConversationView --> <!-- ReactionsConversationView -->
<string name="ReactionsConversationView_plus">+%1$d</string> <string name="ReactionsConversationView_plus">+%1$d</string>
<!-- ReactionsRecipientAdapter -->
<string name="ReactionsRecipientAdapter_you">You</string>
<!-- RecipientPreferencesActivity --> <!-- RecipientPreferencesActivity -->
<string name="RecipientPreferenceActivity_block_this_contact_question">Block this contact?</string> <string name="RecipientPreferenceActivity_block_this_contact_question">Block this contact?</string>
<string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">You will no longer receive messages and calls from this contact.</string> <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">You will no longer receive messages and calls from this contact.</string>