kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed bookmarks item layout

Browse source
This commit is contained in:
Dmitry Donskoy 2018-07-18 12:06:40 +03:00 • committed by Vlad Mihaylenko
parent 60e4545dbd
commit cde18a14e3
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/src/com/mapswithme/maps/bookmarks/Holders.java
View file

@ -344,14 +344,11 @@ public class Holders
BookmarkInfo bookmark = new BookmarkInfo(category.getId(), bookmarkId);
mName.setText(bookmark.getTitle());
final Location loc = LocationHelper.INSTANCE.getSavedLocation();
if (loc != null)
{
final DistanceAndAzimut daa = bookmark.getDistanceAndAzimuth(loc.getLatitude(),
loc.getLongitude(), 0.0);
mDistance.setText(daa.getDistance());
}
else
mDistance.setText(null);
String distanceValue = loc == null ? null : bookmark.getDistance(loc.getLatitude(),
loc.getLongitude(), 0.0);
mDistance.setText(distanceValue);
UiUtils.hideIf(TextUtils.isEmpty(distanceValue), mDistance);
mIcon.setImageResource(bookmark.getIcon().getSelectedResId());
}

6
android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java
View file

@ -53,4 +53,10 @@ public class BookmarkInfo
{
return mIcon;
}
@NonNull
public String getDistance(double latitude, double longitude, double v)
{
return getDistanceAndAzimuth(latitude, longitude, v).getDistance();
}
}