Converted GuitarChordView to Kotlin and Refactored the class

Author: Chris

library/src/main/java/com/chrynan/guitarchords/chordpro/ChordPro.java

@@ -198,7 +198,7 @@ public static GuitarChordView.Chord getChordFromString(String string){
                 baseFret = string.substring(baseFretStart + MetaTag.BASE_FRET.length(), string.length()).trim();
             }
             GuitarChordView.Chord chord = new GuitarChordView.Chord();
-            chord.setTitle(title);
+            chord.title = title;
             int b;
             try {
                 b = (Integer.valueOf(baseFret) < 0) ? 0 : Integer.valueOf(baseFret);

library/src/main/java/com/chrynan/guitarchords/model/Chord.kt

@@ -12,4 +12,18 @@ data class Chord(
     val opens: Set<ChordMarker.Open> by lazy { markers.filterIsInstance<ChordMarker.Open>().toSet() }
 
     val mutes: Set<ChordMarker.Muted> by lazy { markers.filterIsInstance<ChordMarker.Muted>().toSet() }
+
+    operator fun contains(marker: ChordMarker) = markers.contains(marker)
+
+    fun getMarkersOnString(number: Int): List<ChordMarker> {
+        return markers.filter {
+            when {
+                it is ChordMarker.Note && it.string.number == number -> true
+                it is ChordMarker.Bar && (number in it.startString.number..it.endString.number) -> true
+                it is ChordMarker.Open && it.stringNumber.number == number -> true
+                it is ChordMarker.Muted && it.stringNumber.number == number -> true
+                else -> false
+            }
+        }
+    }
 }

library/src/main/java/com/chrynan/guitarchords/model/ChordMarker.kt

@@ -5,17 +5,26 @@ sealed class ChordMarker {
     data class Note(
             val finger: Finger,
             val fretNumber: FretNumber,
-            val stringNumber: StringNumber
+            val string: ChordString
     ) : ChordMarker()
 
     data class Bar(
             val finger: Finger,
             val fretNumber: FretNumber,
-            val startString: StringNumber,
-            val endString: StringNumber
-    ) : ChordMarker()
+            val startString: ChordString,
+            val endString: ChordString
+    ) : ChordMarker() {
+
+        val notes: Set<Note> by lazy {
+            (startString.number..endString.number).map {
+                Note(finger = finger,
+                        fretNumber = fretNumber,
+                        string = ChordString(number = it))
+            }.toSet()
+        }
+    }
 
-    data class Open(val stringNumber: StringNumber) : ChordMarker()
+    data class Open(val stringNumber: ChordString) : ChordMarker()
 
-    data class Muted(val stringNumber: StringNumber) : ChordMarker()
+    data class Muted(val stringNumber: ChordString) : ChordMarker()
 }

library/src/main/java/com/chrynan/guitarchords/model/ChordParser.kt

@@ -0,0 +1,6 @@
+package com.chrynan.guitarchords.model
+
+interface ChordParser<T> {
+
+    fun parse(item: T): Chord
+}

library/src/main/java/com/chrynan/guitarchords/model/ChordString.kt

@@ -0,0 +1,6 @@
+package com.chrynan.guitarchords.model
+
+data class ChordString(
+        val number: Int,
+        val label: String? = null
+)