From f3da936c4204c357776b2da1cc248de4496182d5 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 6 Apr 2016 12:14:41 +0200
Subject: [PATCH] Update remaining time on minutes instead on seconds

---
 .../io/bitsquare/gui/main/MainViewModel.java  |  1 -
 .../pendingtrades/PendingTradesViewModel.java |  2 +-
 .../pendingtrades/steps/TradeStepView.java    |  1 -
 .../io/bitsquare/gui/util/BSFormatter.java    | 72 ++++++++++++-------
 4 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 3620ca0ee3..6db6eaa0a6 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -531,7 +531,6 @@ public class MainViewModel implements ViewModel {
         clock.addListener(new Clock.Listener() {
             @Override
             public void onSecondTick() {
-                updateTradePeriodState();
             }
 
             @Override
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
index 8f549b2604..50b01b3ed1 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
@@ -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() {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
index 6a2a1c732a..6126efcbde 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -113,7 +113,6 @@ public abstract class TradeStepView extends AnchorPane {
         clockListener = new Clock.Listener() {
             @Override
             public void onSecondTick() {
-                updateTimeLeft();
             }
 
             @Override
diff --git a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
index 02a7de1843..411e199b73 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
@@ -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();
     }