diff --git a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java index 3242dd2..78e1531 100644 --- a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java +++ b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java @@ -628,6 +628,8 @@ public class InstanceInterface { workerStatsData.getNextSoPrice(), workerStatsData.getPrice(), workerStatsData.getTakeProfitPrice(), + workerStatsData.getQuoteSpent(), + workerStatsData.getBaseBought(), workerStatsData.getIsShort(), //Let's deal with this later false, 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 998f000..ec430a8 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 @@ -10,6 +10,8 @@ public class WorkerData { private final double nextSoPrice; private final double price; private final double takeProfitPrice; + private final double totalAmountOfQuote; + private final double totalAmountOfBase; private final boolean isShort; private final boolean isBoosted; private final boolean isAuto; @@ -17,7 +19,7 @@ public class WorkerData { private final InstanceInterface.OldLongDictionary oldLongDictionary; public WorkerData(String pair, int amountOfSafetyOrders, int maxSafetyOrders, double uptime, - double nextSoPrice, double price, double takeProfitPrice, boolean isShort, + double nextSoPrice, double price, double takeProfitPrice, double totalAmountOfQuote, double totalAmountOfBase, boolean isShort, boolean isBoosted, boolean isAuto, boolean isPaused, InstanceInterface.OldLongDictionary oldLongDictionary) { @@ -29,6 +31,8 @@ public class WorkerData { this.nextSoPrice = nextSoPrice; this.price = price; this.takeProfitPrice = takeProfitPrice; + this.totalAmountOfQuote = totalAmountOfQuote; + this.totalAmountOfBase = totalAmountOfBase; this.isShort = isShort; this.isBoosted = isBoosted; this.isAuto = isAuto; @@ -43,6 +47,8 @@ public class WorkerData { public double getNextSoPrice() { return nextSoPrice; } public double getPrice() { return price; } public double getTakeProfitPrice() { return takeProfitPrice; } + public double getTotalAmountOfQuote() { return totalAmountOfQuote; } + public double getTotalAmountOfBase() { return totalAmountOfBase; } public boolean isShort() { return isShort; } public boolean isBoosted() { return isBoosted; } public boolean isAuto() { return isAuto; } 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 32bc038..b141c47 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 @@ -3,6 +3,12 @@ package com.example.dcav2gui.ui.exchanges.adapters; import static java.lang.Math.abs; import android.annotation.SuppressLint; +import android.content.Context; +import android.graphics.Color; +import android.graphics.drawable.ClipDrawable; +import android.graphics.drawable.GradientDrawable; +import android.graphics.drawable.LayerDrawable; +import android.graphics.drawable.shapes.Shape; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +16,8 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.appcompat.view.menu.MenuView; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.example.dcav2gui.R; import com.example.dcav2gui.ui.exchanges.WorkerData; @@ -17,6 +25,8 @@ import java.util.List; import java.util.Locale; import java.util.concurrent.TimeUnit; +import android.graphics.drawable.Drawable; + public class WorkerCardAdapter extends RecyclerView.Adapter { private List workerDataList; @@ -34,8 +44,18 @@ public class WorkerCardAdapter extends RecyclerView.Adapter=breakEven){ +// color = Color.GREEN; +// } else { +// color = Color.RED; +// } +// } else { +// if (worker.getPrice() + @@ -7,9 +8,9 @@ - + - +