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

Fixed issue 745, text not readable in night mode

Browse source
This commit is contained in:
Pavol Zibrita 2011-12-09 02:28:31 +01:00
parent 1fc2f9369a
commit cae73da448
4 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -188,15 +188,15 @@ public class MapControlsLayer extends OsmandMapLayer {
private void drawZoomLevel(Canvas canvas) {
String zoomText = view.getZoom() + "";
float length = zoomTextPaint.measureText(zoomText);
ShadowText zoomText = ShadowText.create(view.getZoom() + "");
float length = zoomTextPaint.measureText(zoomText.getText());
if (zoomShadow.getBounds().width() == 0) {
zoomShadow.setBounds(zoomInButton.getLeft() - 2, zoomInButton.getTop() - (int) (18 * scaleCoefficient), zoomInButton.getRight(),
zoomInButton.getBottom());
}
zoomShadow.draw(canvas);
canvas.drawText(zoomText, zoomInButton.getLeft() + (zoomInButton.getWidth() - length - 2) / 2,
zoomText.draw(canvas, zoomInButton.getLeft() + (zoomInButton.getWidth() - length - 2) / 2,
zoomInButton.getTop() + 4 * scaleCoefficient, zoomTextPaint);
}
@ -372,7 +372,7 @@ public class MapControlsLayer extends OsmandMapLayer {
/////////////////////// Ruler ///////////////////
// cache values for ruler
String cacheRulerText = null;
ShadowText cacheRulerText = null;
int cacheRulerZoom = 0;
double cacheRulerTileX = 0;
double cacheRulerTileY = 0;
@ -397,8 +397,8 @@ public class MapControlsLayer extends OsmandMapLayer {
double roundedDist = OsmAndFormatter.calculateRoundedDist(dist * screenRulerPercent, view.getContext());
int cacheRulerDistPix = (int) (pixDensity * roundedDist);
cacheRulerText = OsmAndFormatter.getFormattedDistance((float) roundedDist, view.getContext());
cacheRulerTextLen = zoomTextPaint.measureText(cacheRulerText);
cacheRulerText = ShadowText.create(OsmAndFormatter.getFormattedDistance((float) roundedDist, view.getContext()));
cacheRulerTextLen = zoomTextPaint.measureText(cacheRulerText.getText());
Rect bounds = rulerDrawable.getBounds();
bounds.right = (int) (view.getWidth() - 7 * scaleCoefficient);
@ -410,7 +410,7 @@ public class MapControlsLayer extends OsmandMapLayer {
if (cacheRulerText != null) {
rulerDrawable.draw(canvas);
Rect bounds = rulerDrawable.getBounds();
canvas.drawText(cacheRulerText, bounds.left + (bounds.width() - cacheRulerTextLen) / 2, bounds.bottom - 8 * scaleCoefficient,
cacheRulerText.draw(canvas, bounds.left + (bounds.width() - cacheRulerTextLen) / 2, bounds.bottom - 8 * scaleCoefficient,
rulerTextPaint);
}
}

13
OsmAnd/src/net/osmand/plus/views/MapInfoControl.java
View file

@ -2,10 +2,8 @@ package net.osmand.plus.views;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.Paint.Style;
import android.graphics.drawable.Drawable;
import android.view.View;
@ -48,16 +46,7 @@ public abstract class MapInfoControl extends View {
}
protected void drawShadowText(Canvas cv, String text, float centerX, float centerY, Paint textPaint) {
int c = textPaint.getColor();
textPaint.setStyle(Style.STROKE);
textPaint.setColor(Color.WHITE);
textPaint.setStrokeWidth(4);
cv.drawText(text, centerX, centerY, textPaint);
// reset
textPaint.setStrokeWidth(1);
textPaint.setStyle(Style.FILL);
textPaint.setColor(c);
cv.drawText(text, centerX, centerY, textPaint);
ShadowText.create(text).draw(cv, centerX, centerY, textPaint);
}
@Override

36
OsmAnd/src/net/osmand/plus/views/ShadowText.java Normal file
View file

@ -0,0 +1,36 @@
package net.osmand.plus.views;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Paint.Style;
public class ShadowText {
private final String text;
ShadowText(String text) {
this.text = text;
}
public static ShadowText create(String text) {
return new ShadowText(text);
}
protected void draw(Canvas cv, float centerX, float centerY, Paint textPaint) {
int c = textPaint.getColor();
textPaint.setStyle(Style.STROKE);
textPaint.setColor(Color.WHITE);
textPaint.setStrokeWidth(4);
cv.drawText(text, centerX, centerY, textPaint);
// reset
textPaint.setStrokeWidth(1);
textPaint.setStyle(Style.FILL);
textPaint.setColor(c);
cv.drawText(text, centerX, centerY, textPaint);
}
public String getText() {
return text;
}
}

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

@ -7,7 +7,6 @@ import net.osmand.data.TransportStop;
import net.osmand.osm.LatLon;
import net.osmand.plus.R;
import net.osmand.plus.TransportIndexRepository;
import net.osmand.plus.views.OsmBugsLayer.OpenStreetBug;
import android.content.Context;
import android.content.DialogInterface.OnClickListener;
import android.graphics.Canvas;