diff --git a/app/src/main/java/com/example/dcav2gui/WorkerInterface.java b/app/src/main/java/com/example/dcav2gui/WorkerInterface.java index 8cfecfc..7b1a16a 100644 --- a/app/src/main/java/com/example/dcav2gui/WorkerInterface.java +++ b/app/src/main/java/com/example/dcav2gui/WorkerInterface.java @@ -1137,10 +1137,10 @@ public class WorkerInterface { "Base in deal: " + result.getBaseBought() + "\n" + "Safety orders sent: " + (result.getSoAmount()-1) + "\n" + "Max safety orders: " + result.getNumberOfSafetyOrders() + "\n" + - "Start time: " + HomeFragment.timeStampConverter(result.getStartTime()) + "\n" + + "Start time: " + HomeFragment.timeStampConverter(result.getStartTime(), false) + "\n" + "Total uptime: " + WorkerCardAdapter.formatSeconds(result.getTotalUptime()) + "\n" + "Start price: " + String.format(Locale.ROOT, numberFormat,result.getStartPrice()) + "\n" + - "Deal start time: " + HomeFragment.timeStampConverter(result.getDealStartTime()) + "\n" + + "Deal start time: " + HomeFragment.timeStampConverter(result.getDealStartTime(), false) + "\n" + "Deal uptime: " + WorkerCardAdapter.formatSeconds(result.getDealUptime()) + "\n" + "Fees paid in base: " + result.getFeesPaidInBase() + "\n" + "Fees paid in quote: " + result.getFeesPaidInQuote() + "\n" + diff --git a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java index 4ff10c5..7ad5a11 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java @@ -551,16 +551,9 @@ public class HomeFragment extends Fragment { } } - LayoutInflater inflater = LayoutInflater.from(getContext()); - View customLayout = inflater.inflate(R.layout.trades_detail_dialog, null); - TextView titleTextView = customLayout.findViewById(R.id.trades_details_title); - TextView detailsTextView = customLayout.findViewById(R.id.trades_details_content); + builder.setTitle("Last " + result.size() + " trades"); + builder.setMessage(parseDeals(result, shortWorkers, true)); - String title = "Last " + result.size() + " trades"; - titleTextView.setText(title); - detailsTextView.setText(parseDeals(result, shortWorkers)); - - builder.setView(customLayout); builder.setPositiveButton("OK", null); builder.show(); } @@ -569,17 +562,8 @@ public class HomeFragment extends Fragment { private void showExtendedLogsDialog(String exchange, String result) { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - LayoutInflater inflater = LayoutInflater.from(getContext()); - // Reuse trades_detail_dialog layout - View customLayout = inflater.inflate(R.layout.trades_detail_dialog, null); - TextView titleTextView = customLayout.findViewById(R.id.trades_details_title); - TextView detailsTextView = customLayout.findViewById(R.id.trades_details_content); - - String title = exchange + " log"; - titleTextView.setText(title); - detailsTextView.setText(result); - - builder.setView(customLayout); + builder.setTitle(exchange + " log"); + builder.setMessage(result); builder.setPositiveButton("OK", null); builder.show(); } @@ -587,12 +571,6 @@ public class HomeFragment extends Fragment { private void showProfitsReport(JsonObject result) { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - LayoutInflater inflater = LayoutInflater.from(getContext()); - // Reuse trades_detail_dialog layout - View customLayout = inflater.inflate(R.layout.trades_detail_dialog, null); - TextView titleTextView = customLayout.findViewById(R.id.trades_details_title); - TextView detailsTextView = customLayout.findViewById(R.id.trades_details_content); - String last60Days = ""; for (String key: result.get("Last 60 days").getAsJsonObject().keySet()) { Object value = result.get("Last 60 days").getAsJsonObject().get(key).getAsDouble(); @@ -604,8 +582,6 @@ public class HomeFragment extends Fragment { last18Months = last18Months + key + ": " + String.format(Locale.ROOT, "%.2f",value) + "\n"; } - String title = "Profits report"; - titleTextView.setText(title); String dialogBody = "Last 60 days:\n" + last60Days + "\n" + "Last 18 months:\n" + @@ -624,9 +600,9 @@ public class HomeFragment extends Fragment { String.format(Locale.ROOT, "%.2f", result.get("OKX percentage").getAsDouble()) + "%)\n\n" + "Total: " + String.format(Locale.ROOT, "%.2f", result.get("Total profit").getAsDouble()); - detailsTextView.setText(dialogBody); + builder.setTitle("Profits report"); + builder.setMessage(dialogBody); - builder.setView(customLayout); builder.setPositiveButton("OK", null); builder.show(); } @@ -674,7 +650,7 @@ public class HomeFragment extends Fragment { private void showServerTimeDialog(double serverTime) { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); builder.setTitle("Server time"); - builder.setMessage(timeStampConverter(serverTime)); + builder.setMessage(timeStampConverter(serverTime, false)); builder.setPositiveButton("OK", null); builder.show(); } @@ -682,7 +658,7 @@ public class HomeFragment extends Fragment { private void showTraderTimeDialog(double traderTime) { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); builder.setTitle("Trader time"); - builder.setMessage(timeStampConverter(traderTime)); + builder.setMessage(timeStampConverter(traderTime,false)); builder.setPositiveButton("OK", null); builder.show(); } @@ -881,13 +857,13 @@ public class HomeFragment extends Fragment { }); } - public SpannableStringBuilder parseDeals(List dealData, List shortWorkers) { + public SpannableStringBuilder parseDeals(List dealData, List shortWorkers, boolean noDate) { int shortColor = ContextCompat.getColor(requireContext(), R.color.orange); int LongColor = ContextCompat.getColor(requireContext(), R.color.dark_cyan); if (dealData != null) { SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(); for (InstanceInterface.DealData deal : dealData) { - String timestamp = timeStampConverter(deal.getTimestamp()); + String timestamp = timeStampConverter(deal.getTimestamp(), noDate); String pair = deal.getPair(); String amount = String.format(Locale.ROOT, "%.2f", deal.getAmount()); String exchange = Character.toUpperCase(deal.getExchangeName().charAt(0)) + deal.getExchangeName().substring(1); @@ -1125,7 +1101,7 @@ public class HomeFragment extends Fragment { // Deals list if (dealData != null) { - lastTrades.setText(parseDeals(dealData, shortWorkers)); + lastTrades.setText(parseDeals(dealData, shortWorkers, false)); } //Populate logs @@ -1195,10 +1171,13 @@ public class HomeFragment extends Fragment { public String getOkexLogs() { return okexLogs; } } - public static String timeStampConverter(double timestamp) { + public static String timeStampConverter(double timestamp, boolean noDate) { long linuxTimestamp = (long) timestamp; // Replace with your timestamp - Date date = new Date(linuxTimestamp * 1000); // Multiply by 1000 to convert to milliseconds - @SuppressLint("SimpleDateFormat") SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(linuxTimestamp * 1000); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// Multiply by 1000 to convert to milliseconds + if (noDate) { + formatter = new SimpleDateFormat("HH:mm:ss"); + } return formatter.format(date); } diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9421f0c..2d64726 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,4 +13,8 @@ + + \ No newline at end of file