commit e2505432a916f597a952ed2e5e960e463e99d3b7
parent 2a39db5ecd74a9bbbee3abcc2283b31d82ba9d3a
Author: gstraube <gstraube@mailbox.org>
Date: Fri, 28 Jul 2017 21:44:36 +0200
Extract class to enable testability of drawing methods
Diffstat:
2 files changed, 143 insertions(+), 110 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/CanvasPainter.java b/app/src/main/java/com/github/cythara/CanvasPainter.java
@@ -0,0 +1,138 @@
+package com.github.cythara;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.text.TextPaint;
+
+class CanvasPainter {
+
+ private static final double MAX_ALLOWED_DEVIATION = 3D;
+ private final Context context;
+
+ private Canvas canvas;
+
+ private TextPaint textPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+ private TextPaint numbersPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+ private Paint gaugePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ private Paint symbolPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+ private Paint background = new Paint();
+
+ private PitchDifference pitchDifference;
+
+ private float gaugeWidth;
+ private float x;
+ private float y;
+
+ static CanvasPainter with(Context context) {
+ return new CanvasPainter(context);
+ }
+
+ private CanvasPainter(Context context) {
+ this.context = context;
+ }
+
+ CanvasPainter paint(PitchDifference pitchDifference) {
+ this.pitchDifference = pitchDifference;
+
+ return this;
+ }
+
+ void on(Canvas canvas) {
+ this.canvas = canvas;
+
+ gaugeWidth = 0.45F * canvas.getWidth();
+ x = canvas.getWidth() / 2F;
+ y = canvas.getHeight() / 2F;
+
+ textPaint.setColor(Color.BLACK);
+ int textSize = context.getResources().getDimensionPixelSize(R.dimen.noteTextSize);
+ textPaint.setTextSize(textSize);
+
+ drawGauge();
+
+ if (pitchDifference != null) {
+ setBackground();
+
+ drawIndicator();
+
+ drawText();
+ }
+ }
+
+ private void drawGauge() {
+ gaugePaint.setColor(Color.BLACK);
+
+ int gaugeSize = context.getResources().getDimensionPixelSize(R.dimen.gaugeSize);
+ gaugePaint.setStrokeWidth(gaugeSize);
+
+ int textSize = context.getResources().getDimensionPixelSize(R.dimen.numbersTextSize);
+ numbersPaint.setTextSize(textSize);
+
+ canvas.drawLine(x - gaugeWidth, y, x + gaugeWidth, y, gaugePaint);
+
+ float spaceWidth = gaugeWidth / 3F;
+
+ for (int i = 0; i <= 30; i = i + 10) {
+ float factor = i / 10F;
+ drawMark(y, x + factor * spaceWidth, i);
+ drawMark(y, x - factor * spaceWidth, -i);
+ }
+
+ String sharp = "♯";
+ String flat = "♭";
+
+ int symbolsTextSize = context.getResources().getDimensionPixelSize(R.dimen.symbolsTextSize);
+ symbolPaint.setTextSize(symbolsTextSize);
+
+ canvas.drawText(sharp, x + 3 * spaceWidth - symbolPaint.measureText(sharp) / 2F, y - 200,
+ symbolPaint);
+
+ canvas.drawText(flat, x - 3 * spaceWidth - symbolPaint.measureText(flat) / 2F, y - 200,
+ symbolPaint);
+ }
+
+ private void drawIndicator() {
+ float deviation = (float) pitchDifference.deviation;
+
+ float xPos = x + (deviation * gaugeWidth / 30F);
+ String text = "|";
+ canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y + 30,
+ numbersPaint);
+ }
+
+ private void drawMark(float y, float xPos, int mark) {
+ String prefix = "";
+ if (mark > 0) {
+ prefix = "+";
+ }
+ String text = prefix + String.valueOf(mark);
+
+ canvas.drawLine(xPos, y - 10, xPos, y + 10, gaugePaint);
+ canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y - 30, numbersPaint);
+ }
+
+ private void drawText() {
+ float x = canvas.getWidth() / 2F;
+ float y = canvas.getHeight() - canvas.getHeight() / 3F;
+
+ String note = pitchDifference.closest.name();
+ float offset = textPaint.measureText(note) / 2F;
+
+ canvas.drawText(note, x - offset, y, textPaint);
+ }
+
+ private void setBackground() {
+ int color = Color.RED;
+ if (Math.abs(pitchDifference.deviation) <= MAX_ALLOWED_DEVIATION) {
+ color = Color.GREEN;
+ }
+ background.setColor(color);
+
+ background.setStyle(Paint.Style.FILL);
+ background.setAlpha(70);
+
+ canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), background);
+ }
+}
+\ No newline at end of file
diff --git a/app/src/main/java/com/github/cythara/TunerView.java b/app/src/main/java/com/github/cythara/TunerView.java
@@ -2,134 +2,28 @@ package com.github.cythara;
import android.content.Context;
import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.text.TextPaint;
import android.util.AttributeSet;
import android.view.View;
public class TunerView extends View {
- private static final double MAX_ALLOWED_DEVIATION = 3D;
-
- private Canvas canvas;
-
- private TextPaint textPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
- private TextPaint numbersPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
- private Paint gaugePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- private Paint symbolPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
- private Paint background = new Paint();
+ private CanvasPainter canvasPainter;
private PitchDifference pitchDifference;
- private float gaugeWidth;
- private float x;
- private float y;
-
public TunerView(Context context) {
super(context);
+ canvasPainter = CanvasPainter.with(getContext());
}
public TunerView(Context context, AttributeSet attrs) {
super(context, attrs);
+ canvasPainter = CanvasPainter.with(getContext());
}
@Override
public void onDraw(Canvas canvas) {
super.onDraw(canvas);
-
- this.canvas = canvas;
- gaugeWidth = 0.45F * canvas.getWidth();
- x = canvas.getWidth() / 2F;
- y = canvas.getHeight() / 2F;
-
- textPaint.setColor(Color.BLACK);
- int textSize = getResources().getDimensionPixelSize(R.dimen.noteTextSize);
- textPaint.setTextSize(textSize);
-
- drawGauge();
-
- if (pitchDifference != null) {
- setBackground();
-
- drawIndicator();
-
- drawText();
- }
- }
-
- private void drawGauge() {
- gaugePaint.setColor(Color.BLACK);
-
- int gaugeSize = getResources().getDimensionPixelSize(R.dimen.gaugeSize);
- gaugePaint.setStrokeWidth(gaugeSize);
-
- int textSize = getResources().getDimensionPixelSize(R.dimen.numbersTextSize);
- numbersPaint.setTextSize(textSize);
-
- canvas.drawLine(x - gaugeWidth, y, x + gaugeWidth, y, gaugePaint);
-
- float spaceWidth = gaugeWidth / 3F;
-
- for (int i = 0; i <= 30; i = i + 10) {
- float factor = i / 10F;
- drawMark(y, x + factor * spaceWidth, i);
- drawMark(y, x - factor * spaceWidth, -i);
- }
-
- String sharp = "♯";
- String flat = "♭";
-
- int symbolsTextSize = getResources().getDimensionPixelSize(R.dimen.symbolsTextSize);
- symbolPaint.setTextSize(symbolsTextSize);
-
- canvas.drawText(sharp, x + 3 * spaceWidth - symbolPaint.measureText(sharp) / 2F, y - 200,
- symbolPaint);
-
- canvas.drawText(flat, x - 3 * spaceWidth - symbolPaint.measureText(flat) / 2F, y - 200,
- symbolPaint);
- }
-
- private void drawIndicator() {
- float deviation = (float) pitchDifference.deviation;
-
- float xPos = x + (deviation * gaugeWidth / 30F);
- String text = "|";
- canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y + 30,
- numbersPaint);
- }
-
- private void drawMark(float y, float xPos, int mark) {
- String prefix = "";
- if (mark > 0) {
- prefix = "+";
- }
- String text = prefix + String.valueOf(mark);
-
- canvas.drawLine(xPos, y - 10, xPos, y + 10, gaugePaint);
- canvas.drawText(text, xPos - numbersPaint.measureText(text) / 2F, y - 30, numbersPaint);
- }
-
- private void drawText() {
- float x = canvas.getWidth() / 2F;
- float y = canvas.getHeight() - canvas.getHeight() / 3F;
-
- String note = pitchDifference.closest.name();
- float offset = textPaint.measureText(note) / 2F;
-
- canvas.drawText(note, x - offset, y, textPaint);
- }
-
- private void setBackground() {
- int color = Color.RED;
- if (Math.abs(pitchDifference.deviation) <= MAX_ALLOWED_DEVIATION) {
- color = Color.GREEN;
- }
- background.setColor(color);
-
- background.setStyle(Paint.Style.FILL);
- background.setAlpha(70);
-
- canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), background);
+ canvasPainter.paint(pitchDifference).on(canvas);
}
public void setPitchDifference(PitchDifference pitchDifference) {
