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

Updated layouts for configure map menu

Browse source
This commit is contained in:
Denis_Bars 2014-10-23 13:45:06 +03:00
parent 535e020418
commit 834d513614
7 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/drawer_list_header.xml
View file

@ -9,7 +9,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/header" <TextView android:id="@+id/title"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"

14
OsmAnd/res/layout/drawer_list_layer.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
@ -10,17 +10,19 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<LinearLayout android:layout_marginLeft="8dp" <LinearLayout android:layout_marginLeft="8dp"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="0dp"> android:layout_height="wrap_content">
<TextView android:id="@+id/header" <TextView android:id="@+id/title"
android:textSize="18sp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextureView android:id="@+id/descr" <TextView android:id="@+id/descr"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
<CheckBox android:id="@+id/chek" <CheckBox android:id="@+id/check_item"
android:focusable="false"
android:layout_marginLeft="11dp" android:layout_marginLeft="11dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"

13
OsmAnd/res/layout/drawer_list_rendering.xml
View file

@ -1,26 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"> android:layout_marginRight="16dp">
<LinearLayout android:layout_width="wrap_content" <LinearLayout android:layout_width="0dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:layout_height="0dp"> android:layout_height="wrap_content">
<TextView android:id="@+id/header" <TextView android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextureView android:id="@+id/descr" <TextView android:id="@+id/descr"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
<CheckBox android:id="@+id/check" <CheckBox android:id="@+id/check_item"
android:focusable="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="8dp"/> android:layout_marginRight="8dp"/>

2
OsmAnd/res/layout/drawer_list_sub_header.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="16dp"> android:layout_marginLeft="16dp">
<TextView android:id="@+id/header" <TextView android:id="@+id/title"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"

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

@ -1,5 +1,6 @@
package net.osmand.plus; package net.osmand.plus;
import android.widget.*;
import gnu.trove.list.array.TIntArrayList; import gnu.trove.list.array.TIntArrayList;
import java.util.ArrayList; import java.util.ArrayList;
@ -10,12 +11,7 @@ import android.graphics.Typeface;
import android.os.Build; import android.os.Build;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ListAdapter;
import android.widget.TextView;
public class ContextMenuAdapter { public class ContextMenuAdapter {
@ -36,6 +32,7 @@ public class ContextMenuAdapter {
final TIntArrayList layoutIds = new TIntArrayList(); final TIntArrayList layoutIds = new TIntArrayList();
final TIntArrayList iconList = new TIntArrayList(); final TIntArrayList iconList = new TIntArrayList();
final TIntArrayList iconListLight = new TIntArrayList(); final TIntArrayList iconListLight = new TIntArrayList();
final ArrayList<String> itemDescription = new ArrayList<String>();
public ContextMenuAdapter(Context ctx) { public ContextMenuAdapter(Context ctx) {
this.ctx = ctx; this.ctx = ctx;
@ -64,10 +61,18 @@ public class ContextMenuAdapter {
public String getItemName(int pos){ public String getItemName(int pos){
return itemNames.get(pos); return itemNames.get(pos);
} }
public String getItemDescr(int pos){
return itemDescription.get(pos);
}
public void setItemName(int pos, String str) { public void setItemName(int pos, String str) {
itemNames.set(pos, str); itemNames.set(pos, str);
} }
public void setItemDescription(int pos, String str) {
itemDescription.set(pos, str);
}
public int getSelection(int pos) { public int getSelection(int pos) {
return selectedList.get(pos); return selectedList.get(pos);
@ -120,6 +125,7 @@ public class ContextMenuAdapter {
int layout = -1; int layout = -1;
boolean cat; boolean cat;
int pos = -1; int pos = -1;
String description = "";
private OnContextMenuClick listener; private OnContextMenuClick listener;
private Item() { private Item() {
@ -151,6 +157,11 @@ public class ContextMenuAdapter {
return this; return this;
} }
public Item description(String descr){
this.description = descr;
return this;
}
public Item listen(OnContextMenuClick l) { public Item listen(OnContextMenuClick l) {
this.listener = l; this.listener = l;
return this; return this;
@ -163,6 +174,7 @@ public class ContextMenuAdapter {
} }
items.insert(pos, id); items.insert(pos, id);
itemNames.add(pos, name); itemNames.add(pos, name);
itemDescription.add(pos, description);
selectedList.insert(pos, selected); selectedList.insert(pos, selected);
layoutIds.insert(pos, layout); layoutIds.insert(pos, layout);
iconList.insert(pos, icon); iconList.insert(pos, icon);
@ -219,11 +231,12 @@ public class ContextMenuAdapter {
TextView tv = (TextView) v.findViewById(R.id.title); TextView tv = (TextView) v.findViewById(R.id.title);
tv.setText(getItemName(position)); tv.setText(getItemName(position));
// Put the image on the TextView int imageId = getImageId(position, holoLight);
if (getImageId(position, holoLight) != 0) { if (imageId != 0) {
tv.setCompoundDrawablesWithIntrinsicBounds(getImageId(position, holoLight), 0, 0, 0); ((ImageView) v.findViewById(R.id.icon)).setImageResource(imageId);
} else { v.findViewById(R.id.icon).setVisibility(View.VISIBLE);
tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_transparent, 0, 0, 0); } else if (v.findViewById(R.id.icon) != null){
v.findViewById(R.id.icon).setVisibility(View.GONE);
} }
tv.setCompoundDrawablePadding(padding); tv.setCompoundDrawablePadding(padding);
@ -249,9 +262,14 @@ public class ContextMenuAdapter {
} }
}); });
ch.setVisibility(View.VISIBLE); ch.setVisibility(View.VISIBLE);
} else { } else if (ch != null) {
ch.setVisibility(View.GONE); ch.setVisibility(View.GONE);
} }
String itemDescr = getItemDescr(position);
if (v.findViewById(R.id.descr) != null){
((TextView)v.findViewById(R.id.descr)).setText(itemDescr);
}
return v; return v;
} }
}; };

42
OsmAnd/src/net/osmand/plus/configuremap/ConfigureMapMenu.java
View file

@ -91,24 +91,24 @@ public class ConfigureMapMenu {
OsmandApplication app = activity.getMyApplication(); OsmandApplication app = activity.getMyApplication();
OsmandSettings settings = app.getSettings(); OsmandSettings settings = app.getSettings();
LayerMenuListener l = new LayerMenuListener(activity); LayerMenuListener l = new LayerMenuListener(activity);
adapter.item(R.string.layers_category_show).setCategory(true).reg(); adapter.item(R.string.layers_category_show).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
// String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] "; // String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] ";
adapter.item(R.string.layer_poi).selected(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0) adapter.item(R.string.layer_poi).selected(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0)
.icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light).listen(l).reg(); .icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light).listen(l).layout(R.layout.drawer_list_layer).reg();
adapter.item(R.string.layer_amenity_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0) adapter.item(R.string.layer_amenity_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0)
.icons(R.drawable.ic_action_text_dark, R.drawable.ic_action_text_light).listen(l).reg(); .icons(R.drawable.ic_action_text_dark, R.drawable.ic_action_text_light).listen(l).layout(R.layout.drawer_list_layer).reg();
adapter.item(R.string.layer_favorites).selected(settings.SHOW_FAVORITES.get() ? 1 : 0) adapter.item(R.string.layer_favorites).selected(settings.SHOW_FAVORITES.get() ? 1 : 0)
.icons(R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_light).listen(l).reg(); .icons(R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_light).listen(l).layout(R.layout.drawer_list_layer).reg();
adapter.item(R.string.layer_gpx_layer).selected( adapter.item(R.string.layer_gpx_layer).selected(
app.getSelectedGpxHelper().isShowingAnyGpxFiles()? 1 : 0) app.getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0)
// .icons(R.drawable.ic_action_foot_dark, R.drawable.ic_action_foot_light) // .icons(R.drawable.ic_action_foot_dark, R.drawable.ic_action_foot_light)
.icons(R.drawable.ic_action_polygom_dark, R.drawable.ic_action_polygom_light) .icons(R.drawable.ic_action_polygom_dark, R.drawable.ic_action_polygom_light)
.listen(l).reg(); .listen(l).layout(R.layout.drawer_list_layer).reg();
adapter.item(R.string.layer_transport).selected( settings.SHOW_TRANSPORT_OVER_MAP.get() ? 1 : 0) adapter.item(R.string.layer_transport).selected(settings.SHOW_TRANSPORT_OVER_MAP.get() ? 1 : 0)
.icons(R.drawable.ic_action_bus_dark, R.drawable.ic_action_bus_light).listen(l).reg(); .icons(R.drawable.ic_action_bus_dark, R.drawable.ic_action_bus_light).listen(l).layout(R.layout.drawer_list_layer).reg();
if(TransportRouteHelper.getInstance().routeIsCalculated()){ if(TransportRouteHelper.getInstance().routeIsCalculated()){
adapter.item(R.string.layer_transport_route).selected(1) adapter.item(R.string.layer_transport_route).selected(1)
.icons(R.drawable.ic_action_bus_dark, R.drawable.ic_action_bus_light).listen(l).reg(); .icons(R.drawable.ic_action_bus_dark, R.drawable.ic_action_bus_light).listen(l).layout(R.layout.drawer_list_layer).reg();
} }
OsmandPlugin.registerLayerContextMenu(activity.getMapView(), adapter, activity); OsmandPlugin.registerLayerContextMenu(activity.getMapView(), adapter, activity);
@ -120,8 +120,8 @@ public class ConfigureMapMenu {
activity.getMapView().refreshMap(true); activity.getMapView().refreshMap(true);
} }
private void createRenderingAttributeItems(ContextMenuAdapter adapter, final MapActivity activity) { private void createRenderingAttributeItems(final ContextMenuAdapter adapter, final MapActivity activity) {
adapter.item(R.string.map_widget_map_rendering).setCategory(true).reg(); adapter.item(R.string.map_widget_map_rendering).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
adapter.item(R.string.map_widget_renderer).listen(new OnContextMenuClick() { adapter.item(R.string.map_widget_renderer).listen(new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) { public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) {
@ -160,9 +160,9 @@ public class ConfigureMapMenu {
bld.show(); bld.show();
return false; return false;
} }
}).reg(); }).layout(R.layout.drawer_list_rendering).reg();
adapter.item(R.string.map_widget_day_night).listen(new OnContextMenuClick() { adapter.item(R.string.map_widget_day_night).description(activity.getMyApplication().getSettings().DAYNIGHT_MODE.get().toHumanString(activity)).listen(new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) { public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) {
final OsmandMapTileView view = activity.getMapView(); final OsmandMapTileView view = activity.getMapView();
@ -184,7 +184,7 @@ public class ConfigureMapMenu {
bld.show(); bld.show();
return false; return false;
} }
}).reg(); }).layout(R.layout.drawer_list_rendering).reg();
adapter.item(R.string.text_size).listen(new OnContextMenuClick() { adapter.item(R.string.text_size).listen(new OnContextMenuClick() {
@Override @Override
@ -193,7 +193,7 @@ public class ConfigureMapMenu {
AlertDialog.Builder b = new AlertDialog.Builder(view.getContext()); AlertDialog.Builder b = new AlertDialog.Builder(view.getContext());
// test old descr as title // test old descr as title
b.setTitle(R.string.text_size); b.setTitle(R.string.text_size);
final Float[] txtValues = new Float[] { 0.75f, 1f, 1.25f, 1.5f, 2f, 3f }; final Float[] txtValues = new Float[]{0.75f, 1f, 1.25f, 1.5f, 2f, 3f};
int selected = -1; int selected = -1;
final String[] txtNames = new String[txtValues.length]; final String[] txtNames = new String[txtValues.length];
for (int i = 0; i < txtNames.length; i++) { for (int i = 0; i < txtNames.length; i++) {
@ -212,7 +212,7 @@ public class ConfigureMapMenu {
b.show(); b.show();
return false; return false;
} }
}).reg(); }).layout(R.layout.drawer_list_rendering).reg();
RenderingRulesStorage renderer = activity.getMyApplication().getRendererRegistry().getCurrentSelectedRenderer(); RenderingRulesStorage renderer = activity.getMyApplication().getRendererRegistry().getCurrentSelectedRenderer();
if (renderer != null) { if (renderer != null) {
@ -223,7 +223,7 @@ public class ConfigureMapMenu {
private void createCustomRenderingProperties(RenderingRulesStorage renderer, ContextMenuAdapter adapter , final MapActivity activity){ private void createCustomRenderingProperties(RenderingRulesStorage renderer, ContextMenuAdapter adapter , final MapActivity activity){
final OsmandMapTileView view = activity.getMapView(); final OsmandMapTileView view = activity.getMapView();
adapter.item(R.string.map_widget_vector_attributes).setCategory(true).reg(); adapter.item(R.string.map_widget_vector_attributes).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
final OsmandApplication app = view.getApplication(); final OsmandApplication app = view.getApplication();
List<RenderingRuleProperty> customRules = renderer.PROPS.getCustomRules(); List<RenderingRuleProperty> customRules = renderer.PROPS.getCustomRules();
for (final RenderingRuleProperty p : customRules) { for (final RenderingRuleProperty p : customRules) {
@ -236,19 +236,19 @@ public class ConfigureMapMenu {
final OsmandSettings.CommonPreference<Boolean> pref = view.getApplication().getSettings() final OsmandSettings.CommonPreference<Boolean> pref = view.getApplication().getSettings()
.getCustomRenderBooleanProperty(p.getAttrName()); .getCustomRenderBooleanProperty(p.getAttrName());
adapter.item(propertyName).listen(new OnContextMenuClick() { adapter.item(propertyName).listen(new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) { public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) {
pref.set(!pref.get()); pref.set(!pref.get());
refreshMapComplete(activity); refreshMapComplete(activity);
return false; return false;
} }
}).selected(pref.get() ? 1 : 0).reg(); }).selected(pref.get() ? 1 : 0).layout(R.layout.drawer_list_rendering).reg();
} else { } else {
final OsmandSettings.CommonPreference<String> pref = view.getApplication().getSettings() final OsmandSettings.CommonPreference<String> pref = view.getApplication().getSettings()
.getCustomRenderProperty(p.getAttrName()); .getCustomRenderProperty(p.getAttrName());
adapter.item(propertyName).listen(new OnContextMenuClick() { adapter.item(propertyName).listen(new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) { public boolean onContextMenuClick(int itemId, int pos, boolean isChecked) {
AlertDialog.Builder b = new AlertDialog.Builder(view.getContext()); AlertDialog.Builder b = new AlertDialog.Builder(view.getContext());
@ -276,7 +276,7 @@ public class ConfigureMapMenu {
b.show(); b.show();
return false; return false;
} }
}).reg(); }).layout(R.layout.drawer_list_rendering).reg();
} }
} }
} }

2
OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
View file

@ -103,7 +103,7 @@ public class SRTMPlugin extends OsmandPlugin {
} }
}; };
adapter.item(R.string.layer_hillshade).selected(HILLSHADE.get()? 1 : 0) adapter.item(R.string.layer_hillshade).selected(HILLSHADE.get()? 1 : 0)
.icons( R.drawable.ic_action_hillshade_dark, R.drawable.ic_action_hillshade_light).listen(listener).position(9).reg(); .icons( R.drawable.ic_action_hillshade_dark, R.drawable.ic_action_hillshade_light).listen(listener).position(9).layout(R.layout.drawer_list_layer).reg();
} }
@Override @Override