From 66103d0cd96e4cc69e74620e2f955e1291d164f9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 5 Aug 2022 15:36:09 +0100
Subject: [PATCH] improve icons loaders

---
 .../group-messages/group-messages.page.html   | 16 ++++++++++++----
 .../pages/chat/messages/messages.page.html    | 10 ++++++----
 src/app/services/chat/message.service.ts      |  2 +-
 .../group-messages/group-messages.page.html   | 10 ++++++----
 .../shared/chat/messages/messages.page.html   | 19 +++++++++++--------
 src/assets/images/retry-svgrepo-com.svg       |  3 +++
 6 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 src/assets/images/retry-svgrepo-com.svg

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 cc652c9c0..f47750df2 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -90,8 +90,12 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                    <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" >
@@ -131,8 +135,12 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <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>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 74142cdbb..b9d0b620f 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -85,11 +85,12 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
 
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                     <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                    <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">
@@ -137,11 +138,12 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
   
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <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>
                   <div class="file audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 4b2ef8839..9ac1017ca 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -262,7 +262,7 @@ export class MessageService {
     }, ()=>{
       // error
       this.downloadLoader = false;
-      this.downloadAttachments = true
+      this.downloadAttachments = false
       this.downloadAttachmentsTemp++;
     });
 
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 d9fcd5d2d..bccd01e04 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -89,11 +89,12 @@
                       <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                         <ion-icon name="image" class="file-icon"></ion-icon>
                         <ion-label>{{"Imagem"}}</ion-label>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
     
                         <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                        <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>
                   </div>
@@ -138,11 +139,12 @@
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                           <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                           <ion-label>{{"Mensagem de voz"}}</ion-label>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
       
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                          <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>
                       <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index a66504622..269d2e38f 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -90,12 +90,13 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <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-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
-                    
                   </ion-item>
                 </div>
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
@@ -146,11 +147,13 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{'Mensagem de voz'}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
   
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>s
+                      <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>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/assets/images/retry-svgrepo-com.svg b/src/assets/images/retry-svgrepo-com.svg
new file mode 100644
index 000000000..1617591e8
--- /dev/null
+++ b/src/assets/images/retry-svgrepo-com.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#000000" d="M14.9547098,7.98576084 L15.0711,7.99552 C15.6179,8.07328 15.9981,8.57957 15.9204,9.12636 C15.6826,10.7983 14.9218,12.3522 13.747,13.5654 C12.5721,14.7785 11.0435,15.5888 9.37999,15.8801 C7.7165,16.1714 6.00349,15.9288 4.48631,15.187 C3.77335,14.8385 3.12082,14.3881 2.5472,13.8537 L1.70711,14.6938 C1.07714,15.3238 3.55271368e-15,14.8776 3.55271368e-15,13.9867 L3.55271368e-15,9.99998 L3.98673,9.99998 C4.87763,9.99998 5.3238,11.0771 4.69383,11.7071 L3.9626,12.4383 C4.38006,12.8181 4.85153,13.1394 5.36475,13.3903 C6.50264,13.9466 7.78739,14.1285 9.03501,13.9101 C10.2826,13.6916 11.4291,13.0839 12.3102,12.174 C13.1914,11.2641 13.762,10.0988 13.9403,8.84476 C14.0181,8.29798 14.5244,7.91776 15.0711,7.99552 L14.9547098,7.98576084 Z M11.5137,0.812976 C12.2279,1.16215 12.8814,1.61349 13.4558,2.14905 L14.2929,1.31193 C14.9229,0.681961 16,1.12813 16,2.01904 L16,6.00001 L12.019,6.00001 C11.1281,6.00001 10.6819,4.92287 11.3119,4.29291 L12.0404,3.56441 C11.6222,3.18346 11.1497,2.86125 10.6353,2.60973 C9.49736,2.05342 8.21261,1.87146 6.96499,2.08994 C5.71737,2.30841 4.57089,2.91611 3.68976,3.82599 C2.80862,4.73586 2.23802,5.90125 2.05969,7.15524 C1.98193,7.70202 1.47564,8.08224 0.928858,8.00448 C0.382075,7.92672 0.00185585,7.42043 0.0796146,6.87364 C0.31739,5.20166 1.07818,3.64782 2.25303,2.43465 C3.42788,1.22148 4.95652,0.411217 6.62001,0.119916 C8.2835,-0.171384 9.99651,0.0712178 11.5137,0.812976 Z"/>
+</svg>