commit 47d7f67159fcccf5465162ebdfcf8109ba76bc93
parent ba823a817396e9d8450c2ae0a1982018fa45bf6e
Author: gstraube <gstraube@mailbox.org>
Date: Sun, 15 Oct 2017 12:53:58 +0200
Embed enums
Diffstat:
10 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/app/src/androidTest/java/com/github/cythara/TunerViewTest.java b/app/src/androidTest/java/com/github/cythara/TunerViewTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import static android.support.test.rule.GrantPermissionRule.grant;
-import static com.github.cythara.GuitarString.*;
+import static com.github.cythara.StandardTuning.Pitch.*;
import static java.lang.String.format;
@RunWith(AndroidJUnit4.class)
diff --git a/app/src/main/java/com/github/cythara/GuitarString.java b/app/src/main/java/com/github/cythara/GuitarString.java
@@ -1,25 +0,0 @@
-package com.github.cythara;
-
-enum GuitarString implements Note {
-
- E2(82.41f),
- A2(110f),
- D3(146.83f),
- G3(196f),
- B3(246.94f),
- E4(329.63f);
-
- private final float frequency;
-
- GuitarString(float frequency) {
- this.frequency = frequency;
- }
-
- public String getName() {
- return this.name();
- }
-
- public float getFrequency() {
- return frequency;
- }
-}
diff --git a/app/src/main/java/com/github/cythara/GuitarTuning.java b/app/src/main/java/com/github/cythara/GuitarTuning.java
@@ -1,14 +0,0 @@
-package com.github.cythara;
-
-class GuitarTuning implements Tuning {
-
- @Override
- public Note[] getNotes() {
- return GuitarString.values();
- }
-
- @Override
- public Note findNote(String name) {
- return GuitarString.valueOf(name);
- }
-}
diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java
@@ -23,7 +23,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
public static final int RECORD_AUDIO_PERMISSION = 0;
private static final String TAG_LISTENER_FRAGMENT = "listener_fragment";
- static Tuning tuning = new GuitarTuning();
+ static Tuning tuning = new StandardTuning();
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/github/cythara/StandardTuning.java b/app/src/main/java/com/github/cythara/StandardTuning.java
@@ -0,0 +1,38 @@
+package com.github.cythara;
+
+class StandardTuning implements Tuning {
+
+ enum Pitch implements com.github.cythara.Note {
+
+ E2(82.41f),
+ A2(110f),
+ D3(146.83f),
+ G3(196f),
+ B3(246.94f),
+ E4(329.63f);
+
+ private final float frequency;
+
+ Pitch(float frequency) {
+ this.frequency = frequency;
+ }
+
+ public String getName() {
+ return this.name();
+ }
+
+ public float getFrequency() {
+ return frequency;
+ }
+ }
+
+ @Override
+ public com.github.cythara.Note[] getNotes() {
+ return Pitch.values();
+ }
+
+ @Override
+ public com.github.cythara.Note findNote(String name) {
+ return Pitch.valueOf(name);
+ }
+}
diff --git a/app/src/main/java/com/github/cythara/TuningMapper.java b/app/src/main/java/com/github/cythara/TuningMapper.java
@@ -10,12 +10,12 @@ class TuningMapper {
static Tuning getTuningFromPosition(int position) {
switch (position) {
case GUITAR_TUNING_POSITION:
- return new GuitarTuning();
+ return new StandardTuning();
case UKULELE_TUNING_POSITION:
return new UkuleleTuning();
default:
Log.w("com.github.cythara", "Unknown position for tuning dropdown list");
- return new GuitarTuning();
+ return new StandardTuning();
}
}
}
diff --git a/app/src/main/java/com/github/cythara/UkuleleString.java b/app/src/main/java/com/github/cythara/UkuleleString.java
@@ -1,23 +0,0 @@
-package com.github.cythara;
-
-enum UkuleleString implements Note {
-
- G4(391.995f),
- C4(261.626f),
- E4(329.628f),
- A4(440f);
-
- private final float frequency;
-
- UkuleleString(float frequency) {
- this.frequency = frequency;
- }
-
- public String getName() {
- return this.name();
- }
-
- public float getFrequency() {
- return frequency;
- }
-}
diff --git a/app/src/main/java/com/github/cythara/UkuleleTuning.java b/app/src/main/java/com/github/cythara/UkuleleTuning.java
@@ -2,13 +2,35 @@ package com.github.cythara;
class UkuleleTuning implements Tuning {
+ private enum Pitch implements Note {
+
+ G4(391.995f),
+ C4(261.626f),
+ E4(329.628f),
+ A4(440f);
+
+ private final float frequency;
+
+ Pitch(float frequency) {
+ this.frequency = frequency;
+ }
+
+ public String getName() {
+ return this.name();
+ }
+
+ public float getFrequency() {
+ return frequency;
+ }
+ }
+
@Override
public Note[] getNotes() {
- return UkuleleString.values();
+ return Pitch.values();
}
@Override
public Note findNote(String name) {
- return UkuleleString.valueOf(name);
+ return Pitch.valueOf(name);
}
}
diff --git a/app/src/test/java/com/github/cythara/PitchComparatorTest.java b/app/src/test/java/com/github/cythara/PitchComparatorTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
-import static com.github.cythara.GuitarString.*;
+import static com.github.cythara.StandardTuning.Pitch.*;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.closeTo;
diff --git a/app/src/test/java/com/github/cythara/SamplerTest.java b/app/src/test/java/com/github/cythara/SamplerTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import static com.github.cythara.GuitarString.*;
+import static com.github.cythara.StandardTuning.Pitch.*;
import static com.github.cythara.Sampler.*;
import static org.hamcrest.CoreMatchers.either;
import static org.hamcrest.CoreMatchers.is;
