3 files changed, 36 insertions, 18 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index e916a53..0fc2eaa 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 
+import cgeo.calendar.CalendarAddon;
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.AbstractViewPagerActivity;
 import cgeo.geocaching.activity.Progress;
@@ -57,6 +58,7 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+
 import rx.Observable;
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
@@ -87,7 +89,6 @@ import android.text.Editable;
 import android.text.Html;
 import android.text.Spannable;
 import android.text.Spanned;
-import android.text.format.DateUtils;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
@@ -116,7 +117,6 @@ import android.widget.TextView.BufferType;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Locale;
@@ -388,6 +388,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 clickedItemText = ((TextView) view).getText();
                 buildDetailsContextMenu(menu, res.getString(R.string.cache_logs), false);
                 break;
+            case R.id.date: // event date
+                assert view instanceof TextView;
+                clickedItemText = ((TextView) view).getText();
+                buildDetailsContextMenu(menu, res.getString(R.string.cache_event), true);
+                menu.findItem(R.id.menu_calendar).setVisible(cache.canBeAddedToCalendar());
+                break;
             case R.id.waypoint:
                 menu.setHeaderTitle(selectedWaypoint.getName() + " (" + res.getString(R.string.waypoint) + ")");
                 getMenuInflater().inflate(R.menu.waypoint_options, menu);
@@ -490,6 +496,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     new ResetCoordsThread(cache, handler, selectedWaypoint, true, false, progressDialog).start();
                 }
                 return true;
+            case R.id.menu_calendar:
+                CalendarAddon.addToCalendarWithIntent(this, cache);
+                return true;
             default:
                 break;
         }
@@ -977,17 +986,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 ownerView.setOnClickListener(new OwnerActionsClickListener(cache));
             }
 
-            // cache hidden
-            final Date hiddenDate = cache.getHiddenDate();
-            if (hiddenDate != null) {
-                final long time = hiddenDate.getTime();
-                if (time > 0) {
-                    String dateString = Formatter.formatFullDate(time);
-                    if (cache.isEventCache()) {
-                        dateString = DateUtils.formatDateTime(CgeoApplication.getInstance().getBaseContext(), time, DateUtils.FORMAT_SHOW_WEEKDAY) + ", " + dateString;
-                    }
-                    details.add(cache.isEventCache() ? R.string.cache_event : R.string.cache_hidden, dateString);
-                }
+            // hidden or event date
+            final TextView hiddenView = details.addHiddenDate(cache);
+            if (hiddenView != null) {
+                registerForContextMenu(hiddenView);
             }
 
             // cache location
diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index 5f67c57..ab11765 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -9,8 +9,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 /**
- * Shared menu handling for all activities having menu items related to a cache.
- *
+ * Shared menu handling for all activities having menu items related to a cache. <br>
+ * TODO: replace by a fragment
+ * 
  */
 public class CacheMenuHandler extends AbstractUIFactory {
 
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index 7fe77c4..5d8ebef 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -39,6 +39,11 @@ public final class CacheDetailsCreator {
         parentView.removeAllViews();
     }
 
+    /**
+     * @param nameId
+     * @param value
+     * @return the view containing the displayed string (i.e. the right side one from the pair of "label": "value")
+     */
     public TextView add(final int nameId, final CharSequence value) {
         final RelativeLayout layout = (RelativeLayout) activity.getLayoutInflater().inflate(R.layout.cache_information_item, null);
         final TextView nameView = (TextView) layout.findViewById(R.id.name);
@@ -188,14 +193,24 @@ public final class CacheDetailsCreator {
         if (!cache.isEventCache()) {
             return;
         }
+        addHiddenDate(cache);
+    }
+
+    public TextView addHiddenDate(final @NonNull Geocache cache) {
         final Date hiddenDate = cache.getHiddenDate();
         if (hiddenDate == null) {
-            return;
+            return null;
         }
         final long time = hiddenDate.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);
+            String dateString = Formatter.formatFullDate(time);
+            if (cache.isEventCache()) {
+                dateString = DateUtils.formatDateTime(CgeoApplication.getInstance().getBaseContext(), time, DateUtils.FORMAT_SHOW_WEEKDAY) + ", " + dateString;
+            }
+            final TextView view = add(cache.isEventCache() ? R.string.cache_event : R.string.cache_hidden, dateString);
+            view.setId(R.id.date);
+            return view;
         }
+        return null;
     }
 }