From b2da0777ed3da0b3e7b23be7732bb2716ca118de Mon Sep 17 00:00:00 2001
From: Robert Vokac <robertvokac@nanoboot.org>
Date: Sat, 27 Jan 2024 17:56:55 +0000
Subject: [PATCH] New improvements

---
 src/main/java/rvc/timecalc/Battery.java        | 12 +++++++-----
 src/main/java/rvc/timecalc/ProgressCircle.java |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/rvc/timecalc/Battery.java b/src/main/java/rvc/timecalc/Battery.java
index 4451bc9..6a053b9 100644
--- a/src/main/java/rvc/timecalc/Battery.java
+++ b/src/main/java/rvc/timecalc/Battery.java
@@ -10,6 +10,8 @@ import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 
 public class Battery extends JPanel {
 
@@ -24,11 +26,11 @@ public class Battery extends JPanel {
     public static final Color HIGH_HIGHLIGHTED = new Color(158, 227, 158);
     public static final Color HIGHEST_HIGHLIGHTED = Color.green;
     private int height_ = 0;
-    private int square;
     private double donePercent = 0;
 
     private boolean highlight = false;
     private int width_;
+    NumberFormat formatter3 = new DecimalFormat("#0.000");
 
     public void setHighlight(boolean highlight) {
         this.highlight = highlight;
@@ -92,8 +94,7 @@ public class Battery extends JPanel {
 
     @Override
     public void paintComponent(Graphics g) {
-        if(Math.random() > 0.9)
-        {highlight = Utils.highlightTxt.exists();}
+        highlight = Utils.highlightTxt.exists();
         if (height_ == 0) {
             this.height_ = Math.min(getWidth(), getHeight());
             this.width_= (int)(this.height_* 0.6);
@@ -113,8 +114,9 @@ public class Battery extends JPanel {
                     MEDIUM : (donePercent < 0.9 ? HIGH : HIGHEST)));
         }
         g2d.fillRect(width_/4,height_ - (int)(height_ * donePercent),width_, (int)(height_ * donePercent));
-        g2d.setColor(Color.LIGHT_GRAY);
-        g2d.drawString(String.valueOf((int)(donePercent * 100)) + "%",width_/2, height_/2);
+        g2d.setColor(highlight ? Color.BLACK : Color.LIGHT_GRAY);
+        g2d.drawString(
+                formatter3.format(donePercent * 100) + "%",((int)(width_ * 0.4)), height_ / 2);
 
     }
 
diff --git a/src/main/java/rvc/timecalc/ProgressCircle.java b/src/main/java/rvc/timecalc/ProgressCircle.java
index 8a24c07..099c450 100644
--- a/src/main/java/rvc/timecalc/ProgressCircle.java
+++ b/src/main/java/rvc/timecalc/ProgressCircle.java
@@ -84,12 +84,13 @@ public class ProgressCircle extends JPanel {
 
     @Override
     public void paintComponent(Graphics g) {
+        highlight = Utils.highlightTxt.exists();
         if (side == 0) {
             this.side = Math.min(getWidth(), getHeight());
         }
         super.paintComponent(g);
         Graphics2D g2d = (Graphics2D) g;
-        g2d.setColor(FOREGROUND_COLOR);
+        g2d.setColor(highlight ? Color.darkGray : FOREGROUND_COLOR);
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
                 RenderingHints.VALUE_ANTIALIAS_ON);
 //        if (highlight) {
@@ -105,7 +106,7 @@ public class ProgressCircle extends JPanel {
 
         g2d.fillArc(0,0,side,side,90, -(int) angleDouble);
         int side2 = ((int)(side/2));
-        g2d.setColor(FOREGROUND_COLOR2);
+        g2d.setColor(highlight ? new Color(105, 175, 236) : FOREGROUND_COLOR2);
         g2d.fillArc(0+(side2/2),0+(side2/2),side2, side2,90, -(int) angleDouble2);
     }