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

Update favorite icons and implement new layer list functionality

Browse source
This commit is contained in:
Victor Shcherb 2012-01-26 01:05:55 +01:00
parent e758615cb4
commit fdfcd07506
7 changed files with 122 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
OsmAnd/res/drawable-hdpi/poi_favourite.png → OsmAnd/res/drawable-hdpi/poi_favourite_3d.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
OsmAnd/res/drawable/poi_favourite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

20
OsmAnd/res/layout/layers_list_activity_item.xml
View file

@ -2,31 +2,29 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:paddingTop="1dip"
android:paddingBottom="1dip"
android:paddingTop="0dip"
android:background="@color/color_white"
android:paddingBottom="0dip"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/quickaction_slider_btn">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/icon"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="15sp" />
android:textSize="15sp"
android:textColor="@color/color_black"/>
<CheckBox
android:id="@+id/check_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
android:focusable="false" />
</LinearLayout>

9
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -508,7 +508,8 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
if (keyCode == KeyEvent.KEYCODE_BACK) {
//some application/hardware needs that back button reacts on key up, so
//that they could do some key combinations with it...
return true;
// Victor : doing in that way doesn't close dialog properly!
// return true;
} else if (keyCode == KeyEvent.KEYCODE_SEARCH && event.getRepeatCount() == 0) {
Intent newIntent = new Intent(MapActivity.this, SearchActivity.class);
// causes wrong position caching: newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@ -929,9 +930,9 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
if (keyCode == KeyEvent.KEYCODE_BACK) {
//some application/hardware needs that back button reacts on key up, so
//that they could do some key combinations with it...
// Android 1.6 doesn't have onBack method!
finish();
return true;
// Android 1.6 doesn't have onBackPressed() method it should be finish instead!
// onBackPressed();
// return true;
} else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
contextMenuPoint(mapView.getLatitude(), mapView.getLongitude());
return true;

120
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -48,10 +48,25 @@ import net.osmand.plus.views.TransportInfoLayer;
import net.osmand.plus.views.TransportStopsLayer;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnMultiChoiceClickListener;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.FrameLayout.LayoutParams;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
/**
@ -237,52 +252,54 @@ public class MapActivityLayers {
public void openLayerSelectionDialog(final OsmandMapTileView mapView){
final TIntArrayList layers = new TIntArrayList();
TIntArrayList selectedList = new TIntArrayList();
final TIntArrayList selectedList = new TIntArrayList();
final TIntArrayList iconList = new TIntArrayList();
final OsmandSettings settings = getApplication().getSettings();
layers.add(R.string.layer_map);
selectedList.add(1);
iconList.add(R.drawable.list_activities_map_src);
selectedList.add(-1);
layers.add(R.string.layer_poi);
iconList.add(R.drawable.list_activities_poi);
selectedList.add(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0);
if(settings.SHOW_POI_OVER_MAP.get()){
layers.add(R.string.layer_poi_label);
selectedList.add(settings.SHOW_POI_LABEL.get() ? 1 : 0);
iconList.add(0);
}
layers.add(R.string.layer_favorites);
iconList.add(R.drawable.list_activities_favorites);
selectedList.add(settings.SHOW_FAVORITES.get() ? 1 : 0);
layers.add(R.string.layer_overlay);
selectedList.add(overlayLayer.getMap() != null ? 1 : 0);
iconList.add(R.drawable.list_activities_overlay_map);
layers.add(R.string.layer_underlay);
selectedList.add(underlayLayer.getMap() != null ? 1 : 0);
iconList.add(R.drawable.list_activities_underlay_map);
layers.add(R.string.layer_gpx_layer);
selectedList.add(getApplication().getGpxFileToDisplay() != null ? 1 : 0);
iconList.add(R.drawable.list_activities_gpx_tracks);
if(routeInfoLayer.couldBeVisible()){
layers.add(R.string.layer_route);
selectedList.add(routeInfoLayer.isUserDefinedVisible() ? 1 : 0);
iconList.add(0);
}
layers.add(R.string.layer_transport);
selectedList.add(settings.SHOW_TRANSPORT_OVER_MAP.get() ? 1 : 0);
iconList.add(R.drawable.list_activities_transport_stops);
if(TransportRouteHelper.getInstance().routeIsCalculated()){
layers.add(R.string.layer_transport_route);
selectedList.add(routeInfoLayer.isUserDefinedVisible() ? 1 : 0);
iconList.add(0);
}
layers.add(R.string.layer_osm_bugs);
selectedList.add(settings.SHOW_OSM_BUGS.get() ? 1 : 0);
iconList.add(R.drawable.list_activities_osm_bugs);
final boolean[] selected = new boolean[selectedList.size()];
for (int i = 0; i < selected.length; i++) {
selected[i] = selectedList.get(i) > 0;
}
Builder builder = new AlertDialog.Builder(activity);
String[] layersName = new String[layers.size()];
for (int i = 0; i < layers.size(); i++) {
layersName[i] = getString(layers.get(i));
}
builder.setMultiChoiceItems(layersName, selected, new DialogInterface.OnMultiChoiceClickListener() {
final OnMultiChoiceClickListener listener = new DialogInterface.OnMultiChoiceClickListener() {
@Override
public void onClick(DialogInterface dialog, int item, boolean isChecked) {
@ -336,8 +353,81 @@ public class MapActivityLayers {
updateLayers(mapView);
mapView.refreshMap();
}
});
builder.show();
};
// final boolean[] selected = new boolean[selectedList.size()];
// for (int i = 0; i < selected.length; i++) {
// selected[i] = selectedList.get(i) != 0;
// }
//
// Builder builder = new AlertDialog.Builder(activity);
// final Dialog dlg = new Dialog(activity, android.R.style.Theme_Light);
Builder b = new AlertDialog.Builder(activity);
ListView list = new ListView(activity);
// dlg.setContentView(list);
b.setView(list);
final List<String> layerNames = new ArrayList<String>();
for (int i = 0; i < layers.size(); i++) {
layerNames.add(getString(layers.get(i)));
}
final AlertDialog dlg = b.create();
final int minWidth = activity.getResources().getDrawable(R.drawable.list_activities_favorites).getMinimumWidth();
ArrayAdapter<String> adapter = new ArrayAdapter<String>(activity, R.layout.layers_list_activity_item,
layerNames) {
@Override
public View getView(final int position, View convertView, ViewGroup parent) {
View row = activity.getLayoutInflater().inflate(R.layout.layers_list_activity_item, null);
((TextView) row.findViewById(R.id.title)).setText(layerNames.get(position));
if(iconList.get(position) != 0) {
Drawable d = activity.getResources().getDrawable(iconList.get(position));
((ImageView) row.findViewById(R.id.icon)).setImageDrawable(d);
} else {
LinearLayout.LayoutParams layoutParams = (android.widget.LinearLayout.LayoutParams) ((ImageView) row.findViewById(R.id.icon)).getLayoutParams();
layoutParams.leftMargin = minWidth;
}
final CheckBox ch = ((CheckBox) row.findViewById(R.id.check_item));
if(selectedList.get(position) == -1){
ch.setVisibility(View.INVISIBLE);
} else {
ch.setChecked(selectedList.get(position) > 0);
ch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
listener.onClick(dlg, position, isChecked);
}
});
}
row.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(selectedList.get(position) >= 0) {
ch.setChecked(!ch.isChecked());
} else {
listener.onClick(dlg, position, selectedList.get(position) > 0);
}
}
});
return row;
}
};
list.setAdapter(adapter);
// list.setOnItemClickListener(new OnItemClickListener() {
// @Override
// public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// listener.onClick(dlg, position, selectedList.get(position) > 0);
// }
// });
dlg.setCanceledOnTouchOutside(true);
dlg.show();
// String[] layersName = new String[layers.size()];
// for (int i = 0; i < layers.size(); i++) {
// layersName[i] = getString(layers.get(i));
//
// }
// builder.setMultiChoiceItems(layersName, selected, );
// builder.show();
}
public void showGPXFileLayer(final OsmandMapTileView mapView){

4
OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
View file

@ -91,11 +91,11 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
int ex = (int) point.x;
int ey = (int) point.y;
int w = favoriteIcon.getWidth() / 2;
int h = favoriteIcon.getHeight();
int h = favoriteIcon.getHeight() / 2;
for (FavouritePoint n : favorites.getFavouritePoints()) {
int x = view.getRotatedMapXForPoint(n.getLatitude(), n.getLongitude());
int y = view.getRotatedMapYForPoint(n.getLatitude(), n.getLongitude());
if (Math.abs(x - ex) <= w && y - ey <= h && y - ey >= 0) {
if (Math.abs(x - ex) <= w && Math.abs(y - ey) <= h) {
float newr = Math.max(Math.abs(x - ex), Math.abs(y - ey));
if (newr < r) {
res.add(n);

2
OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
View file

@ -70,7 +70,7 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
public boolean onSingleTap(PointF point) {
ArrayList<TransportStop> stops = new ArrayList<TransportStop >();
getFromPoint(point, stops);
if(stops.isEmpty()){
if(!stops.isEmpty()){
StringBuilder res = new StringBuilder();
int i = 0;
for (TransportStop n : stops) {