1 files changed, 72 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/ui/Formatter.java b/main/src/cgeo/geocaching/ui/Formatter.java
index 33793c1..53a7276 100644
--- a/main/src/cgeo/geocaching/ui/Formatter.java
+++ b/main/src/cgeo/geocaching/ui/Formatter.java
@@ -1,11 +1,21 @@
 package cgeo.geocaching.ui;
 
 import cgeo.geocaching.R;
+import cgeo.geocaching.cgCache;
+import cgeo.geocaching.cgWaypoint;
 import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.enumerations.CacheListType;
+import cgeo.geocaching.enumerations.CacheSize;
+import cgeo.geocaching.enumerations.WaypointType;
+
+import org.apache.commons.lang3.StringUtils;
 
 import android.content.Context;
 import android.text.format.DateUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public abstract class Formatter {
 
     /** Text separator used for formatting texts */
@@ -67,7 +77,7 @@ public abstract class Formatter {
     /**
      * Generate a numeric date string according to system-wide settings (locale, date format)
      * such as "10/20/2010". Today and yesterday will be presented as strings "today" and "yesterday".
-     * 
+     *
      * @param date
      *            milliseconds since the epoch
      * @return the formatted string
@@ -87,7 +97,7 @@ public abstract class Formatter {
     /**
      * Generate a numeric date and time string according to system-wide settings (locale,
      * date format) such as "7 sept. at 12:35".
-     * 
+     *
      * @param context
      *            a Context
      * @param date
@@ -98,4 +108,64 @@ public abstract class Formatter {
         return DateUtils.formatDateTime(context, date, DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL);
     }
 
+    public static String formatCacheInfoLong(cgCache cache, CacheListType cacheListType) {
+        final ArrayList<String> infos = new ArrayList<String>();
+        if (StringUtils.isNotBlank(cache.getGeocode())) {
+            infos.add(cache.getGeocode());
+        }
+
+        infos.add(Formatter.formatCacheInfoShort(cache));
+
+        if (cache.isPremiumMembersOnly()) {
+            infos.add(cgeoapplication.getInstance().getString(R.string.cache_premium));
+        }
+        if (cacheListType != CacheListType.OFFLINE && cacheListType != CacheListType.HISTORY && cache.getListId() > 0) {
+            infos.add(cgeoapplication.getInstance().getString(R.string.cache_offline));
+        }
+        return StringUtils.join(infos, Formatter.SEPARATOR);
+    }
+
+    public static String formatCacheInfoShort(cgCache cache) {
+        final ArrayList<String> infos = new ArrayList<String>();
+        if (cache.hasDifficulty()) {
+            infos.add("D " + String.format("%.1f", cache.getDifficulty()));
+        }
+        if (cache.hasTerrain()) {
+            infos.add("T " + String.format("%.1f", cache.getTerrain()));
+        }
+
+        // don't show "not chosen" for events and virtuals, that should be the normal case
+        if (cache.getSize() != CacheSize.UNKNOWN && cache.showSize()) {
+            infos.add(cache.getSize().getL10n());
+        } else if (cache.isEventCache() && cache.getHiddenDate() != null) {
+            infos.add(Formatter.formatShortDate(cache.getHiddenDate().getTime()));
+        }
+        return StringUtils.join(infos, Formatter.SEPARATOR);
+    }
+
+    public static String formatCacheInfoHistory(cgCache cache) {
+        final ArrayList<String> infos = new ArrayList<String>(3);
+        infos.add(StringUtils.upperCase(cache.getGeocode()));
+        infos.add(Formatter.formatDate(cache.getVisitedDate()));
+        infos.add(Formatter.formatTime(cache.getVisitedDate()));
+        return StringUtils.join(infos, Formatter.SEPARATOR);
+    }
+
+    public static String formatWaypointInfo(cgWaypoint waypoint) {
+        final List<String> infos = new ArrayList<String>(3);
+        if (WaypointType.ALL_TYPES_EXCEPT_OWN.contains(waypoint.getWaypointType())) {
+            infos.add(waypoint.getWaypointType().getL10n());
+        }
+        if (cgWaypoint.PREFIX_OWN.equalsIgnoreCase(waypoint.getPrefix())) {
+            infos.add(cgeoapplication.getInstance().getString(R.string.waypoint_custom));
+        } else {
+            if (StringUtils.isNotBlank(waypoint.getPrefix())) {
+                infos.add(waypoint.getPrefix());
+            }
+            if (StringUtils.isNotBlank(waypoint.getLookup())) {
+                infos.add(waypoint.getLookup());
+            }
+        }
+        return StringUtils.join(infos, Formatter.SEPARATOR);
+    }
 }