From 0496ad86a325ec5e29473356dc52fce81581e06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Ma=C3=B1osa?= Date: Sat, 8 Apr 2023 17:26:29 +0200 Subject: [PATCH] refactor(src): reorganize directories by content (#15) * refactor(src): reorganize directories by content * refactor(test): reorganize directories by content * refactor(music_notes): import `iterable.dart` relative --- lib/music_notes.dart | 31 ++++++++++--------- lib/src/{classes => }/enharmonic.dart | 2 +- .../enharmonic_interval.dart | 0 lib/src/{classes => interval}/interval.dart | 0 lib/src/{enums => interval}/intervals.dart | 0 lib/src/{enums => interval}/qualities.dart | 0 lib/src/{utils => }/music.dart | 2 +- lib/src/{interfaces => }/music_item.dart | 2 +- .../{classes => note}/enharmonic_note.dart | 0 lib/src/{enums => note}/notes.dart | 0 .../{classes => tonality}/key_signature.dart | 0 lib/src/{enums => tonality}/modes.dart | 0 .../relative_tonalities.dart | 0 lib/src/{classes => tonality}/tonality.dart | 0 lib/src/{interfaces => }/transposable.dart | 2 +- .../enharmonic_interval_test.dart | 0 test/{ => interval}/interval_test.dart | 0 17 files changed, 20 insertions(+), 19 deletions(-) rename lib/src/{classes => }/enharmonic.dart (96%) rename lib/src/{classes => interval}/enharmonic_interval.dart (100%) rename lib/src/{classes => interval}/interval.dart (100%) rename lib/src/{enums => interval}/intervals.dart (100%) rename lib/src/{enums => interval}/qualities.dart (100%) rename lib/src/{utils => }/music.dart (98%) rename lib/src/{interfaces => }/music_item.dart (81%) rename lib/src/{classes => note}/enharmonic_note.dart (100%) rename lib/src/{enums => note}/notes.dart (100%) rename lib/src/{classes => tonality}/key_signature.dart (100%) rename lib/src/{enums => tonality}/modes.dart (100%) rename lib/src/{classes => tonality}/relative_tonalities.dart (100%) rename lib/src/{classes => tonality}/tonality.dart (100%) rename lib/src/{interfaces => }/transposable.dart (82%) rename test/{ => interval}/enharmonic_interval_test.dart (100%) rename test/{ => interval}/interval_test.dart (100%) diff --git a/lib/music_notes.dart b/lib/music_notes.dart index 850eb654..f1b45840 100644 --- a/lib/music_notes.dart +++ b/lib/music_notes.dart @@ -5,22 +5,23 @@ import 'dart:math' as math show min; import 'package:collection/collection.dart' show IterableExtension; import 'package:meta/meta.dart'; -import 'package:music_notes/src/utils/iterable.dart'; import 'package:quiver/core.dart'; -part 'src/classes/enharmonic.dart'; -part 'src/classes/enharmonic_interval.dart'; -part 'src/classes/enharmonic_note.dart'; -part 'src/classes/interval.dart'; -part 'src/classes/key_signature.dart'; -part 'src/classes/relative_tonalities.dart'; -part 'src/classes/tonality.dart'; -part 'src/enums/intervals.dart'; -part 'src/enums/modes.dart'; -part 'src/enums/notes.dart'; -part 'src/enums/qualities.dart'; -part 'src/interfaces/music_item.dart'; -part 'src/interfaces/transposable.dart'; +import 'src/utils/iterable.dart'; + +part 'src/enharmonic.dart'; +part 'src/interval/enharmonic_interval.dart'; +part 'src/interval/interval.dart'; +part 'src/interval/intervals.dart'; +part 'src/interval/qualities.dart'; +part 'src/music.dart'; +part 'src/music_item.dart'; part 'src/note/accidental.dart'; +part 'src/note/enharmonic_note.dart'; part 'src/note/note.dart'; -part 'src/utils/music.dart'; +part 'src/note/notes.dart'; +part 'src/tonality/key_signature.dart'; +part 'src/tonality/modes.dart'; +part 'src/tonality/relative_tonalities.dart'; +part 'src/tonality/tonality.dart'; +part 'src/transposable.dart'; diff --git a/lib/src/classes/enharmonic.dart b/lib/src/enharmonic.dart similarity index 96% rename from lib/src/classes/enharmonic.dart rename to lib/src/enharmonic.dart index ba6d8431..e9e43df9 100644 --- a/lib/src/classes/enharmonic.dart +++ b/lib/src/enharmonic.dart @@ -1,4 +1,4 @@ -part of '../../music_notes.dart'; +part of '../music_notes.dart'; @immutable abstract class Enharmonic diff --git a/lib/src/classes/enharmonic_interval.dart b/lib/src/interval/enharmonic_interval.dart similarity index 100% rename from lib/src/classes/enharmonic_interval.dart rename to lib/src/interval/enharmonic_interval.dart diff --git a/lib/src/classes/interval.dart b/lib/src/interval/interval.dart similarity index 100% rename from lib/src/classes/interval.dart rename to lib/src/interval/interval.dart diff --git a/lib/src/enums/intervals.dart b/lib/src/interval/intervals.dart similarity index 100% rename from lib/src/enums/intervals.dart rename to lib/src/interval/intervals.dart diff --git a/lib/src/enums/qualities.dart b/lib/src/interval/qualities.dart similarity index 100% rename from lib/src/enums/qualities.dart rename to lib/src/interval/qualities.dart diff --git a/lib/src/utils/music.dart b/lib/src/music.dart similarity index 98% rename from lib/src/utils/music.dart rename to lib/src/music.dart index 763cb459..47315d25 100644 --- a/lib/src/utils/music.dart +++ b/lib/src/music.dart @@ -1,4 +1,4 @@ -part of '../../music_notes.dart'; +part of '../music_notes.dart'; /// Number of chromatic divisions in an octave. const int chromaticDivisions = 12; diff --git a/lib/src/interfaces/music_item.dart b/lib/src/music_item.dart similarity index 81% rename from lib/src/interfaces/music_item.dart rename to lib/src/music_item.dart index 24dda11d..fe5d5aea 100644 --- a/lib/src/interfaces/music_item.dart +++ b/lib/src/music_item.dart @@ -1,4 +1,4 @@ -part of '../../music_notes.dart'; +part of '../music_notes.dart'; abstract class MusicItem { /// Returns the number of semitones that correspond to this [MusicItem]. diff --git a/lib/src/classes/enharmonic_note.dart b/lib/src/note/enharmonic_note.dart similarity index 100% rename from lib/src/classes/enharmonic_note.dart rename to lib/src/note/enharmonic_note.dart diff --git a/lib/src/enums/notes.dart b/lib/src/note/notes.dart similarity index 100% rename from lib/src/enums/notes.dart rename to lib/src/note/notes.dart diff --git a/lib/src/classes/key_signature.dart b/lib/src/tonality/key_signature.dart similarity index 100% rename from lib/src/classes/key_signature.dart rename to lib/src/tonality/key_signature.dart diff --git a/lib/src/enums/modes.dart b/lib/src/tonality/modes.dart similarity index 100% rename from lib/src/enums/modes.dart rename to lib/src/tonality/modes.dart diff --git a/lib/src/classes/relative_tonalities.dart b/lib/src/tonality/relative_tonalities.dart similarity index 100% rename from lib/src/classes/relative_tonalities.dart rename to lib/src/tonality/relative_tonalities.dart diff --git a/lib/src/classes/tonality.dart b/lib/src/tonality/tonality.dart similarity index 100% rename from lib/src/classes/tonality.dart rename to lib/src/tonality/tonality.dart diff --git a/lib/src/interfaces/transposable.dart b/lib/src/transposable.dart similarity index 82% rename from lib/src/interfaces/transposable.dart rename to lib/src/transposable.dart index 6643f358..3c0679ae 100644 --- a/lib/src/interfaces/transposable.dart +++ b/lib/src/transposable.dart @@ -1,4 +1,4 @@ -part of '../../music_notes.dart'; +part of '../music_notes.dart'; abstract class Transposable { /// Returns a transposed [T] by [semitones] from this [T]. diff --git a/test/enharmonic_interval_test.dart b/test/interval/enharmonic_interval_test.dart similarity index 100% rename from test/enharmonic_interval_test.dart rename to test/interval/enharmonic_interval_test.dart diff --git a/test/interval_test.dart b/test/interval/interval_test.dart similarity index 100% rename from test/interval_test.dart rename to test/interval/interval_test.dart