commit b67d738f93754c0ef5951553a4e7545899310e89 parent d09926666b0cf0489d803c44a167fdef73f52d72 Author: gstraube <gstraube@users.noreply.github.com> Date: Sun, 7 Oct 2018 18:20:04 +0200 Merge pull request #19 from thim/master Adding cello tuning. Diffstat:
26 files changed, 176 insertions(+), 48 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -92,42 +92,13 @@ obj/ ehthumbs.db Thumbs.db -# Legacy Eclipse project files -.classpath -.project -.cproject -.settings/ - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.war -*.ear - -# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) -hs_err_pid* - ## Plugin-specific files: # mpeltonen/sbt-idea plugin .idea_modules/ -# JIRA plugin -atlassian-ide-plugin.xml - -# Mongo Explorer plugin -.idea/mongoSettings.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - ### AndroidStudio Patch ### !/gradle/wrapper/gradle-wrapper.jar - # End of https://www.gitignore.io/api/androidstudio diff --git a/app/build.gradle b/app/build.gradle @@ -41,7 +41,7 @@ dependencies { androidTestImplementation('com.android.support.test:rules:1.0.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:28.0.0-rc01' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.jaredrummler:material-spinner:1.2.5' implementation 'com.shawnlin:number-picker:2.4.6' diff --git a/app/src/main/res/drawable/blank.png b/app/src/androidTest/res/drawable/blank.png Binary files differ. diff --git a/app/src/main/res/drawable/close.png b/app/src/androidTest/res/drawable/close.png Binary files differ. diff --git a/app/src/main/res/drawable/exact.png b/app/src/androidTest/res/drawable/exact.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_10_cents.png b/app/src/androidTest/res/drawable/negative_10_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_20_cents.png b/app/src/androidTest/res/drawable/negative_20_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_30_cents.png b/app/src/androidTest/res/drawable/negative_30_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_10_cents.png b/app/src/androidTest/res/drawable/positive_10_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_20_cents.png b/app/src/androidTest/res/drawable/positive_20_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_30_cents.png b/app/src/androidTest/res/drawable/positive_30_cents.png Binary files differ. diff --git a/app/src/main/java/com/github/cythara/TuningMapper.java b/app/src/main/java/com/github/cythara/TuningMapper.java @@ -3,6 +3,7 @@ package com.github.cythara; import android.util.Log; import com.github.cythara.tuning.BassTuning; +import com.github.cythara.tuning.CelloTuning; import com.github.cythara.tuning.ChromaticTuning; import com.github.cythara.tuning.DropCGuitarTuning; import com.github.cythara.tuning.DropCSharpGuitarTuning; @@ -24,7 +25,8 @@ class TuningMapper { private static final int UKULELE_TUNING_POSITION = 6; private static final int D_TUNING_POSITION = 7; private static final int VIOLIN_TUNING_POSITION = 8; - private static final int CHROMATIC_TUNING_POSITION = 9; + private static final int CELLO_TUNING_POSITION = 9; + private static final int CHROMATIC_TUNING_POSITION = 10; static Tuning getTuningFromPosition(int position) { switch (position) { @@ -46,6 +48,8 @@ class TuningMapper { return new UkuleleDTuning(); case VIOLIN_TUNING_POSITION: return new ViolinTuning(); + case CELLO_TUNING_POSITION: + return new CelloTuning(); case CHROMATIC_TUNING_POSITION: return new ChromaticTuning(); default: diff --git a/app/src/main/java/com/github/cythara/tuning/CelloTuning.java b/app/src/main/java/com/github/cythara/tuning/CelloTuning.java @@ -0,0 +1,60 @@ +package com.github.cythara.tuning; + +import com.github.cythara.NoteName; +import com.github.cythara.Tuning; + +import static com.github.cythara.NoteName.A; +import static com.github.cythara.NoteName.C; +import static com.github.cythara.NoteName.D; +import static com.github.cythara.NoteName.G; + +public class CelloTuning implements Tuning { + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } + + private enum Pitch implements com.github.cythara.Note { + + C2(C, 2, 65.4f), + G2(G, 2, 98f), + D3(D, 3, 146.8f), + A3(A, 3, 220f); + + private final String sign; + private final int octave; + private final float frequency; + private NoteName name; + + Pitch(NoteName name, int octave, float frequency) { + this.name = name; + this.octave = octave; + this.sign = ""; + this.frequency = frequency; + } + + public NoteName getName() { + return name; + } + + public float getFrequency() { + return frequency; + } + + @Override + public int getOctave() { + return octave; + } + + @Override + public String getSign() { + return sign; + } + } +} diff --git a/app/src/main/res/drawable-nodpi/ic_launcher_background.xml b/app/src/main/res/drawable-nodpi/ic_launcher_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#1D1D1B" /> +</shape> +\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_line_style_icons_mic.xml b/app/src/main/res/drawable-nodpi/ic_line_style_icons_mic.xml diff --git a/app/src/main/res/drawable/ic_line_style_icons_mic_active.xml b/app/src/main/res/drawable-nodpi/ic_line_style_icons_mic_active.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - -</selector> -\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml @@ -0,0 +1,95 @@ +<vector android:height="24dp" android:viewportHeight="254.00002" + android:viewportWidth="253.99998" android:width="24dp" + xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:pathData="m201.355,83.745 l-41.8,-39.9 -20.4,-18.4c-1.1,-1.3 -2.7,-2.1 -4.6,-2.1 -3.2,0 -5.9,2.4 -5.9,5.3v125.7c-4.1,-2.4 -9,-3.9 -14.3,-3.9 -14.4,0 -26,10.5 -26,23.5 0,13 11.6,23.5 26,23.5 14.4,0 26,-10.5 26,-23.5 0,-0.1 0,-0.3 0,-0.4 0,-0.1 0,-0.1 0,-0.2L140.355,59.745l15.2,5.6z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="125.15384" android:endY="224.94815" + android:startX="151.94794" android:startY="92.93785" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> + <path android:pathData="m65.155,166.245c0.8,0 1.5,-0.6 1.6,-1.5 1.1,-10.3 5.6,-20.3 13.5,-28.2 7.9,-7.9 17.9,-12.4 28.2,-13.5 0.8,-0.1 1.5,-0.8 1.5,-1.6v0c0,-1 -0.8,-1.7 -1.8,-1.6 -11,1.2 -21.7,6 -30.2,14.4 -8.4,8.4 -13.2,19.2 -14.4,30.2 -0.2,0.9 0.6,1.8 1.6,1.8z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="72.13724" android:endY="214.18735" + android:startX="98.931335" android:startY="82.17705" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> + <path android:pathData="m109.955,218.145c0,-0.8 -0.6,-1.5 -1.5,-1.6 -10.3,-1.1 -20.3,-5.6 -28.2,-13.5 -7.9,-7.9 -12.4,-17.9 -13.5,-28.2 -0.1,-0.8 -0.8,-1.5 -1.6,-1.5v0c-1,0 -1.7,0.8 -1.6,1.8 1.2,11 6,21.7 14.4,30.2 8.4,8.5 19.2,13.2 30.2,14.4 0.9,0.2 1.8,-0.6 1.8,-1.6z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="82.690155" android:endY="216.32925" + android:startX="109.484245" android:startY="84.31904" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> + <path android:pathData="m161.855,173.345c-0.8,0 -1.5,0.6 -1.6,1.5 -1.1,10.3 -5.6,20.3 -13.5,28.2 -7.9,7.9 -17.9,12.4 -28.2,13.5 -0.8,0.1 -1.5,0.8 -1.5,1.6v0c0,1 0.8,1.7 1.8,1.6 11,-1.2 21.7,-6 30.2,-14.4 8.4,-8.4 13.2,-19.2 14.4,-30.2 0.1,-0.9 -0.6,-1.8 -1.6,-1.8z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="134.26495" android:endY="226.79745" + android:startX="161.05914" android:startY="94.787155" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> + <path android:pathData="m54.955,165.845c0.8,0 1.5,-0.6 1.6,-1.5 1.3,-12.6 6.7,-24.8 16.3,-34.4 9.6,-9.6 21.8,-15.1 34.4,-16.3 0.8,-0.1 1.5,-0.8 1.5,-1.6v-0.7c0,-1 -0.8,-1.7 -1.8,-1.6 -13.5,1.4 -26.5,7.2 -36.8,17.5 -10.3,10.3 -16.1,23.4 -17.5,36.8 -0.1,1 0.6,1.8 1.6,1.8z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="65.41165" android:endY="212.82227" + android:startX="92.20584" android:startY="80.81195" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> + <path android:pathData="m108.855,228.345c0,-0.8 -0.6,-1.5 -1.5,-1.6 -12.6,-1.3 -24.8,-6.7 -34.4,-16.3 -9.6,-9.6 -15.1,-21.8 -16.3,-34.4 -0.1,-0.8 -0.8,-1.5 -1.6,-1.5h-0.7c-1,0 -1.7,0.8 -1.6,1.8 1.4,13.5 7.2,26.5 17.5,36.8 10.3,10.3 23.4,16.1 36.8,17.5 1,0.1 1.8,-0.6 1.8,-1.6z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="78.12726" android:endY="215.40314" + android:startX="104.92145" android:startY="83.39285" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> + <path android:pathData="m171.255,174.445c-0.8,0 -1.5,0.6 -1.6,1.5 -1.3,12.6 -6.7,24.8 -16.3,34.4 -9.6,9.6 -21.8,15.1 -34.4,16.3 -0.8,0.1 -1.5,0.8 -1.5,1.6v0.7c0,1 0.8,1.7 1.8,1.6 13.5,-1.4 26.5,-7.2 36.8,-17.5 10.3,-10.3 16.1,-23.4 17.5,-36.8 0.1,-1 -0.6,-1.8 -1.6,-1.8z"> + <aapt:attr name="android:fillColor"> + <gradient android:endX="140.45316" android:endY="228.05344" + android:startX="167.24734" android:startY="96.04315" android:type="linear"> + <item android:color="#FFFF1577" android:offset="0"/> + <item android:color="#FFFE116E" android:offset="0.05213103"/> + <item android:color="#FFFC075B" android:offset="0.193"/> + <item android:color="#FFFA0250" android:offset="0.3381"/> + <item android:color="#FFFA004C" android:offset="0.4927"/> + <item android:color="#FFF70D70" android:offset="1"/> + </gradient> + </aapt:attr> + </path> +</vector> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@mipmap/ic_launcher_foreground"/> + <background android:drawable="@drawable/ic_launcher_background" /> + <foreground android:drawable="@mipmap/ic_launcher_foreground" /> </adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> + <background android:drawable="@drawable/ic_launcher_background"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/> </adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml @@ -17,6 +17,7 @@ <item>Ukulele (Standard)</item> <item>Ukulele (D tuning)</item> <item>Geige (Standard)</item> + <item>Cello (Standard)</item> <item>Chromatisch</item> </string-array> <string-array name="notations"> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml @@ -14,11 +14,12 @@ <item>Ukulele (padrão)</item> <item>Ukulele (D tuning)</item> <item>Violino (padrão)</item> + <item>Cello (padrão)</item> <item>Cromático</item> </string-array> <string-array name="notations"> - <item name="scientific">Notação de pitch científico</item> - <item name="sol">Solfège</item> + <item name="scientific">Notação científica</item> + <item name="sol">Solfejo</item> </string-array> <string name="toggle_dark_mode">Alternar modo escuro</string> <string name="set_reference_pitch">Definir o passo de referência</string> diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="ic_launcher_background">#1D1D1B</color> -</resources> -\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ <item>Ukulele (standard)</item> <item>Ukulele (D tuning)</item> <item>Violin (standard)</item> + <item>Cello (standard)</item> <item>Chromatic</item> </string-array> <string-array name="notations"> diff --git a/build.gradle b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists
