Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix small issues

Browse source
This commit is contained in:
Alexander Sytnyk 2017-09-08 16:12:59 +03:00
parent c5a0536057
commit a1b9e6791e
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/map_marker_item_new.xml
View file

@ -9,8 +9,8 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_height="56dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?attr/selectableItemBackground"> android:background="?attr/selectableItemBackground">
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
@ -45,6 +45,8 @@
android:id="@+id/map_marker_title" android:id="@+id/map_marker_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
tools:text="Van Gogh Museum"/> tools:text="Van Gogh Museum"/>

2
OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
View file

@ -355,7 +355,7 @@ public class MapMarkersHelper {
} }
if (colorIndex == -1) { if (colorIndex == -1) {
if (mapMarkers.size() > 0) { if (mapMarkers.size() > 0) {
colorIndex = (mapMarkers.get(0).colorIndex + 1) % MAP_MARKERS_COLORS_COUNT; colorIndex = (mapMarkers.get(mapMarkers.size() - 1).colorIndex + 1) % MAP_MARKERS_COLORS_COUNT;
} else { } else {
colorIndex = 0; colorIndex = 0;
} }

2
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
View file

@ -269,7 +269,7 @@ public class MapMarkersDbHelper {
boolean active = query.getInt(4) == 1; boolean active = query.getInt(4) == 1;
long added = query.getLong(5); long added = query.getLong(5);
long visited = query.getLong(6); long visited = query.getLong(6);
long groupKey = query.getInt(7); long groupKey = query.getLong(7);
int colorIndex = query.getInt(8); int colorIndex = query.getInt(8);
long nextKey = query.getLong(9); long nextKey = query.getLong(9);

4
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
View file

@ -89,7 +89,9 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
holder.title.setText(marker.getName(mapActivity)); holder.title.setText(marker.getName(mapActivity));
holder.description.setText(marker.creationDate + ""); holder.description.setText(marker.groupKey == -1
? marker.creationDate + ""
: mapActivity.getMyApplication().getMapMarkersHelper().getGroupName(marker.groupKey));
holder.optionsBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_marker_passed)); holder.optionsBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_marker_passed));
holder.optionsBtn.setOnClickListener(new View.OnClickListener() { holder.optionsBtn.setOnClickListener(new View.OnClickListener() {