Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability to clear about and emoji.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-01-22 10:29:52 -05:00
parent bd88be2513
commit 52a9f2c893
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
View File

@@ -59,7 +59,6 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
this.bodyView = view.findViewById(R.id.edit_about_body);
this.countView = view.findViewById(R.id.edit_about_count);
view.<Toolbar>findViewById(R.id.toolbar)
.setNavigationOnClickListener(v -> Navigation.findNavController(view)
.popBackStack());
@@ -76,6 +75,7 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
});
view.findViewById(R.id.edit_about_save).setOnClickListener(this::onSaveClicked);
view.findViewById(R.id.edit_about_clear).setOnClickListener(v -> onClearClicked());
if (savedInstanceState != null && savedInstanceState.containsKey(KEY_SELECTED_EMOJI)) {
onEmojiSelected(savedInstanceState.getString(KEY_SELECTED_EMOJI, ""));
@@ -98,6 +98,9 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
if (drawable != null) {
this.emojiView.setImageDrawable(drawable);
this.selectedEmoji = emoji;
} else {
this.emojiView.setImageResource(R.drawable.ic_add_emoji);
this.selectedEmoji = "";
}
}
@@ -125,7 +128,12 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
});
}
public static void trimFieldToMaxByteLength(Editable s) {
private void onClearClicked() {
bodyView.setText("");
onEmojiSelected("");
}
private static void trimFieldToMaxByteLength(Editable s) {
int trimmedLength = StringUtil.trimToFit(s.toString(), ProfileCipher.MAX_POSSIBLE_ABOUT_LENGTH).length();
if (s.length() > trimmedLength) {