From ecc2ee461c555d615f98842be2aca026530682e8 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Fri, 1 Sep 2023 13:09:24 +0200
Subject: [PATCH 1/3] Hide search footer by default

---
 app/res/layout/entity_select_layout.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/res/layout/entity_select_layout.xml b/app/res/layout/entity_select_layout.xml
index f59231a47f..8cf6ae3cbb 100644
--- a/app/res/layout/entity_select_layout.xml
+++ b/app/res/layout/entity_select_layout.xml
@@ -111,7 +111,8 @@
         android:id="@+id/searchfooter"
         android:orientation="horizontal"
         android:background="@drawable/border_top_black"
-        android:paddingTop="1dp">
+        android:paddingTop="1dp"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/screen_entity_select_search_label"

From 7c6ee039d709165cdfa24b6dd2889aed635619b6 Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Mon, 4 Sep 2023 14:25:29 +0200
Subject: [PATCH 2/3] Remove search footer view

---
 app/res/layout/entity_select_layout.xml | 45 +------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/app/res/layout/entity_select_layout.xml b/app/res/layout/entity_select_layout.xml
index 8cf6ae3cbb..18a80e2b30 100644
--- a/app/res/layout/entity_select_layout.xml
+++ b/app/res/layout/entity_select_layout.xml
@@ -68,7 +68,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/searchfooter"
+        android:layout_above="@+id/universal_frame_tile"
         android:layout_below="@+id/entity_select_filter_dropdown">
 
         <ListView
@@ -104,49 +104,6 @@
         android:layout_alignParentBottom="true">
     </FrameLayout>
 
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:layout_above="@id/ad_container"
-        android:id="@+id/searchfooter"
-        android:orientation="horizontal"
-        android:background="@drawable/border_top_black"
-        android:paddingTop="1dp"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/screen_entity_select_search_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="Search:">
-        </TextView>
-
-        <RelativeLayout
-            android:id="@+id/relativeLayout1"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent">
-
-            <EditText
-                android:id="@+id/searchbox"
-                android:layout_height="wrap_content"
-                android:layout_width="fill_parent"
-                android:layout_toLeftOf="@+id/barcodeButton"
-                android:maxLines="3"
-                android:inputType="textImeMultiLine"
-                android:imeOptions="actionDone"
-                android:layout_toStartOf="@+id/barcodeButton" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                app:srcCompat="@drawable/barcode"
-                android:id="@+id/barcodeButton"
-                android:layout_alignParentEnd="true" />
-        </RelativeLayout>
-    </LinearLayout>
-
     <FrameLayout
         android:id="@+id/universal_frame_tile"
         android:layout_width="match_parent"

From d76e12ad370f889c18a1604d31b1596a7b496f7d Mon Sep 17 00:00:00 2001
From: Ahmad Vazirna <avazirna@gmail.com>
Date: Mon, 4 Sep 2023 14:26:52 +0200
Subject: [PATCH 3/3] Update activities

---
 .../commcare/activities/CommCareActivity.java  |  5 -----
 .../activities/FormRecordListActivity.java     | 18 ------------------
 2 files changed, 23 deletions(-)

diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
index f6de4e1c34..ce7968295e 100755
--- a/app/src/org/commcare/activities/CommCareActivity.java
+++ b/app/src/org/commcare/activities/CommCareActivity.java
@@ -731,11 +731,6 @@ protected void tryToAddSearchActionToAppBar(AppCompatActivity activity, Menu men
                 instantiator.onActionBarFound(searchMenuItem, searchView, barcodeItem);
             }
         }
-
-        View bottomSearchWidget = activity.findViewById(org.commcare.dalvik.R.id.searchfooter);
-        if (bottomSearchWidget != null) {
-            bottomSearchWidget.setVisibility(View.GONE);
-        }
     }
 
     /**
diff --git a/app/src/org/commcare/activities/FormRecordListActivity.java b/app/src/org/commcare/activities/FormRecordListActivity.java
index 38cba1e2ed..ce868d3961 100644
--- a/app/src/org/commcare/activities/FormRecordListActivity.java
+++ b/app/src/org/commcare/activities/FormRecordListActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.text.Editable;
@@ -18,12 +17,9 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import org.commcare.CommCareApplication;
@@ -85,7 +81,6 @@ public class FormRecordListActivity extends SessionAwareCommCareActivity<FormRec
 
     private int initialSelection = -1;
 
-    private EditText searchbox;
     private ListView listView;
     private SearchView searchView;
     private MenuItem searchItem;
@@ -157,9 +152,7 @@ public void onCreateSessionSafe(Bundle savedInstanceState) {
         setContentView(R.layout.entity_select_layout);
         findViewById(R.id.entity_select_loading).setVisibility(View.GONE);
 
-        searchbox = findViewById(R.id.searchbox);
         LinearLayout header = findViewById(R.id.entity_select_header);
-        ImageButton barcodeButton = findViewById(R.id.barcodeButton);
 
         Spinner filterSelect = findViewById(R.id.entity_select_filter_dropdown);
 
@@ -167,14 +160,9 @@ public void onCreateSessionSafe(Bundle savedInstanceState) {
         listView.setOnItemClickListener(this);
 
         header.setVisibility(View.GONE);
-        barcodeButton.setVisibility(View.GONE);
 
         barcodeScanOnClickListener = v -> callBarcodeScanIntent(FormRecordListActivity.this);
 
-        TextView searchLabel = findViewById(R.id.screen_entity_select_search_label);
-        searchLabel.setText(this.localize("select.search.label"));
-
-        searchbox.addTextChangedListener(this);
         FormRecordLoaderTask task = new FormRecordLoaderTask(this, CommCareApplication.instance().getUserStorage(SessionStateDescriptor.class), platform);
         task.addListener(this);
 
@@ -336,8 +324,6 @@ private void attachToPurgeTask() {
     private void setSearchEnabled(boolean enabled) {
         if (isUsingActionBar()) {
             searchView.setEnabled(enabled);
-        } else {
-            searchbox.setEnabled(enabled);
         }
     }
 
@@ -496,7 +482,6 @@ private void setSearchText(CharSequence text) {
             MenuItemCompat.expandActionView(searchItem);
             searchView.setQuery(text, false);
         }
-        searchbox.setText(text);
     }
 
     @Override
@@ -627,9 +612,6 @@ public int getWakeLockLevel() {
     @Override
     public void afterTextChanged(Editable s) {
         String filtertext = s.toString();
-        if (searchbox.getText() == s) {
-            adapter.applyTextFilter(filtertext);
-        }
         if (!isUsingActionBar()) {
             lastQueryString = filtertext;
         }