Merge pull request #1125 from PhenoApps/field_search

field_search

app/src/main/java/com/fieldbook/tracker/activities/FieldEditorActivity.java

@@ -17,6 +17,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.provider.OpenableColumns;
 import android.text.Html;
 import android.text.Spanned;
@@ -38,6 +39,7 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.DividerItemDecoration;
@@ -70,6 +72,7 @@
 import com.fieldbook.tracker.utilities.SnackbarUtils;
 import com.fieldbook.tracker.utilities.TapTargetUtil;
 import com.fieldbook.tracker.utilities.Utils;
+import com.fieldbook.tracker.views.SearchBar;
 import com.getkeepsafe.taptargetview.TapTarget;
 import com.getkeepsafe.taptargetview.TapTargetSequence;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -102,6 +105,7 @@ public class FieldEditorActivity extends ThemedActivity
     private static final int REQUEST_FILE_EXPLORER_CODE = 1;
     private static final int REQUEST_CLOUD_FILE_CODE = 5;
     private static final int REQUEST_BRAPI_IMPORT_ACTIVITY = 10;
+
     private ArrayList<FieldObject> fieldList;
     public FieldAdapter mAdapter;
     public EditText trait;
@@ -116,6 +120,7 @@ public class FieldEditorActivity extends ThemedActivity
     private ActionMode actionMode;
     private TextView customTitleView;
     public ExportUtil exportUtil;
+    private SearchBar searchBar;
 
     @Inject
     DataHelper database;
@@ -182,6 +187,8 @@ public void onFieldSelected(int fieldId) {
         FloatingActionButton fab = findViewById(R.id.newField);
         fab.setOnClickListener(v -> handleImportAction());
 
+        searchBar = findViewById(R.id.act_fields_sb);
+
         queryAndLoadFields();
 
     }
@@ -1062,6 +1069,9 @@ public void queryAndLoadFields() {
             fieldList = database.getAllFieldObjects(); // Fetch data from the database
             mAdapter.submitList(new ArrayList<>(fieldList), () -> recyclerView.scrollToPosition(0));
             mAdapter.notifyDataSetChanged();
+
+            new Handler(Looper.getMainLooper()).postDelayed(this::setupSearchBar, 100);
+
         } catch (Exception e) {
             Log.e(TAG, "Error updating fields list", e);
         }
@@ -1085,4 +1095,34 @@ public FieldSwitcher getFieldSwitcher() {
         return fieldSwitcher;
     }
 
+    private void setupSearchBar() {
+
+        if (recyclerView.canScrollVertically(1) || recyclerView.canScrollVertically(-1)) {
+
+            searchBar.setVisibility(View.VISIBLE);
+
+            searchBar.editText.addTextChangedListener(new android.text.TextWatcher() {
+
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                    // Do nothing
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    mAdapter.setTextFilter(s.toString());
+                }
+
+                @Override
+                public void afterTextChanged(android.text.Editable s) {
+                    // Do nothing
+                }
+            });
+
+        } else {
+
+            searchBar.setVisibility(View.GONE);
+
+        }
+    }
 }

app/src/main/java/com/fieldbook/tracker/adapters/FieldAdapter.java

@@ -9,6 +9,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
@@ -39,6 +40,8 @@ public class FieldAdapter extends ListAdapter<FieldObject, FieldAdapter.ViewHold
     private final FieldSwitcher fieldSwitcher;
     private AdapterCallback callback;
     private OnFieldSelectedListener listener;
+    private String filterText = "";
+    private final List<FieldObject> fullFieldList = new ArrayList<>();
 
     public interface OnFieldSelectedListener {
         void onFieldSelected(int itemId);
@@ -219,4 +222,24 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             holder.sourceIcon.setBackground(null);
         }
     }
+
+    @Override
+    public void submitList(@Nullable List<FieldObject> list, @Nullable Runnable commitCallback) {
+        super.submitList(list, commitCallback);
+        fullFieldList.clear();
+        if (list != null) {
+            fullFieldList.addAll(list);
+        }
+    }
+
+    public void setTextFilter(String filter) {
+        this.filterText = filter;
+        List<FieldObject> filterFields = new ArrayList<>(fullFieldList);
+        for (FieldObject field : fullFieldList) {
+            if (!filter.isEmpty() && !field.getExp_name().toLowerCase().contains(filter.toLowerCase())) {
+                filterFields.remove(field);
+            }
+        }
+        submitList(filterFields);
+    }
 }

app/src/main/java/com/fieldbook/tracker/views/SearchBar.kt

@@ -3,19 +3,15 @@ package com.fieldbook.tracker.views
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.AutoCompleteTextView
-import android.widget.EditText
 import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.TextView
-import androidx.core.widget.addTextChangedListener
+import android.widget.ImageView
 import com.fieldbook.tracker.R
 
-class SearchBar: FrameLayout {
+class SearchBar : FrameLayout {
 
     lateinit var editText: AutoCompleteTextView
+    lateinit var clearButton: ImageView
 
     constructor(context: Context) : super(context) {
         init()
@@ -25,7 +21,11 @@ class SearchBar: FrameLayout {
         init()
     }
 
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
         init()
     }
 
@@ -35,6 +35,10 @@ class SearchBar: FrameLayout {
         val view = LayoutInflater.from(context).inflate(R.layout.view_search_bar, this, true)
 
         editText = view.findViewById(R.id.search)
+        clearButton = view.findViewById(R.id.clear)
 
+        clearButton.setOnClickListener {
+            editText.text.clear()
+        }
     }
 }

app/src/main/res/layout/activity_fields.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/fb_color_background"
+    android:id="@+id/field_editor_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -21,6 +23,14 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <com.fieldbook.tracker.views.SearchBar
+            android:visibility="gone"
+            android:id="@+id/act_fields_sb"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/act_list_filter_tb" />
+
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/main_content"
             android:layout_width="match_parent"
@@ -30,7 +40,9 @@
             android:id="@+id/fieldRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="5dp" />
+            android:padding="5dp"
+            tools:listitem="@layout/list_item_field_recycler"
+            tools:itemCount="3"/>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
     </LinearLayout>

app/src/main/res/layout/list_item_field_recycler.xml

@@ -13,7 +13,8 @@
         android:layout_width="44dp"
         android:layout_height="44dp"
         android:gravity="center"
-        android:padding="8dp"/>
+        android:padding="8dp"
+        tools:src="@drawable/ic_file_csv"/>
 
     <LinearLayout xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -43,7 +44,8 @@
             android:ellipsize="end"
             android:gravity="start"
             android:minWidth="40dp"
-            android:singleLine="true"/>
+            android:singleLine="true"
+            tools:text="200"/>
 
     </LinearLayout>
 

app/src/main/res/layout/view_search_bar.xml

@@ -47,7 +47,6 @@
             android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/searchpreference_clear"
             android:padding="4dp"
-            android:visibility="gone"
             app:srcCompat="@drawable/searchpreference_ic_clear"
             app:tint="?android:attr/textColorPrimary" />