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

[android] [bookmark] Added guide's image from jni.

Browse source
This commit is contained in:
velichkomarija 2020-09-29 10:25:10 +03:00 • committed by Aleksandr Zatsepin
parent bf8e6c8656
commit 6f8ecadd97
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -159,7 +159,7 @@ void PrepareClassRefs(JNIEnv * env)
g_bookmarkCategoryConstructor =
jni::GetConstructorID(env, g_bookmarkCategoryClass,
"(JLjava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIZZZILjava/lang/String;)V");
"Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIZZZILjava/lang/String;Ljava/lang/String;)V");
g_catalogTagClass =
jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogTag");
@ -557,6 +557,7 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids)
auto const description = GetPreferredBookmarkStr(data.m_description);
auto const accessRules = data.m_accessRules;
auto const serverId = manager.GetCategoryServerId(data.m_id);
auto const imageUrl = data.m_imageUrl;
jni::TScopedLocalRef preferBookmarkStrRef(env, jni::ToJavaString(env, preferBookmarkStr));
jni::TScopedLocalRef authorIdRef(env, jni::ToJavaString(env, data.m_authorId));
@ -564,6 +565,7 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids)
jni::TScopedLocalRef annotationRef(env, jni::ToJavaString(env, annotation));
jni::TScopedLocalRef descriptionRef(env, jni::ToJavaString(env, description));
jni::TScopedLocalRef serverIdRef(env, jni::ToJavaString(env, serverId));
jni::TScopedLocalRef imageUrlIdRef(env, jni::ToJavaString(env, imageUrl));
return env->NewObject(g_bookmarkCategoryClass,
g_bookmarkCategoryConstructor,
@ -579,7 +581,8 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids)
static_cast<jboolean>(isMyCategory),
static_cast<jboolean>(isVisible),
static_cast<jint>(accessRules),
serverIdRef.get());
serverIdRef.get(),
imageUrlIdRef.get());
};
return ToJavaArray(env, g_bookmarkCategoryClass, ids, bookmarkConverter);
}

14
android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java
View file

@ -34,13 +34,15 @@ public class BookmarkCategory implements Parcelable
private final boolean mIsVisible;
@NonNull
private final String mServerId;
@NonNull
private final String mImageUrl;
public BookmarkCategory(long id, @NonNull String name, @NonNull String authorId,
@NonNull String authorName, @NonNull String annotation,
@NonNull String description, int tracksCount, int bookmarksCount,
boolean fromCatalog, boolean isMyCategory, boolean isVisible,
int accessRulesIndex, @NonNull String serverId)
int accessRulesIndex, @NonNull String serverId, @NonNull String imageUrl)
{
mId = id;
mName = name;
@ -56,6 +58,7 @@ public class BookmarkCategory implements Parcelable
? null
: new Author(authorId, authorName);
mAccessRulesIndex = accessRulesIndex;
mImageUrl = imageUrl;
}
@Override
@ -150,6 +153,12 @@ public class BookmarkCategory implements Parcelable
return mServerId;
}
@NonNull
public String getImageUrl()
{
return mImageUrl;
}
@NonNull
public CountAndPlurals getPluralsCountTemplate()
{
@ -309,6 +318,7 @@ public class BookmarkCategory implements Parcelable
sb.append(", mIsVisible=").append(mIsVisible);
sb.append(", mAccessRules=").append(getAccessRules());
sb.append(", mServerId=").append(mServerId);
sb.append(", mImageUrl=").append(mImageUrl);
sb.append('}');
return sb.toString();
}
@ -372,6 +382,7 @@ public class BookmarkCategory implements Parcelable
dest.writeByte(this.mIsVisible ? (byte) 1 : (byte) 0);
dest.writeInt(this.mAccessRulesIndex);
dest.writeString(this.mServerId);
dest.writeString(this.mImageUrl);
}
protected BookmarkCategory(Parcel in)
@ -388,6 +399,7 @@ public class BookmarkCategory implements Parcelable
this.mIsVisible = in.readByte() != 0;
this.mAccessRulesIndex = in.readInt();
this.mServerId = in.readString();
this.mImageUrl = in.readString();
}
public static final Creator<BookmarkCategory> CREATOR = new Creator<BookmarkCategory>()