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

rename createHeaderInGroup and change imageButton

Browse source
This commit is contained in:
Chumva 2018-04-17 16:51:22 +03:00
parent bdc795404a
commit a46f28501f
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/layout/map_marker_item_categories.xml
View file

@ -27,14 +27,11 @@
android:layout_height="@dimen/map_button_shadow_width" android:layout_height="@dimen/map_button_shadow_width"
android:background="?attr/selectableItemBackground"> android:background="?attr/selectableItemBackground">
<ImageButton <ImageView
android:id="@+id/icon_left" android:id="@+id/icon_left"
android:layout_width="@dimen/map_button_shadow_width" android:layout_width="@dimen/map_button_shadow_width"
android:layout_height="@dimen/map_button_shadow_width" android:layout_height="@dimen/map_button_shadow_width"
android:focusableInTouchMode="true" android:visibility="invisible" />
android:visibility="invisible"
tools:background="@drawable/marker_circle_background_dark_with_inset"
tools:src="@drawable/ic_action_marker_passed" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"

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

@ -418,7 +418,7 @@ public class MapMarkersHelper {
if (mapMarkersGroup.getId() == null || mapMarkersGroup.getName() == null) { if (mapMarkersGroup.getId() == null || mapMarkersGroup.getName() == null) {
return; return;
} }
createHeaderInGroup(mapMarkersGroup); createHeadersInGroup(mapMarkersGroup);
int historyMarkersCount = mapMarkersGroup.getHistoryMarkers().size(); int historyMarkersCount = mapMarkersGroup.getHistoryMarkers().size();
ShowHideHistoryButton showHideHistoryButton = mapMarkersGroup.getShowHideHistoryButton(); ShowHideHistoryButton showHideHistoryButton = mapMarkersGroup.getShowHideHistoryButton();
if (showHideHistoryButton != null) { if (showHideHistoryButton != null) {
@ -460,7 +460,7 @@ public class MapMarkersHelper {
} }
} }
private void createHeaderInGroup(@NonNull MapMarkersGroup group) { private void createHeadersInGroup(@NonNull MapMarkersGroup group) {
GroupHeader header = new GroupHeader(); GroupHeader header = new GroupHeader();
CategoriesHeader categoriesHeader = new CategoriesHeader(); CategoriesHeader categoriesHeader = new CategoriesHeader();
WikivoyageArticleHeader wikivoyageArticleHeader = new WikivoyageArticleHeader(); WikivoyageArticleHeader wikivoyageArticleHeader = new WikivoyageArticleHeader();
@ -541,7 +541,7 @@ public class MapMarkersHelper {
if (search == null && selected.getGpxFile() != null && selected.getGpxFile().path != null) { if (search == null && selected.getGpxFile() != null && selected.getGpxFile().path != null) {
MapMarkersGroup group = createGPXMarkerGroup(new File(selected.getGpxFile().path)); MapMarkersGroup group = createGPXMarkerGroup(new File(selected.getGpxFile().path));
group.disabled = true; group.disabled = true;
createHeaderInGroup(group); createHeadersInGroup(group);
res.add(group); res.add(group);
} }
} }
@ -562,7 +562,7 @@ public class MapMarkersHelper {
if (search == null) { if (search == null) {
MapMarkersGroup group = createGPXMarkerGroup(path); MapMarkersGroup group = createGPXMarkerGroup(path);
group.disabled = true; group.disabled = true;
createHeaderInGroup(group); createHeadersInGroup(group);
res.add(group); res.add(group);
} }
} }