Draw concurrentNotesWidget at correct y position

Author: ataulm

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

@@ -14,7 +14,7 @@ public class ConcurrentNotesWidget extends View {
 
     public ConcurrentNotesWidget(Context context) {
         super(context);
-        setBackgroundColor(Color.RED);
+        setBackgroundColor(Color.BLACK);
 
         positionCalculator = new PositionsApartFromMiddleCCalculator();
         symbolSizes = MusicalSymbolSizes.create();

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

@@ -21,7 +21,7 @@ static Sequence pachelbelsCanon() {
         );
     }
 
-    Sequence maryHadALittleLamb() {
+    static Sequence maryHadALittleLamb() {
         return Sequence.create(
                 ConcurrentNotes.create(Fixtures.E4), ConcurrentNotes.create(Fixtures.E4), ConcurrentNotes.create(Fixtures.D4), ConcurrentNotes.create(Fixtures.C4), ConcurrentNotes.create(Fixtures.D4), ConcurrentNotes.create(Fixtures.E4), ConcurrentNotes.create(Fixtures.E4), ConcurrentNotes.create(Fixtures.E4),
                 ConcurrentNotes.create(Fixtures.D4), ConcurrentNotes.create(Fixtures.D4), ConcurrentNotes.create(Fixtures.D4), ConcurrentNotes.create(Fixtures.E4), ConcurrentNotes.create(Fixtures.E4), ConcurrentNotes.create(Fixtures.E4),

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

@@ -68,6 +68,11 @@ int[] linesY() {
         };
     }
 
+    int middleCY() {
+        int noteHeight = musicalSymbolSizes.note.height();
+        return 10 * noteHeight;
+    }
+
     @Px
     int height() {
         return 14 * musicalSymbolSizes.note.height();

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

@@ -73,10 +73,13 @@ private List<ConcurrentNotes> buildCurrentWindowFrom(Sequence sequence) {
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        int middleCY = trebleStaffSizer.middleCY();
+
         for (int i = 0; i < getChildCount(); i++) {
             ConcurrentNotesWidget child = (ConcurrentNotesWidget) getChildAt(i);
-            int childLeft = i * 20;
-            child.layout(childLeft, child.topToMiddleC(), childLeft + child.getMeasuredWidth(), child.getMeasuredHeight());
+            int childLeft = 60 + i * 20;
+            int childTop = middleCY + child.topToMiddleC();
+            child.layout(childLeft, childTop, childLeft + child.getMeasuredWidth(), childTop + child.getMeasuredHeight());
         }
     }
 

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

@@ -14,7 +14,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_virtual_piano);
 
         TrebleStaffWidget trebleStaffWidget = (TrebleStaffWidget) findViewById(R.id.treble_staff_widget);
-        trebleStaffWidget.bind(pachelbelsCanon());
+        trebleStaffWidget.bind(SongFactory.maryHadALittleLamb());
     }
 
 }