Renew UI
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_create_poi.png
Normal file
After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 5 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_parking_poi_add.png
Normal file
After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_parking_poi_remove.png
Normal file
After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_search_near_here.png
Normal file
After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_set_destination.png
Normal file
After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_set_intermediate.png
Normal file
After Width: | Height: | Size: 104 B |
BIN
OsmAnd/res/drawable-hdpi/list_activities_share_location.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 6 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 104 B |
After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 104 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 6 KiB |
Before Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 1.9 KiB |
37
OsmAnd/res/layout/list_menu_item.xml
Normal file
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/LinearLayout1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:background="@color/color_white">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="12dip"
|
||||
android:layout_marginTop="12dip"
|
||||
android:layout_marginBottom="12dip"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/layer_poi"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="@color/color_black" android:layout_weight="1"/>
|
||||
|
||||
<LinearLayout android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/check_item"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dip"
|
||||
android:layout_marginRight="2dip"
|
||||
android:button="@drawable/ic_btn_wocheckbox"
|
||||
android:focusable="false"
|
||||
android:gravity="center_vertical" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
|
@ -38,8 +38,9 @@ public class IntermediatePointsDialog {
|
|||
final List<LatLon> intermediates = targets.getIntermediatePointsWithTarget();
|
||||
final List<String> names = targets.getIntermediatePointNamesWithTarget();
|
||||
final boolean[] checkedIntermediates = new boolean[intermediates.size()];
|
||||
final int padding = (int) (12 * activity.getResources().getDisplayMetrics().density + 0.5f);
|
||||
final ArrayAdapter<LatLon> listadapter = new ArrayAdapter<LatLon>(app,
|
||||
changeOrder? R.layout.change_order_item : R.layout.layers_list_activity_item, R.id.title,
|
||||
changeOrder? R.layout.change_order_item : R.layout.list_menu_item, R.id.title,
|
||||
intermediates) {
|
||||
@Override
|
||||
public View getView(final int position, View convertView, ViewGroup parent) {
|
||||
|
@ -90,8 +91,9 @@ public class IntermediatePointsDialog {
|
|||
});
|
||||
} else {
|
||||
tv.setCompoundDrawablesWithIntrinsicBounds(
|
||||
position == intermediates.size() - 1? R.drawable.list_view_set_destination:
|
||||
R.drawable.list_view_set_intermediate, 0, 0, 0);
|
||||
position == intermediates.size() - 1? R.drawable.list_activities_set_destination:
|
||||
R.drawable.list_activities_set_intermediate, 0, 0, 0);
|
||||
tv.setCompoundDrawablePadding(padding);
|
||||
final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item));
|
||||
ch.setVisibility(View.VISIBLE);
|
||||
ch.setChecked(true);
|
||||
|
|
|
@ -814,26 +814,29 @@ public class MapActivityActions implements DialogProvider {
|
|||
final ContextMenuAdapter adapter = iadapter == null ? new ContextMenuAdapter(mapActivity) : iadapter;
|
||||
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_activities_set_destination);
|
||||
final TargetPointsHelper targets = getMyApplication().getTargetPointsHelper();
|
||||
if(targets.getPointToNavigate() != null) {
|
||||
adapter.registerItem(R.string.context_menu_item_intermediate_point, R.drawable.list_view_set_intermediate);
|
||||
adapter.registerItem(R.string.context_menu_item_intermediate_point, R.drawable.list_activities_set_intermediate);
|
||||
}
|
||||
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_share_location, R.drawable.list_view_share_location);
|
||||
adapter.registerItem(R.string.context_menu_item_show_route, R.drawable.list_activities_show_route_from_here);
|
||||
adapter.registerItem(R.string.context_menu_item_search, R.drawable.list_activities_search_near_here);
|
||||
adapter.registerItem(R.string.context_menu_item_share_location, R.drawable.list_activities_share_location);
|
||||
adapter.registerItem(R.string.context_menu_item_add_favorite, R.drawable.list_activities_favorites);
|
||||
|
||||
|
||||
|
||||
OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj);
|
||||
|
||||
ListAdapter listadapter = new ArrayAdapter<String>(mapActivity, R.layout.layers_list_activity_item, R.id.title,
|
||||
final int padding = (int) (12 * mapActivity.getResources().getDisplayMetrics().density + 0.5f);
|
||||
ListAdapter listadapter = new ArrayAdapter<String>(mapActivity, R.layout.list_menu_item, R.id.title,
|
||||
adapter.getItemNames()) {
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
// User super class to create the View
|
||||
View v = super.getView(position, convertView, parent);
|
||||
View v = convertView;
|
||||
if (v == null) {
|
||||
v = mapActivity.getLayoutInflater().inflate(R.layout.list_menu_item, null);
|
||||
}
|
||||
TextView tv = (TextView) v.findViewById(R.id.title);
|
||||
tv.setText(adapter.getItemName(position));
|
||||
|
||||
|
@ -843,6 +846,7 @@ public class MapActivityActions implements DialogProvider {
|
|||
} else {
|
||||
tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_transparent, 0, 0, 0);
|
||||
}
|
||||
tv.setCompoundDrawablePadding(padding);
|
||||
|
||||
final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item));
|
||||
ch.setVisibility(View.GONE);
|
||||
|
@ -1276,7 +1280,7 @@ public class MapActivityActions implements DialogProvider {
|
|||
});
|
||||
qa.addActionItem(showOnMap);
|
||||
ActionItem setAsDestination = new ActionItem();
|
||||
setAsDestination.setIcon(activity.getResources().getDrawable(R.drawable.list_view_set_destination));
|
||||
setAsDestination.setIcon(activity.getResources().getDrawable(R.drawable.list_activities_set_destination));
|
||||
setAsDestination.setTitle(activity.getString(R.string.navigate_to));
|
||||
setAsDestination.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
|
|
|
@ -297,14 +297,14 @@ public class MapActivityLayers {
|
|||
final LayerMenuListener listener = new LayerMenuListener(adapter, mapView, settings);
|
||||
Builder b = new AlertDialog.Builder(activity);
|
||||
|
||||
final int padding = (int) (12 * activity.getResources().getDisplayMetrics().density + 0.5f);
|
||||
|
||||
ListAdapter listAdapter = new ArrayAdapter<String>(
|
||||
activity,
|
||||
R.layout.layers_list_activity_item,
|
||||
R.id.title,
|
||||
adapter.getItemNames()){
|
||||
activity, R.layout.list_menu_item, R.id.title, adapter.getItemNames()){
|
||||
@Override
|
||||
public View getView(final int position, View convertView, ViewGroup parent) {
|
||||
View v = activity.getLayoutInflater().inflate(R.layout.layers_list_activity_item, null);
|
||||
// User super class to create the View
|
||||
View v = activity.getLayoutInflater().inflate(R.layout.list_menu_item, null);
|
||||
TextView tv = (TextView)v.findViewById(R.id.title);
|
||||
tv.setText(adapter.getItemName(position));
|
||||
|
||||
|
@ -314,11 +314,13 @@ public class MapActivityLayers {
|
|||
} else {
|
||||
tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_transparent, 0, 0, 0);
|
||||
}
|
||||
tv.setCompoundDrawablePadding(padding);
|
||||
|
||||
final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item));
|
||||
if(adapter.getSelection(position) == -1){
|
||||
ch.setVisibility(View.INVISIBLE);
|
||||
} else {
|
||||
ch.setOnCheckedChangeListener(null);
|
||||
ch.setChecked(adapter.getSelection(position) > 0);
|
||||
ch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
||||
@Override
|
||||
|
|
|
@ -153,7 +153,7 @@ public class SearchPoiFilterActivity extends ListActivity {
|
|||
icon.setImageResource(android.R.drawable.ic_search_category_default);
|
||||
} else {
|
||||
// label.setTypeface(Typeface.DEFAULT);
|
||||
icon.setImageResource(model.isStandardFilter() ? R.drawable.folder : R.drawable.tab_icon_favourite_menu);
|
||||
icon.setImageResource(model.isStandardFilter() ? R.drawable.folder : R.drawable.list_activities_favorites);
|
||||
}
|
||||
ImageView editIcon = (ImageView) row.findViewById(R.id.folder_edit_icon);
|
||||
if (model.isStandardFilter()) {
|
||||
|
|
|
@ -154,7 +154,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
|
|||
adapter.registerItem(R.string.poi_context_menu_modify, R.drawable.list_activities_poi_modify, listener, 1);
|
||||
adapter.registerItem(R.string.poi_context_menu_delete, R.drawable.list_activities_poi_remove, listener, 2);
|
||||
} else {
|
||||
adapter.registerItem(R.string.context_menu_item_create_poi, R.drawable.list_view_create_poi, listener, -1);
|
||||
adapter.registerItem(R.string.context_menu_item_create_poi, R.drawable.list_activities_create_poi, listener, -1);
|
||||
}
|
||||
adapter.registerItem(R.string.context_menu_item_open_bug, R.drawable.list_activities_osm_bugs, listener, -1);
|
||||
}
|
||||
|
|
|
@ -213,7 +213,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
|
|||
}
|
||||
};
|
||||
if (parkingPosition != null)
|
||||
adapter.registerItem(R.string.context_menu_item_delete_parking_point, R.drawable.list_parking_poi_remove, removeListener, 0);
|
||||
adapter.registerItem(R.string.context_menu_item_delete_parking_point, R.drawable.list_activities_parking_poi_remove, removeListener, 0);
|
||||
}
|
||||
|
||||
OnContextMenuClick addListener = new OnContextMenuClick() {
|
||||
|
@ -225,7 +225,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
|
|||
}
|
||||
}
|
||||
};
|
||||
adapter.registerItem(R.string.context_menu_item_add_parking_point, R.drawable.list_parking_poi_add, addListener, -1);
|
||||
adapter.registerItem(R.string.context_menu_item_add_parking_point, R.drawable.list_activities_parking_poi_add, addListener, -1);
|
||||
|
||||
}
|
||||
|
||||
|
|