Configure musical symbol sizes from resource dimens

Author: ataulm

mobile/src/main/java/com/ataulm/notes/ConcurrentNotesWidget.java

@@ -20,7 +20,7 @@ public ConcurrentNotesWidget(Context context) {
 
         setBackgroundColor(Color.YELLOW);
         positionCalculator = new MiddleCeeOffsetCalculator();
-        symbolSizes = MusicalSymbolSizes.create();
+        symbolSizes = MusicalSymbolSizes.create(getResources());
         noteDrawable = ContextCompat.getDrawable(context, R.drawable.vec_whole_note);
         noteDrawable.setBounds(0, 0, symbolSizes.note.width(), symbolSizes.note.height());
     }

mobile/src/main/java/com/ataulm/notes/MusicalSymbolSizes.java

@@ -1,20 +1,20 @@
 package com.ataulm.notes;
 
+import android.content.res.Resources;
+
 class MusicalSymbolSizes {
 
     final Size note;
     final Size sharp;
     final Size flat;
     final Size natural;
 
-    static MusicalSymbolSizes create() {
-        // these should be fixed based on the symbol sizes which are known at compile time
-        // users should not create with whatever parameters they choose - this should be fixed, systemwide
+    static MusicalSymbolSizes create(Resources resources) {
         return new MusicalSymbolSizes(
-                Size.create(16, 10),
-                Size.create(10, 10),
-                Size.create(10, 10),
-                Size.create(10, 10)
+                Size.create(resources.getDimensionPixelSize(R.dimen.note_width), resources.getDimensionPixelSize(R.dimen.note_height)),
+                Size.create(resources.getDimensionPixelSize(R.dimen.sharp_width), resources.getDimensionPixelSize(R.dimen.sharp_height)),
+                Size.create(resources.getDimensionPixelSize(R.dimen.flat_width), resources.getDimensionPixelSize(R.dimen.flat_height)),
+                Size.create(resources.getDimensionPixelSize(R.dimen.natural_width), resources.getDimensionPixelSize(R.dimen.natural_height))
         );
     }
 

mobile/src/main/java/com/ataulm/notes/TrebleStaffSizer.java

@@ -37,11 +37,6 @@ class TrebleStaffSizer {
 
     private final MusicalSymbolSizes musicalSymbolSizes;
 
-    static TrebleStaffSizer create() {
-        MusicalSymbolSizes musicalSymbolSizes = MusicalSymbolSizes.create();
-        return new TrebleStaffSizer(musicalSymbolSizes);
-    }
-
     TrebleStaffSizer(MusicalSymbolSizes musicalSymbolSizes) {
         this.musicalSymbolSizes = musicalSymbolSizes;
     }

mobile/src/main/java/com/ataulm/notes/TrebleStaffWidget.java

@@ -9,9 +9,6 @@
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
 
 import java.util.List;
@@ -26,14 +23,15 @@ public class TrebleStaffWidget extends FrameLayout {
     private final Paint paint;
     private final Paint red;
     private final Drawable trebleClefDrawable;
-    private final TrebleStaffSizer trebleStaffSizer = TrebleStaffSizer.create();
+    private final TrebleStaffSizer trebleStaffSizer;
 
     private Key key = Key.C_MAJ;
 
     public TrebleStaffWidget(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         setWillNotDraw(false);
 
+        trebleStaffSizer = new TrebleStaffSizer(MusicalSymbolSizes.create(context.getResources()));
         trebleClefDrawable = ContextCompat.getDrawable(context, R.drawable.vec_treble_clef);
         Size trebleClefSize = trebleStaffSizer.clefSize();
         trebleClefDrawable.setBounds(0, 0, trebleClefSize.width(), trebleClefSize.height());
@@ -123,5 +121,4 @@ private void drawStaff(Canvas canvas) {
     }
 
 
-
 }