plectrum

commit 10a4018486a17050a6212ad2ad96c8388eef3d18
parent dceb0e1d6e560bd82e86d6e27db4f7387c3c65fe
Author: gstraube <gstraube@mailbox.org>
Date:   Thu,  6 Jul 2017 18:59:52 +0200

Remove guitar string name as field

Diffstat:
M
app/src/main/java/com/github/cythara/MainActivity.java
 | 
2
+-
M
app/src/main/java/com/github/cythara/Note.java
 | 
20
+++++++-------------
M
app/src/main/java/com/github/cythara/TunerView.java
 | 
2
+-

3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java
@@ -63,7 +63,7 @@ public class MainActivity extends AppCompatActivity {
 
                             if (Math.abs(pitchDifference.deviation) < MAX_DEVIATION) {
                                 msg = String.format(Locale.US, "Closest: %s Diff: %f Freq: %f",
-                                        pitchDifference.closest.getGuitarString(),
+                                        pitchDifference.closest.name(),
                                         pitchDifference.deviation, pitch);
 
                                 Message message = new Message();
diff --git a/app/src/main/java/com/github/cythara/Note.java b/app/src/main/java/com/github/cythara/Note.java
@@ -2,25 +2,19 @@ package com.github.cythara;
 
 enum Note {
 
-    E2("E", 82.41f),
-    A2("A", 110f),
-    D3("D", 146.83f),
-    G3("G", 196f),
-    B3("B", 246.94f),
-    E4("E", 329.63f);
+    E2(82.41f),
+    A2(110f),
+    D3(146.83f),
+    G3(196f),
+    B3(246.94f),
+    E4(329.63f);
 
-    private final String guitarString;
     private final float frequency;
 
-    Note(String guitarString, float frequency) {
-        this.guitarString = guitarString;
+    Note(float frequency) {
         this.frequency = frequency;
     }
 
-    public String getGuitarString() {
-        return guitarString;
-    }
-
     public float getFrequency() {
         return frequency;
     }
diff --git a/app/src/main/java/com/github/cythara/TunerView.java b/app/src/main/java/com/github/cythara/TunerView.java
@@ -32,7 +32,7 @@ public class TunerView extends View {
         float y = canvas.getHeight() / 2F;
 
         if (pitchDifference != null) {
-            canvas.drawText(pitchDifference.closest.getGuitarString(), x, y, paint);
+            canvas.drawText(pitchDifference.closest.name(), x, y, paint);
         }
     }