From 2754d55f5ec897850cb60bbba3d57f33b2d7e079 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sat, 20 Jan 2024 00:13:51 -0300 Subject: [PATCH] [android] Fixed localized Feature type. Signed-off-by: Viktor Govako --- .../java/app/organicmaps/search/SearchFragment.java | 7 ++----- .../java/app/organicmaps/search/SearchResult.java | 11 ++++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java index 901973530a..20a1e2d0a8 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java @@ -397,11 +397,8 @@ public class SearchFragment extends BaseMwmFragment if (RoutingController.get().isWaitingPoiPick()) { - SearchResult.Description description = result.description; - String subtitle = description != null - ? Utils.getLocalizedFeatureType(requireContext(), description.featureType) - : ""; - String title = TextUtils.isEmpty(result.name) ? subtitle : ""; + final String subtitle = (result.description != null) ? result.description.localizedFeatureType : ""; + final String title = TextUtils.isEmpty(result.name) ? subtitle : result.name; final MapObject point = MapObject.createMapObject(FeatureId.EMPTY, MapObject.SEARCH, title, subtitle, result.lat, result.lon); diff --git a/android/app/src/main/java/app/organicmaps/search/SearchResult.java b/android/app/src/main/java/app/organicmaps/search/SearchResult.java index 33be110c75..468e29da0e 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchResult.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchResult.java @@ -40,7 +40,7 @@ public class SearchResult public static class Description { public final FeatureId featureId; - public final String featureType; + public final String localizedFeatureType; public final String region; public final Distance distance; @@ -56,7 +56,7 @@ public class SearchResult boolean hasPopularityHigherPriority) { this.featureId = featureId; - this.featureType = featureType; + this.localizedFeatureType = featureType; this.region = region; this.distance = distance; this.description = description; @@ -114,11 +114,8 @@ public class SearchResult public String getTitle(@NonNull Context context) { String title = name; - if (TextUtils.isEmpty(title)) - { - title = description != null ? description.featureType : ""; - } - + if (TextUtils.isEmpty(title) && description != null) + title = description.localizedFeatureType; return title; }