From 44d5c04212bf5657e7e4414e74e54dcb79db0653 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Fri, 8 May 2020 17:34:13 +0300 Subject: [PATCH] [guides on map] subtitle is removed from gallery data source --- .../jni/com/mapswithme/maps/guides/Guides.cpp | 8 ++++---- .../mapswithme/maps/guides/GuidesGallery.java | 17 ++++++++++++++--- map/guides_manager.cpp | 7 ++----- map/guides_manager.hpp | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/android/jni/com/mapswithme/maps/guides/Guides.cpp b/android/jni/com/mapswithme/maps/guides/Guides.cpp index 428f5ec892..e7d68c35ba 100644 --- a/android/jni/com/mapswithme/maps/guides/Guides.cpp +++ b/android/jni/com/mapswithme/maps/guides/Guides.cpp @@ -26,7 +26,7 @@ void PrepareClassRefs(JNIEnv *env) // @Nullable OutdoorParams outdoorParams) g_itemConstructor = jni::GetConstructorID(env, g_itemClass, "(Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" + "Ljava/lang/String;Ljava/lang/String;" "IZLcom/mapswithme/maps/guides/GuidesGallery$CityParams;" "Lcom/mapswithme/maps/guides/GuidesGallery$OutdoorParams;)" "V"); @@ -38,7 +38,7 @@ void PrepareClassRefs(JNIEnv *env) = jni::GetGlobalClassRef(env, "com/mapswithme/maps/guides/GuidesGallery$OutdoorParams"); // public OutdoorParams(double distance, long duration, int ascent) g_outdoorParamsConstructor - = jni::GetConstructorID(env, g_outdoorParamsClass, "(DJI)V"); + = jni::GetConstructorID(env, g_outdoorParamsClass, "(Ljava/lang/String;DJI)V"); jni::HandleJavaException(env); } } // namespace @@ -55,7 +55,6 @@ jobject CreateGallery(JNIEnv *env, GuidesManager::GuidesGallery const & gallery) jni::TScopedLocalRef url(env, jni::ToJavaString(env, item.m_url)); jni::TScopedLocalRef imageUrl(env, jni::ToJavaString(env, item.m_imageUrl)); jni::TScopedLocalRef title(env, jni::ToJavaString(env, item.m_title)); - jni::TScopedLocalRef subtitle(env, jni::ToJavaString(env, item.m_subTitle)); auto const type = static_cast(item.m_type); auto const downloaded = static_cast(item.m_downloaded); jni::TScopedLocalRef cityParams(env, nullptr); @@ -68,13 +67,14 @@ jobject CreateGallery(JNIEnv *env, GuidesManager::GuidesGallery const & gallery) } else if (item.m_type == GuidesManager::GuidesGallery::Item::Type::Outdoor) { outdoorParams.reset(env->NewObject(g_outdoorParamsClass, g_outdoorParamsConstructor, + jni::ToJavaString(env, item.m_outdoorsParams.m_tag), static_cast(item.m_outdoorsParams.m_distance), static_cast(item.m_outdoorsParams.m_duration), static_cast(item.m_outdoorsParams.m_ascent))); } return env->NewObject(g_itemClass, g_itemConstructor, guideId.get(), url.get(), imageUrl.get(), - title.get(), subtitle.get(), type, downloaded, cityParams.get(), + title.get(), type, downloaded, cityParams.get(), outdoorParams.get()); }; diff --git a/android/src/com/mapswithme/maps/guides/GuidesGallery.java b/android/src/com/mapswithme/maps/guides/GuidesGallery.java index d2c2952be2..a659351ad9 100644 --- a/android/src/com/mapswithme/maps/guides/GuidesGallery.java +++ b/android/src/com/mapswithme/maps/guides/GuidesGallery.java @@ -82,11 +82,11 @@ public class GuidesGallery implements PlacePageData private boolean mActivated = false; public Item(@NonNull String guideId, @NonNull String url, @NonNull String imageUrl, - @NonNull String title, @NonNull String subTitle, int type, + @NonNull String title, int type, boolean downloaded, @Nullable CityParams cityParams, @Nullable OutdoorParams outdoorParams) { - super(Constants.TYPE_PRODUCT, title, subTitle, url); + super(Constants.TYPE_PRODUCT, title, "", url); mGuideId = guideId; mImageUrl = imageUrl; mType = Type.values()[type]; @@ -244,12 +244,15 @@ public class GuidesGallery implements PlacePageData public static class OutdoorParams implements Parcelable { + @NonNull + private final String mTag; private final double mDistance; private final long mDuration; private final int mAscent; - public OutdoorParams(double distance, long duration, int ascent) + public OutdoorParams(@NonNull String tag, double distance, long duration, int ascent) { + mTag = tag; mDistance = distance; mDuration = duration; mAscent = ascent; @@ -257,6 +260,7 @@ public class GuidesGallery implements PlacePageData protected OutdoorParams(Parcel in) { + mTag = in.readString(); mDistance = in.readDouble(); mDuration = in.readLong(); mAscent = in.readInt(); @@ -277,6 +281,12 @@ public class GuidesGallery implements PlacePageData } }; + @NonNull + public String getString() + { + return mTag; + } + public double getDistance() { return mDistance; @@ -301,6 +311,7 @@ public class GuidesGallery implements PlacePageData @Override public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mTag); dest.writeDouble(mDistance); dest.writeLong(mDuration); dest.writeInt(mAscent); diff --git a/map/guides_manager.cpp b/map/guides_manager.cpp index d06c1b7d92..8b10ae2d38 100644 --- a/map/guides_manager.cpp +++ b/map/guides_manager.cpp @@ -156,7 +156,6 @@ GuidesManager::GuidesGallery GuidesManager::GetGallery() const item.m_imageUrl = "https://storage.maps.me/bookmarks_catalogue/" "002dc2ae-7b5c-4d3c-88bc-7c7ba109d0e8.jpg?t=1584470956.009026"; item.m_title = "Moscow by The Village"; - item.m_subTitle = "awesome city guide"; item.m_type = GuidesGallery::Item::Type::City; item.m_downloaded = false; item.m_cityParams.m_bookmarksCount = 32; @@ -172,7 +171,6 @@ GuidesManager::GuidesGallery GuidesManager::GetGallery() const item.m_imageUrl = "https://storage.maps.me/bookmarks_catalogue/" "002dc2ae-7b5c-4d3c-88bc-7c7ba109d0e8.jpg?t=1584470956.009026"; item.m_title = "Riga City Tour"; - item.m_subTitle = "awesome city guide"; item.m_type = GuidesGallery::Item::Type::City; item.m_downloaded = true; item.m_cityParams.m_bookmarksCount = 31; @@ -187,9 +185,9 @@ GuidesManager::GuidesGallery GuidesManager::GetGallery() const item.m_url = "https://routes.maps.me/en/v3/mobilefront/route/d26a6662-20a3-432c-a357-c9cb3cce6d57"; item.m_imageUrl = "https://img.oastatic.com/img2/1966324/834x417s/t.jpg"; item.m_title = "Klassik trifft Romantik"; - item.m_subTitle = "Hiking / Trekking"; item.m_type = GuidesGallery::Item::Type::Outdoor; item.m_downloaded = false; + item.m_outdoorsParams.m_tag = "Hiking / Trekking"; item.m_outdoorsParams.m_ascent = 400; item.m_outdoorsParams.m_distance = 24100; item.m_outdoorsParams.m_duration = 749246; @@ -222,7 +220,6 @@ GuidesManager::GuidesGallery GuidesManager::GetGallery() const item.m_type = GuidesGallery::Item::Type::City; item.m_cityParams.m_bookmarksCount = guide.m_guideInfo.m_bookmarksCount; item.m_cityParams.m_trackIsAvailable = guide.m_guideInfo.m_hasTrack; - item.m_subTitle = "TODO(a): to add correct value"; } else { @@ -230,7 +227,7 @@ GuidesManager::GuidesGallery GuidesManager::GetGallery() const item.m_outdoorsParams.m_duration = guide.m_guideInfo.m_tourDuration; item.m_outdoorsParams.m_distance = guide.m_guideInfo.m_tracksLength; item.m_outdoorsParams.m_ascent = guide.m_guideInfo.m_ascent; - item.m_subTitle = guide.m_guideInfo.m_tag; + item.m_outdoorsParams.m_tag = guide.m_guideInfo.m_tag; } gallery.m_items.emplace_back(std::move(item)); diff --git a/map/guides_manager.hpp b/map/guides_manager.hpp index c4698fae1e..671f3c983e 100644 --- a/map/guides_manager.hpp +++ b/map/guides_manager.hpp @@ -47,6 +47,7 @@ public: struct OutdoorParams { + std::string m_tag; // Distance in meters. double m_distance = 0.0; // Duration in seconds. @@ -65,7 +66,6 @@ public: std::string m_url; std::string m_imageUrl; std::string m_title; - std::string m_subTitle; Type m_type = Type::City; bool m_downloaded = false; CityParams m_cityParams;