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

Commit 7799e30

Browse files
reachme-ankitatimabbott
authored andcommitted
Make compose box behave similarly on all modes.
Fixes #178.
1 parent 18e839f commit 7799e30

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,35 @@ public void muteTopic(Message message) {
259259

260260
@Override
261261
public void recyclerViewScrolled() {
262-
if (chatBox.getVisibility() == View.VISIBLE && !isTextFieldFocused) {
262+
/* in this method we check if the messageEt is empty or not
263+
if messageEt is not empty, it means that the user has typed something in the chatBox and that the chatBox should be open
264+
in spite of scrolling */
265+
if(chatBox.getVisibility()== View.VISIBLE && !isCurrentModeStream()){
266+
//if messageEt is empty in private msg mode, then the chatBox can disappear on scrolling else it will stay
267+
if(messageEt.getText().toString().equals(""))
268+
{
269+
displayChatBox(false);
270+
displayFAB(true);
271+
272+
}
273+
}
274+
275+
else if(chatBox.getVisibility()==View.VISIBLE && isCurrentModeStream()){
276+
//check if messageEt is empty in stream msg mode, then the chatBox can disappear on scrolling else it will disappear
277+
if(messageEt.getText().toString().equals("") && topicActv.getText().toString().equals(""))
278+
{
279+
displayChatBox(false);
280+
displayFAB(true);
281+
282+
}
283+
}
284+
/*check if stream edittext, topic edittext and messageEt edittext is empty in a general msg mode(i.e. when the floating
285+
button is pressed by user). If all fields are empty, then on scrolling the chatBox will disappear else not */
286+
else if (chatBox.getVisibility() == View.VISIBLE && streamActv.getText().toString().equals("") && topicActv.getText().toString().equals("") && messageEt.getText().toString().equals("")) {
263287
displayChatBox(false);
264288
displayFAB(true);
265289
}
290+
266291
}
267292

268293
public RefreshableCursorAdapter getPeopleAdapter() {

0 commit comments

Comments
 (0)