commit d719ffbbf6a5ab6c2c4437d9f81244de5f471c00 parent 57462f2c53b8103073989fdbf8426b95ed205816 Author: Taco <SkytkRSfan3895@gmail.com> Date: Sat, 2 Feb 2019 15:55:52 -0500 (3/4) java: code reformatting, replace qualifiers with imports, general cleanup Signed-off-by: Taco <SkytkRSfan3895@gmail.com> Diffstat:
18 files changed, 203 insertions(+), 201 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/CanvasPainter.java b/app/src/main/java/com/github/cythara/CanvasPainter.java @@ -14,13 +14,7 @@ import android.text.TextPaint; import java.util.Locale; import java.util.Objects; -import static android.content.Context.MODE_PRIVATE; -import static com.github.cythara.ListenerFragment.IS_RECORDING; -import static com.github.cythara.MainActivity.PREFS_FILE; -import static com.github.cythara.MainActivity.REFERENCE_PITCH; -import static com.github.cythara.MainActivity.USE_SCIENTIFIC_NOTATION; -import static com.github.cythara.NoteName.A; -import static java.lang.String.valueOf; +import static android.graphics.Paint.ANTI_ALIAS_FLAG; class CanvasPainter { @@ -31,10 +25,10 @@ class CanvasPainter { 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 TextPaint textPaint = new TextPaint(ANTI_ALIAS_FLAG); + private TextPaint numbersPaint = new TextPaint(ANTI_ALIAS_FLAG); + private Paint gaugePaint = new Paint(ANTI_ALIAS_FLAG); + private Paint symbolPaint = new TextPaint(ANTI_ALIAS_FLAG); private int redBackground; private int greenBackground; @@ -48,14 +42,14 @@ class CanvasPainter { private boolean useScientificNotation; private int referencePitch; - static CanvasPainter with(Context context) { - return new CanvasPainter(context); - } - private CanvasPainter(Context context) { this.context = context; } + static CanvasPainter with(Context context) { + return new CanvasPainter(context); + } + CanvasPainter paint(PitchDifference pitchDifference) { this.pitchDifference = pitchDifference; @@ -63,9 +57,14 @@ class CanvasPainter { } void on(Canvas canvas) { - SharedPreferences preferences = context.getSharedPreferences(PREFS_FILE, MODE_PRIVATE); - useScientificNotation = preferences.getBoolean(USE_SCIENTIFIC_NOTATION, true); - referencePitch = preferences.getInt(REFERENCE_PITCH, 440); + SharedPreferences preferences = context.getSharedPreferences( + MainActivity.PREFS_FILE, Context.MODE_PRIVATE); + + useScientificNotation = preferences.getBoolean( + MainActivity.USE_SCIENTIFIC_NOTATION, true); + + referencePitch = preferences.getInt( + MainActivity.REFERENCE_PITCH, 440); this.canvas = canvas; @@ -139,7 +138,7 @@ class CanvasPainter { Note note = new Note() { @Override public NoteName getName() { - return A; + return NoteName.A; } @Override @@ -158,12 +157,12 @@ class CanvasPainter { } }; - TextPaint paint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG); + TextPaint paint = new TextPaint(ANTI_ALIAS_FLAG); paint.setColor(textColor); int size = (int) (textPaint.getTextSize() / 2); paint.setTextSize(size); - float offset = paint.measureText(getNote(note.getName()) + valueOf(getOctave(4))) * 0.75f; + float offset = paint.measureText(getNote(note.getName()) + String.valueOf(getOctave(4))) * 0.75f; drawText(x - gaugeWidth, y, note, paint); canvas.drawText(String.format(Locale.ENGLISH, "= %d Hz", referencePitch), @@ -173,7 +172,7 @@ class CanvasPainter { private void drawListeningIndicator() { int resourceId = R.drawable.ic_line_style_icons_mic; - if (IS_RECORDING) { + if (ListenerFragment.IS_RECORDING) { resourceId = R.drawable.ic_line_style_icons_mic_active; } @@ -184,8 +183,10 @@ class CanvasPainter { int width = Objects.requireNonNull(drawable).getIntrinsicWidth() * 2; int height = drawable.getIntrinsicHeight() * 2; - drawable.setBounds(x - width / 2, y, - x + width / 2, y + height); + drawable.setBounds( + x - width / 2, y, + x + width / 2, + y + height); drawable.draw(canvas); @@ -235,7 +236,7 @@ class CanvasPainter { if (mark > 0) { prefix = "+"; } - String text = prefix + valueOf(mark); + String text = prefix + String.valueOf(mark); int yOffset = (int) (numbersPaint.getTextSize() / 6); if (mark % 10 == 0) { @@ -255,9 +256,9 @@ class CanvasPainter { float offset = textPaint.measureText(noteText) / 2F; String sign = note.getSign(); - String octave = valueOf(getOctave(note.getOctave())); + String octave = String.valueOf(getOctave(note.getOctave())); - TextPaint paint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG); + TextPaint paint = new TextPaint(ANTI_ALIAS_FLAG); paint.setColor(textColor); int textSize = (int) (textPaint.getTextSize() / 2); paint.setTextSize(textSize); @@ -314,4 +315,4 @@ class CanvasPainter { return Math.round(rounded / 10f) * 10; } -} -\ No newline at end of file +} diff --git a/app/src/main/java/com/github/cythara/ListenerFragment.java b/app/src/main/java/com/github/cythara/ListenerFragment.java @@ -11,31 +11,21 @@ import java.util.ArrayList; import java.util.List; import be.tarsos.dsp.AudioDispatcher; +import be.tarsos.dsp.io.android.AudioDispatcherFactory; import be.tarsos.dsp.pitch.PitchDetectionHandler; import be.tarsos.dsp.pitch.PitchProcessor; - -import static be.tarsos.dsp.io.android.AudioDispatcherFactory.fromDefaultMicrophone; -import static be.tarsos.dsp.pitch.PitchProcessor.PitchEstimationAlgorithm.FFT_YIN; -import static com.github.cythara.PitchComparator.retrieveNote; +import be.tarsos.dsp.pitch.PitchProcessor.PitchEstimationAlgorithm; public class ListenerFragment extends Fragment { - interface TaskCallbacks { - - void onProgressUpdate(PitchDifference percent); - } - - static boolean IS_RECORDING; - private static final int SAMPLE_RATE = 44100; - private static final int BUFFER_SIZE = 1024 * 4; private static final int OVERLAP = 768 * 4; private static final int MIN_ITEMS_COUNT = 15; + static boolean IS_RECORDING; private static List<PitchDifference> pitchDifferences = new ArrayList<>(); - - private PitchListener pitchListener; private static TaskCallbacks taskCallbacks; + private PitchListener pitchListener; @Override public void onAttach(Context context) { @@ -89,6 +79,11 @@ public class ListenerFragment extends Fragment { } } + interface TaskCallbacks { + + void onProgressUpdate(PitchDifference percent); + } + private static class PitchListener extends AsyncTask<Void, PitchDifference, Void> { private AudioDispatcher audioDispatcher; @@ -111,7 +106,7 @@ public class ListenerFragment extends Fragment { if (pitch != -1) { float adjustedPitch = MainActivity.adjustPitch(pitch); - PitchDifference pitchDifference = retrieveNote(adjustedPitch); + PitchDifference pitchDifference = PitchComparator.retrieveNote(adjustedPitch); pitchDifferences.add(pitchDifference); @@ -126,10 +121,10 @@ public class ListenerFragment extends Fragment { } }; - PitchProcessor pitchProcessor = new PitchProcessor(FFT_YIN, SAMPLE_RATE, + PitchProcessor pitchProcessor = new PitchProcessor(PitchEstimationAlgorithm.FFT_YIN, SAMPLE_RATE, BUFFER_SIZE, pitchDetectionHandler); - audioDispatcher = fromDefaultMicrophone(SAMPLE_RATE, + audioDispatcher = AudioDispatcherFactory.fromDefaultMicrophone(SAMPLE_RATE, BUFFER_SIZE, OVERLAP); audioDispatcher.addAudioProcessor(pitchProcessor); diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java @@ -2,6 +2,7 @@ package com.github.cythara; import android.Manifest; import android.app.AlertDialog; +import android.app.AlertDialog.Builder; import android.app.FragmentManager; import android.content.Intent; import android.content.SharedPreferences; @@ -18,18 +19,19 @@ import android.support.v7.widget.Toolbar; import android.view.ContextThemeWrapper; import android.view.Menu; import android.view.MenuItem; -import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; +import com.github.cythara.ListenerFragment.TaskCallbacks; import com.jaredrummler.materialspinner.MaterialSpinner; +import com.jaredrummler.materialspinner.MaterialSpinner.OnItemSelectedListener; import com.jaredrummler.materialspinner.MaterialSpinnerAdapter; import com.shawnlin.numberpicker.NumberPicker; +import com.shawnlin.numberpicker.NumberPicker.OnValueChangeListener; import java.util.Arrays; -import static com.github.cythara.TuningMapper.getTuningFromPosition; - -public class MainActivity extends AppCompatActivity implements ListenerFragment.TaskCallbacks, - MaterialSpinner.OnItemSelectedListener, NumberPicker.OnValueChangeListener { +public class MainActivity extends AppCompatActivity implements TaskCallbacks, + OnItemSelectedListener, OnValueChangeListener { public static final int RECORD_AUDIO_PERMISSION = 0; public static final String PREFS_FILE = "prefs_file"; @@ -43,7 +45,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment. private static PitchAdjuster pitchAdjuster; public static Tuning getCurrentTuning() { - return getTuningFromPosition(tuningPosition); + return TuningMapper.getTuningFromPosition(tuningPosition); } public static boolean isDarkModeEnabled() { @@ -74,7 +76,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment. setTuning(); setPitchAdjuster(); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + getWindow().addFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); Toolbar myToolbar = findViewById(R.id.my_toolbar); myToolbar.setTitle(R.string.app_name); @@ -93,7 +95,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment. switch (item.getItemId()) { case R.id.show_privacy_policy: { Intent browserIntent = new Intent(Intent.ACTION_VIEW, - Uri.parse("https://gstraube.github.io/privacy_policy.html")); + Uri.parse(getString(R.string.privacy_policy_link))); startActivity(browserIntent); break; @@ -106,7 +108,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment. int checkedItem = useScientificNotation ? 0 : 1; - AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(this, + Builder builder = new Builder(new ContextThemeWrapper(this, R.style.AppTheme)); builder.setTitle(R.string.choose_notation); builder.setSingleChoiceItems(R.array.notations, checkedItem, @@ -180,10 +182,10 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment. && grantResults[0] == PackageManager.PERMISSION_GRANTED) { startRecording(); } else { - AlertDialog alertDialog = new AlertDialog.Builder(MainActivity.this).create(); + AlertDialog alertDialog = new Builder(MainActivity.this).create(); alertDialog.setTitle(R.string.permission_required); - alertDialog.setMessage("Microphone permission is required. App will be closed"); - alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "OK", + alertDialog.setMessage(getString(R.string.microphone_permission_required)); + alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.ok), (dialog, which) -> { dialog.dismiss(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { diff --git a/app/src/main/java/com/github/cythara/Note.java b/app/src/main/java/com/github/cythara/Note.java @@ -3,7 +3,10 @@ package com.github.cythara; public interface Note { NoteName getName(); + int getOctave(); + String getSign(); + float getFrequency(); } diff --git a/app/src/main/java/com/github/cythara/NumberPickerDialog.java b/app/src/main/java/com/github/cythara/NumberPickerDialog.java @@ -1,7 +1,6 @@ package com.github.cythara; - -import android.app.AlertDialog; +import android.app.AlertDialog.Builder; import android.app.Dialog; import android.app.DialogFragment; import android.os.Bundle; @@ -31,7 +30,7 @@ public class NumberPickerDialog extends DialogFragment { numberPicker.setSelectedTextColor(color); } - AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), + Builder builder = new Builder(new ContextThemeWrapper(getActivity(), R.style.AppTheme)); builder.setMessage(R.string.choose_a_frequency); diff --git a/app/src/main/java/com/github/cythara/PitchDifference.java b/app/src/main/java/com/github/cythara/PitchDifference.java @@ -5,6 +5,16 @@ import android.os.Parcelable; class PitchDifference implements Parcelable { + public static final Creator<PitchDifference> CREATOR = new Creator<PitchDifference>() { + public PitchDifference createFromParcel(Parcel in) { + return new PitchDifference(in); + } + + public PitchDifference[] newArray(int size) { + return new PitchDifference[size]; + } + }; + final Note closest; final double deviation; @@ -29,15 +39,4 @@ class PitchDifference implements Parcelable { dest.writeString(closest.getName().name()); dest.writeDouble(deviation); } - - public static final Parcelable.Creator<PitchDifference> CREATOR - = new Parcelable.Creator<PitchDifference>() { - public PitchDifference createFromParcel(Parcel in) { - return new PitchDifference(in); - } - - public PitchDifference[] newArray(int size) { - return new PitchDifference[size]; - } - }; -} -\ No newline at end of file +} diff --git a/app/src/main/java/com/github/cythara/Sampler.java b/app/src/main/java/com/github/cythara/Sampler.java @@ -14,8 +14,8 @@ class Sampler { double deviationSum = 0; int sameNoteCount = 0; for (PitchDifference pitchDifference : filteredSamples) { - deviationSum += pitchDifference.deviation; - sameNoteCount++; + deviationSum += pitchDifference.deviation; + sameNoteCount++; } if (sameNoteCount > 0) { diff --git a/app/src/main/java/com/github/cythara/tuning/BassTuning.java b/app/src/main/java/com/github/cythara/tuning/BassTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,17 +8,27 @@ import static com.github.cythara.NoteName.*; public class BassTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { E1(E, 1, 41.204f), A1(A, 1, 55f), D2(D, 2, 73.416f), G2(G, 2, 97.999f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -44,14 +55,4 @@ public class BassTuning implements Tuning { return sign; } } - - @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/tuning/CelloTuning.java b/app/src/main/java/com/github/cythara/tuning/CelloTuning.java @@ -1,26 +1,24 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; -import static com.github.cythara.NoteName.A; -import static com.github.cythara.NoteName.C; -import static com.github.cythara.NoteName.D; -import static com.github.cythara.NoteName.G; +import static com.github.cythara.NoteName.*; public class CelloTuning implements Tuning { @Override - public com.github.cythara.Note[] getNotes() { + public Note[] getNotes() { return Pitch.values(); } @Override - public com.github.cythara.Note findNote(String name) { + public Note findNote(String name) { return Pitch.valueOf(name); } - private enum Pitch implements com.github.cythara.Note { + private enum Pitch implements Note { C2(C, 2, 65.4f), G2(G, 2, 98f), diff --git a/app/src/main/java/com/github/cythara/tuning/ChromaticTuning.java b/app/src/main/java/com/github/cythara/tuning/ChromaticTuning.java @@ -8,6 +8,16 @@ import static com.github.cythara.NoteName.*; public class ChromaticTuning implements Tuning { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + private enum Pitch implements Note { C_MINUS_1(C, -1, 8.176f), @@ -149,10 +159,10 @@ public class ChromaticTuning implements Tuning { F9_SHARP(F, 9, "#", 11839.8f), G9(G, 9, 12543.9f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, String sign, float frequency) { this.name = name; @@ -186,14 +196,4 @@ public class ChromaticTuning implements Tuning { return sign; } } - - @Override - public Note[] getNotes() { - return Pitch.values(); - } - - @Override - public Note findNote(String name) { - return Pitch.valueOf(name); - } } diff --git a/app/src/main/java/com/github/cythara/tuning/DropCGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/DropCGuitarTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,7 +8,17 @@ import static com.github.cythara.NoteName.*; public class DropCGuitarTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { C2(C, 2, 65.406f), G2(G, 2, 97.999f), @@ -16,10 +27,10 @@ public class DropCGuitarTuning implements Tuning { A3(A, 3, 220f), D4(D, 4, 293.665f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -46,14 +57,4 @@ public class DropCGuitarTuning implements Tuning { return sign; } } - - @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/tuning/DropCSharpGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/DropCSharpGuitarTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,7 +8,17 @@ import static com.github.cythara.NoteName.*; public class DropCSharpGuitarTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { C2_SHARP(C, 2, "#", 69.30f), A2(A, 2, 110f), @@ -16,10 +27,10 @@ public class DropCSharpGuitarTuning implements Tuning { B3(B, 3, 246.942f), E4(E, 4, 329.628f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, String sign, float frequency) { this.name = name; @@ -53,14 +64,4 @@ public class DropCSharpGuitarTuning implements Tuning { return sign; } } - - @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/tuning/DropDGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/DropDGuitarTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,7 +8,17 @@ import static com.github.cythara.NoteName.*; public class DropDGuitarTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { D2(D, 2, 73.416f), A2(A, 2, 110f), @@ -16,10 +27,10 @@ public class DropDGuitarTuning implements Tuning { B3(B, 3, 246.942f), E4(E, 4, 329.628f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -46,14 +57,4 @@ public class DropDGuitarTuning implements Tuning { return sign; } } - - @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/tuning/GuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/GuitarTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,7 +8,17 @@ import static com.github.cythara.NoteName.*; public class GuitarTuning implements Tuning { - public enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + public enum Pitch implements Note { E2(E, 2, 82.407f), A2(A, 2, 110f), @@ -16,10 +27,10 @@ public class GuitarTuning implements Tuning { B3(B, 3, 246.942f), E4(E, 4, 329.628f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -46,14 +57,4 @@ public class GuitarTuning implements Tuning { return sign; } } - - @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/tuning/OpenGGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/OpenGGuitarTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,7 +8,17 @@ import static com.github.cythara.NoteName.*; public class OpenGGuitarTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { D2(D, 2, 73.416f), G2(G, 2, 97.999f), @@ -16,10 +27,10 @@ public class OpenGGuitarTuning implements Tuning { B3(B, 3, 246.942f), D4(D, 4, 293.665f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -46,14 +57,4 @@ public class OpenGGuitarTuning implements Tuning { return sign; } } - - @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/tuning/UkuleleDTuning.java b/app/src/main/java/com/github/cythara/tuning/UkuleleDTuning.java @@ -8,17 +8,27 @@ import static com.github.cythara.NoteName.*; public class UkuleleDTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { A4(A, 4, 440f), D4(D, 4, 293.665f), F3_SHARP(F, 3, "#", 369.99f), B4(B, 4, 493.88f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, String sign, float frequency) { this.name = name; @@ -52,14 +62,4 @@ public class UkuleleDTuning implements Tuning { return sign; } } - - @Override - public Note[] getNotes() { - return Pitch.values(); - } - - @Override - public Note findNote(String name) { - return Pitch.valueOf(name); - } } diff --git a/app/src/main/java/com/github/cythara/tuning/UkuleleTuning.java b/app/src/main/java/com/github/cythara/tuning/UkuleleTuning.java @@ -8,6 +8,16 @@ import static com.github.cythara.NoteName.*; public class UkuleleTuning implements Tuning { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + private enum Pitch implements Note { G4(G, 4, 391.995f), @@ -15,10 +25,10 @@ public class UkuleleTuning implements Tuning { E4(E, 4, 329.628f), A4(A, 4, 440f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -45,14 +55,4 @@ public class UkuleleTuning implements Tuning { return sign; } } - - @Override - public Note[] getNotes() { - return Pitch.values(); - } - - @Override - public Note findNote(String name) { - return Pitch.valueOf(name); - } } diff --git a/app/src/main/java/com/github/cythara/tuning/ViolinTuning.java b/app/src/main/java/com/github/cythara/tuning/ViolinTuning.java @@ -1,5 +1,6 @@ package com.github.cythara.tuning; +import com.github.cythara.Note; import com.github.cythara.NoteName; import com.github.cythara.Tuning; @@ -7,17 +8,27 @@ import static com.github.cythara.NoteName.*; public class ViolinTuning implements Tuning { - private enum Pitch implements com.github.cythara.Note { + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements Note { G3(G, 3, 196f), D4(D, 4, 293.66f), A4(A, 4, 440f), E5(E, 5, 659.26f); - private NoteName name; private final String sign; private final int octave; private final float frequency; + private NoteName name; Pitch(NoteName name, int octave, float frequency) { this.name = name; @@ -44,14 +55,4 @@ public class ViolinTuning implements Tuning { return sign; } } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } }