From fd7b068246b4678a429c0907ac900d3131527ce9 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 1 May 2018 17:36:55 +0200
Subject: [PATCH] Fix issues with message history
Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
app/src/main/res/layout/layout_history.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/layout_history.xml b/app/src/main/res/layout/layout_history.xml
index 407d2d0ee..61e6e5817 100644
--- a/app/src/main/res/layout/layout_history.xml
+++ b/app/src/main/res/layout/layout_history.xml
@@ -20,17 +20,17 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/card_panel"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<android.support.v7.widget.CardView
style="?attr/cardStyle"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_marginBottom="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
@@ -77,9 +77,9 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/msg_history"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
tools:listitem="@layout/widget_history_message" />
</LinearLayout>
</android.support.v7.widget.CardView>
-</merge>
+</FrameLayout>
--
GitLab