fix some bug on blue theme

src/app/shared/chat/group-messages/group-messages.page.html

@@ -8,7 +8,7 @@
         <div class="right">
           <!-- <div (click)=" ChatSystemService.getGroupRoom(this.roomId).deleteAll()">delete all</div> -->
           <button title="Menu" class="btn-no-color" (click)="openGroupMessagesOptions()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </button>
         </div>

src/app/shared/chat/messages/messages.page.html

@@ -9,7 +9,7 @@
         </div>
         <div hidden class="right">
           <button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()">
-            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg">
             </ion-icon>
           </button>

src/app/shared/chat/messages/messages.page.ts

@@ -650,7 +650,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       resultType: CameraResultType.Base64,
       source: CameraSource.Camera
     });
-
+    console.log('Selected: ', file)
     var base64 = 'data:image/jpeg;base64,' + file.base64String
     const compressedImage = await this.compressImageBase64(
       base64,
@@ -658,7 +658,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       800, // maxHeight
       0.9  // quality
     ).then((picture) => {
-      console.log('Selected: ', picture)
+
       base64 = picture
     });
 
@@ -790,42 +790,46 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     //const imageData =  await this.fileToBase64Service.convert(file)
     //
-
+    console.log('Selected: ', file)
     var base64 = 'data:image/jpeg;base64,' + file.base64String
-    const compressedImage = await this.compressImageBase64(
-      base64,
-      800, // maxWidth
-      800, // maxHeight
-      0.9  // quality
-    ).then((picture) => {
-      console.log('Selected: ', picture)
-      base64 = picture
-    });
+    if (file.format == "jpeg" || file.format == "png" || file.format == "gif") {
 
-    const response = await fetch(base64);
-    const blob = await response.blob();
+      const compressedImage = await this.compressImageBase64(
+        base64,
+        800, // maxWidth
+        800, // maxHeight
+        0.9  // quality
+      ).then((picture) => {
 
-    console.log(base64)
+        base64 = picture
+      });
 
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+      const response = await fetch(base64);
+      const blob = await response.blob();
+
+      console.log(base64)
+
+      const formData = new FormData();
+      formData.append("blobFile", blob);
+
+      this.ChatSystemService.getDmRoom(roomId).send({
+        file: {
+          "type": "application/img",
+          "guid": ''
+        },
+        temporaryData: formData,
+        attachments: [{
+          "title": file.path,
+          //"image_url": 'data:image/jpeg;base64,' + file.base64String,
+          "text": "description",
+          "title_link_download": false,
+        }],
+        attachmentsModelData: {
+          fileBase64: base64,
+        }
+      })
+    }
 
-    this.ChatSystemService.getDmRoom(roomId).send({
-      file: {
-        "type": "application/img",
-        "guid": ''
-      },
-      temporaryData: formData,
-      attachments: [{
-        "title": file.path,
-        //"image_url": 'data:image/jpeg;base64,' + file.base64String,
-        "text": "description",
-        "title_link_download": false,
-      }],
-      attachmentsModelData: {
-        fileBase64: base64,
-      }
-    })
 
   }
 
@@ -838,63 +842,69 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     const file: any = await this.fileService.getFileFromDevice(types);
 
-    const fileName = file.name
+    if (file.type == 'application/pdf' || file.type == 'application/doc' || file.type == 'application/docx' ||
+      file.type == 'application/xls' || file.type == 'application/xlsx' || file.type == 'application/ppt' ||
+      file.type == 'application/pptx' || file.type == 'application/txt') {
 
-    const validation = this.FileValidatorService.fileNameValidation(fileName)
+      console.log('FILE', file)
 
-    if(validation.isOk) {
+      const fileName = file.name
 
-      const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
-        console.error(error);
-      })));
+      const validation = this.FileValidatorService.fileNameValidation(fileName)
 
-      let blob;
-      let formData
-      let fileBase64
-      if (this.platform.is("tablet")) {
+      if (validation.isOk) {
 
-        blob = this.fileService.base64toBlob(encodedData, file.type)
-        console.log('BLOB BLOB', blob)
+        const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch((error) => {
+          console.error(error);
+        })));
 
-        formData = new FormData();
-        formData.append('blobFile', blob);
-        /*  console.log('add file', fileBase64) */
+        let blob;
+        let formData
+        let fileBase64
+        if (this.platform.is("tablet")) {
 
+          blob = this.fileService.base64toBlob(encodedData, file.type)
+          console.log('BLOB BLOB', blob)
+
+          formData = new FormData();
+          formData.append('blobFile', blob);
+          /*  console.log('add file', fileBase64) */
+
+        } else {
+          blob = this.fileService.base64toBlob(encodedData, file.type)
+
+          fileBase64 = await this._getBase64(file)
+
+          formData = new FormData();
+          formData.append('blobFile', blob);
+        }
+
+
+
+
+        this.ChatSystemService.getDmRoom(roomId).send({
+          file: {
+            "type": file.type,
+            "guid": '',
+          },
+          attachments: [{
+            "title": file.name,
+            "name": file.name,
+            //"image_url": res,
+            // "text": "description",
+            "title_link_download": false,
+          }],
+          temporaryData: formData,
+          attachmentsModelData: {
+            fileBase64: fileBase64,
+          }
+        })
       } else {
-        blob = this.fileService.base64toBlob(encodedData, file.type)
-
-        fileBase64 = await this._getBase64(file)
-
-        formData = new FormData();
-        formData.append('blobFile', blob);
+        this.toastService._badRequest("Ficheiro inválido")
       }
 
-
-
-
-      this.ChatSystemService.getDmRoom(roomId).send({
-        file: {
-          "type": file.type,
-          "guid": '',
-        },
-        attachments: [{
-          "title": file.name,
-          "name": file.name,
-          //"image_url": res,
-          // "text": "description",
-          "title_link_download": false,
-        }],
-        temporaryData: formData,
-        attachmentsModelData: {
-          fileBase64: fileBase64,
-        }
-      })
-    } else {
-      this.toastService._badRequest("Ficheiro inválido")
     }
 
-
-
   }
 
   _getBase64(file) {