Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 9fa33a3

Browse files
committed
Do not hide Chatbox if currently chatBox is used
1 parent 2574423 commit 9fa33a3

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,18 @@ public void onClick(View v) {
400400
streamActv.setAdapter(streamActvAdapter);
401401
topicActv.setAdapter(subjectActvAdapter);
402402
checkAndSetupStreamsDrawer();
403-
<<<<<<< a44f4687bd03950b07becf52be5222d106af8588
403+
404+
setupFab();
405+
View.OnFocusChangeListener focusChangeListener = new View.OnFocusChangeListener() {
406+
@Override
407+
public void onFocusChange(View view, boolean focus) {
408+
hideFABBlocked = focus;
409+
}
410+
};
411+
messageEt.setOnFocusChangeListener(focusChangeListener);
412+
topicActv.setOnFocusChangeListener(focusChangeListener);
413+
streamActv.setOnFocusChangeListener(focusChangeListener);
414+
404415
SimpleCursorAdapter combinedAdapter = new SimpleCursorAdapter(
405416
that, R.layout.emoji_tile, null,
406417
new String[]{Emoji.NAME_FIELD, Emoji.NAME_FIELD},
@@ -498,9 +509,6 @@ private Cursor makePeopleNameCursor(CharSequence name) throws SQLException {
498509
+ Person.NAME_FIELD + " COLLATE NOCASE",
499510
DatabaseHelper.likeEscape(name.toString()) + "%")
500511
.closeableIterator().getRawResults()).getRawCursor();
501-
=======
502-
setupFab();
503-
>>>>>>> Implement Floating ActionButton
504512
}
505513

506514
private void setupFab() {

0 commit comments

Comments
 (0)