aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2015-02-17 18:38:58 +0100
committerBananeweizen <bananeweizen@gmx.de>2015-02-17 18:38:58 +0100
commit0a47150668740f308fb53a0698ce401eb6ed79f1 (patch)
treeeb62d9f9ba57dbe016b6ccf9c9399db9b6658998
parent7c80c1d2394fac49f031a293c133db9fc3486c57 (diff)
downloadcgeo-0a47150668740f308fb53a0698ce401eb6ed79f1.zip
cgeo-0a47150668740f308fb53a0698ce401eb6ed79f1.tar.gz
cgeo-0a47150668740f308fb53a0698ce401eb6ed79f1.tar.bz2
fix preview of CompassMiniView in IDE
-rw-r--r--main/src/cgeo/geocaching/ui/CompassMiniView.java21
1 files changed, 11 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/ui/CompassMiniView.java b/main/src/cgeo/geocaching/ui/CompassMiniView.java
index a811fa0..d50d806 100644
--- a/main/src/cgeo/geocaching/ui/CompassMiniView.java
+++ b/main/src/cgeo/geocaching/ui/CompassMiniView.java
@@ -50,18 +50,19 @@ final public class CompassMiniView extends View {
private static final float MINIMUM_ROTATION_DEGREES_FOR_REPAINT = 5;
private float azimuthRelative;
- public CompassMiniView(Context context) {
+ public CompassMiniView(final Context context) {
super(context);
}
- public CompassMiniView(Context context, AttributeSet attrs) {
+ public CompassMiniView(final Context context, final AttributeSet attrs) {
super(context, attrs);
}
@Override
public void onAttachedToWindow() {
if (instances++ == 0) {
- compassArrow = BitmapFactory.decodeResource(getResources(), Settings.isLightSkin() ? R.drawable.compass_arrow_mini_black : R.drawable.compass_arrow_mini_white);
+ final int drawable = isInEditMode() || !Settings.isLightSkin() ? R.drawable.compass_arrow_mini_white : R.drawable.compass_arrow_mini_black;
+ compassArrow = BitmapFactory.decodeResource(getResources(), drawable);
compassArrowWidth = compassArrow.getWidth();
compassArrowHeight = compassArrow.getWidth();
}
@@ -79,12 +80,12 @@ final public class CompassMiniView extends View {
targetCoords = point;
}
- public void updateAzimuth(float azimuth) {
+ public void updateAzimuth(final float azimuth) {
this.azimuth = azimuth;
updateDirection();
}
- public void updateHeading(float heading) {
+ public void updateHeading(final float heading) {
this.heading = heading;
updateDirection();
}
@@ -106,7 +107,7 @@ final public class CompassMiniView extends View {
azimuthRelative = AngleUtils.normalize(azimuth - heading);
// avoid updates on very small changes, which are not visible to the user
- float change = Math.abs(azimuthRelative - lastDrawnAzimuth);
+ final float change = Math.abs(azimuthRelative - lastDrawnAzimuth);
if (change < MINIMUM_ROTATION_DEGREES_FOR_REPAINT) {
return;
}
@@ -119,7 +120,7 @@ final public class CompassMiniView extends View {
}
@Override
- protected void onDraw(Canvas canvas) {
+ protected void onDraw(final Canvas canvas) {
super.onDraw(canvas);
lastDrawnAzimuth = azimuthRelative;
@@ -137,11 +138,11 @@ final public class CompassMiniView extends View {
}
@Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec));
}
- private int measureWidth(int measureSpec) {
+ private int measureWidth(final int measureSpec) {
final int specMode = MeasureSpec.getMode(measureSpec);
final int specSize = MeasureSpec.getSize(measureSpec);
@@ -158,7 +159,7 @@ final public class CompassMiniView extends View {
return result;
}
- private int measureHeight(int measureSpec) {
+ private int measureHeight(final int measureSpec) {
final int specMode = MeasureSpec.getMode(measureSpec);
final int specSize = MeasureSpec.getSize(measureSpec);