From 5cbe1e1224f201f85eeae7e2e106b17ba6642241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20S=C3=A1nchez?= <nicolassanchez@tutanota.com>
Date: Thu, 13 Mar 2025 12:00:12 -0300
Subject: [PATCH] 2025.03.13

---
 .../ui/earners/EarnerCardAdapter.java         | 14 +++++++++++-
 app/src/main/res/layout/earner_card.xml       | 22 +++++++++----------
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/example/dcav2gui/ui/earners/EarnerCardAdapter.java b/app/src/main/java/com/example/dcav2gui/ui/earners/EarnerCardAdapter.java
index 6befe91..0c7cdb4 100644
--- a/app/src/main/java/com/example/dcav2gui/ui/earners/EarnerCardAdapter.java
+++ b/app/src/main/java/com/example/dcav2gui/ui/earners/EarnerCardAdapter.java
@@ -92,9 +92,21 @@ public class EarnerCardAdapter {
 
     public void populateStatusBar(TextView statusBar, EarnerInterface.EarnerGlobalData earnerData) {
         double uptime = earnerData.getUptime();
+        //Loop through all the earners in earnerData and calculate total funds
+        double totalEarningFunds = 0;
+        double totalTradingFunds = 0;
+        for (EarnerData earner : earnerData.getEarnerList()) {
+            totalEarningFunds += earner.getEarningBalance();
+            totalTradingFunds += earner.getTradingBalance();
+        }
+        double totalFunds = totalEarningFunds + totalTradingFunds;
+        String earningPercentage = String.format(Locale.ROOT, "%.2f", totalEarningFunds/totalFunds*100);
+
         List<EarnerData> earnerList = earnerData.getEarnerList();
 
-        String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Earners online: " + earnerList.size();
+        String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Total funds: " +
+                String.format(Locale.ROOT, "%.2f", totalFunds) + " USDT \n On Earn: " +
+                String.format(Locale.ROOT, "%.2f", totalEarningFunds) + " USDT (" + earningPercentage + "%)";
         statusBar.setText(statusBarText);
     }
 
diff --git a/app/src/main/res/layout/earner_card.xml b/app/src/main/res/layout/earner_card.xml
index e4bd385..ffcc77e 100644
--- a/app/src/main/res/layout/earner_card.xml
+++ b/app/src/main/res/layout/earner_card.xml
@@ -36,7 +36,7 @@
                 android:text="Trading:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="10sp" />
+                android:textSize="11sp" />
             <TextView
                 android:id="@+id/earnerCardTradingBalanceValue"
                 android:layout_width="64dp"
@@ -59,7 +59,7 @@
                 android:text="Earning:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="10sp" />
+                android:textSize="11sp" />
             <TextView
                 android:id="@+id/earnerCardEarningBalanceValue"
                 android:layout_width="64dp"
@@ -88,42 +88,42 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="20dp"
-            android:layout_marginHorizontal="24dp"
+            android:layout_marginHorizontal="8dp"
             android:orientation="horizontal"
             android:padding="3dp"
             android:layout_marginBottom="2dp">
             <TextView
                 android:id="@+id/earnerCardLastSubscriptionLabel"
-                android:layout_width="84dp"
+                android:layout_width="88dp"
                 android:layout_height="18dp"
                 android:text="Last subscription:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="10sp" />
+                android:textSize="11sp" />
             <TextView
                 android:id="@+id/earnerCardLastSubscriptionDateTime"
-                android:layout_width="96dp"
+                android:layout_width="104dp"
                 android:layout_height="18dp"
                 android:text="2025/03/08 04:20"
                 android:textColor="@color/bright_green"
                 android:textAlignment="center"
-                android:textSize="10sp" />
+                android:textSize="11sp" />
             <TextView
                 android:id="@+id/earnerCardLastRedemptionLabel"
-                android:layout_width="84dp"
+                android:layout_width="88dp"
                 android:layout_height="18dp"
                 android:text="Last redemption:"
                 android:textColor="@color/secondary_text_color"
                 android:textAlignment="center"
-                android:textSize="10sp" />
+                android:textSize="11sp" />
             <TextView
                 android:id="@+id/earnerCardLastRedemptionDateTime"
-                android:layout_width="96dp"
+                android:layout_width="104dp"
                 android:layout_height="18dp"
                 android:text="2025/03/08 04:20"
                 android:textColor="@color/red"
                 android:textAlignment="center"
-                android:textSize="10sp" />
+                android:textSize="11sp" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92c3337..b20f673 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name" translatable="false">DCAv2GUI</string>
     <string name="nav_header_title" translatable="false">DCAv2</string>
-    <string name="nav_header_subtitle">Version 2025.03.06 </string>
+    <string name="nav_header_subtitle">Version 2025.03.13 </string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_desc">Navigation header</string>