Merge pull request beemdevelopment#57 from ByteHamster/arrays

Strings.xml cleanup
Sami32 · Apr 14, 2019 · 553cb16 · 553cb16
2 parents 791138c + 47f8c9e
commit 553cb16
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 34 deletions.
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -60,12 +60,6 @@
     <string name="set_password_confirm">Bevestig het wachtwoord</string>
     <string name="invalidated_fingerprint">Er is een verandering in de beveiligingsinstellingen van je toestel gedetecteerd. Ga naar \"Instellingen -> Vingerafdruk\" om je vingerafdruk opnieuw toe te voegen.</string>
 
-    <string-array name="authentication_methods">
-        <item>Geen</item>
-        <item>Wachtwoord</item>
-        <item>Vingerafdruk</item>
-    </string-array>
-
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hallo leeg fragment</string>
     <string name="unlock">Ontgrendel</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -60,12 +60,6 @@
     <string name="set_password_confirm">Пожалуйста, подтвердите пароль</string>
     <string name="invalidated_fingerprint">Обнаружено изменение настроек безопасности вашего устройства. Перейдите в «Настройки - Отпечаток пальца» и повторно добавьте свой отпечаток пальца.</string>
 
-    <string-array name="authentication_methods">
-        <item>Нет</item>
-        <item>Пароль</item>
-        <item>Отпечаток пальца</item>
-    </string-array>
-
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Привет пустой фрагмент</string>
     <string name="unlock">Разблокировать</string>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="authentication_methods">
+        <item>@string/authentication_method_none</item>
+        <item>@string/authentication_method_password</item>
+        <item>@string/authentication_method_fingerprint</item>
+    </string-array>
+
+    <string-array name="otp_types_array">
+        <item>TOTP</item>
+        <item>HOTP</item>
+        <item>Steam</item>
+    </string-array>
+
+    <string-array name="otp_algo_array">
+        <item>SHA1</item>
+        <item>SHA256</item>
+        <item>SHA512</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,7 +8,6 @@
     <string name="discard">Discard</string>
     <string name="save">Save</string>
     <string name="issuer">Issuer</string>
-    <string name="title_activity_intro">IntroActivity</string>
 
     <string name="settings">Preferences</string>
     <string name="pref_appearance_group_title">Appearance</string>
@@ -62,26 +61,6 @@
     <string name="set_password_confirm">Please confirm the password</string>
     <string name="invalidated_fingerprint">A change in your device\'s security settings has been detected. Please go to \"Settings -> Fingerprint\" and re-add your fingerprint.</string>
 
-    <string-array name="authentication_methods">
-        <item>None</item>
-        <item>Password</item>
-        <item>Fingerprint</item>
-    </string-array>
-
-    <string-array name="otp_types_array">
-        <item>TOTP</item>
-        <item>HOTP</item>
-        <item>Steam</item>
-    </string-array>
-
-    <string-array name="otp_algo_array">
-        <item>SHA1</item>
-        <item>SHA256</item>
-        <item>SHA512</item>
-    </string-array>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="unlock">Unlock</string>
     <string name="advanced">Advanced</string>
     <string name="seconds">seconds</string>
@@ -162,7 +141,7 @@
     <string name="sort_alphabetically_name">Account (A to Z)</string>
     <string name="sort_alphabetically_name_reverse">Account (Z to A)</string>
     <string name="sort_custom">Custom</string>
-    <string name="new_group">New group...</string>
+    <string name="new_group">New group…</string>
     <string name="enter_group_name">Enter a group name</string>
     <string name="group_name_hint">Group name</string>
     <string name="preference_manage_groups">Edit groups</string>