mahefa/feufaro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: mahefa:cbd0ccfd9432f1a76befcce9643c6ade97ffc022
Branches Tags
mahefa:master
mahefa:v1.0.0
..
compare: mahefa:5ec0079f2c05de49ab5ce476324b4ed1d8c1dd38
Branches Tags
mahefa:master
mahefa:v1.0.0

No commits in common. "cbd0ccfd9432f1a76befcce9643c6ade97ffc022" and "5ec0079f2c05de49ab5ce476324b4ed1d8c1dd38" have entirely different histories.
cbd0ccfd94 ... 5ec0079f2c

2 changed files with 3 additions and 6 deletions
Show stats Expand all files Collapse all files

6
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Transpose.kt
View file

@ -61,12 +61,10 @@ class Transpose {
val remaining = token.drop(separators.length) val remaining = token.drop(separators.length)
val totalAlter = interval + currentModulationInterval val totalAlter = interval + currentModulationInterval
val rawIndex = (0 + totalAlter) % 12
val targetKeyIndex = if (rawIndex < 0) rawIndex + 12 else rawIndex
val calculatedToKey = keyToNumber[targetKeyIndex]
val transposedBody = NOTE_UNIT_REGEX.replace(remaining) { matchResult -> val transposedBody = NOTE_UNIT_REGEX.replace(remaining) { matchResult ->
val fullNote = matchResult.value val fullNote = matchResult.value
transpose(note = fullNote, fromKey = "C", toKey = calculatedToKey) transpose(note = fullNote, fromKey = "C", toKey = "C", alter = totalAlter)
} }
val result = separators + transposedBody val result = separators + transposedBody

3
composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt
View file

@ -248,8 +248,7 @@ fun MainScreenWithDrawer(
var isEyeVisible by remember { mutableStateOf(false) } var isEyeVisible by remember { mutableStateOf(false) }
val keysOrder = Transpose.keyToNumber val keysOrder = Transpose.keyToNumber
val songKeyIndex = keysOrder.indexOf(songKey).takeIf { it != -1 } ?: 0 val songKeyIndex = keysOrder.indexOf(songKey).takeIf { it != -1 } ?: 0
val rawKeyIndex = (songKeyIndex + tempInterval) % 12 val tempUiKey = keysOrder[(songKeyIndex + tempInterval + 24) % 12]
val tempUiKey = keysOrder[if (rawKeyIndex < 0) rawKeyIndex + 12 else rawKeyIndex]
val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState() val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
val isPendingChange = tempInterval != appliedInterval val isPendingChange = tempInterval != appliedInterval
val isCurrentlyTransposed = appliedInterval != 0 val isCurrentlyTransposed = appliedInterval != 0