From c61d243760cd6e7df6b6e0574c0026143c235091 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 21 Sep 2023 15:42:12 +0100
Subject: [PATCH] chat fixe alignment by adding add-ellipsis

---
 src/app/pages/chat/chat.page.html               | 17 +++++++++++------
 .../group-messages/group-messages.page.html     |  2 +-
 src/app/pages/chat/messages/messages.page.html  |  2 +-
 .../group-messages/group-messages.page.html     |  2 +-
 src/app/shared/chat/messages/messages.page.html |  7 ++++---
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 68131be4b..cc6274e5c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -75,7 +75,7 @@
                     </div>
                     <div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected">
 
-                      <p class="font-13-em mb-0" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
+                      <p class="font-13-em mb-0 add-ellipsis white-space-nowrap" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
                       <p class="font-13-em" *ngIf="room.otherUserType == true">está escrever...</p>
                       <!-- <ion-label *ngIf="room.lastMessage.file">
                         <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
@@ -87,15 +87,18 @@
                         <span  class="font-13-em" *ngIf="room.lastMessage.file.type == 'application/audio'"> audio </span>
 
                         <fa-icon *ngIf="room.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
-                        <span class="font-13-em"> {{room.lastMessage.file.name || room.lastMessage.file.subject}}</span>
+
+                        <fa-icon *ngIf="room.lastMessage.file.type == 'application/img' " icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
+
+                        <span class="font-13-em"> {{room.lastMessage.file.name || room.lastMessage.file.subject || room.lastMessage.attachments[0].title}}</span>
                       </div>
 
-                      <ion-label *ngIf="room.lastMessage.attachments">
+                      <!-- <ion-label *ngIf="room.lastMessage.attachments">
                         <div *ngIf="room.lastMessage.attachments[0].image_url">
                           <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
                           <span class="font-13-em"> Fotografia</span>
                         </div>
-                      </ion-label>
+                      </ion-label> -->
 
                     </div>
                   </div>
@@ -140,15 +143,17 @@
                         <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime}}</div>
                       </div>
                       <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.id ==idSelected">
-                        <div class="item-message font-13-em white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
+                        <div class="item-message font-13-em add-ellipsis white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
                         <div class="font-13-em" *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
 
                         <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
-                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting' && group.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
+                          <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting' && group.lastMessage.file.type != 'application/audio' && group.lastMessage.file.type != 'application/img'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
                           <fa-icon *ngIf="group.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
                           <span *ngIf="group.lastMessage.file.type == 'application/audio'" class="item-files-title font-13-em"> audio </span>
                           <fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
                           <span *ngIf="group.lastMessage.file.type != 'application/audio' && group.lastMessage.attachments" class="item-files-title font-13-em add-ellipsis"> {{ group.lastMessage.attachments[0].title }}</span>
+                          <fa-icon *ngIf="group.lastMessage.file.type == 'application/img' " icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
+
                         </div>
                         <div  class="item-files" *ngIf="group.attachments">
                           <div *ngIf="group.value.lastMessage.attachments[0].image_url">
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 59c31cf5f..b60aaa2af 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -97,7 +97,7 @@
                     <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                   </ion-item>
                 </div>
-                <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image" >
+                <img class="d-block width-100" *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image" >
                 <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                 <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
                   <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 4a3e43798..bdf2213ba 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -95,7 +95,7 @@
                     <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                   </ion-item>
                 </div>
-                <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
+                <img class="d-block width-100" *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
 
                 <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
                   <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 70e6e38a4..9feca8aa1 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -101,7 +101,7 @@
                   <div *ngIf="msg.file.type == 'application/img' &&
                   msg.attachments[0].image_url" (click)="openPreview(msg)">
 
-                    <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
+                    <img class="d-block" *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
                     <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
 
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index f0b860880..6e1515062 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -52,9 +52,9 @@
           <ion-label >{{msg.u.name}}</ion-label>
           <span class="time">{{msg.time}}</span>
         </div>
-        <div class="d-flex justify-space-between">
+        <div class="d-block justify-space-between">
 
-          <div *ngIf="msg.delate == false" class="message-box">{{msg.msg}} </div>
+          <ion-label *ngIf="msg.delate == false" class="message-box">{{msg.msg}} </ion-label>
           <ion-label *ngIf="msg.delate == true" class="flex-0">Apagou a mensagem</ion-label>
 
           <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
@@ -101,7 +101,8 @@
 
                   </ion-item>
                 </div>
-                  <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
+                  <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image" class="d-block">
+
                   <ion-label class="float-status-all float-status"  *ngIf="msg.u.username==sessionStore.user.UserName">
 
                     <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10"> Enviado</span>