diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e12acfd..72c85a7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ data = new ArrayList<>(); // Add WorkerData objects to the list - workerDataList.setValue(data); + workerDataList.postValue(data); // Schedule a periodic update new Thread(() -> { @@ -40,6 +40,7 @@ public class BinanceViewModel extends AndroidViewModel { Thread.sleep(5000); // Fetch and update the data List newData = InstanceInterface.fetchWorkersDataForCards("binance"); + //System.err.println(newData.toString()); workerDataList.postValue(newData); } catch (InterruptedException e) { e.printStackTrace(); @@ -51,5 +52,4 @@ public class BinanceViewModel extends AndroidViewModel { } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/WorkerData.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/WorkerData.java index 27d027e..998f000 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/WorkerData.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/WorkerData.java @@ -20,6 +20,8 @@ public class WorkerData { double nextSoPrice, double price, double takeProfitPrice, boolean isShort, boolean isBoosted, boolean isAuto, boolean isPaused, InstanceInterface.OldLongDictionary oldLongDictionary) { + + // TODO: Add total_amount_of_quote and total_amount_of_base this.pair = pair; this.amountOfSafetyOrders = amountOfSafetyOrders; this.maxSafetyOrders = maxSafetyOrders; 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 c4fe3a4..32bc038 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 @@ -1,5 +1,8 @@ package com.example.dcav2gui.ui.exchanges.adapters; +import static java.lang.Math.abs; + +import android.annotation.SuppressLint; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +14,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.example.dcav2gui.R; import com.example.dcav2gui.ui.exchanges.WorkerData; import java.util.List; +import java.util.Locale; +import java.util.concurrent.TimeUnit; public class WorkerCardAdapter extends RecyclerView.Adapter { @@ -30,11 +35,33 @@ public class WorkerCardAdapter extends RecyclerView.Adapter