From db77e642cb880b28311143481c17d055cf051eb1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 24 Feb 2022 15:32:23 +0100
Subject: [PATCH] improve

---
 .../chat/group-messages/group-messages.page.html     |  9 ++++++++-
 src/app/pages/chat/messages/messages.page.html       | 12 +++++++++++-
 .../chat/group-messages/group-messages.page.html     | 12 +++++++++++-
 .../chat/group-messages/group-messages.page.ts       |  4 ++++
 src/app/shared/chat/messages/messages.page.html      |  2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)

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 9cd924709..6bef28a41 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -187,7 +187,14 @@
 </ion-content>
 
 <ion-footer>
-  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div>
+  <div class="typing" >
+    <ngx-letters-avatar
+    [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"
+    [width]="30" 
+    [circular]="true"
+    fontFamily="Open Sans"></ngx-letters-avatar>
+    {{ wsChatMethodsService.getGroupRoom(roomId).userThatIsTyping }} A escrever...
+  </div>
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" (click)="openChatOptions()">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 91459e6d2..7c1d457bf 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -163,7 +163,17 @@
 </ion-footer> -->
 
 <ion-footer>
-  <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >A escrever...</div>
+
+
+  <div class="typing"  *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true">
+    <ngx-letters-avatar
+    [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"
+    [width]="30" 
+    [circular]="true"
+    fontFamily="Open Sans"></ngx-letters-avatar>
+    A escrever...
+  </div>
+
   <ion-list hidden>
     <ion-item (click)="playFile(storedFileNames)">
       {{storedFileNames}}
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 3c57ada49..2f358ce8c 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -203,7 +203,17 @@
 </ion-content>
 
 <ion-footer>
-  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div>
+  <!-- <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div> -->
+
+  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
+    <ngx-letters-avatar *ngIf="showAvatar"
+    [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"
+    [width]="30" 
+    [circular]="true"
+    fontFamily="Open Sans"></ngx-letters-avatar>
+    {{ wsChatMethodsService.getGroupRoom(roomId).userThatIsTyping }} A escrever...
+  </div>
+
 
   <div class="container width-100 d-flex">
     <div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index bef09ff69..3661c66d5 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -85,6 +85,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   pdfurl = "http://www.africau.edu/images/default/sample.pdf";
   downloadFile: any;
+  showAvatar = false
 
   constructor(
     public wsChatMethodsService: WsChatMethodsService,
@@ -126,8 +127,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.wsChatMethodsService.openRoom(this.roomId)
     this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
 
+    this.showAvatar = false
+
     setTimeout(()=>{
       this.scrollToBottomClicked()
+      this.showAvatar = true
     }, 50)
 
   }
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 9d8053321..8dd060a7c 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -198,7 +198,7 @@
 
 <ion-footer>
   
-  <div class="typing" >
+  <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >
     <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getDmRoom(roomId).name"
     [width]="30"