diff --git a/app/src/main/java/com/example/dcav2gui/WorkerInterface.java b/app/src/main/java/com/example/dcav2gui/WorkerInterface.java
index 0f3065f..a866755 100644
--- a/app/src/main/java/com/example/dcav2gui/WorkerInterface.java
+++ b/app/src/main/java/com/example/dcav2gui/WorkerInterface.java
@@ -9,6 +9,7 @@ import android.os.Looper;
import android.widget.Toast;
import java.io.IOException;
+import java.util.Locale;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -673,6 +674,9 @@ public class WorkerInterface {
public static void showWorkerDetailsDialog(InstanceInterface.WorkerStatsData result, Context context) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ int priceDecimals = countDecimalPlaces(result.getPrice());
+ String numberFormat = "%." + priceDecimals + "f";
+
builder.setTitle(result.getPair() + " status");
String isPausedExtraString = "";
if (result.getIsPaused()) {
@@ -686,15 +690,15 @@ public class WorkerInterface {
oldLongExtraString = "\nOLD LONG:\n" +
"Switch date: " + result.getOldLongDictionary().getDatetime() + "\n" +
"Amount of base in the deal: " + result.getOldLongDictionary().getTpAmount() + "\n" +
- "Take profit price: " + result.getOldLongDictionary().getTpPrice() + "\n" +
- "Switch price: " + minSwitchPrice + "\n" +
+ "Take profit price: " + String.format(Locale.ROOT, numberFormat,result.getOldLongDictionary().getTpPrice()) + "\n" +
+ "Switch price: " + String.format(Locale.ROOT, numberFormat, minSwitchPrice) + "\n" +
"Quote spent: " + result.getOldLongDictionary().getQuoteSpent() + "\n" +
"Fees paid in quote: " + result.getOldLongDictionary().getFeesPaidInQuote();
}
builder.setMessage("Price: " + result.getPrice() + "\n" +
- "Take profit price: " + result.getTakeProfitPrice() + "\n" +
- "Next safety order price: " + result.getTakeProfitPrice() + "\n" +
+ "Take profit price: " + String.format(Locale.ROOT, numberFormat,result.getTakeProfitPrice()) + "\n" +
+ "Next safety order price: " + String.format(Locale.ROOT, numberFormat,result.getNextSoPrice()) + "\n" +
"Take profit order ID: " + result.getTpOrderId() + "\n" +
"Safety order ID: " + result.getSoOrderId() + "\n" +
"Short: " + result.getIsShort() + "\n" +
@@ -708,7 +712,7 @@ public class WorkerInterface {
"Safety orders sent: " + (result.getSoAmount()-1) + "\n" +
"Max safety orders: " + result.getNumberOfSafetyOrders() + "\n" +
"Start time: " + result.getStartTime() + "\n" +
- "Start price: " + result.getStartPrice() + "\n" +
+ "Start price: " + String.format(Locale.ROOT, numberFormat,result.getStartPrice()) + "\n" +
"Deal start time: " + result.getDealStartTime() + "\n" +
"Deal uptime: " + result.getDealUptime() + "\n" +
"Total uptime: " + result.getTotalUptime() + "\n" +
@@ -720,6 +724,17 @@ public class WorkerInterface {
builder.show();
}
+ public static int countDecimalPlaces(double number) {
+ String numberStr = String.valueOf(number);
+ int decimalIndex = numberStr.indexOf('.');
+
+ // If there are no decimals, return 0
+ if (decimalIndex == -1) {
+ return 0;
+ }
+ return numberStr.length() - decimalIndex - 1;
+ }
+
}
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 54f8934..3ef22a6 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
@@ -114,9 +114,6 @@ public class BinanceFragment extends Fragment implements WorkerCardAdapter.OnCar
} else if (item.getItemId() == R.id.addQuote) {
System.err.println(pair + " Add quote option clicked");
return true;
- } else if (item.getItemId() == R.id.workerMenuLastCall) {
- System.err.println(pair + " Worker menu last call option clicked");
- return true;
}
return false;
}
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 a59e4d2..d8b68fe 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
@@ -107,9 +107,6 @@ public class GateioFragment extends Fragment implements WorkerCardAdapter.OnCard
} else if (item.getItemId() == R.id.addQuote) {
System.err.println(pair + " Add quote option clicked");
return true;
- } else if (item.getItemId() == R.id.workerMenuLastCall) {
- System.err.println(pair + " Worker menu last call option clicked");
- return true;
}
return false;
}
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 f16795a..ef72122 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
@@ -107,9 +107,6 @@ public class KucoinFragment extends Fragment implements WorkerCardAdapter.OnCard
} else if (item.getItemId() == R.id.addQuote) {
System.err.println(pair + " Add quote option clicked");
return true;
- } else if (item.getItemId() == R.id.workerMenuLastCall) {
- System.err.println(pair + " Worker menu last call option clicked");
- return true;
}
return false;
}
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 2c1756a..e372768 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
@@ -107,9 +107,6 @@ public class OkxFragment extends Fragment implements WorkerCardAdapter.OnCardLon
} else if (item.getItemId() == R.id.addQuote) {
System.err.println(pair + " Add quote option clicked");
return true;
- } else if (item.getItemId() == R.id.workerMenuLastCall) {
- System.err.println(pair + " Worker menu last call option clicked");
- return true;
}
return false;
}
diff --git a/app/src/main/res/menu/worker_popup_menu.xml b/app/src/main/res/menu/worker_popup_menu.xml
index 9f81cdc..423fef1 100644
--- a/app/src/main/res/menu/worker_popup_menu.xml
+++ b/app/src/main/res/menu/worker_popup_menu.xml
@@ -26,7 +26,6 @@
android:title="Toggle cleanup"/>