From 7f6195eea1eafd566d0c7d0b51924f92e553f5fc Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 14 Sep 2018 14:49:12 +0200
Subject: [PATCH] show 'clear contact search' button only if there is a search,
 closes #27

---
 res/layout/contact_filter_toolbar.xml         |  3 ++-
 .../components/ContactFilterToolbar.java      | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index 5bb26cc97..09d4fdeff 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -33,7 +33,8 @@
                 android:layout_gravity="center"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:gravity="center">
+                android:gravity="center"
+                android:visibility="invisible">
 
                 <ImageView android:id="@+id/search_clear"
                            android:layout_width="wrap_content"
diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
index 5c909ab8b..930cbf02b 100644
--- a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
@@ -48,6 +48,7 @@ public class ContactFilterToolbar extends Toolbar {
       @Override
       public void onClick(View v) {
         searchText.setText("");
+        displayTogglingView(null);
       }
     });
 
@@ -64,14 +65,24 @@ public class ContactFilterToolbar extends Toolbar {
 
       @Override
       public void afterTextChanged(Editable s) {
-        if (!SearchUtil.isEmpty(searchText)) displayTogglingView(clearToggle);
+        if (!SearchUtil.isEmpty(searchText)) {
+          displayTogglingView(clearToggle);
+        }
+        else {
+          displayTogglingView(null);
+        }
         notifyListener();
       }
     });
 
     setLogo(null);
     setContentInsetStartWithNavigation(0);
-    expandTapArea(toggleContainer, clearToggle);
+
+    // avoid flickering by setting button_toggle to INVISIBLE in contact_filter_toolbar.xml
+    // and set it to VISIBLE _after_ choosing to display nothing
+    // (AnimatingToggle displays the first what will flash shortly otherwise)
+    toggle.displayQuick(null);
+    toggle.setVisibility(View.VISIBLE);
   }
 
   public void clear() {
@@ -89,7 +100,9 @@ public class ContactFilterToolbar extends Toolbar {
 
   private void displayTogglingView(View view) {
     toggle.display(view);
-    expandTapArea(toggleContainer, view);
+    if (view!=null) {
+      expandTapArea(toggleContainer, view);
+    }
   }
 
   private void expandTapArea(final View container, final View child) {