From f6f62a89283d37c6c60f7b10a53b55510780ebdc Mon Sep 17 00:00:00 2001
From: Jannick Heisch <jannick.heisch@unibas.ch>
Date: Tue, 12 Dec 2023 11:45:54 +0100
Subject: [PATCH] change appearance of progress bars

---
 android/tinySSB/app/src/main/assets/web/img/chnk-icon.svg | 4 ++++
 .../tinySSB/app/src/main/assets/web/img/goset-icon.svg    | 4 ++++
 android/tinySSB/app/src/main/assets/web/tremola.css       | 8 ++++++++
 android/tinySSB/app/src/main/assets/web/tremola.html      | 4 ++--
 android/tinySSB/app/src/main/assets/web/tremola_ui.js     | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 android/tinySSB/app/src/main/assets/web/img/chnk-icon.svg
 create mode 100644 android/tinySSB/app/src/main/assets/web/img/goset-icon.svg

diff --git a/android/tinySSB/app/src/main/assets/web/img/chnk-icon.svg b/android/tinySSB/app/src/main/assets/web/img/chnk-icon.svg
new file mode 100644
index 0000000..93fe449
--- /dev/null
+++ b/android/tinySSB/app/src/main/assets/web/img/chnk-icon.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Do not edit this file with editors other than diagrams.net -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="161px" height="191px" viewBox="-0.5 -0.5 161 191" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2023-12-11T22:43:18.548Z&quot; agent=&quot;Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36&quot; etag=&quot;Dn8-dizfdvQ1oReGYJBM&quot; version=&quot;21.3.2&quot; type=&quot;device&quot;&gt;&lt;diagram name=&quot;Seite-1&quot; id=&quot;yf-MXJj8c1bQ5wv-AssC&quot;&gt;3ZVNk5swDIZ/Dcd2+EhIcy2bbg/t9JBD29OOFxTsXYMYYwL019cEgeMlmzaHnc70wqDXEpYeWcaLkqK7V6ziXzED6YV+1nnRnReGq83GPAehH4UwjkYhVyIbpcAKe/ELSPRJbUQGteOoEaUWlSumWJaQakdjSmHruh1QurtWLIeFsE+ZXKrfRab5qH4IN1b/DCLn085BvB1XCjY5UyU1Zxm2Z1K086JEIerxregSkAO7icsY9+mV1TkxBaX+m4CHb4+i0Yl4btIA5eGRtw/wjsqodT8VDJmpn0xUmmOOJZM7q35U2JQZDF/1jWV9viBWRgyM+ARa99RM1mg0EteFpFWTsOp/DPHv15P5kz53Mu46x+rJqrXC57kNsVHG7IeUX4VCUo2NSuEKiRUdLqZy0Ff81nPrzJEHLMBkaOIUSKbF0c2D0eHLZz/bH/NCLbqhXZTkkcmGdlr0z3ZnQN1yoWFfsVPprZlQtxNLogchZYISlbFLLGGGfASlobuOeYmFAqKYhmC6BbZkt3amgmlQ+Nk8rf03Irn+T0hG/5zk9haS/p9JXuDmwrVXwRvgXb04qJsLeOMLeIPt7XyNaa//09rZPzTa/QY=&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><path d="M 80 70 L 80 104.29" fill="none" stroke="rgb(0, 0, 0)" stroke-width="6" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 80 113.29 L 74 101.29 L 80 104.29 L 86 101.29 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="6" stroke-miterlimit="10" pointer-events="all"/><rect x="20" y="20" width="120" height="50" rx="7.5" ry="7.5" fill="none" stroke="rgb(0, 0, 0)" stroke-width="6" pointer-events="all"/><rect x="20" y="120" width="120" height="50" rx="7.5" ry="7.5" fill="none" stroke="rgb(0, 0, 0)" stroke-width="6" pointer-events="all"/><rect x="0" y="0" width="160" height="190" fill="none" stroke="none" pointer-events="all"/></g></svg>
\ No newline at end of file
diff --git a/android/tinySSB/app/src/main/assets/web/img/goset-icon.svg b/android/tinySSB/app/src/main/assets/web/img/goset-icon.svg
new file mode 100644
index 0000000..a5871a5
--- /dev/null
+++ b/android/tinySSB/app/src/main/assets/web/img/goset-icon.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 256 256" id="Flat" xmlns="http://www.w3.org/2000/svg">
+  <path d="M52,52V204H80a12,12,0,0,1,0,24H40a12.00028,12.00028,0,0,1-12-12V40A12.00028,12.00028,0,0,1,40,28H80a12,12,0,0,1,0,24ZM216,28H176a12,12,0,0,0,0,24h28V204H176a12,12,0,0,0,0,24h40a12.00028,12.00028,0,0,0,12-12V40A12.00028,12.00028,0,0,0,216,28Z"/>
+</svg>
\ No newline at end of file
diff --git a/android/tinySSB/app/src/main/assets/web/tremola.css b/android/tinySSB/app/src/main/assets/web/tremola.css
index b56a169..aeafaeb 100644
--- a/android/tinySSB/app/src/main/assets/web/tremola.css
+++ b/android/tinySSB/app/src/main/assets/web/tremola.css
@@ -446,6 +446,14 @@ input:checked + .slider:before {
  background: #7fd9eb;
 }
 
+#connection-overlay-progressbar-goset::-webkit-progress-value {
+  background: #2ecc71;
+}
+
+#connection-overlay-progressbar-chnk::-webkit-progress-value {
+  background: #f2a641;
+}
+
 .connection-overlay-progressbar-label {
   position: absolute;
   top: 50%;
diff --git a/android/tinySSB/app/src/main/assets/web/tremola.html b/android/tinySSB/app/src/main/assets/web/tremola.html
index 878f70f..10e5d68 100644
--- a/android/tinySSB/app/src/main/assets/web/tremola.html
+++ b/android/tinySSB/app/src/main/assets/web/tremola.html
@@ -264,7 +264,7 @@
         <div id='connection-overlay-progressbar-label-want' class="connection-overlay-progressbar-label"></div>
       </div>
       <div style="position: relative; margin-bottom: 10px;">
-        <img src='img/receive.png' alt="Icon" class="progress-icon">
+        <img src='img/chnk-icon.svg' alt="Icon" class="progress-icon">
         <progress id='connection-overlay-progressbar-chnk' class='connection-overlay-progressbar' value="0" max="100"></progress>
         <div id='connection-overlay-progressbar-label-chnk' class="connection-overlay-progressbar-label"></div>
       </div>
@@ -272,7 +272,7 @@
 
     <div id='goset-progress-container' style="display: none;">
       <div style="position: relative; margin-bottom: 10px;">
-        <img src='img/fountain.png' alt="Icon" class="progress-icon">
+        <img src='img/goset-icon.svg' alt="Icon" class="progress-icon">
         <progress id='connection-overlay-progressbar-goset' class='connection-overlay-progressbar' value="0" max="100"></progress>
         <div id='connection-overlay-progressbar-label-goset' class="connection-overlay-progressbar-label"></div>
       </div>
diff --git a/android/tinySSB/app/src/main/assets/web/tremola_ui.js b/android/tinySSB/app/src/main/assets/web/tremola_ui.js
index 6ce4e9e..589f725 100644
--- a/android/tinySSB/app/src/main/assets/web/tremola_ui.js
+++ b/android/tinySSB/app/src/main/assets/web/tremola_ui.js
@@ -459,7 +459,7 @@ function refresh_goset_progressbar(curr, max) {
     var delta = max - curr
 
     document.getElementById('connection-overlay-progressbar-goset').value = (curr / max) * 100
-    document.getElementById('connection-overlay-progressbar-label-goset').textContent = delta + " key" + (delta > 1 ? "s" : "") + " left"
+    document.getElementById('connection-overlay-progressbar-label-goset').textContent = "GoSet - " + delta + " key" + (delta > 1 ? "s" : "") + " left"
     if (delta > 0) {
         console.log("display progress")
         document.getElementById('goset-progress-container').style.display = "initial"