plectrum

commit b77c7b1780f76fc3dc3afdec178759149de46324
parent 38d27e6569be1e39c050f160524727d6dc753c41
Author: gstraube <gstraube@users.noreply.github.com>
Date:   Tue, 16 Jan 2024 17:32:22 +0100

Merge pull request #49 from gtataranni/tune/guitalele

add guitalele tuning
Diffstat:
M
app/src/main/java/com/github/cythara/TuningMapper.java
 | 
14
+++++++++-----
A
app/src/main/java/com/github/cythara/tuning/GuitaleleTuning.java
 | 
54
++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
app/src/main/res/values-de-rDE/strings.xml
 | 
1
+
M
app/src/main/res/values-pt-rBR/strings.xml
 | 
1
+
M
app/src/main/res/values-tr/strings.xml
 | 
1
+
M
app/src/main/res/values/strings.xml
 | 
1
+

6 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/TuningMapper.java b/app/src/main/java/com/github/cythara/TuningMapper.java
@@ -10,6 +10,7 @@ import com.github.cythara.tuning.ChromaticTuning;
 import com.github.cythara.tuning.DropCGuitarTuning;
 import com.github.cythara.tuning.DropCSharpGuitarTuning;
 import com.github.cythara.tuning.DropDGuitarTuning;
+import com.github.cythara.tuning.GuitaleleTuning;
 import com.github.cythara.tuning.GuitarTuning;
 import com.github.cythara.tuning.OpenGGuitarTuning;
 import com.github.cythara.tuning.OudStdTurkishTuning;
@@ -30,11 +31,12 @@ class TuningMapper {
     private static final int BASS_DROP_C_TUNING_POSITION = 7;
     private static final int UKULELE_TUNING_POSITION = 8;
     private static final int D_TUNING_POSITION = 9;
-    private static final int VIOLIN_TUNING_POSITION = 10;
-    private static final int CELLO_TUNING_POSITION = 11;
-    private static final int VIOLA_TUNING_POSITION = 12;
-    private static final int OUDSTDTR_TUNING_POSITION = 13;
-    private static final int BANJO_TUNING_POSITION = 14;
+    private static final int GUITALELE_TUNING_POSITION = 10;
+    private static final int VIOLIN_TUNING_POSITION = 11;
+    private static final int CELLO_TUNING_POSITION = 12;
+    private static final int VIOLA_TUNING_POSITION = 13;
+    private static final int OUDSTDTR_TUNING_POSITION = 14;
+    private static final int BANJO_TUNING_POSITION = 15;
 
     static Tuning getTuningFromPosition(int position) {
         switch (position) {
@@ -58,6 +60,8 @@ class TuningMapper {
                 return new UkuleleTuning();
             case D_TUNING_POSITION:
                 return new UkuleleDTuning();
+            case GUITALELE_TUNING_POSITION:
+                return new GuitaleleTuning();
             case VIOLIN_TUNING_POSITION:
                 return new ViolinTuning();
             case CELLO_TUNING_POSITION:
diff --git a/app/src/main/java/com/github/cythara/tuning/GuitaleleTuning.java b/app/src/main/java/com/github/cythara/tuning/GuitaleleTuning.java
@@ -0,0 +1,54 @@
+package com.github.cythara.tuning;
+
+import com.github.cythara.Note;
+import com.github.cythara.NoteName;
+import com.github.cythara.Tuning;
+
+import static com.github.cythara.NoteName.*;
+
+public class GuitaleleTuning implements Tuning {
+
+    @Override
+    public Note[] getNotes() {
+        return Pitch.values();
+    }
+
+    @Override
+    public Note findNote(String name) {
+        return Pitch.valueOf(name);
+    }
+
+    private enum Pitch implements Note {
+
+        A2(A, 2),
+        D3(D, 3),
+        G3(G, 3),
+        C4(C, 4),
+        E4(E, 4),
+        A4(A, 4);
+
+        private final String sign;
+        private final int octave;
+        private NoteName name;
+
+        Pitch(NoteName name, int octave) {
+            this.name = name;
+            this.octave = octave;
+            this.sign = "";
+        }
+
+        public NoteName getName() {
+            return name;
+        }
+
+        @Override
+        public int getOctave() {
+            return octave;
+        }
+
+        @Override
+        public String getSign() {
+            return sign;
+        }
+    }
+}
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -24,6 +24,7 @@
         <item>Bass (Drop C)</item>
         <item>Ukulele (Standard)</item>
         <item>Ukulele (D tuning)</item>
+        <item>Guitalele</item>
         <item>Geige (Standard)</item>
         <item>Cello (Standard)</item>
         <item>Viola (Standard)</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -24,6 +24,7 @@
         <item>Bass (Drop C)</item>
         <item>Ukulele (padrão)</item>
         <item>Ukulele (D tuning)</item>
+        <item>Guitalele</item>
         <item>Violino (padrão)</item>
         <item>Cello (padrão)</item>
         <item>Viola (padrão)</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -24,6 +24,7 @@
         <item>Bas (Drop C)</item>
         <item>Ukulele (standard)</item>
         <item>Ukulele (D akoru)</item>
+        <item>Guitalele</item>
         <item>Keman (standard)</item>
         <item>Çello (standard)</item>
         <item>Viyola (standard)</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
         <item>Bass (Drop C)</item>
         <item>Ukulele (standard)</item>
         <item>Ukulele (D tuning)</item>
+        <item>Guitalele</item>
         <item>Violin (standard)</item>
         <item>Cello (standard)</item>
         <item>Viola (standard)</item>