commit 9e6cef3c85526d1282ba624524858129d1d99cb7
parent d719ffbbf6a5ab6c2c4437d9f81244de5f471c00
Author: Taco <SkytkRSfan3895@gmail.com>
Date: Sat, 2 Feb 2019 16:01:09 -0500
(4/4) xml: reformatting, extract some strings from code into string files, rearrange strings
Signed-off-by: Taco <SkytkRSfan3895@gmail.com>
Diffstat:
10 files changed, 251 insertions(+), 117 deletions(-)
diff --git a/app/src/main/res/drawable-nodpi/ic_line_style_icons_mic.xml b/app/src/main/res/drawable-nodpi/ic_line_style_icons_mic.xml
@@ -1,12 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="15dp"
- android:height="32dp"
- android:viewportWidth="15.0"
- android:viewportHeight="32.0">
+ android:width="15dp"
+ android:height="32dp"
+ android:viewportWidth="15.0"
+ android:viewportHeight="32.0">
<path
- android:pathData="M7,24.007V28H4.034c-1.141,0 -2,0.859 -2,2v1.5c0,0.276 0.224,0.5 0.5,0.5h10c0.276,0 0.5,-0.224 0.5,-0.5v-1.425c0,-1.164 -0.879,-2.075 -2,-2.075H8v-3.993c3.973,-0.278 7.068,-3.56 7.068,-7.564v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S14,14.262 14,14.557v1.887c0,3.597 -2.9,6.522 -6.466,6.522s-6.466,-2.926 -6.466,-6.522v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S0,14.262 0,14.557v1.887C0,20.447 3.095,23.729 7,24.007zM12.034,30.075V31h-9v-1c0,-0.589 0.411,-1 1,-1h7C11.604,29 12.034,29.462 12.034,30.075z"
- android:fillColor="#80e10000"/>
+ android:fillColor="#80e10000"
+ android:pathData="M7,24.007V28H4.034c-1.141,0 -2,0.859 -2,2v1.5c0,0.276 0.224,0.5 0.5,0.5h10c0.276,0 0.5,-0.224 0.5,-0.5v-1.425c0,-1.164 -0.879,-2.075 -2,-2.075H8v-3.993c3.973,-0.278 7.068,-3.56 7.068,-7.564v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S14,14.262 14,14.557v1.887c0,3.597 -2.9,6.522 -6.466,6.522s-6.466,-2.926 -6.466,-6.522v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S0,14.262 0,14.557v1.887C0,20.447 3.095,23.729 7,24.007zM12.034,30.075V31h-9v-1c0,-0.589 0.411,-1 1,-1h7C11.604,29 12.034,29.462 12.034,30.075z" />
<path
- android:pathData="M7.534,-0.034C5.034,-0.034 3,2.025 3,4.557v11.887c0,2.531 2.034,4.591 4.534,4.591s4.534,-2.06 4.466,-4.591V4.557C12.068,2.025 10.034,-0.034 7.534,-0.034zM11,16.443c0,1.942 -1.555,3.522 -3.466,3.522S4,18.386 4,16.443V4.557c0,-1.942 1.623,-3.522 3.534,-3.522S11,2.614 11,4.557V16.443z"
- android:fillColor="#80e10000"/>
+ android:fillColor="#80e10000"
+ android:pathData="M7.534,-0.034C5.034,-0.034 3,2.025 3,4.557v11.887c0,2.531 2.034,4.591 4.534,4.591s4.534,-2.06 4.466,-4.591V4.557C12.068,2.025 10.034,-0.034 7.534,-0.034zM11,16.443c0,1.942 -1.555,3.522 -3.466,3.522S4,18.386 4,16.443V4.557c0,-1.942 1.623,-3.522 3.534,-3.522S11,2.614 11,4.557V16.443z" />
</vector>
diff --git a/app/src/main/res/drawable-nodpi/ic_line_style_icons_mic_active.xml b/app/src/main/res/drawable-nodpi/ic_line_style_icons_mic_active.xml
@@ -1,12 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="15dp"
- android:height="32dp"
- android:viewportWidth="15.0"
- android:viewportHeight="32.0">
+ android:width="15dp"
+ android:height="32dp"
+ android:viewportWidth="15.0"
+ android:viewportHeight="32.0">
<path
- android:pathData="M7,24.007V28H4.034c-1.141,0 -2,0.859 -2,2v1.5c0,0.276 0.224,0.5 0.5,0.5h10c0.276,0 0.5,-0.224 0.5,-0.5v-1.425c0,-1.164 -0.879,-2.075 -2,-2.075H8v-3.993c3.973,-0.278 7.068,-3.56 7.068,-7.564v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S14,14.262 14,14.557v1.887c0,3.597 -2.9,6.522 -6.466,6.522s-6.466,-2.926 -6.466,-6.522v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S0,14.262 0,14.557v1.887C0,20.447 3.095,23.729 7,24.007zM12.034,30.075V31h-9v-1c0,-0.589 0.411,-1 1,-1h7C11.604,29 12.034,29.462 12.034,30.075z"
- android:fillColor="#8000ff00"/>
+ android:fillColor="#8000ff00"
+ android:pathData="M7,24.007V28H4.034c-1.141,0 -2,0.859 -2,2v1.5c0,0.276 0.224,0.5 0.5,0.5h10c0.276,0 0.5,-0.224 0.5,-0.5v-1.425c0,-1.164 -0.879,-2.075 -2,-2.075H8v-3.993c3.973,-0.278 7.068,-3.56 7.068,-7.564v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S14,14.262 14,14.557v1.887c0,3.597 -2.9,6.522 -6.466,6.522s-6.466,-2.926 -6.466,-6.522v-1.887c0,-0.295 -0.239,-0.534 -0.534,-0.534S0,14.262 0,14.557v1.887C0,20.447 3.095,23.729 7,24.007zM12.034,30.075V31h-9v-1c0,-0.589 0.411,-1 1,-1h7C11.604,29 12.034,29.462 12.034,30.075z" />
<path
- android:pathData="M7.534,-0.034C5.034,-0.034 3,2.025 3,4.557v11.887c0,2.531 2.034,4.591 4.534,4.591s4.534,-2.06 4.466,-4.591V4.557C12.068,2.025 10.034,-0.034 7.534,-0.034zM11,16.443c0,1.942 -1.555,3.522 -3.466,3.522S4,18.386 4,16.443V4.557c0,-1.942 1.623,-3.522 3.534,-3.522S11,2.614 11,4.557V16.443z"
- android:fillColor="#8000ff00"/>
+ android:fillColor="#8000ff00"
+ android:pathData="M7.534,-0.034C5.034,-0.034 3,2.025 3,4.557v11.887c0,2.531 2.034,4.591 4.534,4.591s4.534,-2.06 4.466,-4.591V4.557C12.068,2.025 10.034,-0.034 7.534,-0.034zM11,16.443c0,1.942 -1.555,3.522 -3.466,3.522S4,18.386 4,16.443V4.557c0,-1.942 1.623,-3.522 3.534,-3.522S11,2.614 11,4.557V16.443z" />
</vector>
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
@@ -1,94 +1,209 @@
-<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">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="253.99998"
+ android:viewportHeight="254.00002">
<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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -25,6 +25,6 @@
android:id="@+id/pitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:theme="@style/AppTheme"/>
+ android:theme="@style/AppTheme" />
-</LinearLayout>
-\ No newline at end of file
+</LinearLayout>
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="@drawable/ic_launcher_background"/>
- <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
-\ No newline at end of file
+ <background android:drawable="@drawable/ic_launcher_background" />
+ <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,12 +1,18 @@
<resources>
<string name="app_name">Cythara</string>
+
<string name="privacy_policy">Datenschutzrichtlinie anzeigen</string>
<string name="set_notation">Notation wählen</string>
- <string name="toggle_dark_mode">Dunkelmodus umschalten</string>
<string name="choose_notation">Wähle die Notation</string>
- <string name="permission_required">Berechtigungen erforderlich</string>
+ <string name="toggle_dark_mode">Dunkelmodus umschalten</string>
<string name="set_reference_pitch">Referenztonhöhe einstellen</string>
<string name="choose_a_frequency">Wähle eine Frequenz:</string>
+ <string name="permission_required">Berechtigungen erforderlich</string>
+ <string name="microphone_permission_required">
+ Eine Mikrofongenehmigung ist erforderlich. App wird geschlossen.
+ </string>
+ <string name="ok">OK</string>
+
<string-array name="tunings">
<item>Chromatisch</item>
<item>Gitarre (Standard)</item>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
@@ -2,9 +2,11 @@
<string name="app_name">Cythara</string>
<string name="privacy_policy">Erakutsi pribatutasun politika</string>
<string name="set_notation">Ezarri notazioa</string>
- <string name="toggle_dark_mode">(Des)aktibatu modu iluna</string>
<string name="choose_notation">Hautatu notazioa</string>
- <string name="permission_required">Baimena behar da</string>
+ <string name="toggle_dark_mode">(Des)aktibatu modu iluna</string>
<string name="set_reference_pitch">Ezarri erreferentzia-tonua</string>
<string name="choose_a_frequency">Maiztasun bat hautatu:</string>
+ <string name="permission_required">Baimena behar da</string>
+ <string name="microphone_permission_required">Mikrofonoa baimena behar da. Aplikazioa itxi egingo da.</string>
+ <string name="ok">Ados</string>
</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,27 +1,33 @@
-<resources>
- <string name="app_name">Cythara</string>
- <string name="privacy_policy">Exibir políticas de privacidade</string>
- <string name="set_notation">Definir notação</string>
- <string name="choose_notation">Escolher notação</string>
- <string name="permission_required">Permissão necessária</string>
- <string-array name="tunings">
- <item>Cromático</item>
- <item>Violão (padrão)</item>
- <item>Violão (Drop D)</item>
- <item>Violão (Drop C)</item>
- <item>Violão (Drop C#)</item>
- <item>Violão (Open G)</item>
- <item>Bass (padrão)</item>
- <item>Ukulele (padrão)</item>
- <item>Ukulele (D tuning)</item>
- <item>Violino (padrão)</item>
- <item>Cello (padrão)</item>
- </string-array>
- <string-array name="notations">
- <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>
- <string name="choose_a_frequency">Escolha uma frequência:</string>
-</resources>
-\ No newline at end of file
+<resources>
+ <string name="app_name">Cythara</string>
+
+ <string name="privacy_policy">Exibir políticas de privacidade</string>
+ <string name="set_notation">Definir notação</string>
+ <string name="choose_notation">Escolher notação</string>
+ <string name="toggle_dark_mode">Alternar modo escuro</string>
+ <string name="set_reference_pitch">Definir o passo de referência</string>
+ <string name="choose_a_frequency">Escolha uma frequência:</string>
+ <string name="permission_required">Permissão necessária</string>
+ <string name="microphone_permission_required">
+ A permissão do microfone é necessária. App será fechado.
+ </string>
+ <string name="ok">OK</string>
+
+ <string-array name="tunings">
+ <item>Cromático</item>
+ <item>Violão (padrão)</item>
+ <item>Violão (Drop D)</item>
+ <item>Violão (Drop C)</item>
+ <item>Violão (Drop C#)</item>
+ <item>Violão (Open G)</item>
+ <item>Bass (padrão)</item>
+ <item>Ukulele (padrão)</item>
+ <item>Ukulele (D tuning)</item>
+ <item>Violino (padrão)</item>
+ <item>Cello (padrão)</item>
+ </string-array>
+ <string-array name="notations">
+ <item name="scientific">Notação científica</item>
+ <item name="sol">Solfejo</item>
+ </string-array>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,12 +1,20 @@
<resources>
<string name="app_name">Cythara</string>
+
<string name="privacy_policy">Show privacy policy</string>
+ <string name="privacy_policy_link" translatable="false">
+ https://gstraube.github.io/privacy_policy.html
+ </string>
+
<string name="set_notation">Set notation</string>
- <string name="toggle_dark_mode">Toggle dark mode</string>
<string name="choose_notation">Choose notation</string>
- <string name="permission_required">Permission required</string>
+ <string name="toggle_dark_mode">Toggle dark mode</string>
<string name="set_reference_pitch">Set reference pitch</string>
<string name="choose_a_frequency">Choose a frequency:</string>
+ <string name="permission_required">Permission required</string>
+ <string name="microphone_permission_required">Microphone permission is required. App will close.</string>
+ <string name="ok">OK</string>
+
<string-array name="tunings">
<item>Chromatic</item>
<item>Guitar (standard)</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
<resources>
<!-- Base application theme. -->
- <style name="AppTheme" parent="Theme.AppCompat.DayNight"/>
+ <style name="AppTheme" parent="Theme.AppCompat.DayNight" />
</resources>
