Fix search obs UI issues (fix #325)

inaturalist · Apr 27, 2017 · 22e342c · 22e342c
1 parent 77c1759
commit 22e342c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/iNaturalist/src/main/AndroidManifest.xml b/iNaturalist/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.inaturalist.android"
-    android:versionCode="210"
-    android:versionName="1.5.13" >
+    android:versionCode="211"
+    android:versionName="1.5.14" >
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="21"
         />

diff --git a/iNaturalist/src/main/java/org/inaturalist/android/ObservationSearchActivity.java b/iNaturalist/src/main/java/org/inaturalist/android/ObservationSearchActivity.java
@@ -147,6 +147,7 @@ public void onCreate(Bundle savedInstanceState) {
             public void onTextChanged(final CharSequence s, int start, int before, int count) {
                 if (s.length() == 0) {
                     mProgress.setVisibility(View.GONE);
+                    mNoResults.setVisibility(View.GONE);
                     return;
                 } else {
                     getListView().setVisibility(View.VISIBLE);

diff --git a/iNaturalist/src/main/java/org/inaturalist/android/TaxonSearchActivity.java b/iNaturalist/src/main/java/org/inaturalist/android/TaxonSearchActivity.java
@@ -74,6 +74,7 @@ public class TaxonSearchActivity extends AppCompatActivity implements AdapterVie
     private boolean mShowUnknown;
 
     private long mLastTime = 0;
+    private TextView mNoResults;
 
     @Override
 	protected void onStart()
@@ -227,7 +228,7 @@ protected FilterResults performFiltering(CharSequence constraint) {
                         if (constraint.length() == 0) {
                             filterResults.values = new ArrayList<JSONObject>();
                             filterResults.count = 0;
-                            
+
                         } else {
                             toggleLoading(true);
 
@@ -430,6 +431,9 @@ public void onCreate(Bundle savedInstanceState) {
 
         mProgress = (ProgressBar) findViewById(R.id.progress);
         mProgress.setVisibility(View.GONE);
+
+        mNoResults = (TextView) findViewById(android.R.id.empty);
+        mNoResults.setVisibility(View.GONE);
 
         mAdapter = new TaxonAutoCompleteAdapter(getApplicationContext(), R.layout.taxon_result_item);
         final EditText autoCompView = (EditText) customView.findViewById(R.id.search_text);