From de34063565180705afe61126e01711e7fe51dea5 Mon Sep 17 00:00:00 2001
From: Nayam Amarshe <25067102+NayamAmarshe@users.noreply.github.com>
Date: Sat, 31 Aug 2024 16:35:53 +0530
Subject: [PATCH] Remove circle bar

---
 electron/index.ts                             |  5 ++
 .../upscayl-tab/view/ProgressBar.tsx          | 47 ++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/electron/index.ts b/electron/index.ts
index 852a341..6626e65 100644
--- a/electron/index.ts
+++ b/electron/index.ts
@@ -40,6 +40,11 @@ app.on("ready", async () => {
     autoUpdater.checkForUpdates();
   }
 
+  log.info(
+    "🆙 Upscayl version:",
+    app.getVersion(),
+    featureFlags.APP_STORE_BUILD && "MAC-APP-STORE",
+  );
   log.info("🚀 UPSCAYL EXEC PATH: ", execPath);
   log.info("🚀 MODELS PATH: ", modelsPath);
 
diff --git a/renderer/components/upscayl-tab/view/ProgressBar.tsx b/renderer/components/upscayl-tab/view/ProgressBar.tsx
index aa2c89e..818f914 100644
--- a/renderer/components/upscayl-tab/view/ProgressBar.tsx
+++ b/renderer/components/upscayl-tab/view/ProgressBar.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { CSSProperties, useEffect, useMemo } from "react";
 import Spinner from "../../icons/Spinner";
 import Logo from "@/components/icons/Logo";
 
@@ -23,22 +23,43 @@ function ProgressBar({
     }
   }, [progress]);
 
+  // const progressStyle = useMemo(() => {
+  //   if (progress.includes("%")) {
+  //     return {
+  //       "--value": parseFloat(progress.replace("%", "")),
+  //     };
+  //   } else if (progress.includes("Success")) {
+  //     return {
+  //       "--value": 100,
+  //     };
+  //   }
+  //   return {
+  //     "--value": 0,
+  //   };
+  // }, [progress]);
+
   return (
     <div className="absolute z-50 flex h-full w-full flex-col items-center justify-center bg-base-300/50 backdrop-blur-lg">
-      <div className="flex flex-col items-center rounded-btn bg-base-100/50 p-4 backdrop-blur-lg">
-        <Logo className="spinner mb-4 h-12 w-12" />
+      <div className="flex flex-col items-center gap-2 rounded-btn bg-base-100/50 p-4 backdrop-blur-lg">
+        <Logo className="spinner h-12 w-12" />
         <p className="rounded-full px-2 pb-2 font-bold">
-          {batchMode && `Batch Upscayl In Progress: ${batchProgress}` }
-        </p>
-        {progress !== "Hold on..." ? (
-          <div className="radial-progress text-center" style={{ "--value": parseFloat(progress.replace("%", '')) }} role="progressbar" aria-valuenow={ parseFloat(progress.replace("%", '')) } aria-valuemin="0" aria-valuemax="100">
-            {progress}
-            {!batchMode && (doubleUpscaylCounter > 0) && "\nPass " + doubleUpscaylCounter}
-          </div>
-        ) : progress}
-        <p className="animate-pulse rounded-full px-2 pb-3 text-sm font-medium">
-          Doing the Upscayl magic...
+          {batchMode && `Batch Upscayl In Progress: ${batchProgress}`}
         </p>
+        <div className="flex flex-col items-center gap-1">
+          {progress !== "Hold on..." ? (
+            <p className="text-sm font-bold">
+              {progress}
+              {!batchMode &&
+                doubleUpscaylCounter > 0 &&
+                "\nPass " + doubleUpscaylCounter}
+            </p>
+          ) : (
+            <p className="text-sm font-bold">{progress}</p>
+          )}
+          <p className="animate-pulse rounded-full px-2 pb-3 text-xs font-medium text-neutral-content/50">
+            Doing the Upscayl magic...
+          </p>
+        </div>
         <button onClick={stopHandler} className="btn btn-outline">
           STOP
         </button>