commit 7bcc58ed2ccc14b15e9cc812b9b51380353e3bea
parent 69fdee3883efd4a1005b75d884fbd5f1435a771a
Author: gstraube <gstraube@mailbox.org>
Date: Fri, 14 Jul 2017 20:22:57 +0200
Extract methods
Diffstat:
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/TunerView.java b/app/src/main/java/com/github/cythara/TunerView.java
@@ -62,19 +62,9 @@ public class TunerView extends View {
float spaceWidth = gaugeWidth / 3F;
for (int i = 0; i <= 30; i = i + 10) {
- float xPos = x + (i / 10F) * spaceWidth;
- canvas.drawLine(xPos, y - 10, xPos, y + 10, gaugePaint);
- String text = String.valueOf(i);
- canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y - 30,
- numbersPaint);
- }
-
- for (int i = 30; i >= 0; i = i - 10) {
- float xPos = x - (i / 10F) * spaceWidth;
- canvas.drawLine(xPos, y - 10, xPos, y + 10, gaugePaint);
- String text = String.valueOf(i);
- canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y - 30,
- numbersPaint);
+ float factor = i / 10F;
+ drawMark(canvas, y, x + factor * spaceWidth, String.valueOf(i));
+ drawMark(canvas, y, x - factor * spaceWidth, String.valueOf(i));
}
float deviation = (float) pitchDifference.deviation;
@@ -85,6 +75,11 @@ public class TunerView extends View {
numbersPaint);
}
+ private void drawMark(Canvas canvas, float y, float xPos, String text) {
+ canvas.drawLine(xPos, y - 10, xPos, y + 10, gaugePaint);
+ canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y - 30, numbersPaint);
+ }
+
private void drawText(Canvas canvas) {
float x = canvas.getWidth() / 2F;
float y = canvas.getHeight() - canvas.getHeight() / 3F;