pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Made 'View on map' button visible consistently during search

Browse source
This commit is contained in:
Александр Зацепин 2019-12-16 14:25:20 +03:00 • committed by Arsentiy Milchakov
parent 4f3fe17b41
commit c4c00ec308
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
android/src/com/mapswithme/maps/search/SearchAdapter.java
View file

@ -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)
{

6
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -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