From a3f55b3baf8c76eecb366c75357784639d7dce6a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 28 Jul 2022 12:15:25 +0200
Subject: [PATCH] Improved conference invite layout a bit

---
 ...age_conference_invitation_content_cell.xml | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml b/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml
index 97c6f16ea..b03352bcc 100644
--- a/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml
@@ -43,6 +43,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
             android:drawablePadding="5dp"
             style="@style/conference_invite_dat_time_font"
             android:text="@{data.conferenceParticipantCount, default=`3 participants`}"
@@ -51,35 +52,20 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="2dp"
             android:drawablePadding="5dp"
             style="@style/conference_invite_dat_time_font"
             android:text="@{data.conferenceDate, default=`Mon. October 9th, 2021`}"
             app:drawableStartCompat="@drawable/icon_schedule_date" />
 
-        <LinearLayout
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawablePadding="5dp"
-                style="@style/conference_invite_dat_time_font"
-                android:text="@{data.conferenceTime, default=`5:35 PM`}"
-                app:drawableStartCompat="@drawable/icon_schedule_time" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                style="@style/conference_invite_dat_time_font"
-                android:visibility="@{data.showDuration ? View.VISIBLE : View.GONE}"
-                android:text="@{`(` + data.conferenceDuration + `)`, default=`(2h)`}" />
-
-        </LinearLayout>
+            android:drawablePadding="5dp"
+            android:layout_marginTop="2dp"
+            style="@style/conference_invite_dat_time_font"
+            android:text="@{data.conferenceTime + (data.showDuration ? ` (` + data.conferenceDuration + `)` : ``), default=`5:35 PM (2h)`}"
+            app:drawableStartCompat="@drawable/icon_schedule_time" />
 
         <TextView
             android:visibility="@{data.conferenceDescription.length() == 0 ? View.GONE : View.VISIBLE}"