Merge pull request #35 from iAmiAdam/master

Preferences Hard coded Strings replaced

2 files changed, 41 insertions, 21 deletions

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc4e3e36..0b2a3b3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,7 +82,27 @@
     <!-- DECRYPT Layout -->
     <string name="crypto_category">Category</string>
     <string name="action_search">Search</string>
-    
+
+    <!-- Preferences -->
+    <string name="pref_git_title">Git</string>
+    <string name="pref_server_title">Server</string>
+    <string name="pref_server_hint">server.com</string>
+    <string name="pref_remote_title">Remote location</string>
+    <string name="pref_remote_hint">path/to/repository</string>
+    <string name="pref_git_username_title">Username</string>
+    <string name="pref_git_username_hint">username</string>
+    <string name="pref_ssh_title">SSH Key</string>
+    <string name="pref_crypto_title">Crypto</string>
+    <string name="pref_provider_title">Select OpenPGP Provider!</string>
+    <string name="pref_provider_account_title">Set your OpenPGP account</string>
+    <string name="pref_provider_account_hint">mail@somewhere.tld</string>
+    <string name="pref_key_title">Select OpenPGP Key id</string>
+    <string name="pref_general_title">General</string>
+    <string name="pref_password_title">Password Show Time</string>
+    <string name="pref_password_dialog_title">Set the time you want the password to be in clipboard</string>
+    <string name="pref_copy_title">Automatically Copy Password</string>
+    <string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string>
+
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Yes</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 0833ebf8..7fe39daa 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory android:title="Git">
-		<EditTextPreference android:title="Server"
-			android:key="git_remote_server" android:hint="server.com"
+	<PreferenceCategory android:title="@string/pref_git_title">
+		<EditTextPreference android:title= "@string/pref_server_title"
+			android:key="git_remote_server" android:hint="@string/pref_server_hint"
 			android:inputType="textUri" />
-		<EditTextPreference android:title="Remote location"
-			android:key="git_remote_location" android:hint="path/to/repository"
+		<EditTextPreference android:title="@string/pref_remote_title"
+			android:key="git_remote_location" android:hint="@string/pref_remote_hint"
 			android:inputType="textUri" />
-		<EditTextPreference android:title="Username"
-			android:key="git_remote_username" android:hint="username"
+		<EditTextPreference android:title="@string/pref_git_username_title"
+			android:key="git_remote_username" android:hint="@string/pref_git_username_hint"
 			android:inputType="textPersonName" />
-		<Preference android:title="SSH Key" android:key="ssh_key" />
+		<Preference android:title="@string/pref_ssh_title" android:key="ssh_key" />
 	</PreferenceCategory>
 
-	<PreferenceCategory android:title="Crypto">
+	<PreferenceCategory android:title="@string/pref_crypto_title">
 		<org.openintents.openpgp.util.OpenPgpListPreference
-			android:key="openpgp_provider_list" android:title="Select OpenPGP Provider!" />
+			android:key="openpgp_provider_list" android:title="@string/pref_provider_title" />
 
-		<EditTextPreference android:title="Set your OpenPGP account"
-			android:hint="mail@somewhere.tld" android:key="openpgp_account_name"
+		<EditTextPreference android:title="@string/pref_provider_account_title"
+			android:hint="@string/pref_provider_account_hint" android:key="openpgp_account_name"
 			android:inputType="textEmailAddress" />
 
-		<Preference android:title="Select OpenPGP Key id"
+		<Preference android:title="@string/pref_key_title"
 			android:key="openpgp_key_id" />
 	</PreferenceCategory>
 
-	<PreferenceCategory android:title="General">
-		<EditTextPreference android:title="Password Show Time"
-			android:dialogTitle="Set the time you want the password to be in clipboard"
-			android:summary="Set the time you want the password to be in clipboard"
+	<PreferenceCategory android:title="@string/pref_general_title">
+		<EditTextPreference android:title="@string/pref_password_title"
+			android:dialogTitle="@string/pref_password_dialog_title"
+			android:summary="@string/pref_password_dialog_title"
 			android:hint="45" android:key="general_show_time" />
-    <CheckBoxPreference android:title="Automatically Copy Password"
-      android:dialogTitle="Automatically copy the password to the clipboard after decryption was successful."
-      android:summary="Automatically copy the password to the clipboard after decryption was successful."
+    <CheckBoxPreference android:title="@string/pref_copy_title"
+      android:dialogTitle="@string/pref_copy_dialog_title"
+      android:summary="@string/pref_copy_dialog_title"
       android:key="copy_on_decrypt" android:defaultValue="true" />
 	</PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file