Fix missing space between signature and body when sending an email

Infomaniak · Jul 11, 2024 · bf63a91 · bf63a91
1 parent ec8593f
commit bf63a91
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -312,6 +312,7 @@ class NewMessageFragment : Fragment() {
             if (context.isNightModeEnabled()) editor.addCss(context.readRawResource(R.raw.custom_dark_mode))
 
             addCss(context.readRawResource(R.raw.style))
+            addCss(context.readRawResource(R.raw.editor_style))
 
             isEmptyFlow
                 .filterNotNull()

diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
@@ -288,6 +288,7 @@
                         android:id="@+id/editorLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:paddingTop="@dimen/marginStandardMedium"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/attachmentsRecyclerView">
@@ -297,19 +298,25 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content" />
 
-                        <TextView
-                            android:id="@+id/newMessagePlaceholder"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="@dimen/marginStandardMedium"
-                            android:text="@string/newMessagePlaceholderTitle"
-                            android:textColor="@color/tertiaryTextColor"
-                            android:visibility="gone"
-                            tools:visibility="visible" />
-
                     </FrameLayout>
 
+                    <TextView
+                        android:id="@+id/newMessagePlaceholder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="@dimen/marginStandardMedium"
+                        android:layout_marginTop="@dimen/marginStandardMedium"
+                        android:text="@string/newMessagePlaceholderTitle"
+                        android:textColor="@color/tertiaryTextColor"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="@id/editorLayout"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/editorLayout"
+                        tools:visibility="visible" />
+
                     <LinearLayout
                         android:id="@+id/bodyLoader"
                         android:layout_width="match_parent"

diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
@@ -0,0 +1,4 @@
+body {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
diff --git a/app/src/main/res/raw/signature_margins.css b/app/src/main/res/raw/signature_margins.css
@@ -1 +1 @@
-body { margin-top: 0px; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. Here it's `body` */
+body { margin-top: 1rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. Here it's `body` */