refactor(enums): replace toText with native name getter (#6)

albertms10 · Mar 12, 2022 · b740031 · b740031
1 parent efb67e0
commit b740031
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 26 deletions.
diff --git a/lib/music_notes.dart b/lib/music_notes.dart
@@ -17,7 +17,6 @@ part 'src/classes/note.dart';
 part 'src/classes/relative_tonalities.dart';
 part 'src/classes/tonality.dart';
 part 'src/enums/accidentals.dart';
-part 'src/enums/enums_to_string.dart';
 part 'src/enums/intervals.dart';
 part 'src/enums/modes.dart';
 part 'src/enums/notes.dart';

diff --git a/lib/src/classes/interval.dart b/lib/src/classes/interval.dart
@@ -58,7 +58,7 @@ class Interval implements MusicItem, Comparable<Interval> {
   Interval get inverted => Interval(interval.inverted, quality.inverted);
 
   @override
-  String toString() => '${quality.toText()} ${interval.toText()}';
+  String toString() => '${quality.name} ${interval.name}';
 
   @override
   bool operator ==(Object other) =>

diff --git a/lib/src/classes/key_signature.dart b/lib/src/classes/key_signature.dart
@@ -50,7 +50,7 @@ class KeySignature {
       final n =
           i == iterations ? nModExcludeZero(number, notesValues) : notesValues;
 
-      list.add('$n × ${accidental!.increment(i - 1)!.toText()}');
+      list.add('$n × ${accidental!.increment(i - 1)!.name}');
     }
 
     return list.join(', ');

diff --git a/lib/src/classes/note.dart b/lib/src/classes/note.dart
@@ -178,7 +178,7 @@ class Note implements MusicItem, Comparable<Note> {
 
   @override
   String toString() =>
-      note.toText() + (accidental != null ? ' ${accidental!.toText()}' : '');
+      note.name + (accidental != null ? ' ${accidental!.name}' : '');
 
   @override
   bool operator ==(Object other) =>

diff --git a/lib/src/classes/tonality.dart b/lib/src/classes/tonality.dart
@@ -84,7 +84,7 @@ class Tonality implements Comparable<Tonality> {
       );
 
   @override
-  String toString() => '${mode.toText()} $note';
+  String toString() => '${mode.name} $note';
 
   @override
   bool operator ==(Object other) =>

diff --git a/lib/src/enums/enums_to_string.dart b/lib/src/enums/enums_to_string.dart