diff --git a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java index 1750828..8b14d18 100644 --- a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java +++ b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java @@ -635,10 +635,10 @@ public class InstanceInterface { workerStatsData.getQuoteSpent(), workerStatsData.getBaseBought(), workerStatsData.getIsShort(), + workerStatsData.getIsBoosted(), + workerStatsData.getAutoSwitchEnabled(), //Let's deal with this later false, - false, - false, workerStatsData.getStopWhenProfit(), workerStatsData.getOldLongDictionary()); workerDataList.add(workerData); 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 b8f876d..f0269fc 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 @@ -66,6 +66,11 @@ public class WorkerCardAdapter{ nextSoPrice.setText(String.format(Locale.ROOT, "%.8f", worker.getNextSoPrice())); takeProfitPrice.setText(String.format(Locale.ROOT, "%.8f", worker.getTakeProfitPrice())); + double breakEven = worker.getTotalAmountOfQuote()/worker.getTotalAmountOfBase(); + if (worker.getPrice() > breakEven) { + price.setTextColor(Color.parseColor("#00A000")); + } + double percentageToProfit = abs(worker.getTakeProfitPrice()- worker.getPrice())/worker.getPrice()*100; String percentageToDisplay = String.format(Locale.ROOT, "%.2f",percentageToProfit)+"%"; percentage.setText(percentageToDisplay); @@ -90,7 +95,6 @@ public class WorkerCardAdapter{ double progressBarPercentage = (worker.getPrice()-worker.getNextSoPrice())/(worker.getTakeProfitPrice()-worker.getNextSoPrice()); progressBar.setProgress((int) (progressBarPercentage * 100)); - double breakEven = worker.getTotalAmountOfQuote()/worker.getTotalAmountOfBase(); diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 66ca047..5ec75a2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,6 +17,7 @@ #FFA500 #008B8B #006A00 + #00A000 #FF424242 #FFF6F6F6 #C5C281