introduced config flag to show attachment button instead of quick actions

28 files changed, 34 insertions, 0 deletions

diff --git a/src/main/res/drawable-hdpi/ic_send_attachment_away.png b/src/main/res/drawable-hdpi/ic_send_attachment_away.png
new file mode 100644
index 000000000..9bed3051a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_attachment_away.png
diff --git a/src/main/res/drawable-hdpi/ic_send_attachment_dnd.png b/src/main/res/drawable-hdpi/ic_send_attachment_dnd.png
new file mode 100644
index 000000000..b1218fa97
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_attachment_dnd.png
diff --git a/src/main/res/drawable-hdpi/ic_send_attachment_offline.png b/src/main/res/drawable-hdpi/ic_send_attachment_offline.png
new file mode 100644
index 000000000..903507c25
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_attachment_offline.png
diff --git a/src/main/res/drawable-hdpi/ic_send_attachment_offline_white.png b/src/main/res/drawable-hdpi/ic_send_attachment_offline_white.png
new file mode 100644
index 000000000..1da306908
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_attachment_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_send_attachment_online.png b/src/main/res/drawable-hdpi/ic_send_attachment_online.png
new file mode 100644
index 000000000..c6c00dfa9
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_attachment_online.png
diff --git a/src/main/res/drawable-mdpi/ic_send_attachment_away.png b/src/main/res/drawable-mdpi/ic_send_attachment_away.png
new file mode 100644
index 000000000..0d32152e7
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_attachment_away.png
diff --git a/src/main/res/drawable-mdpi/ic_send_attachment_dnd.png b/src/main/res/drawable-mdpi/ic_send_attachment_dnd.png
new file mode 100644
index 000000000..166b1693a
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_attachment_dnd.png
diff --git a/src/main/res/drawable-mdpi/ic_send_attachment_offline.png b/src/main/res/drawable-mdpi/ic_send_attachment_offline.png
new file mode 100644
index 000000000..15664d26c
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_attachment_offline.png
diff --git a/src/main/res/drawable-mdpi/ic_send_attachment_offline_white.png b/src/main/res/drawable-mdpi/ic_send_attachment_offline_white.png
new file mode 100644
index 000000000..4a41d0b99
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_attachment_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_send_attachment_online.png b/src/main/res/drawable-mdpi/ic_send_attachment_online.png
new file mode 100644
index 000000000..7b2157825
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_attachment_online.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_attachment_away.png b/src/main/res/drawable-xhdpi/ic_send_attachment_away.png
new file mode 100644
index 000000000..977fe67a7
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_attachment_away.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_attachment_dnd.png b/src/main/res/drawable-xhdpi/ic_send_attachment_dnd.png
new file mode 100644
index 000000000..33e8e5528
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_attachment_dnd.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_attachment_offline.png b/src/main/res/drawable-xhdpi/ic_send_attachment_offline.png
new file mode 100644
index 000000000..51290ddca
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_attachment_offline.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_attachment_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_attachment_offline_white.png
new file mode 100644
index 000000000..8196f9356
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_attachment_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_attachment_online.png b/src/main/res/drawable-xhdpi/ic_send_attachment_online.png
new file mode 100644
index 000000000..5ec947bf6
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_attachment_online.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_attachment_away.png b/src/main/res/drawable-xxhdpi/ic_send_attachment_away.png
new file mode 100644
index 000000000..f777b433b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_attachment_away.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_attachment_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_attachment_dnd.png
new file mode 100644
index 000000000..a887fc795
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_attachment_dnd.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_attachment_offline.png b/src/main/res/drawable-xxhdpi/ic_send_attachment_offline.png
new file mode 100644
index 000000000..97d5dd587
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_attachment_offline.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_attachment_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_attachment_offline_white.png
new file mode 100644
index 000000000..6c54ec600
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_attachment_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png b/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png
new file mode 100644
index 000000000..34791812f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_attachment_online.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_attachment_away.png b/src/main/res/drawable-xxxhdpi/ic_send_attachment_away.png
new file mode 100644
index 000000000..6d4db066e
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_attachment_away.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_attachment_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_attachment_dnd.png
new file mode 100644
index 000000000..cd794df43
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_attachment_dnd.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_attachment_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_attachment_offline.png
new file mode 100644
index 000000000..33ab03551
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_attachment_offline.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_attachment_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_attachment_offline_white.png
new file mode 100644
index 000000000..931168ec6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_attachment_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png b/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png
new file mode 100644
index 000000000..50764c450
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_attachment_online.png
diff --git a/src/main/res/menu/choose_attachment.xml b/src/main/res/menu/choose_attachment.xml
new file mode 100644
index 000000000..ae6f47a95
--- /dev/null
+++ b/src/main/res/menu/choose_attachment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/attach_choose_file"
+        android:icon="?attr/ic_attach_document"
+        android:title="@string/choose_file" />
+
+    <item
+        android:id="@+id/attach_choose_picture"
+        android:icon="?attr/ic_attach_photo"
+        android:title="@string/attach_choose_picture" />
+
+    <item
+        android:id="@+id/attach_take_picture"
+        android:icon="?attr/ic_attach_camera"
+        android:title="@string/attach_take_from_camera" />
+    <item
+        android:id="@+id/attach_record_voice"
+        android:icon="?attr/ic_attach_record"
+        android:title="@string/attach_record_voice" />
+
+    <item
+        android:id="@+id/attach_location"
+        android:icon="?attr/ic_attach_location"
+        android:title="@string/send_location" />
+</menu>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index b261ea28a..e89ed2944 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -36,6 +36,7 @@
     <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_attachment_offline" format="reference" />
     <attr name="ic_send_videocam_offline" format="reference" />
     <attr name="ic_send_voice_offline" format="reference" />
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index f1b66319f..c8a0a97a1 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -58,6 +58,9 @@
         <item name="ic_send_picture_offline" type="reference">@drawable/ic_send_picture_offline
         </item>
         <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline</item>
+        <item name="ic_send_attachment_offline" type="reference">
+            @drawable/ic_send_attachment_offline
+        </item>
         <item name="ic_send_videocam_offline" type="reference">@drawable/ic_send_videocam_offline
         </item>
         <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item>
@@ -197,6 +200,9 @@
         </item>
         <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline_white
         </item>
+        <item name="ic_send_attachment_offline" type="reference">
+            @drawable/ic_send_attachment_offline_white
+        </item>
         <item name="ic_send_videocam_offline" type="reference">
             @drawable/ic_send_videocam_offline_white
         </item>