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

Minor refactoring

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-02-19 00:12:14 +01:00 • committed by Roman Tsisyk
parent d09c30122e
commit 948d7bd8cb
3 changed files with 32 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,14 +60,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
if (tintAttr != 0)
Graphics.tint((TextView)view, tintAttr);
}
view.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
processClick(mResult, mOrder);
}
});
view.setOnClickListener(v -> processClick(mResult, mOrder));
}
@Override
@ -166,21 +159,21 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
if (!TextUtils.isEmpty(result.description.airportIata))
{
tail.append(" • " + result.description.airportIata);
tail.append(" • ").append(result.description.airportIata);
}
else if (!TextUtils.isEmpty(result.description.roadShields))
{
tail.append(" • " + result.description.roadShields);
tail.append(" • ").append(result.description.roadShields);
}
else
{
if (!TextUtils.isEmpty(result.description.brand))
{
tail.append(" • " + Utils.getLocalizedBrand(mFrame.getContext(), result.description.brand));
tail.append(" • ").append(Utils.getLocalizedBrand(mFrame.getContext(), result.description.brand));
}
if (!TextUtils.isEmpty(result.description.cuisine))
{
tail.append(" • " + result.description.cuisine);
tail.append(" • ").append(result.description.cuisine);
}
}
@ -208,7 +201,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
mRegion = view.findViewById(R.id.region);
mDistance = view.findViewById(R.id.distance);
mClosedMarker.setBackgroundDrawable(mClosedMarkerBackground);
mClosedMarker.setBackground(mClosedMarkerBackground);
}
@Override
@ -241,29 +234,11 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
return isNotPopular || !mResult.description.hasPopularityHigherPriority;
}
private boolean isPopularVisible()
{
boolean isNotPopular = mResult.getPopularity().getType() == Popularity.Type.NOT_POPULAR;
if (isNotPopular)
return false;
boolean isClosed = mResult.description.openNow == SearchResult.OPEN_NOW_NO;
return !isClosed || mResult.description.hasPopularityHigherPriority;
}
private void setBackground()
{
Context context = mSearchFragment.getActivity();
int itemBg = ThemeUtils.getResource(context, R.attr.clickableBackground);
int bottomPad = mFrame.getPaddingBottom();
int topPad = mFrame.getPaddingTop();
int rightPad = mFrame.getPaddingRight();
int leftPad = mFrame.getPaddingLeft();
final Context context = mSearchFragment.getActivity();
final int itemBg = ThemeUtils.getResource(context, R.attr.clickableBackground);
mFrame.setBackgroundResource(itemBg);
// On old Android (4.1) after setting the view background the previous paddings
// are discarded for unknown reasons, that's why restoring the previous paddings is needed.
mFrame.setPadding(leftPad, topPad, rightPad, bottomPad);
}
@Override

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

@ -423,20 +423,29 @@ public class SearchFragment extends BaseMwmFragment
return mHiddenCommands;
}
private void processSelected(@NonNull SearchResult result)
void showSingleResultOnMap(@NonNull SearchResult result, int resultIndex)
{
final String query = getQuery();
SearchRecents.add(query, requireContext());
SearchEngine.INSTANCE.cancel();
SearchEngine.INSTANCE.setQuery(query);
if (RoutingController.get().isWaitingPoiPick())
{
SearchResult.Description description = result.description;
String subtitle = description != null
? Utils.getLocalizedFeatureType(getContext(), description.featureType)
: "";
? Utils.getLocalizedFeatureType(getContext(), description.featureType)
: "";
String title = TextUtils.isEmpty(result.name) ? subtitle : "";
final MapObject point = MapObject.createMapObject(FeatureId.EMPTY, MapObject.SEARCH,
title, subtitle, result.lat, result.lon);
title, subtitle, result.lat, result.lon);
RoutingController.get().onPoiSelected(point);
}
else
{
SearchEngine.INSTANCE.showResult(resultIndex);
}
mToolbarController.deactivate();
@ -444,19 +453,6 @@ public class SearchFragment extends BaseMwmFragment
Utils.navigateToParent(getActivity());
}
void showSingleResultOnMap(@NonNull SearchResult result, int resultIndex)
{
final String query = getQuery();
SearchRecents.add(query, requireContext());
SearchEngine.INSTANCE.cancel();
if (!RoutingController.get().isWaitingPoiPick())
SearchEngine.INSTANCE.showResult(resultIndex);
SearchEngine.INSTANCE.setQuery(query);
processSelected(result);
}
void showAllResultsOnMap()
{
// The previous search should be cancelled before the new one is started, since previous search

23
map/framework.cpp
View file

@ -1317,12 +1317,12 @@ void Framework::SelectSearchResult(search::Result const & result, bool animation
m_currentPlacePageInfo = BuildPlacePageInfo(info);
if (m_currentPlacePageInfo)
{
if (scale < 0)
scale = GetFeatureViewportScale(m_currentPlacePageInfo->GetTypes());
m2::PointD const center = m_currentPlacePageInfo->GetMercator();
if (m_drapeEngine != nullptr)
if (m_drapeEngine) {
if (scale < 0)
scale = GetFeatureViewportScale(m_currentPlacePageInfo->GetTypes());
m2::PointD const center = m_currentPlacePageInfo->GetMercator();
m_drapeEngine->SetModelViewCenter(center, scale, animation, true /* trackVisibleViewport */);
}
ActivateMapSelection();
}
@ -1994,14 +1994,13 @@ void Framework::ActivateMapSelection()
m_searchMarks.SetSelected(featureId);
CHECK_NOT_EQUAL(m_currentPlacePageInfo->GetSelectedObject(), df::SelectionShape::OBJECT_EMPTY, ("Empty selections are impossible."));
if (m_drapeEngine != nullptr)
auto const selObj = m_currentPlacePageInfo->GetSelectedObject();
CHECK_NOT_EQUAL(selObj, df::SelectionShape::OBJECT_EMPTY, ("Empty selections are impossible."));
if (m_drapeEngine)
{
m_drapeEngine->SelectObject(m_currentPlacePageInfo->GetSelectedObject(), m_currentPlacePageInfo->GetMercator(),
featureId,
m_currentPlacePageInfo->GetBuildInfo().m_needAnimationOnSelection,
m_currentPlacePageInfo->GetBuildInfo().m_isGeometrySelectionAllowed,
true);
auto const & bi = m_currentPlacePageInfo->GetBuildInfo();
m_drapeEngine->SelectObject(selObj, m_currentPlacePageInfo->GetMercator(), featureId,
bi.m_needAnimationOnSelection, bi.m_isGeometrySelectionAllowed, true);
}
if (m_onPlacePageOpen)