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

[android] Review fixes.

Browse source
This commit is contained in:
velichkomarija 2020-10-06 09:25:21 +03:00 • committed by Aleksandr Zatsepin
parent ab6d70054b
commit c60c06d9bd
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,11 +155,13 @@ void PrepareClassRefs(JNIEnv * env)
// int bookmarksCount,
// boolean fromCatalog,
// boolean isMyCategory,
// boolean isVisible)
// boolean isVisible,
// String mImageUrl)
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;Ljava/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");

3
android/res/layout/item_bookmark_collection.xml
View file

@ -36,7 +36,8 @@
android:layout_marginBottom="@dimen/margin_half_plus"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?android:textColorSecondary"
android:textAppearance="?fontBody2"
tools:text="42000000" />
</LinearLayout>
</LinearLayout>

2
android/res/layout/item_bookmark_group_list_header.xml
View file

@ -30,6 +30,6 @@
android:fontFamily="@string/robotoMedium"
android:text="@string/bookmarks_groups_hide_all"
android:textAllCaps="true"
android:textAppearance="?textAppearanceSubtitle2"
android:textAppearance="?fontSubtitle2"
android:textColor="?colorAccent" />
</RelativeLayout>

5
android/res/layout/item_track.xml
View file

@ -25,7 +25,7 @@
android:layout_marginTop="@dimen/margin_base"
android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
android:singleLine="true"
android:textAppearance="?textAppearanceBody1"
android:textAppearance="?fontBody1"
tools:text="@string/tracks_title" />
<TextView
android:id="@+id/tv__bookmark_distance"
@ -34,7 +34,8 @@
android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
android:layout_marginBottom="@dimen/margin_half_plus"
android:singleLine="true"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:textColor="?android:textColorSecondary"
android:textAppearance="?fontBody2"
tools:text="@string/by_distance" />
</LinearLayout>
</RelativeLayout>

9
android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
View file

@ -27,15 +27,14 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
private final static int TYPE_CATEGORY_ITEM = 2;
@NonNull
private List<BookmarkCategory> mItemsCollection;
@NonNull
private List<BookmarkCategory> mItemsCategory;
private final List<BookmarkCategory> mItemsCollection;
@NonNull
private final List<BookmarkCategory> mItemsCategory;
private int mSectionCount;
@NonNull
private int mCollectionSectionIndex = SectionPosition.INVALID_POSITION;
@NonNull
private int mCategorySectionIndex = SectionPosition.INVALID_POSITION;
@Nullable
private OnItemClickListener<BookmarkCategory> mClickListener;