aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_action_add.pngbin181 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_add_group.pngbin0 -> 876 bytes
-rw-r--r--res/drawable-hdpi/ic_action_add_person.pngbin679 -> 616 bytes
-rw-r--r--res/drawable-hdpi/ic_action_delete.pngbin1624 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_discard.pngbin454 -> 450 bytes
-rw-r--r--res/drawable-hdpi/ic_action_edit.pngbin884 -> 765 bytes
-rw-r--r--res/drawable-hdpi/ic_action_group.pngbin859 -> 776 bytes
-rw-r--r--res/drawable-hdpi/ic_action_new.pngbin0 -> 262 bytes
-rw-r--r--res/drawable-hdpi/ic_action_new_attachment.pngbin648 -> 587 bytes
-rw-r--r--res/drawable-hdpi/ic_action_not_secure.pngbin0 -> 367 bytes
-rw-r--r--res/drawable-hdpi/ic_action_person.pngbin573 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_search.pngbin702 -> 650 bytes
-rw-r--r--res/drawable-hdpi/ic_action_secure.pngbin394 -> 384 bytes
-rw-r--r--res/drawable-hdpi/ic_action_send.pngbin342 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_unsecure.pngbin368 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add.pngbin134 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add_group.pngbin0 -> 634 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add_person.pngbin513 -> 469 bytes
-rw-r--r--res/drawable-mdpi/ic_action_delete.pngbin1359 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_discard.pngbin333 -> 324 bytes
-rw-r--r--res/drawable-mdpi/ic_action_edit.pngbin587 -> 522 bytes
-rw-r--r--res/drawable-mdpi/ic_action_group.pngbin557 -> 546 bytes
-rw-r--r--res/drawable-mdpi/ic_action_new.pngbin0 -> 185 bytes
-rw-r--r--res/drawable-mdpi/ic_action_new_attachment.pngbin468 -> 415 bytes
-rw-r--r--res/drawable-mdpi/ic_action_not_secure.pngbin0 -> 298 bytes
-rw-r--r--res/drawable-mdpi/ic_action_person.pngbin468 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_search.pngbin479 -> 449 bytes
-rw-r--r--res/drawable-mdpi/ic_action_secure.pngbin317 -> 304 bytes
-rw-r--r--res/drawable-mdpi/ic_action_send.pngbin246 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_unsecure.pngbin283 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add.pngbin201 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add_group.pngbin0 -> 1122 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add_person.pngbin884 -> 798 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_delete.pngbin1848 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_discard.pngbin552 -> 543 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_edit.pngbin1179 -> 994 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_group.pngbin1086 -> 1048 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_new.pngbin0 -> 234 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_new_attachment.pngbin789 -> 753 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_not_secure.pngbin0 -> 482 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_person.pngbin781 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_search.pngbin900 -> 827 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_secure.pngbin510 -> 468 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_send.pngbin416 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_unsecure.pngbin458 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_add_group.pngbin0 -> 1643 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_add_person.pngbin1171 -> 1088 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_discard.pngbin781 -> 765 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_edit.pngbin1670 -> 1458 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_group.pngbin1560 -> 1475 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_new.pngbin0 -> 288 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_new_attachment.pngbin1112 -> 1048 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_not_secure.pngbin0 -> 593 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_person.pngbin1004 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_search.pngbin1153 -> 1152 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_secure.pngbin624 -> 586 bytes
-rw-r--r--res/drawable/es_slidingpane_shadow.xml4
-rw-r--r--res/drawable/message_border.xml2
-rw-r--r--res/drawable/section_header.xml4
-rw-r--r--res/layout-sw320dp/fragment_conversations_overview.xml7
-rw-r--r--res/layout-sw360dp/fragment_conversations_overview.xml7
-rw-r--r--res/layout-sw384dp/fragment_conversations_overview.xml7
-rw-r--r--res/layout-sw600dp/fragment_conversations_overview.xml7
-rw-r--r--res/layout-sw720dp/fragment_conversations_overview.xml7
-rw-r--r--res/layout/account_row.xml5
-rw-r--r--res/layout/activity_contact_details.xml26
-rw-r--r--res/layout/activity_muc_details.xml27
-rw-r--r--res/layout/contact.xml6
-rw-r--r--res/layout/contact_key.xml4
-rw-r--r--res/layout/conversation_list_row.xml11
-rw-r--r--res/layout/dialog_verify_otr.xml21
-rw-r--r--res/layout/edit_contact_name.xml2
-rw-r--r--res/layout/fragment_conversation.xml11
-rw-r--r--res/layout/manage_accounts.xml3
-rw-r--r--res/layout/message_recieved.xml12
-rw-r--r--res/layout/message_sent.xml12
-rw-r--r--res/menu/conversations.xml7
-rw-r--r--res/menu/manageaccounts_context.xml2
-rw-r--r--res/menu/newconversation_context.xml1
-rw-r--r--res/values-fr/styles.xml19
-rw-r--r--res/values/colors.xml9
-rw-r--r--res/values/strings.xml2
82 files changed, 111 insertions, 114 deletions
diff --git a/res/drawable-hdpi/ic_action_add.png b/res/drawable-hdpi/ic_action_add.png
deleted file mode 100644
index aa7cf4f2..00000000
--- a/res/drawable-hdpi/ic_action_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_add_group.png b/res/drawable-hdpi/ic_action_add_group.png
new file mode 100644
index 00000000..97640355
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_add_person.png b/res/drawable-hdpi/ic_action_add_person.png
index 5ebac970..9d88d0f4 100644
--- a/res/drawable-hdpi/ic_action_add_person.png
+++ b/res/drawable-hdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png
deleted file mode 100644
index e9ce89e0..00000000
--- a/res/drawable-hdpi/ic_action_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_discard.png b/res/drawable-hdpi/ic_action_discard.png
index 9c717dd3..703b31f8 100644
--- a/res/drawable-hdpi/ic_action_discard.png
+++ b/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_edit.png b/res/drawable-hdpi/ic_action_edit.png
index 5f7c6eff..756db316 100644
--- a/res/drawable-hdpi/ic_action_edit.png
+++ b/res/drawable-hdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_group.png b/res/drawable-hdpi/ic_action_group.png
index 271980b9..3e7f16d5 100644
--- a/res/drawable-hdpi/ic_action_group.png
+++ b/res/drawable-hdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_new.png b/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 00000000..d866d616
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/res/drawable-hdpi/ic_action_new_attachment.png
index 28507da2..c01c2b38 100644
--- a/res/drawable-hdpi/ic_action_new_attachment.png
+++ b/res/drawable-hdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_not_secure.png b/res/drawable-hdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..2c917615
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png
deleted file mode 100644
index 9fd81097..00000000
--- a/res/drawable-hdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
index f594b4e4..772e3598 100644
--- a/res/drawable-hdpi/ic_action_search.png
+++ b/res/drawable-hdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_secure.png b/res/drawable-hdpi/ic_action_secure.png
index 287ae2fb..4439d1ae 100644
--- a/res/drawable-hdpi/ic_action_secure.png
+++ b/res/drawable-hdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_send.png b/res/drawable-hdpi/ic_action_send.png
deleted file mode 100644
index 6384a4ee..00000000
--- a/res/drawable-hdpi/ic_action_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_unsecure.png b/res/drawable-hdpi/ic_action_unsecure.png
deleted file mode 100644
index b9f442d5..00000000
--- a/res/drawable-hdpi/ic_action_unsecure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add.png b/res/drawable-mdpi/ic_action_add.png
deleted file mode 100644
index 99b189a0..00000000
--- a/res/drawable-mdpi/ic_action_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add_group.png b/res/drawable-mdpi/ic_action_add_group.png
new file mode 100644
index 00000000..9a655899
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add_person.png b/res/drawable-mdpi/ic_action_add_person.png
index c43cf655..b7d8f46a 100644
--- a/res/drawable-mdpi/ic_action_add_person.png
+++ b/res/drawable-mdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png
deleted file mode 100644
index cedb1085..00000000
--- a/res/drawable-mdpi/ic_action_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_discard.png b/res/drawable-mdpi/ic_action_discard.png
index 9dfb7cc2..248fb09c 100644
--- a/res/drawable-mdpi/ic_action_discard.png
+++ b/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_edit.png b/res/drawable-mdpi/ic_action_edit.png
index 650b4d89..68a45320 100644
--- a/res/drawable-mdpi/ic_action_edit.png
+++ b/res/drawable-mdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_group.png b/res/drawable-mdpi/ic_action_group.png
index 06dbeecd..1ee3cccd 100644
--- a/res/drawable-mdpi/ic_action_group.png
+++ b/res/drawable-mdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_new.png b/res/drawable-mdpi/ic_action_new.png
new file mode 100644
index 00000000..f17e7980
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_new_attachment.png b/res/drawable-mdpi/ic_action_new_attachment.png
index 33058655..1d265aac 100644
--- a/res/drawable-mdpi/ic_action_new_attachment.png
+++ b/res/drawable-mdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_not_secure.png b/res/drawable-mdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..faffa233
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png
deleted file mode 100644
index 359da1c1..00000000
--- a/res/drawable-mdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
index 2e446ec0..4edb1ff9 100644
--- a/res/drawable-mdpi/ic_action_search.png
+++ b/res/drawable-mdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_secure.png b/res/drawable-mdpi/ic_action_secure.png
index d4921723..05332ebf 100644
--- a/res/drawable-mdpi/ic_action_secure.png
+++ b/res/drawable-mdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_send.png b/res/drawable-mdpi/ic_action_send.png
deleted file mode 100644
index 4552ae6d..00000000
--- a/res/drawable-mdpi/ic_action_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_unsecure.png b/res/drawable-mdpi/ic_action_unsecure.png
deleted file mode 100644
index 84072abd..00000000
--- a/res/drawable-mdpi/ic_action_unsecure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add.png b/res/drawable-xhdpi/ic_action_add.png
deleted file mode 100644
index 9d6af042..00000000
--- a/res/drawable-xhdpi/ic_action_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add_group.png b/res/drawable-xhdpi/ic_action_add_group.png
new file mode 100644
index 00000000..c493aa5a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/res/drawable-xhdpi/ic_action_add_person.png
index 91434a47..4e8de1b6 100644
--- a/res/drawable-xhdpi/ic_action_add_person.png
+++ b/res/drawable-xhdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png
deleted file mode 100644
index 98c73da1..00000000
--- a/res/drawable-xhdpi/ic_action_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_discard.png b/res/drawable-xhdpi/ic_action_discard.png
index db69d6c2..9eeeed12 100644
--- a/res/drawable-xhdpi/ic_action_discard.png
+++ b/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_edit.png b/res/drawable-xhdpi/ic_action_edit.png
index 8ab436d8..67e056fe 100644
--- a/res/drawable-xhdpi/ic_action_edit.png
+++ b/res/drawable-xhdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_group.png b/res/drawable-xhdpi/ic_action_group.png
index ea3f24e7..fa2af497 100644
--- a/res/drawable-xhdpi/ic_action_group.png
+++ b/res/drawable-xhdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_new.png b/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 00000000..dde2141f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_new_attachment.png b/res/drawable-xhdpi/ic_action_new_attachment.png
index 4948feec..41cbab20 100644
--- a/res/drawable-xhdpi/ic_action_new_attachment.png
+++ b/res/drawable-xhdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_not_secure.png b/res/drawable-xhdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..c0902a03
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png
deleted file mode 100644
index 03eeb8d6..00000000
--- a/res/drawable-xhdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
index aad535e9..19658e4a 100644
--- a/res/drawable-xhdpi/ic_action_search.png
+++ b/res/drawable-xhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_secure.png b/res/drawable-xhdpi/ic_action_secure.png
index 2a089838..4e08b95a 100644
--- a/res/drawable-xhdpi/ic_action_secure.png
+++ b/res/drawable-xhdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_send.png b/res/drawable-xhdpi/ic_action_send.png
deleted file mode 100644
index 652ac68d..00000000
--- a/res/drawable-xhdpi/ic_action_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_unsecure.png b/res/drawable-xhdpi/ic_action_unsecure.png
deleted file mode 100644
index 96b128f2..00000000
--- a/res/drawable-xhdpi/ic_action_unsecure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_group.png b/res/drawable-xxhdpi/ic_action_add_group.png
new file mode 100644
index 00000000..2b46dbb9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png
index f18aa614..e9a58eaf 100644
--- a/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/res/drawable-xxhdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/res/drawable-xxhdpi/ic_action_discard.png
index b522daff..cb1260a4 100644
--- a/res/drawable-xxhdpi/ic_action_discard.png
+++ b/res/drawable-xxhdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/res/drawable-xxhdpi/ic_action_edit.png
index f2b2078b..3a241ea4 100644
--- a/res/drawable-xxhdpi/ic_action_edit.png
+++ b/res/drawable-xxhdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_group.png b/res/drawable-xxhdpi/ic_action_group.png
index 6ef9b128..9289b1c8 100644
--- a/res/drawable-xxhdpi/ic_action_group.png
+++ b/res/drawable-xxhdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_new.png b/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 00000000..c42c2bfb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/res/drawable-xxhdpi/ic_action_new_attachment.png
index 78553886..ce7536cb 100644
--- a/res/drawable-xxhdpi/ic_action_new_attachment.png
+++ b/res/drawable-xxhdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_not_secure.png b/res/drawable-xxhdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..a186f1fb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png
deleted file mode 100644
index fd1bcdd4..00000000
--- a/res/drawable-xxhdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
index 9c0ea3ca..a1086388 100644
--- a/res/drawable-xxhdpi/ic_action_search.png
+++ b/res/drawable-xxhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_secure.png b/res/drawable-xxhdpi/ic_action_secure.png
index d8c094ed..ccf1fb00 100644
--- a/res/drawable-xxhdpi/ic_action_secure.png
+++ b/res/drawable-xxhdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable/es_slidingpane_shadow.xml b/res/drawable/es_slidingpane_shadow.xml
index 8c2cefc2..5b6037f7 100644
--- a/res/drawable/es_slidingpane_shadow.xml
+++ b/res/drawable/es_slidingpane_shadow.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<gradient
- android:endColor="#cccccc"
- android:startColor="#00000000" />
+ android:endColor="@color/divider"
+ android:startColor="@android:color/transparent" />
<size android:width="3.0dp" android:height="0.5dp" />
</shape> \ No newline at end of file
diff --git a/res/drawable/message_border.xml b/res/drawable/message_border.xml
index 1477fbe8..4a581e7d 100644
--- a/res/drawable/message_border.xml
+++ b/res/drawable/message_border.xml
@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="2dp"/>
<padding android:left="1.5dp" android:right="1.5dp" android:top="1.5dp" android:bottom="1.5dp"/>
- <solid android:color="#cecece"/>
+ <solid android:color="@color/divider"/>
</shape> \ No newline at end of file
diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml
index 25f148ce..e4cb9742 100644
--- a/res/drawable/section_header.xml
+++ b/res/drawable/section_header.xml
@@ -4,7 +4,7 @@
<size
android:height="1.5dp"
- android:width="1000dp" />
+ android:width="2000dp" />
- <solid android:color="#b7b7b7" />
+ <solid android:color="@color/divider" />
</shape> \ No newline at end of file
diff --git a/res/layout-sw320dp/fragment_conversations_overview.xml b/res/layout-sw320dp/fragment_conversations_overview.xml
index fcb1949c..b85f1116 100644
--- a/res/layout-sw320dp/fragment_conversations_overview.xml
+++ b/res/layout-sw320dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
android:layout_width="288dp"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="#b5b5b5"
+ android:divider="@color/divider"
android:dividerHeight="1dp"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
/>
</LinearLayout>
@@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-sw360dp/fragment_conversations_overview.xml
index 939950c2..ceb3b5fa 100644
--- a/res/layout-sw360dp/fragment_conversations_overview.xml
+++ b/res/layout-sw360dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
android:layout_width="324dp"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="#b5b5b5"
+ android:divider="@color/divider"
android:dividerHeight="1dp"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
/>
</LinearLayout>
@@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-sw384dp/fragment_conversations_overview.xml
index e48cf9ec..26d79d23 100644
--- a/res/layout-sw384dp/fragment_conversations_overview.xml
+++ b/res/layout-sw384dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
android:layout_width="345dp"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="#b5b5b5"
+ android:divider="@color/divider"
android:dividerHeight="1dp"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
/>
</LinearLayout>
@@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-sw600dp/fragment_conversations_overview.xml
index fac95f9c..f26c840b 100644
--- a/res/layout-sw600dp/fragment_conversations_overview.xml
+++ b/res/layout-sw600dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="#b5b5b5"
+ android:divider="@color/divider"
android:dividerHeight="1dp"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
/>
</LinearLayout>
@@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-sw720dp/fragment_conversations_overview.xml
index fcb1949c..b85f1116 100644
--- a/res/layout-sw720dp/fragment_conversations_overview.xml
+++ b/res/layout-sw720dp/fragment_conversations_overview.xml
@@ -7,16 +7,16 @@
android:layout_width="288dp"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="#b5b5b5"
+ android:divider="@color/divider"
android:dividerHeight="1dp"
- android:background="#eeeeee"
+ android:background="@color/primarybackground"
/>
</LinearLayout>
@@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 248b17f7..0c18d9b2 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -20,6 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
+ android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"/>
@@ -35,14 +36,14 @@
android:layout_height="wrap_content"
android:text="@string/account_status"
android:textStyle="bold"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/account_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="4dp"
- android:textColor="#669900"
android:text="@string/account_status_unknown"
android:textStyle="bold"
android:textSize="14sp"/>
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index ae3aaf7c..d55dcc9c 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -2,7 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5">
+ android:background="@color/primarybackground">
<LinearLayout
android:layout_width="match_parent"
@@ -14,7 +14,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/action_contact_details" />
+ android:text="@string/action_contact_details"
+ android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -43,8 +44,8 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
- android:textColor="#5b5b5b"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/details_contactstatus"
@@ -52,6 +53,7 @@
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:textSize="18sp"
+ android:textColor="@color/primarytext"
android:textStyle="bold" />
<TextView
android:id="@+id/details_lastseen"
@@ -59,8 +61,8 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
- android:textColor="#5b5b5b"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
</LinearLayout>
</RelativeLayout>
@@ -71,20 +73,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/your_account" />
+ android:text="@string/your_account"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
- android:textColor="#5b5b5b" />
+ android:textColor="@color/primarytext" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/subscriptions" />
+ android:text="@string/subscriptions"
+ android:textColor="@color/primarytext"/>
<CheckBox
android:id="@+id/details_send_presence"
@@ -92,7 +96,7 @@
android:layout_height="wrap_content"
android:text="@string/send_presence_updates"
android:textSize="14sp"
- android:textColor="#5b5b5b" />
+ android:textColor="@color/primarytext" />
<CheckBox
android:id="@+id/details_receive_presence"
@@ -100,7 +104,7 @@
android:layout_height="wrap_content"
android:text="@string/receive_presence_updates"
android:textSize="14sp"
- android:textColor="#5b5b5b" />
+ android:textColor="@color/primarytext" />
<TextView
android:id="@+id/ask_again"
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index ebd3db0f..15f09c7c 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -2,7 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5">
+ android:background="@color/secondarybackground">
<LinearLayout
android:layout_width="wrap_content"
@@ -13,11 +13,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
- android:text="@string/muc_details_conference" />
+ android:text="@string/muc_details_conference"
+ android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#eee" >
+ android:background="@color/primarybackground" >
<EditText
@@ -26,7 +27,7 @@
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/muc_edit_subject"
- android:background="#eee"
+ android:background="@color/primarybackground"
android:ems="10"
android:hint="@string/muc_details_conference_subject"
android:inputType="textAutoComplete"
@@ -52,8 +53,8 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:singleLine="true"
- android:textColor="#5b5b5b"
- android:textSize="14sp"/>
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<TextView
style="@style/sectionHeader"
@@ -62,12 +63,13 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
- android:text="@string/muc_details_your_nickname" />
+ android:text="@string/muc_details_your_nickname"
+ android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#eee" >
+ android:background="@color/primarybackground" >
<EditText
@@ -76,7 +78,7 @@
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/muc_edit_nick"
- android:background="#eee"
+ android:background="@color/primarybackground"
android:ems="10"
android:hint="@string/muc_details_your_nickname"
android:inputType="textEmailAddress"
@@ -103,7 +105,7 @@
android:padding="8dp"
android:singleLine="true"
android:textSize="14sp"
- android:textColor="#5b5b5b"/>
+ android:textColor="@color/primarytext"/>
<LinearLayout
android:id="@+id/muc_more_details"
@@ -119,12 +121,13 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
- android:text="@string/muc_details_other_members" />
+ android:text="@string/muc_details_other_members"
+ android:textColor="@color/primarytext"/>
<LinearLayout
android:id="@+id/muc_members"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:divider="?android:dividerHorizontal"
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index e637e4b1..8432c7a3 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -25,23 +25,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:singleLine="true"
/>
<TextView
android:id="@+id/contact_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#5b5b5b"
android:singleLine="true"
android:textSize="14sp"
+ android:textColor="@color/primarytext"
/>
<TextView
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:typeface="monospace"
android:visibility="gone"
/>
diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml
index dcac42e9..0c457c25 100644
--- a/res/layout/contact_key.xml
+++ b/res/layout/contact_key.xml
@@ -10,13 +10,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:typeface="monospace"
/>
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#5b5b5b"
+ android:textColor="@color/secondarytext"
/>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 8b9c461d..97985737 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -25,8 +25,8 @@
android:layout_alignLeft="@+id/conversation_lastwrapper"
android:layout_toLeftOf="@+id/conversation_lastupdate"
android:singleLine="true"
- android:textColor="#636363"
android:textSize="18sp"
+ android:textColor="@color/primarytext"
android:typeface="sans" />
<LinearLayout
@@ -41,9 +41,8 @@
android:id="@+id/conversation_lastmsg"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
-
- android:textColor="#636363"
android:textSize="14sp"
+ android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"
/>
@@ -52,7 +51,7 @@
android:id="@+id/conversation_lastimage"
android:layout_width="fill_parent"
android:layout_height="36dp"
- android:background="#333333"
+ android:background="@color/primarytext"
android:scaleType="centerCrop" />
</LinearLayout>
@@ -63,8 +62,8 @@
android:layout_alignBaseline="@+id/conversation_name"
android:layout_alignParentRight="true"
android:gravity="right"
- android:textColor="#636363"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:textColor="@color/secondarytext"/>
</RelativeLayout>
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index a55dce01..c518c647 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="Jabber ID"
- android:textColor="#33B5E5"
+ android:textColor="@color/primarytext"
android:textSize="18sp"/>
<TextView
@@ -20,13 +20,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/secondarytext"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:text="OTR fingerprint"
- android:textColor="#33B5E5"
+ android:text="@string/otr_fingerprint"
+ android:textColor="@color/primarytext"
android:textSize="18sp"/>
<TextView
@@ -35,14 +36,15 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
- android:typeface="monospace"/>
+ android:typeface="monospace"
+ android:textColor="@color/secondarytext"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:text="Your fingerprint"
- android:textColor="#33B5E5"
- android:textSize="18sp"/>
+ android:text="@string/your_fingerprint"
+ android:textSize="18sp"
+ android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/verify_otr_yourprint"
@@ -50,5 +52,6 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
- android:typeface="monospace"/>
+ android:typeface="monospace"
+ android:textColor="@color/secondarytext"/>
</LinearLayout>
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
index 206c7432..42f0fb88 100644
--- a/res/layout/edit_contact_name.xml
+++ b/res/layout/edit_contact_name.xml
@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enter_new_name"
- android:textColor="#5b5b5b"
+ android:textColor="@color/primarytext"
android:textSize="18sp" />
<EditText
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 4bf93eab..749d97b2 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5" >
+ android:background="@color/primarybackground" >
<RelativeLayout
android:id="@+id/textsend"
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:background="#eee" >
+ android:background="@color/primarybackground" >
<EditText
android:id="@+id/textinput"
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
- android:background="#eee"
+ android:background="@color/primarybackground"
android:ems="10"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
android:minHeight="48dp"
@@ -27,7 +27,8 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="12dp" >
+ android:paddingTop="12dp"
+ android:textColor="@color/primarytext">
<requestFocus />
</EditText>
@@ -49,7 +50,7 @@
android:layout_above="@+id/textsend"
android:layout_alignParentLeft="true"
android:layout_below="@+id/info_box"
- android:background="#e5e5e5"
+ android:background="@color/secondarybackground"
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml
index 0866477a..a2a01bf1 100644
--- a/res/layout/manage_accounts.xml
+++ b/res/layout/manage_accounts.xml
@@ -8,7 +8,8 @@
android:id="@+id/account_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- tools:listitem="@layout/account_row">
+ android:divider="@color/divider"
+ android:dividerHeight="1dp">
</ListView>
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 7949f2e1..563d730d 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:background="#ededed"
+ android:background="@color/primarybackground"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingTop="4dp"
@@ -35,7 +35,7 @@
android:adjustViewBounds="true"
android:paddingBottom="2dp"
android:scaleType="fitXY"
- android:background="#333333"
+ android:background="@color/primarytext"
/>
<TextView
@@ -44,8 +44,8 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
- android:textColor="#333333"
- android:textSize="14sp"/>
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<Button
android:id="@+id/download_button"
@@ -79,8 +79,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="#8e8e8e"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:textColor="@color/secondarytext"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index b9c2ee10..d4970e6f 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:background="#ededed"
+ android:background="@color/primarybackground"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingTop="4dp"
@@ -35,7 +35,7 @@
android:adjustViewBounds="true"
android:paddingBottom="2dp"
android:scaleType="fitXY"
- android:background="#333333"
+ android:background="@color/primarytext"
/>
<TextView
@@ -44,8 +44,8 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
- android:textColor="#333333"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:textColor="@color/primarytext"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -61,8 +61,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="#8e8e8e"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ android:textColor="@color/secondarytext"/>
<ImageView
android:id="@+id/security_indicator"
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index ba627715..710a552e 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -3,7 +3,7 @@
<item
android:id="@+id/action_add"
android:orderInCategory="10"
- android:icon="@drawable/ic_action_add"
+ android:icon="@drawable/ic_action_new"
android:showAsAction="always"
android:title="@string/action_add" />
@@ -11,7 +11,7 @@
android:id="@+id/action_security"
android:orderInCategory="20"
android:showAsAction="always"
- android:icon="@drawable/ic_action_unsecure"
+ android:icon="@drawable/ic_action_not_secure"
android:title="@string/action_secure" />
<item
@@ -24,8 +24,7 @@
<item
android:id="@+id/action_contact_details"
android:orderInCategory="40"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_person"
+ android:showAsAction="never"
android:title="@string/action_contact_details" />
<item
android:id="@+id/action_muc_details"
diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml
index 5f76b0e0..04ecc25f 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/res/menu/manageaccounts_context.xml
@@ -8,7 +8,7 @@
android:title="@string/mgmt_account_edit"/>
<item
android:id="@+id/mgmt_account_delete"
- android:icon="@drawable/ic_action_delete"
+ android:icon="@drawable/ic_action_discard"
android:showAsAction="always"
android:title="@string/mgmt_account_delete"/>
<item
diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml
index 7492c265..8b454d42 100644
--- a/res/menu/newconversation_context.xml
+++ b/res/menu/newconversation_context.xml
@@ -4,7 +4,6 @@
<item
android:id="@+id/action_contact_details"
android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_person"
android:title="@string/action_contact_details" />
<item
android:id="@+id/action_start_conversation"
diff --git a/res/values-fr/styles.xml b/res/values-fr/styles.xml
deleted file mode 100644
index 1468283e..00000000
--- a/res/values-fr/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
- <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView">
- <item name="android:drawableBottom">@drawable/section_header</item>
- <item name="android:drawablePadding">4dp</item>
- <item name="android:layout_marginTop">8dp</item>
- <item name="android:textSize">14sp</item>
- <item name="android:textAllCaps">true</item>
- <item name="android:textColor">#5b5b5b</item>
- <item name="android:textStyle">bold</item>
- </style>
-
- <style name="Divider">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">1.5dp</item>
- <item name="android:background">#b7b7b7</item>
- </style>
-
-</resources> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 00000000..382b5471
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="primarytext" type="color">#de000000</color>
+ <color name="secondarytext" type="color">#8a000000</color>
+ <color name="primarybackground" type="color">#fffafafa</color>
+ <color name="secondarybackground" type="color">#ffeeeeee</color>
+ <color name="divider">#1f000000</color>
+ <color name="red">#ffe51c23</color>
+</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index af372357..dcaf58d2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,4 +250,6 @@
<string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string>
<string name="reception_failed">Reception failed</string>
<string name="no_muc_server_found">No suitable Conference Server found</string>
+ <string name="your_fingerprint">Your fingerprint</string>
+ <string name="otr_fingerprint">OTR fingerprint</string>
</resources> \ No newline at end of file