plectrum

commit b435ee60103e48d4e4fc522363610ed2f0b1899d
parent 1871ad927c15ea783da1b592974cd78980bf43b6
Author: gstraube <gstraube@mailbox.org>
Date:   Sun, 11 Feb 2018 12:02:40 +0100

Show value of reference pitch (issue #14)

Diffstat:
M
app/src/main/java/com/github/cythara/CanvasPainter.java
 | 
10
++++++++++
M
app/src/main/java/com/github/cythara/MainActivity.java
 | 
5
++++-

2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/github/cythara/CanvasPainter.java b/app/src/main/java/com/github/cythara/CanvasPainter.java
@@ -1,5 +1,6 @@
 package com.github.cythara;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Canvas;
@@ -11,8 +12,11 @@ import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
 import android.text.TextPaint;
 
+import java.util.Locale;
+
 import static android.content.Context.MODE_PRIVATE;
 import static com.github.cythara.ListenerFragment.IS_RECORDING;
+import static com.github.cythara.MainActivity.REFERENCE_PITCH;
 import static com.github.cythara.MainActivity.PREFS_FILE;
 import static com.github.cythara.MainActivity.USE_SCIENTIFIC_NOTATION;
 
@@ -40,6 +44,7 @@ class CanvasPainter {
     private float x;
     private float y;
     private boolean useScientificNotation;
+    private int referencePitch;
 
     static CanvasPainter with(Context context) {
         return new CanvasPainter(context);
@@ -58,6 +63,7 @@ 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);
 
         this.canvas = canvas;
 
@@ -118,6 +124,10 @@ class CanvasPainter {
         }
 
         drawSymbols(spaceWidth);
+
+        float y = canvas.getHeight() * 0.9f;
+        canvas.drawText(String.format(Locale.ENGLISH, "A = %d Hz", referencePitch), x - gaugeWidth,
+                y, numbersPaint);
     }
 
     private void drawListeningIndicator() {
diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java
@@ -36,9 +36,9 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
     public static final String PREFS_FILE = "prefs_file";
     public static final String USE_SCIENTIFIC_NOTATION = "use_scientific_notation";
     public static final String CURRENT_TUNING = "current_tuning";
+    protected static final String REFERENCE_PITCH = "reference_pitch";
     private static final String TAG_LISTENER_FRAGMENT = "listener_fragment";
     private static final String USE_DARK_MODE = "use_dark_mode";
-    private static final String REFERENCE_PITCH = "reference_pitch";
     private static int tuningPosition = 0;
     private static boolean isDarkModeEnabled;
     private static PitchAdjuster pitchAdjuster;
@@ -223,6 +223,9 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
         editor.apply();
 
         setPitchAdjuster();
+
+        TunerView tunerView = this.findViewById(R.id.pitch);
+        tunerView.invalidate();
     }
 
     private void startRecording() {