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

Show mention picker immediately after @ entered.

Browse Source
This commit is contained in:
Cody Henthorne
2020-08-07 15:27:15 -04:00
committed by GitHub
parent d563de4207
commit 1634d7d531
4 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
View File

@@ -102,7 +102,7 @@ public class ComposeText extends EmojiEditText {
if (selectionStart == selectionEnd) {
doAfterCursorChange(getText());
} else {
updateQuery("");
updateQuery(null);
}
}
@@ -284,7 +284,7 @@ public class ComposeText extends EmojiEditText {
if (enoughToFilter(text)) {
performFiltering(text);
} else {
updateQuery("");
updateQuery(null);
}
}
@@ -292,10 +292,10 @@ public class ComposeText extends EmojiEditText {
int end = getSelectionEnd();
int start = findQueryStart(text, end);
CharSequence query = text.subSequence(start, end);
updateQuery(query);
updateQuery(query.toString());
}
private void updateQuery(@NonNull CharSequence query) {
private void updateQuery(@Nullable String query) {
if (mentionQueryChangedListener != null) {
mentionQueryChangedListener.onQueryChanged(query);
}
@@ -306,7 +306,7 @@ public class ComposeText extends EmojiEditText {
if (end < 0) {
return false;
}
return end - findQueryStart(text, end) >= 1;
return findQueryStart(text, end) != -1;
}
public void replaceTextWithMention(@NonNull String displayName, @NonNull RecipientId recipientId) {
@@ -340,7 +340,7 @@ public class ComposeText extends EmojiEditText {
private int findQueryStart(@NonNull CharSequence text, int inputCursorPosition) {
if (inputCursorPosition == 0) {
return inputCursorPosition;
return -1;
}
int delimiterSearchIndex = inputCursorPosition - 1;
@@ -351,7 +351,7 @@ public class ComposeText extends EmojiEditText {
if (delimiterSearchIndex >= 0 && text.charAt(delimiterSearchIndex) == MENTION_STARTER) {
return delimiterSearchIndex + 1;
}
return inputCursorPosition;
return -1;
}
private static class CommitContentListener implements InputConnectionCompat.OnCommitContentListener {
@@ -391,6 +391,6 @@ public class ComposeText extends EmojiEditText {
}
public interface MentionQueryChangedListener {
void onQueryChanged(CharSequence query);
void onQueryChanged(@Nullable String query);
}
}