From 1924cfbd53b371c6c0e5f7b5fa719ec62ed9aac6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 25 Dec 2016 21:11:20 +0100
Subject: support for quoting messages

---
 src/main/res/drawable-hdpi/ic_action_reply.png        | Bin 0 -> 462 bytes
 src/main/res/drawable-hdpi/ic_reply_white_24dp.png    | Bin 0 -> 253 bytes
 src/main/res/drawable-mdpi/ic_action_reply.png        | Bin 0 -> 343 bytes
 src/main/res/drawable-mdpi/ic_reply_white_24dp.png    | Bin 0 -> 186 bytes
 src/main/res/drawable-xhdpi/ic_action_reply.png       | Bin 0 -> 561 bytes
 src/main/res/drawable-xhdpi/ic_reply_white_24dp.png   | Bin 0 -> 306 bytes
 src/main/res/drawable-xxhdpi/ic_action_reply.png      | Bin 0 -> 775 bytes
 src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png  | Bin 0 -> 436 bytes
 src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png | Bin 0 -> 579 bytes
 src/main/res/values-de/strings.xml                    |   1 +
 src/main/res/values-v21/themes.xml                    |   1 +
 src/main/res/values/attrs.xml                         |   3 ++-
 src/main/res/values/colors.xml                        |   1 +
 src/main/res/values/strings.xml                       |   1 +
 src/main/res/values/themes.xml                        |   2 +-
 15 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_action_reply.png
 create mode 100644 src/main/res/drawable-hdpi/ic_reply_white_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_reply.png
 create mode 100644 src/main/res/drawable-mdpi/ic_reply_white_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_reply.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_reply.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/ic_action_reply.png b/src/main/res/drawable-hdpi/ic_action_reply.png
new file mode 100644
index 000000000..b3bae9289
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_reply.png differ
diff --git a/src/main/res/drawable-hdpi/ic_reply_white_24dp.png b/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
new file mode 100644
index 000000000..0424c2bd6
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_reply_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_reply.png b/src/main/res/drawable-mdpi/ic_action_reply.png
new file mode 100644
index 000000000..ce00dbc4b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_reply.png differ
diff --git a/src/main/res/drawable-mdpi/ic_reply_white_24dp.png b/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
new file mode 100644
index 000000000..862114b82
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_reply_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_reply.png b/src/main/res/drawable-xhdpi/ic_action_reply.png
new file mode 100644
index 000000000..31df11126
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_reply.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png b/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
new file mode 100644
index 000000000..885623e4d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_reply.png b/src/main/res/drawable-xxhdpi/ic_action_reply.png
new file mode 100644
index 000000000..119006014
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_reply.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
new file mode 100644
index 000000000..de0dad204
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
new file mode 100644
index 000000000..ed85f50ab
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png differ
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 063f79c95..779239aa0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -682,5 +682,6 @@
     <string name="i_followed_this_link_from_a_trusted_source">Ich bin diesem Link von einer vertrauenswürdigen Quelle gefolgt</string>
     <string name="verify_omemo_keys">Verifiziere OMEMO Fingerabdrücke</string>
     <string name="verifying_omemo_keys_trusted_source">Du bestätigst den OMEMO Fingerabdruck von %1$s nachdem du diesen Link angeklickt hast. Dies ist nur dann sicher, wenn du den Link von einer vertrauenswürdigen Quelle hast, auf die %2$s den Link veröffentlichen konnte.</string>
+    <string name="quote">Zitieren</string>
 
 </resources>
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 80e140f0c..785820217 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -26,6 +26,7 @@
         <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
         <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
         <item name="attr/icon_done">@drawable/ic_done_black_24dp</item>
+        <item name="attr/icon_quote">@drawable/ic_reply_white_24dp</item>
         <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
         <item name="attr/icon_new">@drawable/ic_add_white_24dp</item>
         <item name="attr/icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index da88d1f44..93aa76544 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -18,7 +18,8 @@
     <attr name="icon_group" format="reference" />
     <attr name="icon_new" format="reference" />
     <attr name="icon_new_attachment" format="reference" />
-    <attr name="icon_not_secure" format="reference" />
+    <attr name="icon_not_secure" format="reference"/>
+    <attr name="icon_quote" format="reference"/>
     <attr name="icon_refresh" format="reference" />
     <attr name="icon_remove" format="reference" />
     <attr name="icon_search" format="reference" />
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a613cefb9..c497997f1 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -16,4 +16,5 @@
     <color name="grey800">#ff424242</color>
     <color name="red800">#ffc62828</color>
     <color name="orange500">#ffff9800</color>
+    <color name="bubble">#ff2e4272</color>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3ed0e9d20..d7f5ffa67 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -697,6 +697,7 @@
     <string name="missing_omemo_keys">Missing OMEMO keys</string>
     <string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
     <string name="select_text">Select text</string>
+    <string name="quote">Quote</string>
     <string name="show_error_message">Show error message</string>
     <string name="error_message">Error Message</string>
     <string name="data_saver_enabled">Data saver enabled</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 61a2d2bb1..38698e061 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -20,11 +20,11 @@
         <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
         <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
         <item name="attr/icon_done">@drawable/ic_done_black_24dp</item>
-
         <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
         <item name="attr/icon_new">@drawable/ic_add_white_24dp</item>
         <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
         <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="attr/icon_quote">@drawable/ic_action_reply</item>
         <item name="attr/icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
         <item name="attr/icon_remove">@drawable/ic_delete_grey600_24dp</item>
         <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
-- 
cgit v1.2.3