From a0b0aad4a69666b37f3dd12fa79effb1a23ddf3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Mon, 13 Nov 2023 10:59:36 +0100
Subject: [PATCH] some changes

---
 android/app/src/main/AndroidManifest.xml      |  7 ++++
 src/app/home/home.page.ts                     |  2 +-
 .../new-publication/new-publication.page.html | 13 ++++--
 .../new-publication/new-publication.page.scss | 18 ++++++++
 .../new-publication/new-publication.page.ts   | 41 ++++++++++++-------
 .../pages/publications/publications.page.ts   |  4 +-
 .../view-publications.page.html               | 10 +++--
 .../view-publications.page.scss               | 21 ++++++++++
 .../view-publications.page.html               |  2 +-
 .../view-publications.page.scss               | 21 ++++++++++
 10 files changed, 115 insertions(+), 24 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ccb3f28aa..bac297391 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -40,6 +40,13 @@
 
         <category android:name="android.intent.category.DEFAULT" />
 
+        <data android:mimeType="video/*" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.SEND" />
+
+        <category android:name="android.intent.category.DEFAULT" />
+
         <data android:mimeType="text/plain" />
       </intent-filter>
       <intent-filter>
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index c59027153..57ad842e0 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -296,7 +296,7 @@ export class HomePage implements OnInit {
         if (isActive) {
           /* sendIntent.setRouteService(this.router) */
           console.log('App is in the foreground');
-          this.checkSendIntentReceived()
+          /* this.checkSendIntentReceived() */
         } else {
           // The app is in the background.
           console.log('App is in the background');
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index d6a6f194b..867ef103b 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -36,8 +36,8 @@
 
               <ion-img *ngIf="fileType == 'image/jpeg'" [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage" (click)="imageSize(capturedImage)" ></ion-img>
 
-              <video *ngIf="fileType == 'video/mp4'" height="80px" width="80px" playsinline controls preload="auto">
-                <source src="{{capturedVideo}}" type="video/mp4" >
+              <video *ngIf="fileType == 'video'" width="70" height="70" controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline">
+                <source type="video/mp4" [src]="capturedVideo">
               </video>
 
             </ion-thumbnail>
@@ -83,7 +83,12 @@
           </div>
         </ion-label>
       </div>
-      <div *ngIf="photoOrVideo" class="ion-item-container-no-border">
+      <div *ngIf="photoOrVideo" class="container-multiselect">
+        <button id="container-multiselect" class="multiselect-button" (click)="takePicture()">Fotografia</button>
+        <button id="container-multiselect" class="multiselect-button" (click)="startVideoRecording()">Video</button>
+      </div>
+      
+     <!--  <div *ngIf="photoOrVideo" class="ion-item-container-no-border">
         <ion-label (click)="takePicture()">
           <div class="attach-icon">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
@@ -110,7 +115,7 @@
             <ion-label>Video</ion-label>
           </div>
         </ion-label>
-      </div>
+      </div> -->
 
       <!--   <div class="ion-item-container-no-border">
         <ion-label (click)="laodPicture()" class="cursor-pointer">
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss
index 2fa8e3f03..b3961715a 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.scss
+++ b/src/app/pages/publications/new-publication/new-publication.page.scss
@@ -57,6 +57,24 @@ ion-toolbar{
   box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6);
   overflow: auto;
 }
+
+.container-multiselect {
+  display: grid;
+}
+
+.multiselect-button {
+  border-radius: 3px;
+  width: 40%;
+  border: groove;
+  background-color: white;
+}
+
+.container button:last-child {
+  --border-radius: 50px;
+  width: 40%;
+  border: groove;
+  background-color: white;
+}
 .padding{
   padding: 25px 20px 0 20px;
 }
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index d915a0dc1..c723231af 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -141,6 +141,7 @@ export class NewPublicationPage implements OnInit {
 
   ngOnInit() {
     if (this.intent) {
+      this.filecontent = true
       this.capturedImage = 'data:image/jpeg;base64,' + this.intent;
     }
 
@@ -151,8 +152,12 @@ export class NewPublicationPage implements OnInit {
       recursive: true
     });
 
-
-    // this.takePicture();
+    document.addEventListener("click", clickOutside, false);
+    function clickOutside(e) {
+      const inside = document.getElementById('container-multiselect').contains(e.target);
+      this.photoOrVideo = false;
+      console.log(this.photoOrVideo)
+    }
   }
 
   // in use
@@ -210,19 +215,25 @@ export class NewPublicationPage implements OnInit {
       const data = await this.mediaCapture.captureVideo(options)
       this.video = data[0];
       console.log(data)
-      const originalFilePath = 'file:///storage/emulated/0/DCIM/Camera/20231110_125118.mp4';
-      const mediaFile = new Media();
-      mediaFile.create(data[0].fullPath)
-      console.log(mediaFile)
-      this.mediaFileToBase64(data[0])
-        .then((base64Data) => {
-          console.log('Base64 data:', base64Data);
-          // Now you can use the base64 data as needed
+      const savedFile = await Filesystem.copy({
+        from: data[0].fullPath,  // directory prop removed, Capacitor parses filename for us
+        to: "video.mp4",
+        toDirectory: FilesystemDirectory.Data
+      });
+      console.log(savedFile.uri)
+      Filesystem.readFile({ path: savedFile.uri })
+
+        .then(async (content) => {
+          console.log(content)
+          this.filecontent = true;
+          this.fileType = "video"
+          this.capturedVideo = content.data;
+          console.log(this.capturedVideo)
         })
-        .catch((error) => {
-          console.error('Error converting to base64:', error);
-          // Handle errors
-        });
+        .catch((err) => console.error(err));
+
+
+
 
 
     } catch (error) {
@@ -651,4 +662,6 @@ export class NewPublicationPage implements OnInit {
   }
 
 
+
+
 }
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 53114a029..7bdf48577 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -133,7 +133,9 @@ export class PublicationsPage implements OnInit {
   }
 
   close() {
-    this.modalController.dismiss();
+    window["sharedContent"] = null;
+    this.intent = null;
+    this.router.navigateByUrl("/home/");
   }
   get windowInnerWidth(): number {
     return window.innerWidth
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index 88b782a76..4b6454a06 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -43,10 +43,14 @@
 
       <ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
         <ion-card-content>
-          <div (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-img" >
-            <img *ngIf="publication.FileExtension != 'mp4'" [lazyLoad]="publication.FileBase64">
+          <div *ngIf="publication.FileExtension != 'mp4'" (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-img" >
+            <img  [lazyLoad]="publication.FileBase64">
 
-            <video *ngIf="publication.FileExtension == 'mp4'"  controls="controls" preload="metadata"  webkit-playsinline="webkit-playsinline">
+          </div>
+
+          <div *ngIf="publication.FileExtension == 'mp4'"  (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-video" >
+
+            <video  controls="controls" preload="metadata"  webkit-playsinline="webkit-playsinline">
               <source src="{{publication.FileBase64}}" type="video/mp4">
             </video>
 
diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss
index 6e4d1949d..968bafdc7 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.scss
+++ b/src/app/pages/publications/view-publications/view-publications.page.scss
@@ -141,6 +141,27 @@
     background: black;
 
   }
+  .post-video{
+    width: 100%;
+    height: 100%;
+
+    max-height: 400px;
+    min-height: 350px;
+    min-width: 350px;
+
+    margin: 5px auto;
+
+    border-radius: 0px !important;
+    overflow: hidden;
+    background-color: white;
+    display: flex;
+    justify-content: center;
+    background: black;
+
+  }
+  video{
+    max-width: -webkit-fill-available;
+  }
   .post-img img{
       height: 100%;
       max-height: 420px;
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index b684287ac..74bdb9b30 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -43,7 +43,7 @@
           <img [lazyLoad]="publication.FileBase64">
         </div>
 
-        <div *ngIf="publication.FileExtension == 'mp4'"  class="post-img  cursor-pointer" (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
+        <div *ngIf="publication.FileExtension == 'mp4'"  class="post-video  cursor-pointer" (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
           <video controls="controls" preload="metadata"  webkit-playsinline="webkit-playsinline" class="videoPlayer">
             <source [src]="publication.FileBase64" type="video/mp4" />
            </video>
diff --git a/src/app/shared/publication/view-publications/view-publications.page.scss b/src/app/shared/publication/view-publications/view-publications.page.scss
index 3b70916aa..883d1571c 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.scss
+++ b/src/app/shared/publication/view-publications/view-publications.page.scss
@@ -166,6 +166,27 @@
     align-items: center;
     background: black;
 
+  }
+  .post-video{
+    width: 100%;
+    height: 100%;
+
+    max-height: 500px;
+    max-width: 468px;
+
+    min-height: 350px;
+    min-width: 468px;
+
+    margin: 5px auto;
+
+    border-radius: 0px !important;
+    overflow: hidden;
+    background-color: white;
+    display: flex;
+    justify-content: center;
+    background: black;
+    align-items: self-end;
+
   }
   .post-img img{
       height: 100%;