drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

nit and style fixes

Browse Source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond
2025-08-30 19:56:24 +01:00
parent ea1d0eefa2
commit 3c1b8be5ce
2 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
View File

@@ -72,16 +72,16 @@ public abstract class BaseSignView extends View
}
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);
float px = getPaddingLeft() + getPaddingRight();
float py = getPaddingTop() + getPaddingBottom();
mWidth = w - px;
mHeight = h - py;
protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
super.onSizeChanged(width, height, oldWidth, oldHeight);
final float paddingX = getPaddingLeft() + getPaddingRight();
final float paddingY = getPaddingTop() + getPaddingBottom();
mWidth = width - paddingX;
mHeight = height - paddingY;
mRadius = Math.min(mWidth, mHeight) / 2f;
mBorderWidth = mRadius * mBorderWidthRatio;
// subtract half the stroke PLUS the extra inset
float gap = mRadius * mBorderInsetRatio;
final float gap = mRadius * mBorderInsetRatio;
mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
configureTextSize();
}
@@ -90,11 +90,11 @@ public abstract class BaseSignView extends View
protected void onDraw(@NonNull Canvas canvas)
{
super.onDraw(canvas);
String str = getValueString();
final String str = getValueString();
if (str == null) return;
float cx = mWidth / 2f;
float cy = mHeight / 2f;
final float cx = mWidth / 2f;
final float cy = mHeight / 2f;
// background & border
boolean alert = isAlert();
@@ -115,9 +115,9 @@ public abstract class BaseSignView extends View
@Override
public boolean onTouchEvent(@NonNull MotionEvent e)
{
float cx = mWidth / 2f, cy = mHeight / 2f;
float dx = e.getX() - cx, dy = e.getY() - cy;
if (dx*dx + dy*dy <= mRadius*mRadius)
final float cx = mWidth / 2f, cy = mHeight / 2f;
final float dx = e.getX() - cx, dy = e.getY() - cy;
if ((dx * dx) + (dy * dy) <= (mRadius * mRadius))
{
performClick();
return true;
@@ -136,7 +136,7 @@ public abstract class BaseSignView extends View
{
Rect b = new Rect();
mTextPaint.getTextBounds(str, 0, str.length(), b);
float y = cy - b.exactCenterY();
final float y = cy - b.exactCenterY();
c.drawText(str, cx, y, mTextPaint);
}
@@ -144,10 +144,10 @@ public abstract class BaseSignView extends View
{
String text = getValueString();
if (text == null) return;
float textRadius = mBorderRadius - mBorderWidth;
float maxSz = 2f * textRadius;
float maxSz2 = maxSz * maxSz;
float lo = 0f, hi = maxSz, sz = maxSz;
final float textRadius = mBorderRadius - mBorderWidth;
final float maxTextSize = 2f * textRadius;
final float maxTextSize2 = maxTextSize * maxTextSize;
float lo = 0f, hi = maxTextSize, sz = maxTextSize;
Rect b = new Rect();
while (lo <= hi)
{
@@ -155,8 +155,10 @@ public abstract class BaseSignView extends View
mTextPaint.setTextSize(sz);
mTextPaint.getTextBounds(text, 0, text.length(), b);
float area = b.width()*b.width() + b.height()*b.height();
if (area <= maxSz2) lo = sz + 1f;
else hi = sz - 1f;
if (area <= maxTextSize2)
lo = sz + 1f;
else
hi = sz - 1f;
}
mTextPaint.setTextSize(Math.max(1f, sz));
}

53
android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
View File

@@ -25,24 +25,23 @@ public class SpeedLimitView extends BaseSignView
setBorderWidthRatio(0.2f);
setBorderInsetRatio(0.05f);
try (TypedArray a = ctx.getTheme()
.obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
try (TypedArray styleAttrs = ctx.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
{
int bg = a.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
int bd = a.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
int al = a.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
int tc = a.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
int tac = a.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
setColors(bg, bd, al, tc, tac);
final int bgColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
final int borderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
final int alertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
final int textColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
final int txtAlertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
setColors(bgColor, borderColor, alertColor, textColor, txtAlertColor);
unlimitedBorderColor = a.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor, DefaultValues.UNLIMITED_BORDER_COLOR);
unlimitedStripeColor = a.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor, DefaultValues.UNLIMITED_STRIPE_COLOR);
unlimitedBorderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor, DefaultValues.UNLIMITED_BORDER_COLOR);
unlimitedStripeColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor, DefaultValues.UNLIMITED_STRIPE_COLOR);
if (isInEditMode())
{
mSpeedLimit = a.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
mAlert = a.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
mSpeedStr = Integer.toString(mSpeedLimit);
mSpeedLimit = styleAttrs.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
mAlert = styleAttrs.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
mSpeedStr = Integer.toString(mSpeedLimit);
}
}
}
@@ -76,9 +75,9 @@ public class SpeedLimitView extends BaseSignView
@Override
protected void onDraw(Canvas canvas)
{
float cx = mWidth/2f, cy = mHeight/2f;
final float cx = mWidth/2f, cy = mHeight/2f;
if (mSpeedLimit == 0)
if (mSpeedLimit == 0) // 0 means unlimited speed (maxspeed=none)
{
// background
mBackgroundPaint.setColor(mBackgroundColor);
@@ -101,24 +100,24 @@ public class SpeedLimitView extends BaseSignView
private void drawUnlimitedStripes(Canvas c, float cx, float cy)
{
Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
final Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
stripe.setColor(unlimitedStripeColor);
stripe.setStrokeWidth(mBorderWidth * 0.4f);
float r = mRadius * 0.8f; // shorten to 80% of full radius
float diag = (float)(1/Math.sqrt(2));
float dx = -diag, dy = +diag;
float px = -dy, py = +dx; // perpendicular
float step = r * 0.15f; // spacing
final float radius = mRadius * 0.8f; // Shorten to 80% of full radius
final float diag = (float) (1/Math.sqrt(2)); // 45 degrees
final float dx = -diag, dy = +diag;
final float px = -dy, py = +dx; // Perpendicular
final float step = radius * 0.15f; // Spacing
for (int i = -2; i <= 2; i++)
{
float ox = px * step * i;
float oy = py * step * i;
float sx = cx + dx * r + ox;
float sy = cy + dy * r + oy;
float ex = cx - dx * r + ox;
float ey = cy - dy * r + oy;
final float ox = px * step * i;
final float oy = py * step * i;
final float sx = cx + dx * radius + ox;
final float sy = cy + dy * radius + oy;
final float ex = cx - dx * radius + ox;
final float ey = cy - dy * radius + oy;
c.drawLine(sx, sy, ex, ey, stripe);
}
}