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

Fix emoji toggle behavior when in emoji search mode.

Browse Source 
When in emoji search, toggle would be set to "emoji" state or
act like in "emoji" state. Fix is to show "keyboard" state still
when in emoji search.
This commit is contained in:
Cody Henthorne
2022-12-15 13:32:22 -05:00
parent 4d47b9c594
commit 3ce5a7da67
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowConfirmationFragment.kt
View File

@@ -157,7 +157,7 @@ class GiftFlowConfirmationFragment :
viewModel.setAdditionalMessage(it)
},
onEmojiToggleClicked = {
if (inputAwareLayout.isKeyboardOpen || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
if ((inputAwareLayout.isKeyboardOpen && !emojiKeyboard.isEmojiSearchMode) || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
inputAwareLayout.show(it, emojiKeyboard)
emojiToggle.setImageResource(R.drawable.ic_keyboard_24)
} else {

4
app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
View File

@@ -489,6 +489,10 @@ public class InputPanel extends LinearLayout
mediaKeyboard.setToMedia();
}
public void setToIme() {
mediaKeyboard.setToIme();
}
@Override
public void onKeyEvent(KeyEvent keyEvent) {
composeText.dispatchKeyEvent(keyEvent);

8
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -1171,8 +1171,12 @@ public class ConversationParentFragment extends Fragment
@Override
public void onKeyboardShown() {
inputPanel.onKeyboardShown();
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing() && !emojiDrawerStub.get().isEmojiSearchMode()) {
emojiDrawerStub.get().hide(true);
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing()) {
if (emojiDrawerStub.get().isEmojiSearchMode()) {
inputPanel.setToIme();
} else {
emojiDrawerStub.get().hide(true);
}
}
if (attachmentKeyboardStub.resolved() && attachmentKeyboardStub.get().isShowing()) {
navigationBarBackground.setVisibility(View.GONE);

8
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
View File

@@ -147,8 +147,12 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
override fun onKeyboardShown() {
super.onKeyboardShown()
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing && !emojiDrawerStub.get().isEmojiSearchMode) {
emojiDrawerStub.get().hide(true)
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing) {
if (emojiDrawerStub.get().isEmojiSearchMode) {
binding.content.emojiToggle.setToIme()
} else {
emojiDrawerStub.get().hide(true)
}
}
}