Merge pull request #1717 from Infomaniak/webview-spacing

Fix webview min height and add reply/forward new line

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt

@@ -133,6 +133,7 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
 
         val forwardRoot = "<div class=\"${MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME}\" />"
         return parseAndWrapElementInNewDocument(forwardRoot).apply {
+            addAndEscapeTextLine("")
             addAndEscapeTextLine("---------- $messageForwardHeader ---------")
             addAndEscapeTextLine("$fromTitle ${message.fromName()}")
             addAndEscapeTextLine("$dateTitle ${message.date.toDate().formatForHeader()}")
@@ -149,6 +150,7 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
     private fun assembleReplyHtmlFooter(messageReplyHeader: String, previousFullBody: String): String {
         val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}" />"""
         return parseAndWrapElementInNewDocument(replyRoot).apply {
+            addAndEscapeTextLine("")
             addAndEscapeTextLine(messageReplyHeader, endWithBr = false)
             addReplyBlockQuote {
                 addAlreadyEscapedBody(previousFullBody)

app/src/main/res/layout/item_message.xml

@@ -425,9 +425,9 @@
             android:id="@+id/messageLoader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/threadHorizontalMargin"
             android:orientation="vertical"
             android:visibility="gone"
-            android:layout_marginHorizontal="@dimen/threadHorizontalMargin"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -473,7 +473,7 @@
             android:id="@+id/webViewsFrameLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:minHeight="100dp"
+            android:minHeight="70dp"
             app:layout_constraintBottom_toTopOf="@id/quoteButtonFrameLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"