Skip to content

Commit

Permalink
Fix sharp/flat preference for some edos.
Browse files Browse the repository at this point in the history
  • Loading branch information
@thetwom
thetwom committed Jan 10, 2025
1 parent 28267aa commit 2c19d8d
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 84 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ android {
applicationId = "de.moekadu.tuner"
minSdk = 23
targetSdk = 35
versionCode = 41
versionName = "7.1.1"
versionCode = 42
versionName = "7.1.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
resourceConfigurations += listOf("cs", "de", "en", "fr", "zh-rCN")
Expand Down
160 changes: 80 additions & 80 deletions app/src/main/java/de/moekadu/tuner/temperaments/NoteNames.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,16 +594,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.D,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.C,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.C,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.D,
modifier = NoteModifier.NaturalDownDown,
enharmonicBase = BaseNote.C,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.C,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.NaturalDownDown
),
MusicalNote(base = BaseNote.D, modifier = NoteModifier.NaturalDown),
//
Expand All @@ -622,16 +622,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.E,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.D,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.E,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.E,
modifier = NoteModifier.NaturalDownDown,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.D,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.E,
enharmonicModifier = NoteModifier.NaturalDownDown
),
MusicalNote(base = BaseNote.E, modifier = NoteModifier.NaturalDown),
//
Expand All @@ -654,16 +654,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.G,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.F,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.F,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.G,
modifier = NoteModifier.NaturalDownDown,
enharmonicBase = BaseNote.F,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.F,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.NaturalDownDown
),
MusicalNote(base = BaseNote.G, modifier = NoteModifier.NaturalDown),
//
Expand All @@ -682,16 +682,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.A,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.G,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.A,
modifier = NoteModifier.NaturalDownDown,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.G,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.NaturalDownDown
),
MusicalNote(base = BaseNote.A, modifier = NoteModifier.NaturalDown),
//
Expand All @@ -710,16 +710,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.B,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.A,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.B,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.B,
modifier = NoteModifier.NaturalDownDown,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.A,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.B,
enharmonicModifier = NoteModifier.NaturalDownDown
),
MusicalNote(base = BaseNote.B, modifier = NoteModifier.NaturalDown),
//
Expand Down Expand Up @@ -753,16 +753,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.D,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.C,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.C,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.D,
modifier = NoteModifier.FlatUpUp,
enharmonicBase = BaseNote.C,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.C,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.FlatUpUp,
),
MusicalNote(base = BaseNote.D, modifier = NoteModifier.NaturalDownDown),
MusicalNote(base = BaseNote.D, modifier = NoteModifier.NaturalDown),
Expand All @@ -783,16 +783,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.E,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.D,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.E,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.E,
modifier = NoteModifier.FlatUpUp,
enharmonicBase = BaseNote.D,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.D,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.E,
enharmonicModifier = NoteModifier.FlatUpUp
),
MusicalNote(base = BaseNote.E, modifier = NoteModifier.NaturalDownDown),
MusicalNote(base = BaseNote.E, modifier = NoteModifier.NaturalDown),
Expand Down Expand Up @@ -823,16 +823,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.G,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.F,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.F,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.G,
modifier = NoteModifier.FlatUpUp,
enharmonicBase = BaseNote.F,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.F,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.FlatUpUp
),
MusicalNote(base = BaseNote.G, modifier = NoteModifier.NaturalDownDown),
MusicalNote(base = BaseNote.G, modifier = NoteModifier.NaturalDown),
Expand All @@ -853,16 +853,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.A,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.G,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.A,
modifier = NoteModifier.FlatUpUp,
enharmonicBase = BaseNote.G,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.G,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.FlatUpUp
),
MusicalNote(base = BaseNote.A, modifier = NoteModifier.NaturalDownDown),
MusicalNote(base = BaseNote.A, modifier = NoteModifier.NaturalDown),
Expand All @@ -883,16 +883,16 @@ fun getSuitableNoteNames(numberOfNotesPerOctave: Int): NoteNames? {
enharmonicModifier = NoteModifier.Flat
),
MusicalNote(
base = BaseNote.B,
modifier = NoteModifier.FlatUp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.Sharp
base = BaseNote.A,
modifier = NoteModifier.Sharp,
enharmonicBase = BaseNote.B,
enharmonicModifier = NoteModifier.FlatUp
),
MusicalNote(
base = BaseNote.B,
modifier = NoteModifier.FlatUpUp,
enharmonicBase = BaseNote.A,
enharmonicModifier = NoteModifier.SharpUp
base = BaseNote.A,
modifier = NoteModifier.SharpUp,
enharmonicBase = BaseNote.B,
enharmonicModifier = NoteModifier.FlatUpUp
),
MusicalNote(base = BaseNote.B, modifier = NoteModifier.NaturalDownDown),
MusicalNote(base = BaseNote.B, modifier = NoteModifier.NaturalDown),
Expand Down
15 changes: 15 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/42.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
v7.0.0:
- New UI backend (jetpack compose).
- (Hopefully) improved note detection for some edge cases.
- User defined temperaments.

v7.1.0:
- Fix displaying preferences correctly on Android 15.
- Enable edge-to-edge mode (meaning that e.g. lists are displayed
down to the bottom behind navigation bar).

v7.1.1:
- Fix common crash when detecting low frequencies.

v7.1.2:
- Fix sharp/flap preference behavior for (non 12 tone) scales.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
accompanistPermissions = "0.37.0"
agp = "8.7.3"
agp = "8.8.0"
hiltNavigationCompose = "1.2.0"
kotlin = "2.1.0"

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

0 comments on commit 2c19d8d

Please # to comment.