From 7e41c4833740409b0e3ade6dc761b7c1f78d162a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20S=C3=A1nchez?= Date: Tue, 11 Mar 2025 14:38:06 -0300 Subject: [PATCH] . --- .../example/dcav2gui/ui/earners/EarnFragment.java | 14 +++++++------- .../dcav2gui/ui/earners/EarnerCardAdapter.java | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/example/dcav2gui/ui/earners/EarnFragment.java b/app/src/main/java/com/example/dcav2gui/ui/earners/EarnFragment.java index cf0c99d..f210f9f 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/earners/EarnFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/earners/EarnFragment.java @@ -35,13 +35,13 @@ public class EarnFragment extends Fragment { earnerCardAdapter = new EarnerCardAdapter(binding.earnersCardsContainer); - try { - earnerData = EarnerInterface.getEarnerGlobalData(true); - earnerCardAdapter.populateStatusBar(statusBar, earnerData); - earnerCardAdapter.updateData(earnerData.getEarnerList()); - } catch (IOException e) { - throw new RuntimeException(e); - } +// try { +// earnerData = EarnerInterface.getEarnerGlobalData(true); +// earnerCardAdapter.populateStatusBar(statusBar, earnerData); +// earnerCardAdapter.updateData(earnerData.getEarnerList()); +// } catch (IOException e) { +// throw new RuntimeException(e); +// } earnerViewModel.getEarnerData().observe(getViewLifecycleOwner(), earnerDataList -> { 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 20a2e6e..ebfc2ce 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 @@ -88,9 +88,8 @@ public class EarnerCardAdapter { double uptime = earnerData.getUptime(); List earnerList = earnerData.getEarnerList(); - //String percentage = String.format(Locale.ROOT, "%.2f", (double) safetyOrdersSent/maxSafetyOrders*100); - //String statusBarText = amountOfWorkers + " traders online (" + longWorkers + "/" + shortWorkers + ") - Occupancy " + percentage + "%"; - //statusBar.setText(statusBarText); + String statusBarText = "Uptime: " + formatSeconds(uptime) + " | Earners online: " + earnerList.size(); + statusBar.setText(statusBarText); } }