This repository was archived by the owner on Jul 25, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed
app/src/main/java/com/zulip/android/activities Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -400,7 +400,18 @@ public void onClick(View v) {
400
400
streamActv .setAdapter (streamActvAdapter );
401
401
topicActv .setAdapter (subjectActvAdapter );
402
402
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
+
404
415
SimpleCursorAdapter combinedAdapter = new SimpleCursorAdapter (
405
416
that , R .layout .emoji_tile , null ,
406
417
new String []{Emoji .NAME_FIELD , Emoji .NAME_FIELD },
@@ -498,9 +509,6 @@ private Cursor makePeopleNameCursor(CharSequence name) throws SQLException {
498
509
+ Person .NAME_FIELD + " COLLATE NOCASE" ,
499
510
DatabaseHelper .likeEscape (name .toString ()) + "%" )
500
511
.closeableIterator ().getRawResults ()).getRawCursor ();
501
- =======
502
- setupFab ();
503
- >>>>>>> Implement Floating ActionButton
504
512
}
505
513
506
514
private void setupFab () {
You can’t perform that action at this time.
0 commit comments