diff --git a/OsmAnd/res/drawable-hdpi/monitoring.png b/OsmAnd/res/drawable-hdpi/monitoring.png index cbc5e15c90..c4f422129d 100644 Binary files a/OsmAnd/res/drawable-hdpi/monitoring.png and b/OsmAnd/res/drawable-hdpi/monitoring.png differ diff --git a/OsmAnd/res/drawable-hdpi/widget_parking.png b/OsmAnd/res/drawable-hdpi/widget_parking.png new file mode 100644 index 0000000000..409062a3e3 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/widget_parking.png differ diff --git a/OsmAnd/res/drawable-large/monitoring.png b/OsmAnd/res/drawable-large/monitoring.png index cbc5e15c90..c4f422129d 100644 Binary files a/OsmAnd/res/drawable-large/monitoring.png and b/OsmAnd/res/drawable-large/monitoring.png differ diff --git a/OsmAnd/res/drawable-large/widget_parking.png b/OsmAnd/res/drawable-large/widget_parking.png new file mode 100644 index 0000000000..409062a3e3 Binary files /dev/null and b/OsmAnd/res/drawable-large/widget_parking.png differ diff --git a/OsmAnd/res/layout/layers_list_activity_item.xml b/OsmAnd/res/layout/layers_list_activity_item.xml index eadd0a5467..7e6c734927 100644 --- a/OsmAnd/res/layout/layers_list_activity_item.xml +++ b/OsmAnd/res/layout/layers_list_activity_item.xml @@ -17,12 +17,17 @@ android:text="@string/layer_poi" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/color_black" android:layout_weight="1"/> - + + + + android:gravity="center_vertical" /> + \ No newline at end of file diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index cd43db3c6a..0b461c153f 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -19,6 +19,7 @@ \n\t* better UI finish (icons) \n\t* lots of bug fixes + Monitoring services No route Remove target point Target point %1$s diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index a823b937e4..45c8282097 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -104,7 +104,7 @@ public class ParkingPositionPlugin extends OsmandPlugin { if (mapInfoLayer != null) { parkingPlaceControl = createParkingPlaceInfoControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText()); mapInfoLayer.getMapInfoControls().registerSideWidget(parkingPlaceControl, - R.drawable.list_activities_poi_parking, R.string.map_widget_parking, "parking", false, + R.drawable.widget_parking, R.string.map_widget_parking, "parking", false, EnumSet.allOf(ApplicationMode.class), EnumSet.noneOf(ApplicationMode.class), 8); mapInfoLayer.recreateControls(); } diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index 8d040b027d..eb8b0d554b 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -258,6 +258,8 @@ public class MapInfoLayer extends OsmandMapLayer { mapInfoControls.registerTopWidget(lockView, R.drawable.lock_enabled, R.string.bg_service_screen_lock, "bgService", MapInfoControls.LEFT_CONTROL, exceptCar, 15); backToLocation = createBackToLocation(map); mapInfoControls.registerTopWidget(backToLocation, R.drawable.default_location, R.string.map_widget_back_to_loc, "back_to_location", MapInfoControls.RIGHT_CONTROL, all, 5); + mapInfoControls.registerTopWidget(createMonitoring(map), R.drawable.monitoring, R.string.map_widget_monitoring_services, "monitorign_services", MapInfoControls.LEFT_CONTROL, all, 12); + View globus = createGlobus(); mapInfoControls.registerTopWidget(globus, R.drawable.globus, R.string.map_widget_map_select, "progress", MapInfoControls.RIGHT_CONTROL, none, 15); @@ -563,7 +565,7 @@ public class MapInfoLayer extends OsmandMapLayer { final boolean selecteable = mi.selecteable(); ch.setOnCheckedChangeListener(null); if(!mi.selecteable()) { - ch.setVisibility(View.INVISIBLE); + ch.setVisibility(View.GONE); } else { boolean check = mi.visibleCollapsed(mode) || mi.visible(mode); ch.setChecked(check); @@ -726,6 +728,18 @@ public class MapInfoLayer extends OsmandMapLayer { return backToLocation; } + private ImageView createMonitoring(final MapActivity map){ + ImageView monitoring = new ImageView(view.getContext()); + monitoring.setImageDrawable(map.getResources().getDrawable(R.drawable.monitoring)); + monitoring.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + map.backToLocationImpl(); + } + }); + return monitoring; + } + private ImageViewControl createCompassView(final MapActivity map){ final Drawable compass = map.getResources().getDrawable(R.drawable.compass);