From bf21216452a148838d467a61c86a754c812a0be1 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 12 Sep 2012 01:44:51 +0200 Subject: [PATCH] Remove discrepancies --- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java | 7 ++++--- OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 74456443ba..262146fd26 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + Warnungen anzeigen… Warnungen für Tempolimits, stationäre Radarkontrollen, Rüttelschwellen u.Ä. Kompass verwenden, wenn keine andere Richtungsbestimmung möglich diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index b09bd8cb01..e3b1a6f156 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -222,6 +222,7 @@ public class MapInfoLayer extends OsmandMapLayer { // register right stack EnumSet all = EnumSet.allOf(ApplicationMode.class); EnumSet bicyclePedestrian = EnumSet.of(ApplicationMode.BICYCLE, ApplicationMode.PEDESTRIAN); + EnumSet exceptCar = EnumSet.of(ApplicationMode.BICYCLE, ApplicationMode.PEDESTRIAN, ApplicationMode.DEFAULT); EnumSet none = EnumSet.noneOf(ApplicationMode.class); RoutingHelper routingHelper = view.getApplication().getRoutingHelper(); NextTurnInfoControl bigInfoControl = ric.createNextInfoControl(routingHelper, view.getApplication(), view.getSettings(), paintText, @@ -249,9 +250,9 @@ public class MapInfoLayer extends OsmandMapLayer { ImageViewControl compassView = createCompassView(map); mapInfoControls.registerTopWidget(compassView, R.drawable.compass, R.string.map_widget_compass, "compass", MapInfoControls.LEFT_CONTROL, all, 5); View config = createConfiguration(); - mapInfoControls.registerTopWidget(config, R.drawable.widget_config, R.string.map_widget_config, "config", MapInfoControls.RIGHT_CONTROL, all, 10).required(ApplicationMode.values()); + mapInfoControls.registerTopWidget(config, R.drawable.widget_config, R.string.map_widget_config, "config", MapInfoControls.RIGHT_CONTROL, all, 10).required(ApplicationMode.DEFAULT); ImageView lockView = lockInfoControl.createLockScreenWidget(view, map); - mapInfoControls.registerTopWidget(lockView, R.drawable.lock_enabled, R.string.bg_service_screen_lock, "bgService", MapInfoControls.LEFT_CONTROL, all, 15); + 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); View globus = createGlobus(); @@ -808,7 +809,7 @@ public class MapInfoLayer extends OsmandMapLayer { pp.setTextSize(20 * scaleCoefficient); float ts = pp.measureText(text); int wth = getWidth(); - while (ts > wth && pp.getTextSize() > (14 * scaleCoefficient)) { + while (ts > wth && pp.getTextSize() > (16 * scaleCoefficient)) { pp.setTextSize(pp.getTextSize() - 1); ts = pp.measureText(text); } diff --git a/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java b/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java index c682a6aa33..8fb7375124 100644 --- a/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java @@ -124,9 +124,9 @@ public class NextTurnInfoControl extends MapInfoControl { float mt = textPaint.measureText(text); if (!horisontalMini) { float startX = Math.max((getWWidth() - st - mt) / 2, 2 * scaleCoefficient); - drawShadowText(canvas, text, startX, getWHeight() - 3 * scaleCoefficient, textPaint); + drawShadowText(canvas, text, startX, getWHeight() - 5 * scaleCoefficient, textPaint); if (subtext != null) { - drawShadowText(canvas, subtext, startX + 2 * scaleCoefficient + mt, getWHeight() - 4 * scaleCoefficient, subtextPaint); + drawShadowText(canvas, subtext, startX + 2 * scaleCoefficient + mt, getWHeight() - 5 * scaleCoefficient, subtextPaint); } } else { drawShadowText(canvas, text, 72 * scaleCoefficient / miniCoeff + 2 * scaleCoefficient,