From dde5315460fdf40d92ef71f175c73a22f4c77c36 Mon Sep 17 00:00:00 2001
From: Dariusz Olszewski <starypatyk@users.noreply.github.com>
Date: Tue, 16 Mar 2021 23:09:01 +0100
Subject: [PATCH 1/2] Fix for display issues with non default font sizes (issue
 #955)

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
---
 .../res/layout/rv_item_conversation_with_last_message.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index 726affc05..cc56f2b71 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -26,14 +26,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/rv_item_view_height"
+    android:layout_height="wrap_content"
     android:layout_margin="@dimen/double_margin_between_elements">
 
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
         <FrameLayout
             android:id="@+id/dialogAvatarFrameLayout"
             android:layout_width="@dimen/small_item_height"
@@ -126,5 +121,4 @@
             android:textSize="16sp"
             tools:text="Best conversation" />
 
-    </RelativeLayout>
 </RelativeLayout>

From 464414cbf12e5310ef852525b07ebcfd5250b0af Mon Sep 17 00:00:00 2001
From: Dariusz Olszewski <starypatyk@users.noreply.github.com>
Date: Sat, 20 Mar 2021 15:55:57 +0100
Subject: [PATCH 2/2] Additional fix for display issues (issue #955) Fix height
 of the file browser for Nextcloud files (Share from Nextcloud)

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
---
 app/src/main/res/layout/rv_item_browser_file.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/rv_item_browser_file.xml b/app/src/main/res/layout/rv_item_browser_file.xml
index 4b56835d6..0734d74ef 100644
--- a/app/src/main/res/layout/rv_item_browser_file.xml
+++ b/app/src/main/res/layout/rv_item_browser_file.xml
@@ -20,7 +20,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/rv_item_view_height"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_margin="@dimen/double_margin_between_elements"
     android:background="@color/bg_default">