kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix emoji toggle behavior when in emoji search mode.
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.main
rodzic
4d47b9c594
commit
3ce5a7da67
|
@ -157,7 +157,7 @@ class GiftFlowConfirmationFragment :
|
||||||
viewModel.setAdditionalMessage(it)
|
viewModel.setAdditionalMessage(it)
|
||||||
},
|
},
|
||||||
onEmojiToggleClicked = {
|
onEmojiToggleClicked = {
|
||||||
if (inputAwareLayout.isKeyboardOpen || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
|
if ((inputAwareLayout.isKeyboardOpen && !emojiKeyboard.isEmojiSearchMode) || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
|
||||||
inputAwareLayout.show(it, emojiKeyboard)
|
inputAwareLayout.show(it, emojiKeyboard)
|
||||||
emojiToggle.setImageResource(R.drawable.ic_keyboard_24)
|
emojiToggle.setImageResource(R.drawable.ic_keyboard_24)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -489,6 +489,10 @@ public class InputPanel extends LinearLayout
|
||||||
mediaKeyboard.setToMedia();
|
mediaKeyboard.setToMedia();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setToIme() {
|
||||||
|
mediaKeyboard.setToIme();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onKeyEvent(KeyEvent keyEvent) {
|
public void onKeyEvent(KeyEvent keyEvent) {
|
||||||
composeText.dispatchKeyEvent(keyEvent);
|
composeText.dispatchKeyEvent(keyEvent);
|
||||||
|
|
|
@ -1171,8 +1171,12 @@ public class ConversationParentFragment extends Fragment
|
||||||
@Override
|
@Override
|
||||||
public void onKeyboardShown() {
|
public void onKeyboardShown() {
|
||||||
inputPanel.onKeyboardShown();
|
inputPanel.onKeyboardShown();
|
||||||
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing() && !emojiDrawerStub.get().isEmojiSearchMode()) {
|
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing()) {
|
||||||
emojiDrawerStub.get().hide(true);
|
if (emojiDrawerStub.get().isEmojiSearchMode()) {
|
||||||
|
inputPanel.setToIme();
|
||||||
|
} else {
|
||||||
|
emojiDrawerStub.get().hide(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (attachmentKeyboardStub.resolved() && attachmentKeyboardStub.get().isShowing()) {
|
if (attachmentKeyboardStub.resolved() && attachmentKeyboardStub.get().isShowing()) {
|
||||||
navigationBarBackground.setVisibility(View.GONE);
|
navigationBarBackground.setVisibility(View.GONE);
|
||||||
|
|
|
@ -147,8 +147,12 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
|
||||||
|
|
||||||
override fun onKeyboardShown() {
|
override fun onKeyboardShown() {
|
||||||
super.onKeyboardShown()
|
super.onKeyboardShown()
|
||||||
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing && !emojiDrawerStub.get().isEmojiSearchMode) {
|
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing) {
|
||||||
emojiDrawerStub.get().hide(true)
|
if (emojiDrawerStub.get().isEmojiSearchMode) {
|
||||||
|
binding.content.emojiToggle.setToIme()
|
||||||
|
} else {
|
||||||
|
emojiDrawerStub.get().hide(true)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue