Merge branch 'master' of github.com:wix/react-native-calendars into release

Author: Inbal-Tish

example/src/mocks/timelineEvents.ts

@@ -0,0 +1,120 @@
+import {TimelineEventProps, CalendarUtils} from 'react-native-calendars';
+
+const EVENT_COLOR = '#e6add8';
+const today = new Date();
+export const getDate = (offset = 0) => CalendarUtils.getCalendarDateString(new Date().setDate(today.getDate() + offset));
+
+export const timelineEvents: TimelineEventProps[] = [
+  {
+    start: `${getDate(-1)} 09:20:00`,
+    end: `${getDate(-1)} 12:00:00`,
+    title: 'Merge Request to React Native Calendars',
+    summary: 'Merge Timeline Calendar to React Native Calendars'
+  },
+  {
+    start: `${getDate()} 01:15:00`,
+    end: `${getDate()} 02:30:00`,
+    title: 'Meeting A',
+    summary: 'Summary for meeting A',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate()} 01:30:00`,
+    end: `${getDate()} 02:30:00`,
+    title: 'Meeting B',
+    summary: 'Summary for meeting B',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate()} 01:45:00`,
+    end: `${getDate()} 02:45:00`,
+    title: 'Meeting C',
+    summary: 'Summary for meeting C',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate()} 02:40:00`,
+    end: `${getDate()} 03:10:00`,
+    title: 'Meeting D',
+    summary: 'Summary for meeting D',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate()} 02:50:00`,
+    end: `${getDate()} 03:20:00`,
+    title: 'Meeting E',
+    summary: 'Summary for meeting E',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate()} 04:30:00`,
+    end: `${getDate()} 05:30:00`,
+    title: 'Meeting F',
+    summary: 'Summary for meeting F',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate(1)} 00:30:00`,
+    end: `${getDate(1)} 01:30:00`,
+    title: 'Visit Grand Mother',
+    summary: 'Visit Grand Mother and bring some fruits.',
+    color: 'lightblue'
+  },
+  {
+    start: `${getDate(1)} 02:30:00`,
+    end: `${getDate(1)} 03:20:00`,
+    title: 'Meeting with Prof. Behjet Zuhaira',
+    summary: 'Meeting with Prof. Behjet at 130 in her office.',
+    color: EVENT_COLOR
+  },
+  {
+    start: `${getDate(1)} 04:10:00`,
+    end: `${getDate(1)} 04:40:00`,
+    title: 'Tea Time with Dr. Hasan',
+    summary: 'Tea Time with Dr. Hasan, Talk about Project'
+  },
+  {
+    start: `${getDate(1)} 01:05:00`,
+    end: `${getDate(1)} 01:35:00`,
+    title: 'Dr. Mariana Joseph',
+    summary: '3412 Piedmont Rd NE, GA 3032'
+  },
+  {
+    start: `${getDate(1)} 14:30:00`,
+    end: `${getDate(1)} 16:30:00`,
+    title: 'Meeting Some Friends in ARMED',
+    summary: 'Arsalan, Hasnaat, Talha, Waleed, Bilal',
+    color: 'pink'
+  },
+  {
+    start: `${getDate(2)} 01:40:00`,
+    end: `${getDate(2)} 02:25:00`,
+    title: 'Meet Sir Khurram Iqbal',
+    summary: 'Computer Science Dept. Comsats Islamabad',
+    color: 'orange'
+  },
+  {
+    start: `${getDate(2)} 04:10:00`,
+    end: `${getDate(2)} 04:40:00`,
+    title: 'Tea Time with Colleagues',
+    summary: 'WeRplay'
+  },
+  {
+    start: `${getDate(2)} 00:45:00`,
+    end: `${getDate(2)} 01:45:00`,
+    title: 'Lets Play Apex Legends',
+    summary: 'with Boys at Work'
+  },
+  {
+    start: `${getDate(2)} 11:30:00`,
+    end: `${getDate(2)} 12:30:00`,
+    title: 'Dr. Mariana Joseph',
+    summary: '3412 Piedmont Rd NE, GA 3032'
+  },
+  {
+    start: `${getDate(4)} 12:10:00`,
+    end: `${getDate(4)} 13:45:00`,
+    title: 'Merge Request to React Native Calendars',
+    summary: 'Merge Timeline Calendar to React Native Calendars'
+  }
+];

example/src/screens/agendaScreen.tsx

@@ -12,6 +12,10 @@ export default class AgendaScreen extends Component<State> {
     items: undefined
   };
 
+  // reservationsKeyExtractor = (item, index) => {
+  //   return `${item?.reservation?.day}${index}`;
+  // };
+
   render() {
     return (
       <Agenda
@@ -38,6 +42,7 @@ export default class AgendaScreen extends Component<State> {
         //renderDay={(day, item) => (<Text>{day ? day.day: 'item'}</Text>)}
         // hideExtraDays={false}
         // showOnlySelectedDayItems
+        // reservationsKeyExtractor={this.reservationsKeyExtractor}
       />
     );
   }

example/src/screens/calendarListScreen.tsx

@@ -5,6 +5,8 @@ import testIDs from '../testIDs';
 
 const RANGE = 24;
 const initialDate = '2022-07-05';
+const nextWeekDate = '2022-07-14';
+const nextMonthDate = '2022-08-05';
 
 interface Props {
   horizontalView?: boolean;
@@ -21,8 +23,15 @@ const CalendarListScreen = (props: Props) => {
         selectedColor: '#5E60CE',
         selectedTextColor: 'white'
       },
-      ['2022-08-05']: {
-        selectedTextColor: 'pink'
+      [nextWeekDate]: {
+        selected: selected === nextWeekDate,
+        selectedTextColor: '#5E60CE',
+        marked: true
+      },
+      [nextMonthDate]: {
+        selected: selected === nextMonthDate,
+        selectedTextColor: '#5E60CE',
+        marked: true
       }
     };
   }, [selected]);
@@ -40,6 +49,7 @@ const CalendarListScreen = (props: Props) => {
       onDayPress={onDayPress}
       markedDates={marked}
       renderHeader={!horizontalView ? renderCustomHeader : undefined}
+      calendarHeight={!horizontalView ? 390 : undefined}
       theme={!horizontalView ? theme : undefined}
       horizontal={horizontalView}
       pagingEnabled={horizontalView}