more dark theme changes

3 files changed, 53 insertions, 43 deletions

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 4707136cb..0843cb888 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -11,6 +11,18 @@
     <attr name="color_background_primary" format="reference|color" />
     <attr name="color_warning" format="reference|color"/>
 
+    <attr name="ic_send_cancel_offline" format="reference"/>
+    <attr name="ic_send_location_offline" format="reference"/>
+    <attr name="ic_send_photo_offline" format="reference"/>
+    <attr name="ic_send_picture_offline" format="reference"/>
+    <attr name="ic_send_text_offline" format="reference"/>
+    <attr name="ic_send_videocam_offline" format="reference"/>
+    <attr name="ic_send_voice_offline" format="reference"/>
+
+    <attr name="unread_count" format="reference|color" />
+
+    <attr name="conversations_overview_background" format="reference|color"/>
+
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
     <attr name="icon_cancel" format="reference" />
@@ -19,7 +31,7 @@
     <attr name="icon_discard" format="reference" />
     <attr name="icon_download" format="reference" />
     <attr name="icon_edit" format="reference" />
-    <attr name="icon_edit_dark" format="reference" />
+    <attr name="icon_edit_body" format="reference" />
     <attr name="icon_done" format="reference" />
     <attr name="icon_group" format="reference" />
     <attr name="icon_new" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 80911ac4f..f5a6d80be 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -762,4 +762,6 @@
     <string name="edit_status_message">Edit status message</string>
     <string name="all_accounts_on_this_device">Set for all accounts on this device</string>
     <string name="change_presence">Manage availability manually</string>
+    <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string>
+    <string name="pref_automatically_delete_messages">Automatic message deletion</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index d27dc71db..5f8d5ab67 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>
 
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+        <item type="reference" name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
 
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
@@ -24,44 +24,46 @@
         <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
         <item name="divider">@color/black12</item>
 
-        <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="icon_chat">@drawable/ic_action_chat</item>
-        <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
-        <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
-        <item name="icon_done">@drawable/ic_done_black_24dp</item>
-        <item name="icon_group">@drawable/ic_group_white_24dp</item>
-        <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
-        <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
-        <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
-        <item name="icon_search">@drawable/ic_search_white_24dp</item>
-        <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item name="icon_share">@drawable/ic_share_white_24dp</item>
-        <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
+        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
+        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item type="reference" name="icon_chat">@drawable/ic_action_chat</item>
+        <item type="reference" name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
+        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
+        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
+        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
+        <item type="reference" name="icon_new">@drawable/ic_contacts_white_24dp</item>
+        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
+        <item type="reference" name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item type="reference" name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
+        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
+        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item type="reference" name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
+        <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>
         <item name="dialog_horizontal_padding">16dp</item>
         <item name="dialog_vertical_padding">16dp</item>
         <item type="float" name="icon_alpha">0.54</item>
 
-        <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
-        <item name="ic_attach_document">@drawable/ic_attach_document</item>
-        <item name="ic_attach_location">@drawable/ic_attach_location</item>
-        <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
-        <item name="ic_attach_video">@drawable/ic_attach_video</item>
-        <item name="ic_attach_record">@drawable/ic_attach_record</item>
+        <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera</item>
+        <item type="reference" name="ic_attach_document">@drawable/ic_attach_document</item>
+        <item type="reference" name="ic_attach_location">@drawable/ic_attach_location</item>
+        <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo</item>
+        <item type="reference" name="ic_attach_video">@drawable/ic_attach_video</item>
+        <item type="reference" name="ic_attach_record">@drawable/ic_attach_record</item>
+
+        <item name="conversations_overview_background">@color/primary</item>
 
-        <item name="ic_file_apk">@drawable/ic_file_grey600_48dp</item>
-        <item name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
-        <item name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
-        <item name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
+        <item type="reference" name="ic_file_apk">@drawable/ic_file_grey600_48dp</item>
+        <item type="reference" name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
+        <item type="reference" name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
+        <item type="reference" name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
 
         <item type="reference" name="icon_notifications">@drawable/ic_notifications_black_24dp</item>
         <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
@@ -98,19 +100,13 @@
         <item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
 
         <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera_white</item>
-        <item type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam_white</item>
+        <item type="reference" name="ic_attach_video">@drawable/ic_attach_videocam_white</item>
         <item type="reference" name="ic_attach_document">@drawable/ic_attach_document_white</item>
         <item type="reference" name="ic_attach_location">@drawable/ic_attach_location_white</item>
         <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo_white</item>
         <item type="reference" name="ic_attach_record">@drawable/ic_attach_record_white</item>
 
-        <item type="reference" name="message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
-        <item type="reference" name="message_bubble_sent">@drawable/message_bubble_sent_grey</item>
-        <item type="reference" name="message_bubble_received_green">@drawable/message_bubble_received_dark</item>
-
-        <item name="unread_count">@color/unreadcountdark</item>
-
-        <item name="conversations_overview_background">@color/primary900</item>
+        <item name="conversations_overview_background">@color/primary_dark</item>
 
         <item type="float" name="icon_alpha">0.7</item>