aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable-hdpi/ic_attachment_white_24dp.pngbin0 -> 792 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_help_circle_white_24dp.pngbin0 -> 966 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_image_white_24dp.pngbin0 -> 649 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_lock_black_18dp.pngbin0 -> 363 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_lock_blue_18dp.pngbin718 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_lock_white_18dp.pngbin0 -> 362 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.pngbin0 -> 285 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.pngbin376 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.pngbin0 -> 291 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_pause_black_36dp.pngbin126 -> 148 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_pause_white_36dp.pngbin121 -> 149 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.pngbin209 -> 236 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.pngbin211 -> 242 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_security_white_24dp.pngbin0 -> 846 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_verified_user_black_18dp.pngbin0 -> 471 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.pngbin840 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_verified_user_white_18dp.pngbin0 -> 488 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_attachment_white_24dp.pngbin0 -> 584 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_help_circle_white_24dp.pngbin0 -> 656 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_image_white_24dp.pngbin0 -> 506 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_lock_black_18dp.pngbin0 -> 225 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_lock_blue_18dp.pngbin492 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_lock_white_18dp.pngbin0 -> 229 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.pngbin0 -> 166 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.pngbin229 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.pngbin0 -> 171 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_pause_black_36dp.pngbin103 -> 117 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_pause_white_36dp.pngbin106 -> 119 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.pngbin166 -> 194 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.pngbin169 -> 195 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_security_white_24dp.pngbin0 -> 637 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_verified_user_black_18dp.pngbin0 -> 262 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.pngbin556 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_verified_user_white_18dp.pngbin0 -> 270 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_attachment_white_24dp.pngbin0 -> 801 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.pngbin0 -> 1109 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_image_white_24dp.pngbin0 -> 731 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_lock_black_18dp.pngbin0 -> 342 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_lock_blue_18dp.pngbin863 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_lock_white_18dp.pngbin0 -> 342 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.pngbin0 -> 223 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.pngbin330 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.pngbin0 -> 232 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_pause_black_36dp.pngbin133 -> 156 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_pause_white_36dp.pngbin149 -> 155 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.pngbin251 -> 265 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.pngbin255 -> 283 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_security_white_24dp.pngbin0 -> 956 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.pngbin0 -> 466 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.pngbin950 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.pngbin0 -> 475 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.pngbin0 -> 1199 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.pngbin0 -> 1676 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_image_white_24dp.pngbin0 -> 975 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_lock_black_18dp.pngbin0 -> 650 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.pngbin1438 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_lock_white_18dp.pngbin0 -> 657 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.pngbin0 -> 444 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.pngbin599 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.pngbin0 -> 450 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_pause_black_36dp.pngbin188 -> 247 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_pause_white_36dp.pngbin220 -> 249 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.pngbin323 -> 366 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.pngbin328 -> 390 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_security_white_24dp.pngbin0 -> 1338 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.pngbin0 -> 842 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.pngbin1662 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.pngbin0 -> 867 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.pngbin0 -> 1475 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.pngbin0 -> 2216 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_image_white_24dp.pngbin0 -> 1210 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.pngbin0 -> 643 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.pngbin0 -> 649 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.pngbin0 -> 331 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.pngbin0 -> 345 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.pngbin0 -> 364 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.pngbin0 -> 365 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.pngbin0 -> 394 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.pngbin0 -> 461 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_security_white_24dp.pngbin0 -> 1707 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.pngbin0 -> 772 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.pngbin0 -> 807 bytes
-rw-r--r--src/main/res/drawable/date_bubble.xml4
-rw-r--r--src/main/res/drawable/message_border.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_light.xml (renamed from src/main/res/drawable/message_bubble_received_white.xml)4
-rw-r--r--src/main/res/drawable/message_bubble_received_warning.xml (renamed from src/main/res/drawable/message_bubble_received_lightred.xml)4
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue.xml (renamed from src/main/res/drawable/message_bubble_sent_lightblue.xml)4
-rw-r--r--src/main/res/drawable/message_bubble_sent_light.xml (renamed from src/main/res/drawable/message_bubble_sent_white.xml)4
-rw-r--r--src/main/res/drawable/rounded_rectangle_primary.xml2
-rw-r--r--src/main/res/layout/activity_about.xml8
-rw-r--r--src/main/res/layout/activity_contact_details.xml14
-rw-r--r--src/main/res/layout/activity_edit_account.xml12
-rw-r--r--src/main/res/layout/activity_muc_details.xml11
-rw-r--r--src/main/res/layout/activity_recording.xml26
-rw-r--r--src/main/res/layout/activity_set_presence.xml2
-rw-r--r--src/main/res/layout/activity_share_locaction.xml9
-rw-r--r--src/main/res/layout/contact.xml2
-rw-r--r--src/main/res/layout/contact_key.xml4
-rw-r--r--src/main/res/layout/conversation_list_row.xml9
-rw-r--r--src/main/res/layout/dialog_clear_history.xml2
-rw-r--r--src/main/res/layout/dialog_presence.xml4
-rw-r--r--src/main/res/layout/enter_jid_dialog.xml4
-rw-r--r--src/main/res/layout/fragment_conversation.xml25
-rw-r--r--src/main/res/layout/fragment_conversations_overview.xml4
-rw-r--r--src/main/res/layout/join_conference_dialog.xml4
-rw-r--r--src/main/res/layout/magic_create.xml2
-rw-r--r--src/main/res/layout/message_content.xml6
-rw-r--r--src/main/res/layout/message_received.xml9
-rw-r--r--src/main/res/layout/message_sent.xml9
-rw-r--r--src/main/res/layout/message_status.xml2
-rw-r--r--src/main/res/layout/presence_template.xml2
-rw-r--r--src/main/res/layout/simple_list_item.xml5
-rw-r--r--src/main/res/layout/welcome.xml10
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values/arrays.xml9
-rw-r--r--src/main/res/values/attrs.xml22
-rw-r--r--src/main/res/values/colors.xml11
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml5
-rw-r--r--src/main/res/values/styles.xml11
-rw-r--r--src/main/res/values/themes.xml81
-rw-r--r--src/main/res/xml/preferences.xml64
122 files changed, 272 insertions, 142 deletions
diff --git a/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png
new file mode 100644
index 000000000..411d0cbdd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png
new file mode 100644
index 000000000..ebdafee96
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_image_white_24dp.png b/src/main/res/drawable-hdpi/ic_image_white_24dp.png
new file mode 100644
index 000000000..36a2e453f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_image_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png
new file mode 100644
index 000000000..66b066502
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
deleted file mode 100644
index fa671448b..000000000
--- a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
new file mode 100644
index 000000000..826fbb241
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 000000000..852043ff9
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
deleted file mode 100644
index 6ceb6a898..000000000
--- a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 000000000..ff4f18758
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_pause_black_36dp.png b/src/main/res/drawable-hdpi/ic_pause_black_36dp.png
index ec02d44a9..7dbeb0d72 100644
--- a/src/main/res/drawable-hdpi/ic_pause_black_36dp.png
+++ b/src/main/res/drawable-hdpi/ic_pause_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
index 9d826b7e0..94d85dc12 100644
--- a/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
+++ b/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png
index 848f67624..67d0c8209 100644
--- a/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png
+++ b/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
index 1ce6531de..29adeed05 100644
--- a/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
+++ b/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_security_white_24dp.png b/src/main/res/drawable-hdpi/ic_security_white_24dp.png
new file mode 100644
index 000000000..bdc6aa0cc
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_security_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 000000000..ac5b29673
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png
deleted file mode 100644
index d6c12872f..000000000
--- a/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 000000000..f248d6acb
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-mdpi/ic_attachment_white_24dp.png
new file mode 100644
index 000000000..e6e585bab
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_attachment_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png
new file mode 100644
index 000000000..ff8593829
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_image_white_24dp.png b/src/main/res/drawable-mdpi/ic_image_white_24dp.png
new file mode 100644
index 000000000..0626807e0
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_image_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png
new file mode 100644
index 000000000..472922f85
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
deleted file mode 100644
index df90535c8..000000000
--- a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
new file mode 100644
index 000000000..e9b327fd0
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 000000000..81fc6d74b
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
deleted file mode 100644
index 6ae50a9f5..000000000
--- a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 000000000..2ee70ae71
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_pause_black_36dp.png b/src/main/res/drawable-mdpi/ic_pause_black_36dp.png
index 5c0dce2df..4dffa8e53 100644
--- a/src/main/res/drawable-mdpi/ic_pause_black_36dp.png
+++ b/src/main/res/drawable-mdpi/ic_pause_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
index 6176e3f83..e81331fdc 100644
--- a/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
+++ b/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png
index b598dac4b..e9c288c99 100644
--- a/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png
+++ b/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
index c791b597e..57c9fa546 100644
--- a/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
+++ b/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_security_white_24dp.png b/src/main/res/drawable-mdpi/ic_security_white_24dp.png
new file mode 100644
index 000000000..45c2aa1e7
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_security_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 000000000..87ad3d549
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png
deleted file mode 100644
index d4e510f34..000000000
--- a/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 000000000..10ccdca7b
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png
new file mode 100644
index 000000000..e0e9d1b5b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png
new file mode 100644
index 000000000..7c837362e
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
new file mode 100644
index 000000000..fc59b9f5c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png
new file mode 100644
index 000000000..a387eb83c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
deleted file mode 100644
index 4f91b14fe..000000000
--- a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
new file mode 100644
index 000000000..cdbc15769
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 000000000..2e555538b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
deleted file mode 100644
index c11f36b6c..000000000
--- a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 000000000..9b4fd84ee
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png
index 875a01f8a..ec6617a79 100644
--- a/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png
+++ b/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
index d8b29d7da..e84d8f6ed 100644
--- a/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
+++ b/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png
index 744ae66d1..5345ee3c4 100644
--- a/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png
+++ b/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
index 52eb1459f..547ef30aa 100644
--- a/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
+++ b/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_security_white_24dp.png b/src/main/res/drawable-xhdpi/ic_security_white_24dp.png
new file mode 100644
index 000000000..3a543dc09
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_security_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 000000000..59b603892
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png
deleted file mode 100644
index bda56c8a8..000000000
--- a/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 000000000..b4380a9ef
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png
new file mode 100644
index 000000000..96da53737
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png
new file mode 100644
index 000000000..4222dd85b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
new file mode 100644
index 000000000..251d10772
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 000000000..e6b063ab7
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
deleted file mode 100644
index 203d01866..000000000
--- a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
new file mode 100644
index 000000000..98fd945ef
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 000000000..2bcdf9d9f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
deleted file mode 100644
index 779164a27..000000000
--- a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 000000000..b6a786799
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png
index a9bfd1fb7..c3b01aff3 100644
--- a/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
index 8b721f9f5..1babab1f5 100644
--- a/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png
index ded8cda96..bacb6e21d 100644
--- a/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
index b08c0c260..23bb1ba9f 100644
--- a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
+++ b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png
new file mode 100644
index 000000000..61101e18e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 000000000..9f2fb4eab
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png
deleted file mode 100644
index a5138355a..000000000
--- a/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 000000000..8501bc4a1
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png
new file mode 100644
index 000000000..80be319c3
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png
new file mode 100644
index 000000000..169404a2b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
new file mode 100644
index 000000000..08c624751
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 000000000..b12436e84
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png
new file mode 100644
index 000000000..dd1472c9f
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 000000000..94715a840
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 000000000..89beb1938
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png
new file mode 100644
index 000000000..057caefe7
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png
new file mode 100644
index 000000000..46870cb66
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png
new file mode 100644
index 000000000..1c57756b0
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 000000000..2745c3ab9
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png
new file mode 100644
index 000000000..e26e7953b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 000000000..b266feacc
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 000000000..fe4a64ea5
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png
Binary files differ
diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml
index 3edf349e9..1669d5a02 100644
--- a/src/main/res/drawable/date_bubble.xml
+++ b/src/main/res/drawable/date_bubble.xml
@@ -13,9 +13,9 @@
android:top="6dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="?attr/color_border">
</stroke>
<solid
- android:color="@color/lightgreen">
+ android:color="?attr/color_bubble_date">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml
index 83eef8eb8..6b3180944 100644
--- a/src/main/res/drawable/message_border.xml
+++ b/src/main/res/drawable/message_border.xml
@@ -10,6 +10,6 @@
android:right="1.5dp"
android:top="1.5dp" />
- <solid android:color="@color/grey500" />
+ <solid android:color="?attr/color_border" />
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_white.xml b/src/main/res/drawable/message_bubble_received_light.xml
index 32e146460..5cb1ac4db 100644
--- a/src/main/res/drawable/message_bubble_received_white.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -13,9 +13,9 @@
android:top="2dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="?attr/color_border">
</stroke>
<solid
- android:color="@color/lightwhite">
+ android:color="?attr/color_bubble_light">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_lightred.xml b/src/main/res/drawable/message_bubble_received_warning.xml
index b3bf6d451..22959c88a 100644
--- a/src/main/res/drawable/message_bubble_received_lightred.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -13,9 +13,9 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="?attr/color_border">
</stroke>
<solid
- android:color="@color/lightred">
+ android:color="?attr/color_bubble_warning">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_lightblue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml
index 1ee3ad0c8..2613296c6 100644
--- a/src/main/res/drawable/message_bubble_sent_lightblue.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -13,9 +13,9 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="?attr/color_border">
</stroke>
<solid
- android:color="@color/lightblue">
+ android:color="?attr/color_bubble_blue">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_white.xml b/src/main/res/drawable/message_bubble_sent_light.xml
index 73d080cf1..a66321a19 100644
--- a/src/main/res/drawable/message_bubble_sent_white.xml
+++ b/src/main/res/drawable/message_bubble_sent_light.xml
@@ -13,9 +13,9 @@
android:top="2dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="?attr/color_border">
</stroke>
<solid
- android:color="@color/lightwhite">
+ android:color="?attr/color_bubble_light">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/rounded_rectangle_primary.xml b/src/main/res/drawable/rounded_rectangle_primary.xml
index 3a32aa8e5..8ea2b0b5c 100644
--- a/src/main/res/drawable/rounded_rectangle_primary.xml
+++ b/src/main/res/drawable/rounded_rectangle_primary.xml
@@ -8,7 +8,7 @@
android:left="2dp"
android:right="2dp"
android:top="2dp" />
- <solid android:color="@color/primary" />
+ <solid android:color="?attr/colorAccent" />
<corners android:radius="6dp" />
</shape>
</item>
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index af61483ab..2e503d8bd 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -23,7 +23,8 @@
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin">
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:background="?attr/color_background_primary">
<ImageView
android:id="@+id/logo"
@@ -43,7 +44,8 @@
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin">
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:background="?attr/color_background_primary">
<TextView
android:id="@+id/aboutmessage"
@@ -57,7 +59,7 @@
android:linksClickable="true"
android:paddingBottom="@dimen/activity_vertical_margin"
android:text="@string/pref_about_message"
- android:textColor="@color/black87"
+ android:textColor="?attr/text_Color_Main"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace" />
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 191694b7e..f39c59fc2 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -30,24 +30,22 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin">
- <RelativeLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:padding="@dimen/card_padding_regular">
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:paddingBottom="5dp"
android:text="@string/contact"
android:textAlignment="center"
- android:textColor="@color/black87"
+ android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
android:textIsSelectable="false"
- android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
<QuickContactBadge
@@ -169,7 +167,7 @@
android:text="@string/using_account"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:visibility="gone" />
- </RelativeLayout>
+ </LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
@@ -196,7 +194,6 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/notification_status_button"
android:text="@string/notify_on_all_messages"
- android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
<ImageButton
@@ -207,9 +204,10 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
+ android:alpha="?attr/icon_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
- android:src="@drawable/ic_notifications_grey600_24dp" />
+ android:src="@drawable/ic_notifications_black_24dp" />
</RelativeLayout>
</android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 6050a72ab..96e82e40d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -70,10 +70,12 @@
<AutoCompleteTextView
android:id="@+id/account_jid"
+ style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionNext"
- android:inputType="textEmailAddress" />
+ android:inputType="textEmailAddress"
+ android:textColor="?attr/text_Color_Main" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@@ -493,7 +495,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:alpha="1.0"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove"
android:visibility="visible" />
@@ -534,7 +536,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:contentDescription="@string/copy_otr_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
@@ -580,7 +582,7 @@
android:id="@+id/action_copy_axolotl_to_clipboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:contentDescription="@string/copy_omemo_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
@@ -590,7 +592,7 @@
android:id="@+id/action_regenerate_omemo_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:contentDescription="@string/regenerate_omemo_key"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_refresh"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 4a74883ad..676f2eaf9 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -14,8 +14,7 @@
<ScrollView
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/grey200">
+ android:layout_height="fill_parent">
<LinearLayout
android:id="@+id/muc_main_layout"
@@ -42,15 +41,12 @@
android:id="@+id/conference_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:paddingBottom="5dp"
android:text="@string/conference_subject"
android:textAlignment="center"
- android:textColor="@color/black87"
+ android:textAppearance="@style/Base.TextAppearance.AppCompat.Title"
android:textIsSelectable="false"
- android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
<RelativeLayout
@@ -76,6 +72,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
+ android:alpha="?attr/icon_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_settings" />
@@ -160,7 +157,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentRight="false"
android:padding="1dp"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
app:riv_corner_radius="36dp" />
diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml
index b1bcb2a65..c6a57f98d 100644
--- a/src/main/res/layout/activity_recording.xml
+++ b/src/main/res/layout/activity_recording.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@color/grey50">
+ android:background="?attr/color_background_primary">
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/timer"
android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/timer">
<Button
android:id="@+id/cancel_button"
@@ -19,14 +19,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel"
- android:textColor="@color/primary" />
+ android:textColor="?attr/colorAccent" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/accent" />
+ android:textColor="?attr/colorAccent" />
<Button
android:id="@+id/share_button"
@@ -35,18 +35,18 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/share"
- android:textColor="@color/primary" />
+ android:textColor="?attr/colorAccent" />
</LinearLayout>
<TextView
+ android:id="@+id/timer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="50sp"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
android:text="0:00.0"
- android:textColor="@color/primary"
- android:typeface="monospace"
+ android:textColor="?attr/colorAccent"
+ android:textSize="50sp"
android:textStyle="bold"
- android:id="@+id/timer"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true" />
+ android:typeface="monospace" />
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 8ecf792a8..b129e9eb8 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -57,7 +57,7 @@
android:layout_marginBottom="-8dp"
android:layout_marginRight="-8dp"
android:text="@string/change_presence"
- android:textColor="@color/accent" />
+ android:textColor="?attr/colorAccent" />
</LinearLayout>
</android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml
index c6f811997..055db4178 100644
--- a/src/main/res/layout/activity_share_locaction.xml
+++ b/src/main/res/layout/activity_share_locaction.xml
@@ -74,15 +74,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/cancel"
- android:textColor="@color/primary" />
+ android:text="@string/cancel" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
- android:layout_marginTop="7dp"
- android:background="@color/primary" />
+ android:layout_marginTop="7dp" />
<Button
android:id="@+id/share_button"
@@ -91,8 +89,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="false"
- android:text="@string/share"
- android:textColor="@color/primary" />
+ android:text="@string/share" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 08e793ef0..0fd402a10 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,7 +13,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
app:riv_corner_radius="28dp" />
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 45b1c5ca3..ebd2508cd 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="?attr/icon_alpha"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove"
android:visibility="gone" />
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="?attr/icon_alpha"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_enable_undecided_device"
android:visibility="gone" />
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 1e034482f..8936f7622 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -7,18 +7,18 @@
<View
android:layout_width="fill_parent"
android:layout_height="match_parent"
- android:background="@color/primary" />
+ android:background="?attr/color_background_primary" />
<FrameLayout
android:id="@+id/swipeable_item"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@color/grey50">
+ android:background="?attr/color_background_primary">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:orientation="horizontal"
android:padding="8dp">
@@ -30,7 +30,7 @@
android:background="@drawable/message_border"
android:padding="1dp"
android:scaleType="centerCrop"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
app:riv_corner_radius="28dp" />
@@ -50,6 +50,7 @@
android:ellipsize="end"
android:maxLines="1"
android:paddingRight="4dp"
+ android:textColor="?attr/text_Color_Main"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<RelativeLayout
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 3209d1e62..d9e7363ed 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/also_end_conversation"
- android:textColor="@color/black87"
+ android:textColor="?attr/text_Color_Main"
android:visibility="gone" />
</LinearLayout> \ No newline at end of file
diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml
index 164a79840..8ec44be56 100644
--- a/src/main/res/layout/dialog_presence.xml
+++ b/src/main/res/layout/dialog_presence.xml
@@ -47,11 +47,13 @@
<de.pixart.messenger.ui.widget.ImmediateAutoCompleteTextView
android:id="@+id/status_message"
+ style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/status_message"
- android:inputType="textShortMessage"/>
+ android:inputType="textShortMessage"
+ android:textColor="?attr/text_Color_Main" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index dff8f3459..703fb4e5b 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -32,9 +32,11 @@
<AutoCompleteTextView
android:id="@+id/jid"
+ style="@style/Widget.Conversations.EditText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:inputType="textEmailAddress" />
+ android:inputType="textEmailAddress"
+ android:textColor="?attr/text_Color_Main" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 8c4acf3c6..54c608f13 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<RelativeLayout xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200"
- android:clickable="false">
+ android:clickable="false"
+ android:background="?attr/color_background_secondary">
<ListView
android:id="@+id/messages_view"
@@ -14,7 +15,7 @@
android:layout_above="@+id/snackbar"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
- android:background="@color/grey200"
+ android:background="?attr/color_background_secondary"
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
@@ -34,7 +35,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
- android:background="@color/grey500"
+ android:background="?attr/color_border"
android:minHeight="50dp"
android:visibility="gone">
@@ -86,7 +87,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:background="@color/grey200"
+ android:background="?attr/color_background_primary"
android:clickable="true"
android:paddingBottom="2dp"
android:paddingLeft="2dp"
@@ -98,7 +99,8 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
- android:background="@color/grey50"
+ android:background="?attr/color_background_secondary"
+ android:textColor="?attr/text_Color_Main"
android:ems="10"
android:imeOptions="flagNoExtractUi|actionSend"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -109,8 +111,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="12dp"
- android:singleLine="false"
- android:textColor="@color/black87">
+ android:singleLine="false">
</de.pixart.messenger.ui.widget.EditMessage>
@@ -120,7 +121,7 @@
android:layout_height="48dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:background="@color/grey200"
+ android:background="?attr/color_background_primary"
android:contentDescription="@string/send_message"
android:src="@drawable/ic_send_text_offline" />
</RelativeLayout>
@@ -136,7 +137,7 @@
android:layout_marginRight="8dp"
android:background="@drawable/snackbar"
android:minHeight="48dp"
- android:visibility="gone">
+ android:visibility="visible">
<TextView
android:id="@+id/snackbar_message"
@@ -181,7 +182,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingLeft="24dp"
- android:textColor="@color/realgreen"
+ android:textColor="@color/realblack"
android:textSize="?attr/TextSizeBody" />
</RelativeLayout>
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 339514059..ddcc6ac14 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -3,13 +3,13 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/color_background_primary">
+ android:background="?attr/color_background_secondary">
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@color/grey50"
+ android:background="?attr/color_background_secondary"
android:divider="@android:color/transparent"
android:dividerHeight="0dp" />
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index edf16221f..5262d0635 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -32,9 +32,11 @@
<AutoCompleteTextView
android:id="@+id/jid"
+ style="@style/Widget.Conversations.EditText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:inputType="textEmailAddress" />
+ android:inputType="textEmailAddress"
+ android:textColor="?attr/text_Color_Main" />
</android.support.design.widget.TextInputLayout>
<CheckBox
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index 5fb080368..43727a11d 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/next"
- android:textColor="@color/accent" />
+ android:textColor="?attr/colorAccent" />
</LinearLayout>
<RelativeLayout
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index e1b06913e..37f374f65 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -13,7 +13,7 @@
android:maxHeight="500dp"
android:maxWidth="500dp"
android:scaleType="centerCrop"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
app:riv_corner_radius="5dp" />
@@ -43,8 +43,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:alpha="1.0"
- android:background="?attr/selectableItemBackgroundBorderless" />
+ android:alpha="?attr/icon_alpha"
+ android:background="?android:selectableItemBackground" />
<TextView
android:id="@+id/runtime"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index a668f4bc1..cb42861a4 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,7 +16,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dip"
app:riv_corner_radius="24dp" />
@@ -28,7 +28,7 @@
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_toRightOf="@+id/message_photo"
- android:background="@drawable/message_bubble_received_white"
+ android:background="@drawable/message_bubble_received_light"
android:longClickable="true"
android:minHeight="48dp">
@@ -63,8 +63,9 @@
android:layout_height="?attr/TextSizeInfo"
android:layout_gravity="center_vertical"
android:layout_marginRight="4sp"
+ android:alpha="0.70"
android:gravity="center_vertical"
- android:src="@drawable/ic_lock_blue_18dp" />
+ android:src="@drawable/ic_lock_white_18dp" />
<ImageView
android:id="@+id/edit_indicator"
@@ -73,7 +74,7 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="4sp"
android:gravity="center_vertical"
- android:src="@drawable/ic_mode_edit_blue_18dp" />
+ android:src="@drawable/ic_mode_edit_white_18dp" />
<TextView
android:id="@+id/message_time"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index d51f2d998..abddee902 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -17,7 +17,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
app:riv_corner_radius="24dp" />
@@ -30,7 +30,7 @@
android:layout_marginRight="4dp"
android:layout_toLeftOf="@+id/message_photo"
android:layout_toStartOf="@+id/message_photo"
- android:background="@drawable/message_bubble_sent_lightblue"
+ android:background="@drawable/message_bubble_sent_blue"
android:longClickable="true"
android:minHeight="48dp">
@@ -72,8 +72,9 @@
android:layout_height="?attr/TextSizeInfo"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4sp"
+ android:alpha="0.54"
android:gravity="center_vertical"
- android:src="@drawable/ic_lock_blue_18dp" />
+ android:src="@drawable/ic_lock_black_18dp" />
<ImageView
android:id="@+id/edit_indicator"
@@ -82,7 +83,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="4sp"
android:gravity="center_vertical"
- android:src="@drawable/ic_mode_edit_blue_18dp" />
+ android:src="@drawable/ic_mode_edit_black_18dp" />
<ImageView
android:id="@+id/indicator_received"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index b6edbc0b1..e9d6fcaf4 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,7 +29,7 @@
android:padding="0dp"
android:scaleType="fitXY"
android:visibility="gone"
- app:riv_border_color="@color/grey500"
+ app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
app:riv_corner_radius="16dp" />
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index 3d64ea468..42f374a7b 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -44,7 +44,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?attr/color_background_secondary"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove" />
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml
index c54fd7833..c8e90f8ef 100644
--- a/src/main/res/layout/simple_list_item.xml
+++ b/src/main/res/layout/simple_list_item.xml
@@ -17,9 +17,8 @@
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:minHeight="?android:attr/listPreferredItemHeightSmall" />
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index bbe98e90b..ff99efdde 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -14,7 +14,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey50">
+ android:background="?attr/color_background_secondary">
<LinearLayout
android:id="@+id/linearLayout"
@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/import_text"
- android:textColor="@color/black87"
+ android:textColor="?attr/text_Color_Main"
android:textSize="?attr/TextSizeBody"
android:visibility="gone" />
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/import_database"
- android:textColor="@color/accent"
+ android:textColor="?attr/colorAccent"
android:visibility="gone" />
<Button
@@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/create_account"
- android:textColor="@color/accent" />
+ android:textColor="?attr/colorAccent" />
<Button
android:id="@+id/use_existing_account"
@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/use_existing_accout"
- android:textColor="@color/black54" />
+ android:textColor="?attr/colorAccent" />
</LinearLayout>
<RelativeLayout
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 96e5a6db9..d6152dc4f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -752,7 +752,6 @@
<string name="mtm_connect_anyway">Möchtest du trotzdem eine Verbindung herstellen?</string>
<string name="mtm_cert_details">Zertifikatdetails:</string>
<string name="once">Einmalig</string>
- <string name="theme">Design</string>
<string name="qr_code_scanner_needs_access_to_camera">Der QR-Code Scanner benötigt Zugriff auf die Kamera</string>
<string name="pref_scroll_to_bottom_summary">Nach dem abschicken einer Nachricht zum Ende springen</string>
<string name="pref_scroll_to_bottom">Zum Ende springen</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 3ded5490e..7d7823a46 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <string-array name="themes">
+ <item>@string/pref_theme_light</item>
+ <item>@string/pref_theme_dark</item>
+ </string-array>
+ <string-array name="themes_values">
+ <item>light</item>
+ <item>dark</item>
+ </string-array>
+
<string-array name="filesizes">
<item>@string/never</item>
<item>256 KiB</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index faaa662ec..f9fb003f6 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <attr name="TextSizeTitle" format="dimension" />
+ <attr name="TextSizeCaption" format="dimension" />
<attr name="TextSizeInfo" format="dimension" />
+ <attr name="TextSizeInput" format="dimension" />
<attr name="TextSizeBody" format="dimension" />
<attr name="TextSizeHeadline" format="dimension" />
<attr name="TextSeparation" format="dimension"/>
<attr name="IconSize" format="dimension" />
+ <attr name="text_Color_Main" format="reference|color"/>
+
<attr name="color_background_secondary" format="reference|color" />
<attr name="color_background_primary" format="reference|color" />
<attr name="color_warning" format="reference|color"/>
@@ -71,5 +76,20 @@
<attr name="icon_alpha" format="float"/>
<attr name="popupOverlayStyle" format="reference"/>
-
+
+ <attr name="color_bubble_light" format="reference|color"/>
+ <attr name="color_bubble_blue" format="reference|color"/>
+ <attr name="color_bubble_date" format="reference|color"/>
+ <attr name="color_bubble_warning" format="reference|color"/>
+
+ <attr name="color_border" format="reference|color"/>
+
+ <!-- settings -->
+ <attr name="ic_settings_ui" format="reference"/>
+ <attr name="ic_settings_notifications" format="reference"/>
+ <attr name="ic_settings_attachments" format="reference"/>
+ <attr name="ic_settings_status" format="reference"/>
+ <attr name="ic_settings_security" format="reference"/>
+ <attr name="ic_settings_expert" format="reference"/>
+ <attr name="ic_settings_about" format="reference"/>
</resources> \ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 347783b72..e25826403 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -4,10 +4,11 @@
<color name="primary">#ff2e4272</color>
<color name="primary_dark">#ff08183e</color>
<color name="dark">#ff000309</color>
- <color name="accent">#ff2e4272</color>
+ <color name="accent">#ff0091ea</color>
<color name="black87">#de000309</color>
<color name="black54">#8a000309</color>
<color name="black12">#1f000000</color>
+ <color name="realblack">#ff000000</color>
<color name="white">#ffe2e7f1</color>
<color name="white12">#1fffffff</color>
<color name="white70">#b2e2e7f1</color>
@@ -24,14 +25,22 @@
<color name="orange500">#ffff9800</color>
<color name="bubble">#ff2e4272</color>
<color name="realwhite">#ffffffff</color>
+
+ <!-- bubbles -->
<color name="lightwhite">#fffafbfd</color>
+ <color name="darkwhite">#ff424242</color>
<color name="lightblue">#ffd7deee</color>
+ <color name="darkblue">#ff08183e</color>
<color name="lightred">#fff5d9d9</color>
+ <color name="darkred">#ff521010</color>
<color name="lightgreen">#ffcaf2ca</color>
+ <color name="darkgreen">#ff165d15</color>
+
<color name="online">#ff259b24</color>
<color name="away">#ffff9800</color>
<color name="notavailable">#fff44336</color>
<color name="warning_button">#fff5d9d9</color>
+ <color name="warning_button_dark">#ff521010</color>
<!-- scanner -->
<color name="scan_result_dots">#c04CAF50</color>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 201b9aedc..d3f76d528 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -103,5 +103,6 @@
<bool name="show_qr_code_scan">true</bool>
<bool name="scroll_to_bottom">true</bool>
<string name="omemo_setting_default">default_off</string>
+ <string name="theme">light</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b78ea9b49..6b72fa1a7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -753,7 +753,6 @@
<string name="mtm_connect_anyway">Do you want to connect anyway?</string>
<string name="mtm_cert_details">Certificate details:</string>
<string name="once">Once</string>
- <string name="theme">Theme</string>
<string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string>
<string name="pref_scroll_to_bottom_summary">Scroll down after sending a message</string>
<string name="pref_scroll_to_bottom">Scroll to bottom</string>
@@ -778,4 +777,8 @@
<string name="pref_omemo_setting_summary_default_off">OMEMO will have to be turned on explicitly for new conversations.</string>
<string name="default_on">On by default</string>
<string name="default_off">Off by default</string>
+ <string name="pref_theme_light">Light theme</string>
+ <string name="pref_theme_dark">Dark theme</string>
+ <string name="pref_theme_options_summary">Select the color palette</string>
+ <string name="pref_theme_options">Theme</string>
</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 1995c7130..ae3a66e48 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,5 +1,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+ <style name="TextAppearance.Conversations.Title" parent="TextAppearance.AppCompat.Title">
+ <item name="android:textSize">?TextSizeTitle</item>
+ </style>
<style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">?android:textColorSecondary</item>
@@ -10,6 +13,10 @@
<item name="android:typeface">monospace</item>
</style>
+ <style name="Widget.Conversations.EditText" parent="Widget.AppCompat.EditText">
+ <item name="android:textSize">?TextSizeInput</item>
+ </style>
+
<style name="InputLabel" parent="TextAppearance.AppCompat.Caption">
<item name="android:paddingBottom">@dimen/input_label_vertical_spacing</item>
<item name="android:paddingLeft">@dimen/input_label_horizontal_spacing</item>
@@ -32,7 +39,9 @@
<item name="android:textStyle">bold</item>
</style>
- <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption"></style>
+ <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption">
+ <item name="android:textSize">?TextSizeCaption</item>
+ </style>
<style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption">
<item name="android:textColor">@color/red800</item>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0fed4d2b3..e757b7817 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -6,17 +6,30 @@
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
+ <item name="colorControlNormal">@color/accent</item>
+ <item name="colorControlActivated">@color/accent</item>
+ <item name="text_Color_Main">@color/realblack</item>
<item name="color_background_primary">@color/grey50</item>
<item name="color_background_secondary">@color/grey200</item>
<item name="color_warning">@color/red_a700</item>
+ <item name="color_bubble_light">@color/lightwhite</item>
+ <item name="color_bubble_blue">@color/lightblue</item>
+ <item name="color_bubble_date">@color/lightgreen</item>
+ <item name="color_bubble_warning">@color/lightred</item>
+
+ <item name="color_border">@color/grey500</item>
+
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>
<item type="reference" name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+ <item name="TextSizeTitle">20sp</item>
+ <item name="TextSizeCaption">12sp</item>
<item name="TextSizeInfo">12sp</item>
+ <item name="TextSizeInput">14sp</item>
<item name="TextSizeBody">14sp</item>
<item name="TextSeparation">5sp</item>
<item name="IconSize">16sp</item>
@@ -48,6 +61,15 @@
<item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
<item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
<item type="reference" name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
+
+ <!-- settings-->
+ <item type="reference" name="ic_settings_ui">@drawable/ic_image_black_24dp</item>
+ <item type="reference" name="ic_settings_notifications">@drawable/ic_notifications_black_24dp</item>
+ <item type="reference" name="ic_settings_attachments">@drawable/ic_attachment_black_24dp</item>
+ <item type="reference" name="ic_settings_status">@drawable/ic_new_releases_black_24dp</item>
+ <item type="reference" name="ic_settings_security">@drawable/ic_security_black_24dp</item>
+ <item type="reference" name="ic_settings_expert">@drawable/ic_settings_black_24dp</item>
+
<item name="dialog_horizontal_padding">16dp</item>
<item name="dialog_vertical_padding">16dp</item>
<item type="float" name="icon_alpha">0.54</item>
@@ -71,6 +93,7 @@
<item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item>
<item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
<item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item>
+ <item type="reference" name="ic_settings_about">@drawable/ic_help_black_24dp</item>
</style>
<style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
@@ -78,17 +101,32 @@
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
+ <item name="colorControlNormal">@color/accent</item>
+ <item name="colorControlActivated">@color/accent</item>
+ <item name="text_Color_Main">@color/realwhite</item>
+
+ <item name="color_background_primary">@color/grey900</item>
+ <item name="color_background_secondary">@color/realblack</item>
+ <item name="color_warning">@color/red_a700</item>
+
+ <item name="color_bubble_light">@color/darkwhite</item>
+ <item name="color_bubble_blue">@color/darkblue</item>
+ <item name="color_bubble_date">@color/darkgreen</item>
+ <item name="color_bubble_warning">@color/darkred</item>
- <item name="color_background_primary">@color/grey800</item>
- <item name="color_background_secondary">@color/grey900</item>
- <item name="color_warning">@color/red_a100</item>
+ <item name="color_border">@color/grey800</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>
+ <item name="TextSizeTitle">20sp</item>
+ <item name="TextSizeCaption">12sp</item>
<item name="TextSizeInfo">12sp</item>
+ <item name="TextSizeInput">14sp</item>
+ <item name="TextSizeBody">14sp</item>
<item name="TextSeparation">5sp</item>
- <item name="IconSize">18sp</item>
+ <item name="IconSize">16sp</item>
+ <item name="TextSizeHeadline">18sp</item>
<item name="divider">@color/white12</item>
@@ -142,11 +180,23 @@
<item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item>
<item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item>
<item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_white_24dp</item>
+
+ <!-- settings-->
+ <item type="reference" name="ic_settings_ui">@drawable/ic_image_white_24dp</item>
+ <item type="reference" name="ic_settings_notifications">@drawable/ic_notifications_white_24dp</item>
+ <item type="reference" name="ic_settings_attachments">@drawable/ic_attachment_white_24dp</item>
+ <item type="reference" name="ic_settings_status">@drawable/ic_new_releases_white_24dp</item>
+ <item type="reference" name="ic_settings_security">@drawable/ic_security_white_24dp</item>
+ <item type="reference" name="ic_settings_expert">@drawable/ic_settings_white_24dp</item>
+ <item type="reference" name="ic_settings_about">@drawable/ic_help_circle_white_24dp</item>
</style>
<style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
+ <item name="TextSizeTitle">22sp</item>
+ <item name="TextSizeCaption">14sp</item>
<item name="TextSizeInfo">14sp</item>
+ <item name="TextSizeInput">16sp</item>
<item name="TextSizeBody">16sp</item>
<item name="IconSize">18sp</item>
<item name="TextSizeHeadline">20sp</item>
@@ -154,9 +204,32 @@
<style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowNoTitle">true</item>
+ <item name="android:windowActionBar">false</item>
+
+ <item name="TextSizeInfo">12sp</item>
+ <item name="TextSizeBody">14sp</item>
+ <item name="TextSizeInput">14sp</item>
+ <item name="TextSizeHeadline">18sp</item>
+ <item name="colorAccent">@color/accent</item>
+ <item name="color_background_primary">@color/grey50</item>
+ <item name="color_background_secondary">@color/grey200</item>
+
+ <item name="android:background">@color/grey50</item>
+ </style>
+
+ <style name="ConversationsDialog.Dark" parent="Theme.AppCompat.Dialog">
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowActionBar">false</item>
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
+ <item name="TextSizeInput">14sp</item>
<item name="TextSizeHeadline">18sp</item>
+
+ <item name="colorAccent">@color/accent</item>
+ <item name="color_background_primary">@color/grey900</item>
+ <item name="color_background_secondary">@color/realblack</item>
+
+ <item name="android:background">@color/grey900</item>
</style>
<style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light">
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 22d015ab8..822abddcc 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
- android:key="main_screen"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="main_screen">
<!--UI-->
<PreferenceScreen
- android:icon="@drawable/ic_image_black_24dp"
+ android:icon="?attr/ic_settings_ui"
android:key="userinterface"
android:title="@string/pref_ui_options">
<intent
@@ -15,11 +14,13 @@
android:name="page"
android:value="userinterface" />
</intent>
- <CheckBoxPreference
- android:defaultValue="@bool/use_white_background"
- android:key="use_white_background"
- android:summary="@string/pref_use_white_background_summary"
- android:title="@string/pref_use_white_background" />
+ <ListPreference
+ android:defaultValue="@string/theme"
+ android:entries="@array/themes"
+ android:entryValues="@array/themes_values"
+ android:key="theme"
+ android:summary="@string/pref_theme_options_summary"
+ android:title="@string/pref_theme_options" />
<CheckBoxPreference
android:defaultValue="@bool/use_larger_font"
android:key="use_larger_font"
@@ -61,7 +62,7 @@
</PreferenceScreen>
<!--Notifications-->
<PreferenceScreen
- android:icon="@drawable/ic_notifications_black_24dp"
+ android:icon="?attr/ic_settings_notifications"
android:key="notifications"
android:title="@string/pref_notification_settings">
<intent
@@ -142,7 +143,7 @@
</PreferenceScreen>
<!--Attachments-->
<PreferenceScreen
- android:icon="@drawable/ic_attachment_black_24dp"
+ android:icon="?attr/ic_settings_attachments"
android:key="attachments"
android:title="@string/pref_attachments">
<intent
@@ -191,12 +192,12 @@
<CheckBoxPreference
android:defaultValue="@bool/return_to_previous"
android:key="return_to_previous"
- android:title="@string/pref_return_to_previous"
- android:summary="@string/pref_return_to_previous_summary"/>
+ 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:icon="?attr/ic_settings_status"
android:key="presence"
android:title="@string/pref_presence_settings">
<intent
@@ -234,7 +235,7 @@
</PreferenceScreen>
<!--Security-->
<PreferenceScreen
- android:icon="@drawable/ic_security_black_24dp"
+ android:icon="?attr/ic_settings_security"
android:key="security"
android:title="@string/pref_security_settings">
<intent
@@ -268,13 +269,13 @@
<CheckBoxPreference
android:defaultValue="@bool/last_activity"
android:key="last_activity"
- android:title="@string/pref_broadcast_last_activity"
- android:summary="@string/pref_broadcast_last_activity_summary" />
+ android:summary="@string/pref_broadcast_last_activity_summary"
+ android:title="@string/pref_broadcast_last_activity" />
<CheckBoxPreference
android:defaultValue="@bool/warn_unencrypted_chat"
android:key="warn_unencrypted_chat"
- android:title="@string/pref_warn_unencrypted_chat"
- android:summary="@string/pref_warn_unencrypted_chat_summary"/>
+ android:summary="@string/pref_warn_unencrypted_chat_summary"
+ android:title="@string/pref_warn_unencrypted_chat" />
<ListPreference
android:defaultValue="@string/omemo_setting_default"
android:entries="@array/omemo_setting_entries"
@@ -301,7 +302,7 @@
</PreferenceScreen>
<!--Expert-->
<PreferenceScreen
- android:icon="@drawable/ic_settings_black_24dp"
+ android:icon="?attr/ic_settings_expert"
android:key="expert"
android:title="@string/pref_expert_options">
<intent
@@ -312,13 +313,14 @@
android:name="page"
android:value="expert" />
</intent>
- <PreferenceCategory android:title="@string/pref_general"
- android:key="general">
+ <PreferenceCategory
+ android:key="general"
+ android:title="@string/pref_general">
<CheckBoxPreference
android:defaultValue="@bool/show_foreground_service"
android:key="show_foreground_service"
android:summary="@string/pref_show_foreground_service_summary"
- android:title="@string/pref_show_foreground_service"/>
+ android:title="@string/pref_show_foreground_service" />
<PreferenceScreen
android:key="huawei"
android:summary="@string/huawei_protected_apps_summary"
@@ -330,8 +332,8 @@
<CheckBoxPreference
android:defaultValue="@bool/enable_multi_accounts"
android:key="enable_multi_accounts"
- android:title="@string/pref_enable_multi_accounts_title"
- android:summary="@string/pref_enable_multi_accounts_summary" />
+ android:summary="@string/pref_enable_multi_accounts_summary"
+ android:title="@string/pref_enable_multi_accounts_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_ui_options">
<CheckBoxPreference
@@ -349,8 +351,8 @@
<CheckBoxPreference
android:defaultValue="@bool/btbv"
android:key="btbv"
- android:title="@string/pref_blind_trust_before_verification"
- android:summary="@string/pref_blind_trust_before_verification_summary" />
+ android:summary="@string/pref_blind_trust_before_verification_summary"
+ android:title="@string/pref_blind_trust_before_verification" />
<ListPreference
android:defaultValue="@integer/automatic_message_deletion"
android:key="automatic_message_deletion"
@@ -358,8 +360,8 @@
android:title="@string/pref_automatically_delete_messages" />
<Preference
android:key="delete_omemo_identities"
- android:title="@string/pref_delete_omemo_identities"
- android:summary="@string/pref_delete_omemo_identities_summary" />
+ android:summary="@string/pref_delete_omemo_identities_summary"
+ android:title="@string/pref_delete_omemo_identities" />
<CheckBoxPreference
android:defaultValue="@bool/dont_trust_system_cas"
android:key="dont_trust_system_cas"
@@ -387,7 +389,7 @@
android:defaultValue="@bool/show_connection_options"
android:key="show_connection_options"
android:summary="@string/pref_show_connection_options_summary"
- android:title="@string/pref_show_connection_options"/>
+ android:title="@string/pref_show_connection_options" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_input_options">
<CheckBoxPreference
@@ -411,7 +413,7 @@
</PreferenceScreen>
<!--About-->
<de.pixart.messenger.ui.AboutPreference
- android:icon="@drawable/ic_help_black_24dp"
+ android:icon="?attr/ic_settings_about"
android:summary="@string/pref_about_conversations_summary"
android:title="@string/title_activity_about" />