Small modifications

This commit is contained in:
Victor Shcherb 2012-08-28 00:44:23 +02:00
parent 3dd8e05d4c
commit a39d55b45a
32 changed files with 14 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 861 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -6,7 +6,7 @@
android:paddingLeft="3dp" android:paddingRight="3dp"> android:paddingLeft="3dp" android:paddingRight="3dp">
<Button android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:text="@string/filter_current_poiButton" <Button android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:text="@string/filter_current_poiButton"
android:id="@+id/filter_currentButton"></Button> android:id="@+id/filter_currentButton"></Button>
<ImageButton android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_width="wrap_content" android:src="@android:drawable/ic_menu_save" <ImageButton android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_width="wrap_content" android:src="@drawable/save_btn"
android:id="@+id/SaveButton"/> android:id="@+id/SaveButton"/>
</LinearLayout> </LinearLayout>
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:choiceMode="multipleChoice" <ListView android:id="@android:id/list" android:layout_width="fill_parent" android:choiceMode="multipleChoice"

View file

@ -4,9 +4,9 @@
android:orientation="vertical" android:layout_width="fill_parent" android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
<ImageButton android:src="@android:drawable/ic_input_get" android:text="@string/show_poi_on_map" android:id="@+id/ShowFilter" <ImageButton android:src="@drawable/filter" android:id="@+id/ShowFilter"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:contentDescription="@string/search_poi_filter"/> android:layout_height="wrap_content" android:layout_width="wrap_content" android:contentDescription="@string/search_poi_filter"/>
<ImageButton android:src="@android:drawable/ic_dialog_map" android:contentDescription="@string/search_shown_on_map" <ImageButton android:src="@drawable/show_on_map" android:contentDescription="@string/search_shown_on_map"
android:id="@+id/ShowOnMap" android:layout_height="wrap_content" android:layout_width="wrap_content"/> android:id="@+id/ShowOnMap" android:layout_height="wrap_content" android:layout_width="wrap_content"/>
<Button android:text="@string/search_POI_level_btn" <Button android:text="@string/search_POI_level_btn"
android:id="@+id/SearchPOILevelButton" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"/> android:id="@+id/SearchPOILevelButton" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"/>

View file

@ -245,6 +245,7 @@ public class FavouritesActivity extends OsmandExpandableListActivity {
true, onshow); true, onshow);
if (point.isStored()) { if (point.isStored()) {
ActionItem edit = new ActionItem(); ActionItem edit = new ActionItem();
edit.setIcon(getResources().getDrawable(R.drawable.list_activities_fav_edit));
edit.setTitle(getString(R.string.favourites_context_menu_edit)); edit.setTitle(getString(R.string.favourites_context_menu_edit));
edit.setOnClickListener(new OnClickListener() { edit.setOnClickListener(new OnClickListener() {
@Override @Override
@ -257,6 +258,7 @@ public class FavouritesActivity extends OsmandExpandableListActivity {
ActionItem delete = new ActionItem(); ActionItem delete = new ActionItem();
delete.setTitle(getString(R.string.favourites_context_menu_delete)); delete.setTitle(getString(R.string.favourites_context_menu_delete));
delete.setIcon(getResources().getDrawable(R.drawable.list_activities_fav_delete));
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

View file

@ -693,7 +693,7 @@ public class MapActivityActions implements DialogProvider {
Builder builder = new AlertDialog.Builder(mapActivity); Builder builder = new AlertDialog.Builder(mapActivity);
adapter.registerItem(R.string.context_menu_item_navigate_point, R.drawable.list_view_set_destination); adapter.registerItem(R.string.context_menu_item_navigate_point, R.drawable.list_view_set_destination);
adapter.registerItem(R.string.context_menu_item_directions, R.drawable.list_view_directions_to_here); adapter.registerItem(R.string.context_menu_item_directions, R.drawable.list_activities_directions_to_here);
adapter.registerItem(R.string.context_menu_item_show_route, R.drawable.list_view_show_route_from_here); adapter.registerItem(R.string.context_menu_item_show_route, R.drawable.list_view_show_route_from_here);
adapter.registerItem(R.string.context_menu_item_search, R.drawable.list_view_search_near_here); adapter.registerItem(R.string.context_menu_item_search, R.drawable.list_view_search_near_here);
adapter.registerItem(R.string.context_menu_item_share_location, R.drawable.list_view_share_location); adapter.registerItem(R.string.context_menu_item_share_location, R.drawable.list_view_share_location);
@ -1080,7 +1080,7 @@ public class MapActivityActions implements DialogProvider {
final boolean saveHistory, final OnClickListener onShow){ final boolean saveHistory, final OnClickListener onShow){
ActionItem showOnMap = new ActionItem(); ActionItem showOnMap = new ActionItem();
final OsmandApplication app = ((OsmandApplication) activity.getApplication()); final OsmandApplication app = ((OsmandApplication) activity.getApplication());
showOnMap.setIcon(activity.getResources().getDrawable(android.R.drawable.ic_dialog_map)); showOnMap.setIcon(activity.getResources().getDrawable(R.drawable.list_activities_show_on_map));
showOnMap.setTitle(activity.getString(R.string.show_poi_on_map)); showOnMap.setTitle(activity.getString(R.string.show_poi_on_map));
showOnMap.setOnClickListener(new OnClickListener() { showOnMap.setOnClickListener(new OnClickListener() {
@Override @Override
@ -1112,7 +1112,7 @@ public class MapActivityActions implements DialogProvider {
qa.addActionItem(setAsDestination); qa.addActionItem(setAsDestination);
ActionItem directionsTo = new ActionItem(); ActionItem directionsTo = new ActionItem();
directionsTo.setIcon(activity.getResources().getDrawable(R.drawable.list_view_directions_to_here)); directionsTo.setIcon(activity.getResources().getDrawable(R.drawable.list_activities_directions_to_here));
directionsTo.setTitle(activity.getString(R.string.context_menu_item_directions)); directionsTo.setTitle(activity.getString(R.string.context_menu_item_directions));
directionsTo.setOnClickListener(new OnClickListener() { directionsTo.setOnClickListener(new OnClickListener() {
@Override @Override

View file

@ -558,8 +558,13 @@ public class MapInfoLayer extends OsmandMapLayer {
}); });
} else { } else {
tv.setText(o.toString()); tv.setText(o.toString());
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
tv.setPadding((int) (5 *scaleCoefficient), 0, 0, 0); tv.setPadding((int) (5 *scaleCoefficient), 0, 0, 0);
// reset
if (position == 0) {
tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_reset_to_default, 0, 0, 0);
} else {
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
}
ch.setVisibility(View.INVISIBLE); ch.setVisibility(View.INVISIBLE);
} }