From a66c7b9a3315618fcddcb3ee39f86821bad33590 Mon Sep 17 00:00:00 2001
From: Robert Vokac <robertvokac@nanoboot.org>
Date: Sat, 3 Feb 2024 05:25:19 +0000
Subject: [PATCH] Added new improvements

---
 .../org/nanoboot/utils/timecalc/gui/progress/Battery.java | 7 +++----
 .../org/nanoboot/utils/timecalc/main/TimeCalcManager.java | 8 ++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java
index 831b49c..d3c5553 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java
+++ b/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java
@@ -2,6 +2,7 @@ package org.nanoboot.utils.timecalc.gui.progress;
 
 import org.nanoboot.utils.timecalc.gui.common.Widget;
 import org.nanoboot.utils.timecalc.main.TimeCalcConf;
+import org.nanoboot.utils.timecalc.utils.NumberFormats;
 import org.nanoboot.utils.timecalc.utils.Utils;
 
 import java.awt.Color;
@@ -9,8 +10,6 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
 
 public class Battery extends Widget {
     public static final Color LOW = new Color(253, 130, 130);
@@ -22,7 +21,7 @@ public class Battery extends Widget {
     public static final Color HIGH_HIGHLIGHTED = new Color(158, 227, 158);
     public static final Color HIGHEST_HIGHLIGHTED = Color.green;
     public static boolean wavesOff = false;
-    NumberFormat formatter3 = new DecimalFormat("#0.000");
+
     private int totalHeight = 0;
 
     private int width_;
@@ -119,7 +118,7 @@ public class Battery extends Widget {
         g2d.setColor(Utils.highlighted.get() || mouseOver ? Color.BLACK :
                 Color.LIGHT_GRAY);
         g2d.drawString(
-                formatter3.format(donePercent * 100) + "%",
+                NumberFormats.FORMATTER_THREE_DECIMAL_PLACES.format(donePercent * 100) + "%",
                 ((int) (width_ * 0.4)),
                 donePercent > 0.5 ? totalHeight / 4 * 3 : totalHeight / 4 * 1);
 
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java b/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
index bdd0857..301e90b 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
+++ b/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
@@ -386,14 +386,10 @@ public class TimeCalcManager {
             if (millisecondsRemainsD > 0) {
                 minutesRemainsD = minutesRemainsD - 1d / 1000d;
             }
-            hourBattery.setDonePercent(
-                    done >= 1 ? 1 : (1 - ((minutesRemainsD % 60d) / 60d)));
+            hourBattery.setDonePercent(1 - ((minutesRemainsD % 60d) / 60d));
             if (!nowIsWeekend) {
-                int hoursForLabel =
-                        (timeRemains.getMinute() == 0 ? timeRemains.getMinute() / 60 + 1 :
-                                timeRemains.getMinute() / 60);
                 hourBattery.setLabel(
-                        ((totalMinutes / 60) - hoursForLabel) + "/" + (
+                        hourDone + "/" + (
                                 totalMinutes / 60));
             }