Merge remote-tracking branch 'origin/master'

EddyVerbruggen · Jan 9, 2018 · 0991c6b · 0991c6b
2 parents a3a60c4 + 9fcc53d
commit 0991c6b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/calendar.android.js b/calendar.android.js
@@ -16,6 +16,8 @@ Calendar._fields = {
   LOCATION: "eventLocation",
   STARTDATE: "dtstart",
   ENDDATE: "dtend",
+  BEGIN: "begin",
+  END: "end",
   ALLDAY: "allDay",
   TIMEZONE: "eventTimezone",
   HAS_ALARM: "hasAlarm",
@@ -156,7 +158,10 @@ Calendar._findEvents = function(arg) {
     Calendar._fields.LOCATION,
     Calendar._fields.STARTDATE,
     Calendar._fields.ENDDATE,
-    Calendar._fields.ALLDAY
+    Calendar._fields.ALLDAY,
+    Calendar._fields.RRULE,
+    Calendar._fields.BEGIN,
+    Calendar._fields.END
   ];
 
   var sortOrder = android.provider.CalendarContract.Instances.BEGIN + " ASC, " + android.provider.CalendarContract.Instances.END + " ASC";
@@ -207,7 +212,10 @@ Calendar._findEvents = function(arg) {
         calendar: {
           id: cursor.getLong(cursor.getColumnIndex(Calendar._fields.CALENDAR.ID)),
           name: cursor.getString(cursor.getColumnIndex(Calendar._fields.CALENDAR.NAME))
-        }
+        },
+        recurringRule: cursor.getString(cursor.getColumnIndex(Calendar._fields.RRULE)),
+        instanceBeginDate: new Date(cursor.getLong(cursor.getColumnIndex(Calendar._fields.BEGIN))),
+        instanceEndDate: new Date(cursor.getLong(cursor.getColumnIndex(Calendar._fields.END)))
       };
       events.push(event);
     } while (cursor.moveToNext());

diff --git a/index.d.ts b/index.d.ts
@@ -150,11 +150,15 @@ declare module "nativescript-calendar" {
       id: string;
       title: string;
       location: string;
+      notes: string;
       url: string;
       startDate: Date;
       endDate: Date;
       allDay: boolean;
       calendar: Calendar;
+      instanceBeginDate: Date;
+      instanceEndDate: Date;
+      recurringRule: string;
       /**
        * iOS only.
        */