diff --git a/app/src/main/java/com/github/cythara/CanvasPainter.java b/app/src/main/java/com/github/cythara/CanvasPainter.java index 44a9f8b..22df005 100644 --- a/app/src/main/java/com/github/cythara/CanvasPainter.java +++ b/app/src/main/java/com/github/cythara/CanvasPainter.java @@ -201,10 +201,10 @@ private void drawText() { private String getNote(NoteName name) { SharedPreferences preferences = context.getSharedPreferences(PREFS_FILE, MODE_PRIVATE); - boolean useStandardNotation = preferences.getBoolean(USE_STANDARD_NOTATION, true); + boolean useScientificNotation = preferences.getBoolean(USE_SCIENTIFIC_NOTATION, true); - if (useStandardNotation) { - return name.getStandard(); + if (useScientificNotation) { + return name.getScientific(); } return name.getSol(); diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java index b0bff0c..30b49dd 100644 --- a/app/src/main/java/com/github/cythara/MainActivity.java +++ b/app/src/main/java/com/github/cythara/MainActivity.java @@ -31,7 +31,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment. public static final int RECORD_AUDIO_PERMISSION = 0; public static final String PREFS_FILE = "prefs_file"; - public static final String USE_STANDARD_NOTATION = "useStandardNotation"; + public static final String USE_SCIENTIFIC_NOTATION = "use_scientific_notation"; private static final String TAG_LISTENER_FRAGMENT = "listener_fragment"; static Tuning tuning = new GuitarTuning(); @@ -84,10 +84,10 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.set_notation: { final SharedPreferences preferences = getSharedPreferences(PREFS_FILE, MODE_PRIVATE); - final boolean useStandardNotation = preferences.getBoolean(USE_STANDARD_NOTATION, + final boolean useScientificNotation = preferences.getBoolean(USE_SCIENTIFIC_NOTATION, true); - int checkedItem = useStandardNotation ? 0 : 1; + int checkedItem = useScientificNotation ? 0 : 1; AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.choose_notation); @@ -96,7 +96,7 @@ public boolean onOptionsItemSelected(MenuItem item) { @Override public void onClick(DialogInterface dialog, int which) { SharedPreferences.Editor editor = preferences.edit(); - editor.putBoolean(USE_STANDARD_NOTATION, which == 0); + editor.putBoolean(USE_SCIENTIFIC_NOTATION, which == 0); editor.apply(); dialog.dismiss(); diff --git a/app/src/main/java/com/github/cythara/NoteName.java b/app/src/main/java/com/github/cythara/NoteName.java index 15cbafa..3d42a60 100644 --- a/app/src/main/java/com/github/cythara/NoteName.java +++ b/app/src/main/java/com/github/cythara/NoteName.java @@ -10,16 +10,16 @@ public enum NoteName { A("A", "La"), B("B", "Si"); - private final String standard; + private final String scientific; private final String sol; - NoteName(String standard, String sol) { - this.standard = standard; + NoteName(String scientific, String sol) { + this.scientific = scientific; this.sol = sol; } - public String getStandard() { - return standard; + public String getScientific() { + return scientific; } public String getSol() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83fbbde..778ea5a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ Chromatic - Standard + Scientific pitch notation Solfège