From d68ad00358d405dae90509a3c5c5ab5813e03e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20S=C3=A1nchez?= Date: Wed, 18 Dec 2024 16:06:16 -0300 Subject: [PATCH] a bit more data in the status bar --- .../dcav2gui/ui/exchanges/BinanceFragment.java | 7 +++---- .../dcav2gui/ui/exchanges/GateioFragment.java | 7 +++---- .../dcav2gui/ui/exchanges/KucoinFragment.java | 7 +++---- .../example/dcav2gui/ui/exchanges/OkxFragment.java | 7 +++---- .../ui/exchanges/adapters/WorkerCardAdapter.java | 13 +++++++++---- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java index e44545d..fc13fee 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java @@ -46,13 +46,12 @@ public class BinanceFragment extends Fragment { workerCardAdapter = new WorkerCardAdapter(binding.binanceCardsContainer); List workerCache = MainActivity.getInstanceCache("binance").getWorkers(); - List translatedList = InstanceInterface.translateToWorkerData(workerCache); - WorkerCardAdapter.populateStatusBar(statusBar, translatedList); - workerCardAdapter.updateData(translatedList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("binance")); + workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); binanceViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { - WorkerCardAdapter.populateStatusBar(statusBar, workerDataList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("binance")); workerCardAdapter.updateData(workerDataList); } }); diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java index 2faa236..f9be3b6 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/GateioFragment.java @@ -40,13 +40,12 @@ public class GateioFragment extends Fragment { workerCardAdapter = new WorkerCardAdapter(binding.gateioCardsContainer); List workerCache = MainActivity.getInstanceCache("gateio").getWorkers(); - List translatedList = InstanceInterface.translateToWorkerData(workerCache); - WorkerCardAdapter.populateStatusBar(statusBar, translatedList); - workerCardAdapter.updateData(translatedList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("gateio")); + workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); GateioViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { - WorkerCardAdapter.populateStatusBar(statusBar, workerDataList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("gateio")); workerCardAdapter.updateData(workerDataList); } }); diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java index 68d6e16..d58a327 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/KucoinFragment.java @@ -40,13 +40,12 @@ public class KucoinFragment extends Fragment { workerCardAdapter = new WorkerCardAdapter(binding.kucoinCardsContainer); List workerCache = MainActivity.getInstanceCache("kucoin").getWorkers(); - List translatedList = InstanceInterface.translateToWorkerData(workerCache); - WorkerCardAdapter.populateStatusBar(statusBar, translatedList); - workerCardAdapter.updateData(translatedList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("kucoin")); + workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); KucoinViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { - WorkerCardAdapter.populateStatusBar(statusBar, workerDataList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("kucoin")); workerCardAdapter.updateData(workerDataList); } }); diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java index 2c308a0..25cfec8 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/OkxFragment.java @@ -40,13 +40,12 @@ public class OkxFragment extends Fragment { workerCardAdapter = new WorkerCardAdapter(binding.okexCardsContainer); List workerCache = MainActivity.getInstanceCache("okx").getWorkers(); - List translatedList = InstanceInterface.translateToWorkerData(workerCache); - WorkerCardAdapter.populateStatusBar(statusBar, translatedList); - workerCardAdapter.updateData(translatedList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("okx")); + workerCardAdapter.updateData(InstanceInterface.translateToWorkerData(workerCache)); OkxViewModel.getWorkerData().observe(getViewLifecycleOwner(), workerDataList -> { if (workerDataList != null) { - WorkerCardAdapter.populateStatusBar(statusBar, workerDataList); + WorkerCardAdapter.populateStatusBar(statusBar, MainActivity.getInstanceCache("okx")); workerCardAdapter.updateData(workerDataList); } }); 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 35a2fd9..cc78a6d 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 @@ -11,6 +11,8 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; + +import com.example.dcav2gui.InstanceInterface; import com.example.dcav2gui.R; import com.example.dcav2gui.ui.exchanges.WorkerData; import java.util.List; @@ -130,20 +132,23 @@ public class WorkerCardAdapter{ } - public static void populateStatusBar(TextView statusBar, List workerDataList) { - int amountOfWorkers = workerDataList.size(); + public static void populateStatusBar(TextView statusBar, InstanceInterface.ExchangeStatsData exchangeData) { + int amountOfWorkers = exchangeData.getOnlineWorkers(); + //double lastSeen = exchangeData.getLastSeen(); + int longWorkers = exchangeData.getLongWorkers(); + int shortWorkers = exchangeData.getShortWorkers(); int safetyOrdersSent = 0; int maxSafetyOrders = 0; //Iterate workerDataList and extract the total amount of safety orders - for (WorkerData worker : workerDataList) { + for (WorkerData worker : InstanceInterface.translateToWorkerData(exchangeData.getWorkers())) { if (!worker.isShort()) { safetyOrdersSent+=worker.getAmountOfSafetyOrders()-1; maxSafetyOrders+=worker.getMaxSafetyOrders(); } } String percentage = String.format(Locale.ROOT, "%.2f", (double) safetyOrdersSent/maxSafetyOrders*100); - String statusBarText = amountOfWorkers + " traders online - Occupancy " + percentage + "%"; + String statusBarText = amountOfWorkers + " traders online (" + longWorkers + "/" + shortWorkers + ") - Occupancy " + percentage + "%"; statusBar.setText(statusBarText); }