chats: hide calendar/users button when typing into searchbar (iOS off…

…icial app behaviour, also fixes a bug)
iTaysonLab · Feb 5, 2021 · f4fddd5 · f4fddd5
1 parent d44b20e
commit f4fddd5
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -56,6 +56,7 @@
 import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.URLSpan;
+import android.util.Log;
 import android.util.LongSparseArray;
 import android.util.Property;
 import android.util.SparseArray;
@@ -2024,11 +2025,22 @@ public void onSearchPressed(EditText editText) {
                 @Override
                 public void onTextChanged(EditText editText) {
                     showMessagesSearchListView(false);
+
                     if (searchingForUser) {
                         mentionsAdapter.searchUsernameOrHashtag("@" + editText.getText().toString(), 0, messages, true);
                     } else if (searchingUserMessages == null && searchingChatMessages == null && searchUserButton != null && TextUtils.equals(editText.getText(), LocaleController.getString("SearchFrom", R.string.SearchFrom))) {
                         searchUserButton.callOnClick();
                     }
+
+                    if (searchUserButton != null) {
+                        if (editText.getText().length() > 0) {
+                            searchUserButton.setVisibility(View.INVISIBLE);
+                            searchCalendarButton.setVisibility(View.INVISIBLE);
+                        } else {
+                            searchUserButton.setVisibility(View.VISIBLE);
+                            searchCalendarButton.setVisibility(View.VISIBLE);
+                        }
+                    }
                 }
 
                 @Override
@@ -6569,15 +6581,15 @@ protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, i
             searchUserButton.setOnClickListener(view -> {
                 mentionLayoutManager.setReverseLayout(true);
                 mentionsAdapter.setSearchingMentions(true);
-                searchCalendarButton.setVisibility(View.GONE);
-                searchUserButton.setVisibility(View.GONE);
                 searchingForUser = true;
                 searchingUserMessages = null;
                 searchingChatMessages = null;
                 searchItem.setSearchFieldHint(LocaleController.getString("SearchMembers", R.string.SearchMembers));
                 searchItem.setSearchFieldCaption(LocaleController.getString("SearchFrom", R.string.SearchFrom));
                 AndroidUtilities.showKeyboard(searchItem.getSearchField());
                 searchItem.clearSearchText();
+                searchCalendarButton.setVisibility(View.GONE);
+                searchUserButton.setVisibility(View.GONE);
             });
             searchUserButton.setContentDescription(LocaleController.getString("AccDescrSearchByUser", R.string.AccDescrSearchByUser));
         }