From 20dfd0068f84d5153ea3754aa6bf088a571b2a07 Mon Sep 17 00:00:00 2001
From: Robert Vokac <robertvokac@nanoboot.org>
Date: Sat, 3 Feb 2024 03:47:16 +0000
Subject: [PATCH] Added new improvements

---
 .../nanoboot/utils/timecalc/gui/progress/Battery.java |  4 ++++
 .../nanoboot/utils/timecalc/main/TimeCalcManager.java | 11 ++++-------
 2 files changed, 8 insertions(+), 7 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 ee41c89..57b5052 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
@@ -146,4 +146,8 @@ public class Battery extends Widget {
     public void setLabel(String label) {
         this.label = label;
     }
+
+    public void setBounds(int x, int y, int height) {
+        setBounds(x, y, (int) (90d / 140d * height), height);
+    }
 }
\ No newline at end of file
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 010e364..49cce50 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
+++ b/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
@@ -281,14 +281,13 @@ public class TimeCalcManager {
 
         Battery batteryForDay = new Battery();
         batteryForDay.setBounds(progressCircle.getBounds().x,
-                progressCircle.getY() + MARGIN + progressCircle.getHeight(), 90,
-                140);
+                progressCircle.getY() + MARGIN + progressCircle.getHeight(), 140);
         window.add(batteryForDay);
 
         Battery batteryForWeek = new Battery();
         batteryForWeek.setBounds(
                 batteryForDay.getBounds().x + batteryForDay.getWidth(),
-                batteryForDay.getY(), 90, 140);
+                batteryForDay.getY(), 140);
         window.add(batteryForWeek);
 
         Calendar calNow = Calendar.getInstance();
@@ -331,14 +330,12 @@ public class TimeCalcManager {
         Battery batteryForMonth = new Battery();
         batteryForMonth.setBounds(
                 batteryForDay.getBounds().x + batteryForDay.getWidth(),
-                batteryForDay.getY() + batteryForWeek.getHeight() + MARGIN, 90,
-                140);
+                batteryForDay.getY() + batteryForWeek.getHeight() + MARGIN, 140);
         window.add(batteryForMonth);
 
         Battery batteryForHour = new Battery();
         batteryForHour.setBounds(batteryForMonth.getBounds().x,
-                batteryForMonth.getY() + batteryForMonth.getHeight() + MARGIN,
-                90, 140);
+                batteryForMonth.getY() + batteryForMonth.getHeight() + MARGIN, 140);
         window.add(batteryForHour);
         Rectangle hourRectangle = batteryForHour.getBounds();
         Rectangle dayRectangle = batteryForDay.getBounds();