Byzantine notation

thetwom · Dec 14, 2024 · 3801881 · 3801881
1 parent 42aae9b
commit 3801881
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
         minSdk = 23
         targetSdk = 35
         versionCode = 38
-        versionName = "7.0.0-rc2"
+        versionName = "7.0.0-rc4"
         testInstrumentationRunner =  "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         resourceConfigurations += listOf("cs", "de", "en", "fr", "zh-rCN")

diff --git a/app/src/main/java/de/moekadu/tuner/ui/notes/NoteNotationType.kt b/app/src/main/java/de/moekadu/tuner/ui/notes/NoteNotationType.kt
@@ -25,11 +25,12 @@ import de.moekadu.tuner.temperaments.NoteModifier
 
 /** Available note notation types. */
 enum class NotationType(@StringRes val stringResourceId: Int) {
-    Standard(R.string.notation_standard), /**< Default C, D, E, ...*/
-    International(R.string.notation_international),  /**< C, D, E, ..., but using a B and never a H */
-    Solfege(R.string.notation_solfege), /**< Solfege */
-    Carnatic(R.string.notation_carnatic), /**< Carnatic Indian notation */
-    Hindustani(R.string.notation_hindustani) /**< Hindustani Indian notation */
+    Standard(R.string.notation_standard), /**< Default C, D, E, ....*/
+    International(R.string.notation_international),  /**< C, D, E, ..., but using a B and never a H. */
+    Solfege(R.string.notation_solfege), /**< Solfege. */
+    Carnatic(R.string.notation_carnatic), /**< Carnatic Indian notation. */
+    Hindustani(R.string.notation_hindustani), /**< Hindustani Indian notation. */
+    Byzantine(R.string.notation_byzantine) /**< Byzantine notation system. */
 }
 
 fun NotationType.resourceIds(): Map<NoteNameStem, Int> {
@@ -39,6 +40,7 @@ fun NotationType.resourceIds(): Map<NoteNameStem, Int> {
         NotationType.Solfege -> noteSolfegeResourceIds
         NotationType.Carnatic -> noteCarnaticResourceIds
         NotationType.Hindustani -> noteHindustaniResourceIds
+        NotationType.Byzantine -> noteByzantineResourceIds
     }
 }
 
@@ -66,6 +68,16 @@ private val noteSolfegeResourceIds = mapOf(
     NoteNameStem(BaseNote.B) to R.string.b_solfege,
 )
 
+private val noteByzantineResourceIds = mapOf(
+    NoteNameStem(BaseNote.C) to R.string.ni_byzantine,
+    NoteNameStem(BaseNote.D) to R.string.pa_byzantine,
+    NoteNameStem(BaseNote.E) to R.string.vou_byzantine,
+    NoteNameStem(BaseNote.F) to R.string.gha_byzantine,
+    NoteNameStem(BaseNote.G) to R.string.dhi_byzantine,
+    NoteNameStem(BaseNote.A) to R.string.ke_byzantine,
+    NoteNameStem(BaseNote.B) to R.string.zo_byzantine,
+)
+
 private val noteInternationalResourceIds = mapOf(
     NoteNameStem(BaseNote.C) to R.string.c_note_international,
     NoteNameStem(BaseNote.D) to R.string.d_note_international,

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -227,6 +227,7 @@
     <string name="notation_international">International (A-B-C-…)</string>
     <string name="notation_carnatic">Karnatisch</string>
     <string name="notation_hindustani">Hindustanisch</string>
+    <string name="notation_byzantine">Byzantinisch</string>
     <string name="helmholtz_notation">Helmholtz-Schreibweise (C, … c\')</string>
     <string name="sensitivity">Empfindlichkeit</string>
     <string name="instruments">Instrumente</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -267,6 +267,17 @@
     <string name="ni1_hindustani" translatable="false">Ni₁</string>
     <string name="ni2_hindustani" translatable="false">Ni₂</string>
     <string name="notation_hindustani">Hindustani</string>
+
+    <string name="ni_byzantine" translatable="false">Νη</string>
+    <string name="pa_byzantine" translatable="false">Πα</string>
+    <string name="vou_byzantine" translatable="false">Βου</string>
+    <string name="gha_byzantine" translatable="false">Γα</string>
+    <string name="dhi_byzantine" translatable="false">Δι</string>
+    <string name="ke_byzantine" translatable="false">Κε</string>
+    <string name="zo_byzantine" translatable="false">Ζω</string>
+    <string name="notation_byzantine">Byzantine</string>
+
+
     <string name="helmholtz_notation">Helmholtz notation (C, … c\')</string>
     <string name="extended_quarter_comma_mean_tone">Extended ¼ comma meantone</string>
     <string name="extended_quarter_comma_mean_tone_desc">Pure major 3rds, 15 notes</string>