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

Change color for configure screen.

Browse source
This commit is contained in:
GaidamakUA 2016-03-30 11:53:34 +03:00
parent 5d335f5dab
commit 7d4b4f4c48
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -44,7 +44,6 @@ public class ContextMenuAdapter {
return items.size(); return items.size();
} }
// Adapter related
public String[] getItemNames() { public String[] getItemNames() {
String[] itemNames = new String[items.size()]; String[] itemNames = new String[items.size()];
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {

17
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
View file

@ -2,6 +2,7 @@ package net.osmand.plus.views.mapwidgets;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes; import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
@ -378,8 +379,9 @@ public class MapWidgetRegistry {
return left; return left;
} }
private void addControls(final MapActivity map, final ContextMenuAdapter contextMenuAdapter, private void addControls(final MapActivity mapActivity, final ContextMenuAdapter contextMenuAdapter,
Set<MapWidgetRegInfo> top, final ApplicationMode mode) { Set<MapWidgetRegInfo> top, final ApplicationMode mode) {
@ColorRes final int defaultColor = ContextMenuItem.getDefaultColorRes(mapActivity);
for (final MapWidgetRegInfo r : top) { for (final MapWidgetRegInfo r : top) {
if (mode == ApplicationMode.DEFAULT) { if (mode == ApplicationMode.DEFAULT) {
if ("intermediate_distance".equals(r.key) || "distance".equals(r.key) || "time".equals(r.key)) { if ("intermediate_distance".equals(r.key) || "distance".equals(r.key) || "time".equals(r.key)) {
@ -389,9 +391,12 @@ public class MapWidgetRegistry {
if ("map_marker_1st".equals(r.key) || "map_marker_2nd".equals(r.key)) { if ("map_marker_1st".equals(r.key) || "map_marker_2nd".equals(r.key)) {
continue; continue;
} }
contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(r.messageId, map)
.setSelected(r.visibleCollapsed(mode) || r.visible(mode)) final boolean selected = r.visibleCollapsed(mode) || r.visible(mode);
contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(r.messageId, mapActivity)
.setIcon(r.drawableMenu) .setIcon(r.drawableMenu)
.setSelected(selected)
.setColor(selected ? R.color.osmand_orange : defaultColor)
.setSecondaryIcon(R.drawable.ic_action_additional_option) .setSecondaryIcon(R.drawable.ic_action_additional_option)
.setListener(new ContextMenuAdapter.OnRowItemClick() { .setListener(new ContextMenuAdapter.OnRowItemClick() {
@Override @Override
@ -436,11 +441,13 @@ public class MapWidgetRegistry {
boolean visible, boolean visible,
boolean collapsed) { boolean collapsed) {
MapWidgetRegistry.this.setVisibility(r, visible, collapsed); MapWidgetRegistry.this.setVisibility(r, visible, collapsed);
MapInfoLayer mil = map.getMapLayers().getMapInfoLayer(); MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
if (mil != null) { if (mil != null) {
mil.recreateControls(); mil.recreateControls();
} }
adapter.getItem(position).setSelected(visible); ContextMenuItem item = adapter.getItem(position);
item.setSelected(visible);
item.setColorRes(visible || collapsed ? R.color.osmand_orange : defaultColor);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
}).createItem()); }).createItem());