Merge branch 'feature-quotation' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-quotation

15 files changed, 8 insertions, 0 deletions

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 00000000..b3bae928
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_reply.png
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 00000000..0424c2bd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
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 00000000..ce00dbc4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_reply.png
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 00000000..862114b8
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
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 00000000..31df1112
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_reply.png
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 00000000..885623e4
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
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 00000000..11900601
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_reply.png
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 00000000..de0dad20
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
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 00000000..ed85f50a
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_reply_white_24dp.png
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 812068ed..3a88a444 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -330,6 +330,7 @@
   <string name="message_options">Опции сообщения</string>
   <string name="copy_text">Копировать текст</string>
   <string name="select_text">Выбрать текст</string>
+  <string name="quote">Цитировать</string>
   <string name="copy_original_url">Копировать адрес ссылки</string>
   <string name="send_again">Отправить ещё раз</string>
   <string name="file_url">URL файла</string>
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index aa5e825b..f7ab3e92 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -51,6 +51,7 @@
         <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_quote">@drawable/ic_reply_white_24dp</item>
         <item name="attr/icon_refresh">@drawable/ic_refresh_black_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>
@@ -118,6 +119,7 @@
         <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_quote">@drawable/ic_reply_white_24dp</item>
         <item name="attr/icon_refresh">@drawable/ic_refresh_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>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 7b7d2c5a..39787f36 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -40,6 +40,7 @@
     <attr name="icon_new" format="reference"/>
     <attr name="icon_new_attachment" 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 2d97bd41..60db84dd 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -21,4 +21,5 @@
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
 	<color name="green500">#ff259b24</color>
+	<color name="bubble">#ff4b9b4a</color>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 57599032..638b6bd6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -364,6 +364,7 @@
 	<string name="message_options">Message options</string>
 	<string name="copy_text">Copy text</string>
 	<string name="select_text">Select text</string>
+	<string name="quote">Quote</string>
 	<string name="copy_original_url">Copy original URL</string>
 	<string name="send_again">Send again</string>
 	<string name="file_url">File URL</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 69d4d39f..8ac3793b 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -50,6 +50,7 @@
         <item name="attr/icon_new">@drawable/ic_action_new</item>
         <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
         <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+        <item name="attr/icon_quote">@drawable/ic_action_reply</item>
         <item name="attr/icon_refresh">@drawable/ic_action_refresh</item>
         <item name="attr/icon_remove">@drawable/ic_action_remove</item>
         <item name="attr/icon_search">@drawable/ic_action_search</item>
@@ -114,6 +115,7 @@
         <item name="attr/icon_new">@drawable/ic_action_new</item>
         <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
         <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+        <item name="attr/icon_quote">@drawable/ic_action_reply</item>
         <item name="attr/icon_refresh">@drawable/ic_action_refresh_white</item>
         <item name="attr/icon_remove">@drawable/ic_action_remove_white</item>
         <item name="attr/icon_search">@drawable/ic_action_search</item>