mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 13:35:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add space between every emoji

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-01-13 04:12:33 +01:00
parent c4d03c8739
commit 9df5c89784
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View file

@ -93,7 +93,10 @@ import com.stfalcon.chatkit.messages.MessagesList;
import com.stfalcon.chatkit.messages.MessagesListAdapter; import com.stfalcon.chatkit.messages.MessagesListAdapter;
import com.stfalcon.chatkit.utils.DateFormatter; import com.stfalcon.chatkit.utils.DateFormatter;
import com.vanniktech.emoji.EmojiEditText; import com.vanniktech.emoji.EmojiEditText;
import com.vanniktech.emoji.EmojiImageView;
import com.vanniktech.emoji.EmojiPopup; import com.vanniktech.emoji.EmojiPopup;
import com.vanniktech.emoji.emoji.Emoji;
import com.vanniktech.emoji.listeners.OnEmojiClickListener;
import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener; import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener;
import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener; import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener;
import com.webianks.library.PopupBubble; import com.webianks.library.PopupBubble;
@ -135,6 +138,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
MessagesList messagesListView; MessagesList messagesListView;
@BindView(R.id.messageInputView) @BindView(R.id.messageInputView)
MessageInput messageInputView; MessageInput messageInputView;
@BindView(R.id.messageInput)
EmojiEditText messageInput;
@BindView(R.id.popupBubbleView) @BindView(R.id.popupBubbleView)
PopupBubble popupBubble; PopupBubble popupBubble;
@BindView(R.id.emptyLayout) @BindView(R.id.emptyLayout)
@ -388,9 +393,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
InputFilter[] filters = new InputFilter[1]; InputFilter[] filters = new InputFilter[1];
filters[0] = new InputFilter.LengthFilter(1000); filters[0] = new InputFilter.LengthFilter(1000);
messageInputView.getInputEditText().setFilters(filters); messageInput.setFilters(filters);
messageInputView.getInputEditText().addTextChangedListener(new TextWatcher() { messageInput.addTextChangedListener(new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -399,9 +404,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
if (s.length() == 1000) { if (s.length() == 1000) {
messageInputView.getInputEditText().setError(getResources().getString(R.string.nc_limit_hit)); messageInput.setError(getResources().getString(R.string.nc_limit_hit));
} else { } else {
messageInputView.getInputEditText().setError(null); messageInput.setError(null);
} }
} }
@ -438,13 +443,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void showConversationInfoScreen() { private void showConversationInfoScreen() {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(conversationUser)); bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(conversationUser));
bundle.putString(BundleKeys.KEY_BASE_URL, baseUrl); bundle.putString(BundleKeys.KEY_BASE_URL, baseUrl);
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken); bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken);
getRouter().pushController((RouterTransaction.with(new ConversationInfoController(bundle)) getRouter().pushController((RouterTransaction.with(new ConversationInfoController(bundle))
.pushChangeHandler(new HorizontalChangeHandler()) .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler()))); .popChangeHandler(new HorizontalChangeHandler())));
} }
@ -454,15 +459,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
AutocompletePresenter<Mention> presenter = new MentionAutocompletePresenter(getApplicationContext(), roomToken); AutocompletePresenter<Mention> presenter = new MentionAutocompletePresenter(getApplicationContext(), roomToken);
AutocompleteCallback<Mention> callback = new MentionAutocompleteCallback(); AutocompleteCallback<Mention> callback = new MentionAutocompleteCallback();
if (messageInputView != null && messageInputView.getInputEditText() != null) { mentionAutocomplete = Autocomplete.<Mention>on(messageInput)
mentionAutocomplete = Autocomplete.<Mention>on(messageInputView.getInputEditText()) .with(elevation)
.with(elevation) .with(backgroundDrawable)
.with(backgroundDrawable) .with(new CharPolicy('@'))
.with(new CharPolicy('@')) .with(presenter)
.with(presenter) .with(callback)
.with(callback) .build();
.build();
}
} }
@Override @Override
@ -489,7 +492,12 @@ public class ChatController extends BaseController implements MessagesListAdapte
smileyButton.clearColorFilter(); smileyButton.clearColorFilter();
} }
} }
}).build((EmojiEditText) messageInputView.getInputEditText()); }).setOnEmojiClickListener(new OnEmojiClickListener() {
@Override
public void onEmojiClick(@NonNull EmojiImageView emoji, @NonNull Emoji imageView) {
messageInput.getEditableText().append(" ");
}
}).build(messageInput);
if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) { if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
mentionAutocomplete.dismissPopup(); mentionAutocomplete.dismissPopup();