From 21e500cad3b940f89af8dbbc72c7e4a95b6aa25e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 30 Jun 2022 17:35:51 +0200
Subject: [PATCH] Minor UI fixes

---
 ...essage_conference_invitation_content_cell.xml | 16 +++++++++-------
 .../main/res/layout/conference_schedule_cell.xml |  1 -
 app/src/main/res/values-fr/strings.xml           |  2 +-
 app/src/main/res/values-ru/strings.xml           |  2 +-
 app/src/main/res/values/strings.xml              |  2 +-
 app/src/main/res/values/styles.xml               | 10 ++++++++++
 6 files changed, 22 insertions(+), 11 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 1d820fa3b..aca8cc4bd 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
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:minWidth="250dp"
         android:orientation="vertical"
-        android:padding="20dp"
+        android:padding="10dp"
         android:background="@drawable/shape_conference_invite_background">
 
         <TextView
@@ -37,15 +37,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            style="@style/conference_invite_subject_font"
+            style="@style/conference_invite_desc_font"
             android:maxLines="2"
+            android:ellipsize="end"
             android:text="@{data.conferenceSubject, default=`Lorem ipsum dolor sit amet!`}"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawablePadding="5dp"
-            style="@style/conference_invite_desc_font"
+            style="@style/conference_invite_dat_time_font"
             android:text="@{data.conferenceParticipantCount, default=`3 participants`}"
             app:drawableStartCompat="@drawable/icon_schedule_participants"/>
 
@@ -54,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:drawablePadding="5dp"
-            style="@style/conference_invite_desc_font"
+            style="@style/conference_invite_dat_time_font"
             android:text="@{data.conferenceDate, default=`Mon. October 9th, 2021`}"
             app:drawableStartCompat="@drawable/icon_schedule_date" />
 
@@ -68,7 +69,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawablePadding="5dp"
-                style="@style/conference_invite_desc_font"
+                style="@style/conference_invite_dat_time_font"
                 android:text="@{data.conferenceTime, default=`5:35 PM`}"
                 app:drawableStartCompat="@drawable/icon_schedule_time" />
 
@@ -76,7 +77,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
-                style="@style/conference_invite_desc_font"
+                style="@style/conference_invite_dat_time_font"
                 android:visibility="@{data.showDuration ? View.VISIBLE : View.GONE}"
                 android:text="@{`(` + data.conferenceDuration + `)`, default=`(2h)`}" />
 
@@ -87,7 +88,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            style="@style/conference_invite_subject_font"
+            style="@style/conference_invite_desc_title_font"
             android:text="@string/conference_description_title"/>
 
         <TextView
@@ -96,6 +97,7 @@
             android:layout_height="wrap_content"
             style="@style/conference_invite_desc_font"
             android:maxLines="3"
+            android:ellipsize="end"
             android:text="@{data.conferenceDescription, default=`Lorem ipsum dolor sit amet`}"/>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/conference_schedule_cell.xml b/app/src/main/res/layout/conference_schedule_cell.xml
index 419605d9e..3d6055b11 100644
--- a/app/src/main/res/layout/conference_schedule_cell.xml
+++ b/app/src/main/res/layout/conference_schedule_cell.xml
@@ -191,7 +191,6 @@
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     style="@style/conference_invite_desc_font"
-                    android:maxLines="3"
                     android:text="@{data.description, default=`Lorem ipsum dolor sit amet`}"/>
 
                 <TextView
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a3d87ee73..04ed03404 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -626,7 +626,7 @@
     <string name="conference_default_title">Réunion distante</string>
     <string name="conference_local_title">Réunion locale</string>
     <string name="conference_invite_title">Invitation à la réunion :</string>
-    <string name="conference_description_title">Description :</string>
+    <string name="conference_description_title">Description</string>
     <string name="conference_invite_join">Rejoindre</string>
     <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d participants</string>
     <string name="conference_display_mode_mosaic">Mode mosaïque</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e9095906c..54ea3a169 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -603,7 +603,7 @@
     <string name="conference_paused_subtitle">Нажмите на кнопку воспроизведения, чтобы присоединиться к ней обратно.</string>
     <string name="conference_local_title">Местная конференция</string>
     <string name="conference_invite_title">Приглашение на конференцию:</string>
-    <string name="conference_description_title">Описание:</string>
+    <string name="conference_description_title">Описание</string>
     <string name="conference_too_many_participants_for_mosaic_layout">Слишком много участников для мозаичной раскладки, переключение на активного спикера</string>
     <string name="conference_invitation">Приглашение на конференцию</string>
     <string name="conference_low_bandwidth">Обнаружена низкая пропускная способность, отключение видео</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 56be4fc00..196c9d3e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -269,7 +269,7 @@
     <string name="conference_default_title">Remote group call</string>
     <string name="conference_local_title">Local group call</string>
     <string name="conference_invite_title">Meeting invite:</string>
-    <string name="conference_description_title">Description:</string>
+    <string name="conference_description_title">Description</string>
     <string name="conference_invite_join">Join</string>
     <string name="conference_invite_participants_count" tools:ignore="PluralsCandidate">%d participants</string>
     <string name="conference_display_mode_mosaic">Mosaic mode</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6cc2a3322..8f66d924c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -151,11 +151,21 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+    <style name="conference_invite_desc_title_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/lightToolbarTextColor</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
     <style name="conference_invite_desc_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/lightToolbarTextColor</item>
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="conference_invite_dat_time_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/lightToolbarTextColor</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
     <style name="conference_invite_join_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">@color/white_color</item>
         <item name="android:textAllCaps">true</item>