aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-16 17:48:32 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-16 17:48:32 +0200
commitbd1a2228d2f3392ee4cf891bcc07c30ccb363bfa (patch)
treecd660270b376d16d5b75c644b3759f5b63c671b3 /src
parentda0d84a2bebe36f70cf528f0d6d002868e48ffa4 (diff)
refactored preference screen
Diffstat (limited to '')
-rw-r--r--src/main/res/drawable-hdpi/ic_attachment_black_24dp.pngbin0 -> 295 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_bug_report_black_24dp.pngbin0 -> 258 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_help_black_24dp.pngbin0 -> 458 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_image_black_24dp.pngbin0 -> 256 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.pngbin0 -> 202 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_new_releases_black_24dp.pngbin0 -> 384 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_notifications_black_24dp.pngbin0 -> 236 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_security_black_24dp.pngbin0 -> 419 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_settings_black_24dp.pngbin0 -> 453 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_attachment_black_24dp.pngbin0 -> 217 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_bug_report_black_24dp.pngbin0 -> 200 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_help_black_24dp.pngbin0 -> 298 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_image_black_24dp.pngbin0 -> 183 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.pngbin0 -> 160 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_new_releases_black_24dp.pngbin0 -> 277 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_notifications_black_24dp.pngbin0 -> 179 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_security_black_24dp.pngbin0 -> 287 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_settings_black_24dp.pngbin0 -> 322 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_attachment_black_24dp.pngbin0 -> 399 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.pngbin0 -> 289 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_help_black_24dp.pngbin0 -> 579 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_image_black_24dp.pngbin0 -> 295 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.pngbin0 -> 222 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.pngbin0 -> 480 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_notifications_black_24dp.pngbin0 -> 272 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_security_black_24dp.pngbin0 -> 486 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_settings_black_24dp.pngbin0 -> 557 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.pngbin0 -> 551 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.pngbin0 -> 427 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_help_black_24dp.pngbin0 -> 834 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_image_black_24dp.pngbin0 -> 424 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.pngbin0 -> 269 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.pngbin0 -> 699 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.pngbin0 -> 381 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_security_black_24dp.pngbin0 -> 674 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_settings_black_24dp.pngbin0 -> 827 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_attachment_black_24dp.pngbin0 -> 759 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.pngbin0 -> 527 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_help_black_24dp.pngbin0 -> 1122 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_image_black_24dp.pngbin0 -> 548 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.pngbin0 -> 319 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.pngbin0 -> 897 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.pngbin0 -> 493 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_security_black_24dp.pngbin0 -> 872 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.pngbin0 -> 1073 bytes
-rw-r--r--src/main/res/values-de/strings.xml6
-rw-r--r--src/main/res/values/strings.xml6
-rw-r--r--src/main/res/xml/preferences.xml323
48 files changed, 165 insertions, 170 deletions
diff --git a/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png
new file mode 100644
index 000000000..e56ddb5a5
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-hdpi/ic_bug_report_black_24dp.png
new file mode 100644
index 000000000..1bccb1d11
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_bug_report_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/src/main/res/drawable-hdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..374fafd7f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_help_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_image_black_24dp.png b/src/main/res/drawable-hdpi/ic_image_black_24dp.png
new file mode 100644
index 000000000..52c788746
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_image_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png
new file mode 100644
index 000000000..e531d72a5
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 000000000..db0b31631
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..12969c50f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_security_black_24dp.png b/src/main/res/drawable-hdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..e2d880969
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_security_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..acf1ddf85
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-mdpi/ic_attachment_black_24dp.png
new file mode 100644
index 000000000..b37e94a31
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_attachment_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-mdpi/ic_bug_report_black_24dp.png
new file mode 100644
index 000000000..58aef662d
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_bug_report_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/src/main/res/drawable-mdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f6e789ba1
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_help_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_image_black_24dp.png b/src/main/res/drawable-mdpi/ic_image_black_24dp.png
new file mode 100644
index 000000000..377ce1331
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_image_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png
new file mode 100644
index 000000000..9efbaae28
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 000000000..f8f4f111e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..32562b0f3
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_security_black_24dp.png b/src/main/res/drawable-mdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..b86d68634
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_security_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..c59419c02
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png
new file mode 100644
index 000000000..b16a95010
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.png
new file mode 100644
index 000000000..107f74a20
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..d3542c6bc
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_image_black_24dp.png b/src/main/res/drawable-xhdpi/ic_image_black_24dp.png
new file mode 100644
index 000000000..6b7cd7838
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_image_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png
new file mode 100644
index 000000000..87f8de1ca
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 000000000..917b6cf4a
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..98cbec6ed
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_security_black_24dp.png b/src/main/res/drawable-xhdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..160caf166
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_security_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..e84e188a1
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png
new file mode 100644
index 000000000..bf0a53bed
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.png
new file mode 100644
index 000000000..af8c82e6e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..645822e83
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png
new file mode 100644
index 000000000..7297bd5d2
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png
new file mode 100644
index 000000000..4af4ae634
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 000000000..56c24d8d9
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..74c46cf43
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_security_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..73f1f2a6d
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_security_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..3023ff8da
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_attachment_black_24dp.png
new file mode 100644
index 000000000..93ca795cc
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_attachment_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.png
new file mode 100644
index 000000000..6eb1474e3
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..7c4823055
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png
new file mode 100644
index 000000000..ebe206ff7
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png
new file mode 100644
index 000000000..d6761ba16
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 000000000..ec775ec68
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..b06e6bc28
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_security_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..857cacf71
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_security_black_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..476d5c978
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index a272ecb49..1959b9cb5 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -110,8 +110,8 @@
<string name="pref_sound">Benachrichtigungston</string>
<string name="pref_sound_summary">Benachrichtigungston wiedergeben</string>
<string name="pref_advanced_options">Erweitert</string>
- <string name="pref_never_send_crash">Niemals Absturzberichte senden</string>
- <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Pix-Art Messenger stetig zu verbessern</string>
+ <string name="pref_send_crash">Absturzberichte senden</string>
+ <string name="pref_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Pix-Art Messenger stetig zu verbessern</string>
<string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string>
<string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</string>
<string name="pref_ui_options">Benutzeroberfläche</string>
@@ -254,7 +254,7 @@
<string name="sure_delete_fingerprint">Soll dieser Fingerabdruck wirklich gelöscht werden?</string>
<string name="ignore">Ignorieren</string>
<string name="without_mutual_presence_updates"><b>Achtung:</b> Ohne gegenseitige Kenntnis des Online-Status kann es zu unerwarteten Problemen kommen.\n\n<small>Bitte die Einstellungen in den Kontakt-Details prüfen.</small></string>
- <string name="pref_security_settings">Sicherheit</string>
+ <string name="pref_security_settings">Sicherheit und Datenschutz</string>
<string name="pref_allow_message_correction">Nachrichtenkorrektur erlauben</string>
<string name="pref_allow_message_correction_summary">Erlaube Deinen Kontakten das nachträgliche Korrigieren ihrer Nachrichten</string>
<string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a8d62e3d3..ce626b760 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -114,8 +114,8 @@
<string name="pref_sound">Ringtone</string>
<string name="pref_sound_summary">Play sound when a new message arrives</string>
<string name="pref_advanced_options">Advanced</string>
- <string name="pref_never_send_crash">Never send crash reports</string>
- <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string>
+ <string name="pref_send_crash">Send crash reports</string>
+ <string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string>
<string name="pref_confirm_messages">Confirm Messages</string>
<string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
<string name="pref_ui_options">UI</string>
@@ -262,7 +262,7 @@
<string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
<string name="ignore">Ignore</string>
<string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
- <string name="pref_security_settings">Security</string>
+ <string name="pref_security_settings">Security and data protection</string>
<string name="pref_allow_message_correction">Allow message correction</string>
<string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index b9e7ca116..797f17bb5 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -1,34 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory android:title="@string/pref_general">
+ <!--UI-->
+ <PreferenceScreen
+ android:icon="@drawable/ic_image_black_24dp"
+ android:key="userinterface"
+ android:title="@string/pref_ui_options">
<CheckBoxPreference
- android:defaultValue="true"
- android:key="grant_new_contacts"
- android:summary="@string/pref_grant_presence_updates_summary"
- android:title="@string/pref_grant_presence_updates"/>
-
+ android:defaultValue="false"
+ android:key="use_white_background"
+ android:summary="@string/pref_use_white_background_summary"
+ android:title="@string/pref_use_white_background" />
<CheckBoxPreference
- android:defaultValue="true"
- android:key="confirm_messages"
- android:summary="@string/pref_confirm_messages_summary"
- android:title="@string/pref_confirm_messages"/>
-
+ android:defaultValue="false"
+ android:key="use_larger_font"
+ android:summary="@string/pref_use_larger_font_summary"
+ android:title="@string/pref_use_larger_font" />
<CheckBoxPreference
android:defaultValue="true"
- android:key="chat_states"
- android:summary="@string/pref_chat_states_summary"
- android:title="@string/pref_chat_states"/>
-
- </PreferenceCategory>
- <PreferenceCategory
+ android:key="send_button_status"
+ android:summary="@string/pref_use_send_button_to_indicate_status_summary"
+ android:title="@string/pref_use_send_button_to_indicate_status" />
+ <ListPreference
+ android:defaultValue="recent"
+ android:dialogTitle="@string/choose_quick_action"
+ android:entries="@array/quick_actions"
+ android:entryValues="@array/quick_action_values"
+ android:key="quick_action"
+ android:summary="@string/pref_quick_action_summary"
+ android:title="@string/pref_quick_action" />
+ </PreferenceScreen>
+ <!--Notifications-->
+ <PreferenceScreen
+ android:icon="@drawable/ic_notifications_black_24dp"
android:key="notifications"
android:title="@string/pref_notification_settings">
<CheckBoxPreference
android:defaultValue="true"
android:key="show_notification"
android:summary="@string/pref_notifications_summary"
- android:title="@string/pref_notifications"/>
+ android:title="@string/pref_notifications" />
<PreferenceScreen
android:dependency="show_notification"
android:key="quiet_hours"
@@ -38,41 +48,44 @@
android:defaultValue="false"
android:key="enable_quiet_hours"
android:summary="@string/pref_quiet_hours_summary"
- android:title="@string/title_pref_enable_quiet_hours"/>
+ android:title="@string/title_pref_enable_quiet_hours" />
<eu.siacs.conversations.ui.TimePreference
android:dependency="enable_quiet_hours"
android:key="quiet_hours_start"
android:negativeButtonText="@string/cancel"
android:positiveButtonText="@string/set"
- android:title="@string/title_pref_quiet_hours_start_time"/>
+ android:title="@string/title_pref_quiet_hours_start_time" />
<eu.siacs.conversations.ui.TimePreference
android:dependency="enable_quiet_hours"
android:key="quiet_hours_end"
android:negativeButtonText="@string/cancel"
android:positiveButtonText="@string/set"
- android:title="@string/title_pref_quiet_hours_end_time"/>
+ android:title="@string/title_pref_quiet_hours_end_time" />
</PreferenceScreen>
<CheckBoxPreference
android:defaultValue="true"
android:dependency="show_notification"
android:key="vibrate_on_notification"
android:summary="@string/pref_vibrate_summary"
- android:title="@string/pref_vibrate"/>
+ android:title="@string/pref_vibrate" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="show_notification"
android:key="led"
- android:title="@string/pref_led"
- android:summary="@string/pref_led_summary"/>
+ android:summary="@string/pref_led_summary"
+ android:title="@string/pref_led" />
<RingtonePreference
android:defaultValue="content://settings/system/notification_sound"
android:dependency="show_notification"
android:key="notification_ringtone"
android:ringtoneType="notification"
android:summary="@string/pref_sound_summary"
- android:title="@string/pref_sound"/>
- </PreferenceCategory>
- <PreferenceCategory
+ android:title="@string/pref_sound" />
+ </PreferenceScreen>
+ <!--Attachments-->
+ <PreferenceScreen
+ android:icon="@drawable/ic_attachment_black_24dp"
+ android:key="attachments"
android:title="@string/pref_attachments">
<ListPreference
android:defaultValue="1048576"
@@ -80,171 +93,153 @@
android:entryValues="@array/filesizes_values"
android:key="auto_accept_file_size"
android:summary="@string/pref_accept_files_summary"
- android:title="@string/pref_accept_files"/>
+ android:title="@string/pref_accept_files" />
<ListPreference
android:defaultValue="auto"
android:entries="@array/picture_compression_entries"
android:entryValues="@array/picture_compression_values"
android:key="picture_compression"
android:summary="@string/pref_picture_compression_summary"
- android:title="@string/pref_picture_compression"/>
+ android:title="@string/pref_picture_compression" />
<CheckBoxPreference
android:defaultValue="false"
android:key="return_to_previous"
- android:title="@string/pref_return_to_previous"
- android:summary="@string/pref_return_to_previous_summary"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_ui_options">
+ android:summary="@string/pref_return_to_previous_summary"
+ android:title="@string/pref_return_to_previous" />
+ </PreferenceScreen>
+ <!--status-->
+ <PreferenceScreen
+ android:icon="@drawable/ic_new_releases_black_24dp"
+ android:key="presence"
+ android:title="@string/pref_presence_settings">
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:disableDependentsState="true"
+ android:key="manually_change_presence"
+ android:summary="@string/pref_manually_change_presence_summary"
+ android:title="@string/pref_manually_change_presence" />
<CheckBoxPreference
android:defaultValue="false"
- android:key="use_white_background"
- android:summary="@string/pref_use_white_background_summary"
- android:title="@string/pref_use_white_background"/>
+ android:dependency="manually_change_presence"
+ android:key="away_when_screen_off"
+ android:summary="@string/pref_away_when_screen_off_summary"
+ android:title="@string/pref_away_when_screen_off" />
<CheckBoxPreference
android:defaultValue="false"
- android:key="use_larger_font"
- android:summary="@string/pref_use_larger_font_summary"
- android:title="@string/pref_use_larger_font"/>
+ android:dependency="manually_change_presence"
+ android:key="xa_on_silent_mode"
+ android:summary="@string/pref_xa_on_silent_mode_summary"
+ android:title="@string/pref_xa_on_silent_mode" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:dependency="xa_on_silent_mode"
+ android:key="treat_vibrate_as_silent"
+ android:summary="@string/pref_treat_vibrate_as_silent_summary"
+ android:title="@string/pref_treat_vibrate_as_silent" />
+ </PreferenceScreen>
+ <!--Security-->
+ <PreferenceScreen
+ android:icon="@drawable/ic_security_black_24dp"
+ android:key="security"
+ android:title="@string/pref_security_settings">
<CheckBoxPreference
android:defaultValue="true"
- android:key="send_button_status"
- android:summary="@string/pref_use_send_button_to_indicate_status_summary"
- android:title="@string/pref_use_send_button_to_indicate_status"/>
- <ListPreference
- android:defaultValue="recent"
- android:dialogTitle="@string/choose_quick_action"
- android:entries="@array/quick_actions"
- android:entryValues="@array/quick_action_values"
- android:key="quick_action"
- android:summary="@string/pref_quick_action_summary"
- android:title="@string/pref_quick_action"/>
+ android:key="grant_new_contacts"
+ android:summary="@string/pref_grant_presence_updates_summary"
+ android:title="@string/pref_grant_presence_updates" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="confirm_messages"
+ android:summary="@string/pref_confirm_messages_summary"
+ android:title="@string/pref_confirm_messages" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="chat_states"
+ android:summary="@string/pref_chat_states_summary"
+ android:title="@string/pref_chat_states" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="allow_message_correction"
+ android:summary="@string/pref_allow_message_correction_summary"
+ android:title="@string/pref_allow_message_correction" />
<CheckBoxPreference
android:defaultValue="true"
android:key="indicate_received"
android:summary="@string/pref_use_indicate_received_summary"
- android:title="@string/pref_use_indicate_received"/>
- </PreferenceCategory>
- <PreferenceCategory
- android:key="advanced"
- android:title="@string/pref_advanced_options">
- <PreferenceScreen
- android:key="expert"
- android:summary="@string/pref_expert_options_summary"
- android:title="@string/pref_expert_options">
- <PreferenceCategory android:title="@string/pref_general">
+ android:title="@string/pref_use_indicate_received" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="crashreport"
+ android:summary="@string/pref_send_crash_summary"
+ android:title="@string/pref_send_crash" />
+
+ </PreferenceScreen>
+ <!--Expert-->
+ <PreferenceScreen
+ android:icon="@drawable/ic_settings_black_24dp"
+ android:key="expert"
+ android:title="@string/pref_expert_options">
+ <PreferenceCategory android:title="@string/pref_general">
<ListPreference
android:defaultValue="@string/default_resource"
android:entries="@array/resources"
android:entryValues="@array/resources"
android:key="resource"
android:summary="@string/pref_xmpp_resource_summary"
- android:title="@string/pref_xmpp_resource"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_ui_options">
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="use_subject"
- android:summary="@string/pref_conference_name_summary"
- android:title="@string/pref_conference_name"/>
+ android:title="@string/pref_xmpp_resource" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_ui_options">
<CheckBoxPreference
android:defaultValue="false"
android:key="show_dynamic_tags"
android:summary="@string/pref_show_dynamic_tags_summary"
- android:title="@string/pref_show_dynamic_tags"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_security_settings">
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="dont_save_encrypted"
- android:summary="@string/pref_dont_save_encrypted_summary"
- android:title="@string/pref_dont_save_encrypted"/>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="dont_trust_system_cas"
- android:summary="@string/pref_dont_trust_system_cas_summary"
- android:title="@string/pref_dont_trust_system_cas_title"/>
- <Preference
- android:key="remove_trusted_certificates"
- android:summary="@string/pref_remove_trusted_certificates_summary"
- android:title="@string/pref_remove_trusted_certificates_title"/>
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="allow_message_correction"
- android:title="@string/pref_allow_message_correction"
- android:summary="@string/pref_allow_message_correction_summary"/>
- </PreferenceCategory>
- <PreferenceCategory
- android:key="connection_options"
- android:title="@string/pref_connection_options">
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="use_tor"
- android:summary="@string/pref_use_tor_summary"
- android:title="@string/pref_use_tor"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_input_options">
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="enter_is_send"
- android:summary="@string/pref_enter_is_send_summary"
- android:title="@string/pref_enter_is_send"/>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="display_enter_key"
- android:summary="@string/pref_display_enter_key_summary"
- android:title="@string/pref_display_enter_key"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_presence_settings">
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="manually_change_presence"
- android:title="@string/pref_manually_change_presence"
- android:summary="@string/pref_manually_change_presence_summary"
- android:disableDependentsState="true"/>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="away_when_screen_off"
- android:summary="@string/pref_away_when_screen_off_summary"
- android:title="@string/pref_away_when_screen_off"
- android:dependency="manually_change_presence"/>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="xa_on_silent_mode"
- android:summary="@string/pref_xa_on_silent_mode_summary"
- android:title="@string/pref_xa_on_silent_mode"
- android:dependency="manually_change_presence"/>
- <CheckBoxPreference
- android:dependency="xa_on_silent_mode"
- android:defaultValue="false"
- android:key="treat_vibrate_as_silent"
- android:title="@string/pref_treat_vibrate_as_silent"
- android:summary="@string/pref_treat_vibrate_as_silent_summary"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_expert_options_other">
- <CheckBoxPreference
- android:key="autojoin"
- android:defaultValue="true"
- android:title="@string/pref_autojoin"
- android:summary="@string/pref_autojoin_summary"
- />
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="indicate_received"
- android:summary="@string/pref_use_indicate_received_summary"
- android:title="@string/pref_use_indicate_received"/>
- <eu.siacs.conversations.ui.ExportLogsPreference
- android:key="export_logs"
- android:summary="@string/pref_export_logs_summary"
- android:title="@string/pref_export_logs"/>
- </PreferenceCategory>
- </PreferenceScreen>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="never_send"
- android:summary="@string/pref_never_send_crash_summary"
- android:title="@string/pref_never_send_crash"/>
- </PreferenceCategory>
+ android:title="@string/pref_show_dynamic_tags" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_security_settings">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dont_save_encrypted"
+ android:summary="@string/pref_dont_save_encrypted_summary"
+ android:title="@string/pref_dont_save_encrypted" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dont_trust_system_cas"
+ android:summary="@string/pref_dont_trust_system_cas_summary"
+ android:title="@string/pref_dont_trust_system_cas_title" />
+ <Preference
+ android:key="remove_trusted_certificates"
+ android:summary="@string/pref_remove_trusted_certificates_summary"
+ android:title="@string/pref_remove_trusted_certificates_title" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_input_options">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="enter_is_send"
+ android:summary="@string/pref_enter_is_send_summary"
+ android:title="@string/pref_enter_is_send" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="display_enter_key"
+ android:summary="@string/pref_display_enter_key_summary"
+ android:title="@string/pref_display_enter_key" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_expert_options_other">
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="autojoin"
+ android:summary="@string/pref_autojoin_summary"
+ android:title="@string/pref_autojoin" />
+ <eu.siacs.conversations.ui.ExportLogsPreference
+ android:key="export_logs"
+ android:summary="@string/pref_export_logs_summary"
+ android:title="@string/pref_export_logs" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+ <!--About-->
<eu.siacs.conversations.ui.AboutPreference
+ android:icon="@drawable/ic_help_black_24dp"
android:summary="@string/pref_about_conversations_summary"
- android:title="@string/title_activity_about"/>
+ android:title="@string/title_activity_about" />
+
+
</PreferenceScreen>