From cf8b53bb3833089ff8da50224921b3c356049681 Mon Sep 17 00:00:00 2001
From: Max <maxes2000@t-online.de>
Date: Fri, 24 Jan 2020 16:21:16 +0100
Subject: [PATCH] Add discard button for selected files

---
 src/app/components/feed/feed.component.html | 20 ++++++++++++++------
 src/app/components/feed/feed.component.sass | 11 +++++++++++
 src/app/components/feed/feed.component.ts   | 10 +++++++++-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html
index 01fc5c6..111dfbd 100644
--- a/src/app/components/feed/feed.component.html
+++ b/src/app/components/feed/feed.component.html
@@ -6,12 +6,20 @@
   <div [hidden]="!loggedIn">
     <mat-card>
       <mat-card-content>
-        <div id="inputPreviewWrapper">
-          <h2 *ngIf="localFileUrl">Preview:</h2>
-          <img *ngIf="fileType == 'image'" id="inputPreview" [src]="localFileUrl"/>
-          <video *ngIf="fileType == 'video'"  [src]="localFileUrl" controls="" class="html5-video-player">
-            Your browser does not support playing HTML5 video.
-          </video>
+        <div id="inputPreviewWrapper" *ngIf="localFileUrl">
+          <h2>Preview:</h2>
+          <div id="media-box">
+            <button class="discard-button" mat-button mat-icon-button (click)="discardFile()"
+              matTooltip="discard file"
+              matTooltipShowDelay="200"
+              [disabled]="posting">
+              <mat-icon>close</mat-icon>
+            </button>
+            <img *ngIf="fileType == 'image'" id="inputPreview" [src]="localFileUrl"/>
+            <video *ngIf="fileType == 'video'"  [src]="localFileUrl" id="inputPreview" controls="" class="html5-video-player">
+              Your browser does not support playing HTML5 video.
+            </video>
+          </div>
         </div>
         <mat-form-field class="input">
           <textarea matInput #content type="text" (input)="onTextInputChange()" [(ngModel)]="textInputValue" [disabled]="posting"
diff --git a/src/app/components/feed/feed.component.sass b/src/app/components/feed/feed.component.sass
index 9997dd5..ac0efde 100644
--- a/src/app/components/feed/feed.component.sass
+++ b/src/app/components/feed/feed.component.sass
@@ -54,6 +54,17 @@
   text-align: center
   max-height: 512px
   margin-bottom: 1em
+  #media-box
+    position: relative
+    width: 100%
+::ng-deep .light-theme .discard-button
+  margin: 0.5em
+  position: absolute
+  background: hsla(255,100%,100%,0.3)
+::ng-deep .dark-theme .discard-button 
+  margin: 0.5em
+  position: absolute
+  background: hsla(0,0%,0%,0.3)
 #progress-bar
   margin-top: 1em
 
diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts
index f32a8f4..c943a34 100644
--- a/src/app/components/feed/feed.component.ts
+++ b/src/app/components/feed/feed.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
 import {Post} from 'src/app/models/post';
 import {FeedService, Sort} from 'src/app/services/feed/feed.service';
 import {Activitylist} from 'src/app/models/activity';
@@ -17,6 +17,7 @@ export class FeedComponent implements OnInit {
   loadingNew = true;
   loadingMostLiked = true;
   // file upload variables
+  @ViewChild('name', {static: false}) fileInput;
   public uploading = false;
   public profilePictureUrl: BehaviorSubject<string | null>;
   private file;
@@ -109,6 +110,13 @@ export class FeedComponent implements OnInit {
     }
   }
 
+  discardFile() {
+    this.file = null;
+    this.localFileUrl = null;
+    this.fileType = null;
+    this.fileInput.nativeElement.value = '';
+  }
+
   onFileInputChange(event) {
     this.errorOccurred = false;
     this.errorMessage = '';