fix #1858: add start time to calendar entry

5 files changed, 49 insertions, 4 deletions

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index e1a96fd..f811f44 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -598,7 +598,8 @@
   <string name="cache_image_open_file">Als Datei öffnen</string>
   <string name="cache_image_open_browser">Im Browser öffnen</string>
   <string name="cache_share_field">Weiterleiten</string>
-
+  <string name="cache_time_full_hours">Uhr</string>
+  
   <!-- file list base -->
   <string name="file_searching_in">Suche nach Dateien\nin</string>
   <string name="file_searching_sdcard_in">Keine Dateien in Standardverzeichnissen gefunden:\n%1$s\n\nDurchsuche komplette SD-Karte:\n</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 2d9d50b..6735730 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -608,7 +608,8 @@
   <string name="cache_image_open_file">Open as file</string>
   <string name="cache_image_open_browser">Open in browser</string>
   <string name="cache_share_field">Share</string>
-      
+  <string name="cache_time_full_hours">o\'clock</string>
+  
   <!-- file list base -->
   <string name="file_searching_in">Searching for files\nin</string>
   <string name="file_searching_sdcard_in">No files found in default folders:\n%1$s\n\nSearching whole SD card for files:\n</string>
diff --git a/main/src/cgeo/calendar/ICalendar.java b/main/src/cgeo/calendar/ICalendar.java
index 856de1a..933d248 100644
--- a/main/src/cgeo/calendar/ICalendar.java
+++ b/main/src/cgeo/calendar/ICalendar.java
@@ -15,4 +15,5 @@ public interface ICalendar {
     static final String PARAM_NAME = "name"; // cache name
     static final String PARAM_LOCATION = "location"; // cache location, or empty string
     static final String PARAM_COORDS = "coords"; // cache coords, or empty string
+    static final String PARAM_START_TIME_MINUTES = "time"; // time of start
 }
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index d1b0fde..93566c2 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -787,7 +787,8 @@ public class CacheDetailActivity extends AbstractActivity {
                     ICalendar.PARAM_URL, StringUtils.defaultString(cache.getUrl()),
                     ICalendar.PARAM_COORDS, cache.getCoords() == null ? "" : cache.getCoords().format(GeopointFormatter.Format.LAT_LON_DECMINUTE_RAW),
                     ICalendar.PARAM_LOCATION, StringUtils.defaultString(cache.getLocation()),
-                    ICalendar.PARAM_SHORT_DESC, StringUtils.defaultString(cache.getShortDescription())
+                    ICalendar.PARAM_SHORT_DESC, StringUtils.defaultString(cache.getShortDescription()),
+                    ICalendar.PARAM_START_TIME_MINUTES, StringUtils.defaultString(cache.guessEventTimeMinutes())
                     );
 
             startActivity(new Intent(ICalendar.INTENT,
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index b889d3e..b8590e5 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -1550,4 +1550,45 @@ public class cgCache implements ICache, IWaypoint {
         return listId >= StoredList.STANDARD_LIST_ID;
     }
 
-}
+    /**
+     * guess an event start time from the description
+     *
+     * @return start time in minutes after midnight
+     */
+    public String guessEventTimeMinutes() {
+        if (!isEventCache()) {
+            return null;
+        }
+        // 12:34
+        final Pattern time = Pattern.compile("\\b(\\d{1,2})\\:(\\d\\d)\\b");
+        final Matcher matcher = time.matcher(getDescription());
+        while (matcher.find()) {
+            try {
+                final int hours = Integer.valueOf(matcher.group(1));
+                final int minutes = Integer.valueOf(matcher.group(2));
+                if (hours >= 0 && hours < 24 && minutes >= 0 && minutes < 60) {
+                    return String.valueOf(hours * 60 + minutes);
+                }
+            } catch (NumberFormatException e) {
+                // cannot happen, but static code analysis doesn't know
+            }
+        }
+        // 12 o'clock
+        final String hourLocalized = cgeoapplication.getInstance().getString(R.string.cache_time_full_hours);
+        if (StringUtils.isNotBlank(hourLocalized)) {
+            final Pattern fullHours = Pattern.compile("\\b(\\d{1,2})\\s+" + Pattern.quote(hourLocalized), Pattern.CASE_INSENSITIVE);
+            final Matcher matcherHours = fullHours.matcher(getDescription());
+            if (matcherHours.find()) {
+                try {
+                    final int hours = Integer.valueOf(matcherHours.group(1));
+                    if (hours >= 0 && hours < 24) {
+                        return String.valueOf(hours * 60);
+                    }
+                } catch (NumberFormatException e) {
+                    // cannot happen, but static code analysis doesn't know
+                }
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file