From c4c00ec308b7a888ed0f52f3a90f8080e12f743a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Mon, 16 Dec 2019 14:25:20 +0300
Subject: [PATCH] [android] Made 'View on map' button visible consistently
 during search

---
 .../mapswithme/maps/search/SearchAdapter.java | 20 ++++++-------------
 .../maps/search/SearchFragment.java           |  6 +++---
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/android/src/com/mapswithme/maps/search/SearchAdapter.java b/android/src/com/mapswithme/maps/search/SearchAdapter.java
index 28d310f1d8..904a626581 100644
--- a/android/src/com/mapswithme/maps/search/SearchAdapter.java
+++ b/android/src/com/mapswithme/maps/search/SearchAdapter.java
@@ -4,12 +4,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -21,6 +15,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import com.mapswithme.HotelUtils;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.bookmarks.data.FeatureId;
@@ -427,14 +427,6 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     return mResults[position].type;
   }
 
-  boolean showPopulateButton()
-  {
-    return (!RoutingController.get().isWaitingPoiPick() &&
-            mResults != null &&
-            mResults.length > 0 &&
-            mResults[0].type != TYPE_SUGGEST);
-  }
-
   @Override
   public long getItemId(int position)
   {
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index 136a9efcfb..8779ddf0dd 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -274,8 +274,7 @@ public class SearchFragment extends BaseMwmFragment
                         | AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL : 0);
     mToolbarLayout.setLayoutParams(lp);
     if (mFilterController != null)
-      mFilterController.show(hasQuery && mSearchAdapter.getItemCount() != 0,
-                             mSearchAdapter.showPopulateButton());
+      mFilterController.show(hasQuery, !RoutingController.get().isWaitingPoiPick());
 
     if (hasQuery)
       hideDownloadSuggest();
@@ -293,7 +292,8 @@ public class SearchFragment extends BaseMwmFragment
 
     UiUtils.showIf(show, mResultsPlaceholder);
     if (mFilterController != null)
-      mFilterController.showPopulateButton(mSearchAdapter.showPopulateButton() && !isTabletSearch());
+      mFilterController.showPopulateButton(!RoutingController.get()
+                                                             .isWaitingPoiPick() && !isTabletSearch());
   }
 
   @Override