Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update remaining time on minutes instead on seconds

Browse Source
This commit is contained in:
Manfred Karrer 2016-04-06 12:14:41 +02:00
parent afe009b303
commit f3da936c42
4 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View File

@ -531,7 +531,6 @@ public class MainViewModel implements ViewModel {
clock.addListener(new Clock.Listener() {
@Override
public void onSecondTick() {
updateTradePeriodState();
}
@Override

2
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
View File

@ -176,7 +176,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
}
public String getRemainingTradeDurationAsWords() {
return formatter.getDurationAsWords(Math.max(0, getRemainingTradeDuration()));
return formatter.formatDurationAsWords(Math.max(0, getRemainingTradeDuration()));
}
public double getRemainingTradeDurationAsPercentage() {

1
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
View File

@ -113,7 +113,6 @@ public abstract class TradeStepView extends AnchorPane {
clockListener = new Clock.Listener() {
@Override
public void onSecondTick() {
updateTimeLeft();
}
@Override

72
gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
View File

@ -18,11 +18,11 @@
package io.bitsquare.gui.util;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.locale.Country;
import io.bitsquare.locale.LanguageUtil;
import io.bitsquare.p2p.NodeAddress;
import io.bitsquare.trade.offer.Offer;
import io.bitsquare.user.Preferences;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.bitcoinj.core.Coin;
import org.bitcoinj.utils.Fiat;
@ -37,7 +37,6 @@ import java.text.DecimalFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
public class BSFormatter {
@ -293,21 +292,11 @@ public class BSFormatter {
return formatCoin(offer.getAmount()) + " (" + formatCoin(offer.getMinAmount()) + ")";
}
public String formatVolumeWithMinVolume(Offer offer) {
return formatFiat(offer.getOfferVolume()) +
" (" + formatFiat(offer.getMinOfferVolume()) + ")";
}
public String formatVolumeWithMinVolumeWithCode(Offer offer) {
return formatFiatWithCode(offer.getOfferVolume()) +
" (" + formatFiatWithCode(offer.getMinOfferVolume()) + ")";
}
public String countryLocalesToString(List<Country> countries) {
return countries.stream().map(e -> e.name).collect(Collectors.joining(", "));
}
public String arbitratorAddressesToString(List<NodeAddress> nodeAddresses) {
return nodeAddresses.stream().map(e -> e.getFullAddress()).collect(Collectors.joining(", "));
}
@ -352,21 +341,56 @@ public class BSFormatter {
return input;
}
public Date addBlocksToNowDate(long blocks) {
return new Date(new Date().getTime() + blocks * TimeUnit.MINUTES.toMillis(10));
public String formatDurationAsWords(long durationMillis) {
return formatDurationAsWords(durationMillis, false);
}
public String getDurationAsWords(long duration) {
return DurationFormatUtils.formatDurationWords(duration, true, true);
}
public String getDaysHoursMinutes(Date startDate, Date endDate) {
try {
return DurationFormatUtils.formatDurationWords(endDate.getTime() - startDate.getTime(), true, true);
} catch (Throwable t) {
// in case we get a invalid duration we set swallow the exception
return "";
public static String formatDurationAsWords(long durationMillis, boolean showSeconds) {
String format;
if (showSeconds)
format = "d\' days, \'H\' hours, \'m\' minutes, \'s\' seconds\'";
else
format = "d\' days, \'H\' hours, \'m\' minutes\'";
String duration = DurationFormatUtils.formatDuration(durationMillis, format);
String tmp;
duration = " " + duration;
tmp = StringUtils.replaceOnce(duration, " 0 days", "");
if (tmp.length() != duration.length()) {
duration = tmp;
tmp = StringUtils.replaceOnce(tmp, " 0 hours", "");
if (tmp.length() != duration.length()) {
tmp = StringUtils.replaceOnce(tmp, " 0 minutes", "");
duration = tmp;
if (tmp.length() != tmp.length()) {
duration = StringUtils.replaceOnce(tmp, " 0 seconds", "");
}
}
}
if (duration.length() != 0) {
duration = duration.substring(1);
}
tmp = StringUtils.replaceOnce(duration, " 0 seconds", "");
if (tmp.length() != duration.length()) {
duration = tmp;
tmp = StringUtils.replaceOnce(tmp, " 0 minutes", "");
if (tmp.length() != duration.length()) {
duration = tmp;
tmp = StringUtils.replaceOnce(tmp, " 0 hours", "");
if (tmp.length() != duration.length()) {
duration = StringUtils.replaceOnce(tmp, " 0 days", "");
}
}
}
duration = " " + duration;
duration = StringUtils.replaceOnce(duration, " 1 seconds", " 1 second");
duration = StringUtils.replaceOnce(duration, " 1 minutes", " 1 minute");
duration = StringUtils.replaceOnce(duration, " 1 hours", " 1 hour");
duration = StringUtils.replaceOnce(duration, " 1 days", " 1 day");
return duration.trim();
}