fix #3244: Event cache pop-up should show the date of the event

2 files changed, 14 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 6314003..e88457a 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -243,6 +243,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
     protected abstract void startDefaultNavigation2();
 
     protected final void addCacheDetails() {
+        assert cache != null;
         // cache type
         final String cacheType = cache.getType().getL10n();
         final String cacheSize = cache.getSize() != CacheSize.UNKNOWN ? " (" + cache.getSize().getL10n() + ")" : "";
@@ -256,6 +257,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
 
         details.addDifficulty(cache);
         details.addTerrain(cache);
+        details.addEventDate(cache);
 
         // rating
         if (cache.getRating() > 0) {
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index 5f0d90a..5db562e 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -8,9 +8,11 @@ import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -175,4 +177,14 @@ public final class CacheDetailsCreator {
         }
         add(R.string.cache_distance, text);
     }
+
+    public void addEventDate(@NonNull Geocache cache) {
+        if (cache.isEventCache() && cache.getHiddenDate() != null) {
+            final long time = cache.getHiddenDate().getTime();
+            if (time > 0) {
+                final String dateString = DateUtils.formatDateTime(CgeoApplication.getInstance().getBaseContext(), time, DateUtils.FORMAT_SHOW_WEEKDAY) + ", " + Formatter.formatFullDate(time);
+                add(R.string.cache_event, dateString);
+            }
+        }
+    }
 }