mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-29 00:14:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "trying to fix flashing emoji picker"

Browse source 
This reverts commit 327cb093e3.
This commit is contained in:
12aw 2024-03-04 12:12:49 +01:00
parent df58db6aa2
commit 28c69bfa88
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -4018,9 +4018,7 @@ public class ConversationFragment extends XmppFragment
final Activity activity = getActivity();
messageListAdapter.unregisterListenerInAudioPlayer();
if (activity == null || !activity.isChangingConfigurations()) {
if (activity != null) {
hideSoftKeyboard(activity);
}
hideSoftKeyboard(activity);
messageListAdapter.stopAudioPlayer();
}
if (this.conversation != null) {
@ -4030,7 +4028,7 @@ public class ConversationFragment extends XmppFragment
this.activity.xmppConnectionService.getNotificationService().setOpenConversation(null);
}
this.reInitRequiredOnStart = true;
// if (binding.stickers != null) binding.stickers.setVisibility(GONE);;
if (binding.stickers != null) binding.stickers.setVisibility(GONE);;
}
private void updateChatState(final Conversation conversation, final String msg) {
@ -4784,12 +4782,6 @@ public class ConversationFragment extends XmppFragment
} else if (activity != null && binding.emojiButton.getVisibility() == VISIBLE) {
binding.emojisStickerLayout.setVisibility(GONE);
binding.keyboardButton.setVisibility(GONE);
hideSoftKeyboard(activity);
} else if (activity == null) {
binding.emojisStickerLayout.setVisibility(GONE);
binding.keyboardButton.setVisibility(GONE);
binding.emojiButton.setVisibility(VISIBLE);
hideSoftKeyboard(activity);
}
if (activity != null && activity.xmppConnectionService != null && isKeyboardVisible && activity.xmppConnectionService.showTextFormatting()) {
showTextFormat(me);
@ -4820,17 +4812,8 @@ public class ConversationFragment extends XmppFragment
params.height = keyboardHeight - 150;
emojipickerview.setLayoutParams(params);
binding.emojisStickerLayout.setVisibility(VISIBLE);
} else if (activity != null && binding.emojiButton.getVisibility() == VISIBLE) {
binding.emojisStickerLayout.setVisibility(GONE);
binding.keyboardButton.setVisibility(GONE);
hideSoftKeyboard(activity);
} else if (activity != null) {
} else if (activity != null ) {
activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
} else if (activity == null) {
binding.emojisStickerLayout.setVisibility(GONE);
binding.keyboardButton.setVisibility(GONE);
binding.emojiButton.setVisibility(VISIBLE);
hideSoftKeyboard(activity);
}
if (activity != null && !keyboardOpen && binding.emojiButton.getVisibility() == VISIBLE) {
binding.emojisStickerLayout.setVisibility(GONE);