From b624edb8a9c3f0720d201d1af0b89ee03977145e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20S=C3=A1nchez?= <nicolassanchez@tutanota.com>
Date: Fri, 3 Jan 2025 23:25:08 -0300
Subject: [PATCH] Percentage formatting

---
 .../exchanges/adapters/WorkerCardAdapter.java |  2 +-
 .../dcav2gui/ui/home/HomeFragment.java        | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java
index e29c67e..69ee54e 100644
--- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java
+++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/adapters/WorkerCardAdapter.java
@@ -100,7 +100,7 @@ public class WorkerCardAdapter{
         takeProfitPrice.setText(String.format(Locale.ROOT, "%.8f", worker.getTakeProfitPrice()));
 
         double percentageToProfit = abs(worker.getTakeProfitPrice()- worker.getPrice())/worker.getPrice()*100;
-        String percentageToDisplay = String.format(Locale.ROOT, "%.2f",percentageToProfit)+"%";
+        String percentageToDisplay = String.format(Locale.ROOT, "%.2f", percentageToProfit)+"%";
         percentage.setText(percentageToDisplay);
         if (percentageToProfit<1) {
             //Green
diff --git a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java
index 7ad5a11..31267a7 100644
--- a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java
@@ -1021,7 +1021,11 @@ public class HomeFragment extends Fragment {
             if (binanceData.getFundsNeeded() != 0) {
                 binanceFundsPercentage = 100 - (binanceData.getFundsNeeded() - binanceData.getFundsAvailable()) / binanceData.getFundsNeeded() * 100;
             }
-            String binanceFundsPercentageString = String.format(Locale.ROOT, "%.2f", binanceFundsPercentage) + "%";
+            String percentageFormat = "%.2f";
+            if (binanceFundsPercentage>=100) {
+                percentageFormat = "%.1f";
+            }
+            String binanceFundsPercentageString = String.format(Locale.ROOT, percentageFormat, binanceFundsPercentage) + "%";
             exchange1Funds.setText(binanceFunds);
             exchange1FundsPercentage.setText(binanceFundsPercentageString);
         }
@@ -1034,7 +1038,11 @@ public class HomeFragment extends Fragment {
             if (gateioData.getFundsNeeded() != 0) {
                 gateioFundsPercentage = 100 - (gateioData.getFundsNeeded() - gateioData.getFundsAvailable()) / gateioData.getFundsNeeded() * 100;
             }
-            String gateioFundsPercentageString = String.format(Locale.ROOT, "%.2f", gateioFundsPercentage) + "%";
+            String percentageFormat = "%.2f";
+            if (gateioFundsPercentage>=100) {
+                percentageFormat = "%.1f";
+            }
+            String gateioFundsPercentageString = String.format(Locale.ROOT, percentageFormat, gateioFundsPercentage) + "%";
             exchange2Funds.setText(gateioFunds);
             exchange2FundsPercentage.setText(gateioFundsPercentageString);
         }
@@ -1047,7 +1055,11 @@ public class HomeFragment extends Fragment {
             if (kucoinData.getFundsNeeded() != 0) {
                 kucoinFundsPercentage = 100 - (kucoinData.getFundsNeeded() - kucoinData.getFundsAvailable()) / kucoinData.getFundsNeeded() * 100;
             }
-            String kucoinFundsPercentageString = String.format(Locale.ROOT, "%.2f", kucoinFundsPercentage) + "%";
+            String percentageFormat = "%.2f";
+            if (kucoinFundsPercentage>=100) {
+                percentageFormat = "%.1f";
+            }
+            String kucoinFundsPercentageString = String.format(Locale.ROOT, percentageFormat, kucoinFundsPercentage) + "%";
             exchange3Funds.setText(kucoinFunds);
             exchange3FundsPercentage.setText(kucoinFundsPercentageString);
         }
@@ -1060,7 +1072,11 @@ public class HomeFragment extends Fragment {
             if (okexData.getFundsNeeded() != 0) {
                 okexFundsPercentage = 100 - (okexData.getFundsNeeded() - okexData.getFundsAvailable()) / okexData.getFundsNeeded() * 100;
             }
-            String okexFundsPercentageString = String.format(Locale.ROOT, "%.2f", okexFundsPercentage) + "%";
+            String percentageFormat = "%.2f";
+            if (okexFundsPercentage>=100) {
+                percentageFormat = "%.1f";
+            }
+            String okexFundsPercentageString = String.format(Locale.ROOT, percentageFormat, okexFundsPercentage) + "%";
             exchange4Funds.setText(okexFunds);
             exchange4FundsPercentage.setText(okexFundsPercentageString);
         }