aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-05-03 23:25:34 +0200
committerChristian Schneppe <christian@pix-art.de>2019-05-03 23:25:34 +0200
commit3abd3091ac6aa01b76bca5c6b17023d45fb084b8 (patch)
tree8a105cffc34caf7a90482e989c5d6aa95b4ebc6e /src/main/res/layout
parentace3930d3ca1d56e679e8f38beb6a269d110b1a1 (diff)
introduced type private_file_message to handle attachments in PMs
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/fragment_conversation.xml2
-rw-r--r--src/main/res/layout/message_content.xml28
2 files changed, 15 insertions, 15 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index de16ae5c4..1da8a5b25 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -110,7 +110,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/media_preview"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/message_bubble_sent"
android:orientation="horizontal"
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index bf96cef95..64414c893 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -2,6 +2,20 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <de.pixart.messenger.ui.widget.CopyTextView
+ android:id="@+id/message_body"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autoLink="web"
+ android:longClickable="true"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ <de.pixart.messenger.ui.widget.RichLinkView
+ android:id="@+id/richLinkView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxHeight="80dp" />
+
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_image"
android:layout_width="wrap_content"
@@ -28,20 +42,6 @@
android:scaleType="centerCrop"
app:riv_corner_radius="@dimen/rounded_image_border" />
- <de.pixart.messenger.ui.widget.RichLinkView
- android:id="@+id/richLinkView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxHeight="80dp" />
-
- <de.pixart.messenger.ui.widget.CopyTextView
- android:id="@+id/message_body"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:autoLink="web"
- android:longClickable="true"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
<Button
android:id="@+id/download_button"
android:layout_width="wrap_content"