From 474eb9290ff5c7503adccf970a74cc6ae89e8c31 Mon Sep 17 00:00:00 2001
From: schlagmichdoch <schlagmichdoch@users.noreply.github.com>
Date: Tue, 17 Jan 2023 14:00:01 +0100
Subject: [PATCH] small fixes and style changes

---
 public/index.html         | 6 +++---
 public/scripts/network.js | 4 ++--
 public/scripts/ui.js      | 9 +++++++--
 public/styles.css         | 7 ++++++-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/public/index.html b/public/index.html
index 8a68d93..c41f774 100644
--- a/public/index.html
+++ b/public/index.html
@@ -128,11 +128,11 @@
             </x-background>
         </form>
     </x-dialog>
-    <!-- Receive Dialog -->
-    <x-dialog id="receiveDialog">
+    <!-- Receive File Dialog -->
+    <x-dialog id="receiveFileDialog">
         <x-background class="full center">
             <x-paper shadow="2">
-                <h2 class="center">PairDrop</h2>
+                <h2 class="center" id="receiveTitle"></h2>
                 <div class="text-center file-description"></div>
                 <div class="font-body2 text-center file-size"></div>
                 <div class="center file-preview"></div>
diff --git a/public/scripts/network.js b/public/scripts/network.js
index 2fc13b4..a0c1667 100644
--- a/public/scripts/network.js
+++ b/public/scripts/network.js
@@ -361,7 +361,7 @@ class Peer {
                 this._onDownloadProgress(message.progress);
                 break;
             case 'files-transfer-response':
-                this._onFileTransferResponded(message);
+                this._onFileTransferRequestResponded(message);
                 break;
             case 'file-transfer-complete':
                 this._onFileTransferCompleted();
@@ -456,7 +456,7 @@ class Peer {
         Events.fire('deactivate-paste-mode');
     }
 
-    _onFileTransferResponded(message) {
+    _onFileTransferRequestResponded(message) {
         if (!message.accepted) {
             Events.fire('set-progress', {peerId: this._peerId, progress: 1, status: 'wait'});
 
diff --git a/public/scripts/ui.js b/public/scripts/ui.js
index 7e94722..75eedd9 100644
--- a/public/scripts/ui.js
+++ b/public/scripts/ui.js
@@ -438,9 +438,10 @@ class ReceiveDialog extends Dialog {
 class ReceiveFileDialog extends ReceiveDialog {
 
     constructor() {
-        super('receiveDialog', false);
+        super('receiveFileDialog', false);
 
         this.$shareOrDownloadBtn = this.$el.querySelector('#shareOrDownload');
+        this.$receiveTitleNode = this.$el.querySelector('#receiveTitle')
 
         Events.on('files-received', e => this._onFilesReceived(e.detail.sender, e.detail.files));
         this._filesQueue = [];
@@ -503,13 +504,16 @@ class ReceiveFileDialog extends ReceiveDialog {
         let description;
         let size;
         let filename;
+        let title;
 
         if (files.length === 1) {
+            title = 'PairDrop - File Received'
             description = files[0].name;
             size = this._formatFileSize(files[0].size);
             filename = files[0].name;
             url = URL.createObjectURL(files[0])
         } else {
+            title = `PairDrop - ${files.length} Files Received`
             let completeSize = 0
             for (let i=0; i<files.length; i++) {
                 completeSize += files[0].size;
@@ -535,9 +539,9 @@ class ReceiveFileDialog extends ReceiveDialog {
             filename = `PairDrop_files_${year+month+date}_${hours+minutes}.zip`;
         }
 
+        this.$receiveTitleNode.textContent = title;
         this.$fileDescriptionNode.textContent = description;
         this.$fileSizeNode.textContent = size;
-        this.$shareOrDownloadBtn.download = filename;
 
         if ((window.iOS || window.android) && !!navigator.share && navigator.canShare({files})) {
             this.$shareOrDownloadBtn.innerText = "Share";
@@ -549,6 +553,7 @@ class ReceiveFileDialog extends ReceiveDialog {
             this.$shareOrDownloadBtn.addEventListener("click", this.continueCallback);
         } else {
             this.$shareOrDownloadBtn.innerText = "Download";
+            this.$shareOrDownloadBtn.download = filename;
             this.$shareOrDownloadBtn.href = url;
         }
 
diff --git a/public/styles.css b/public/styles.css
index 3ab6515..d5bbcb6 100644
--- a/public/styles.css
+++ b/public/styles.css
@@ -471,6 +471,11 @@ x-dialog h2 {
     margin-top: 1rem;
 }
 
+#receiveRequestDialog h2,
+#receiveFileDialog h2 {
+    margin-bottom: 0.5rem;
+}
+
 x-dialog .row-reverse {
     margin: auto -24px;
     margin-top: 40px;
@@ -489,7 +494,7 @@ x-dialog .row-reverse {
 }
 
 .file-size{
-    padding-bottom: 5px;
+    margin-bottom: 30px;
 }
 
 /* Send Text Dialog */