Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EventList bug fixing #36

Merged
merged 1 commit into from Dec 21, 2018
Merged

EventList bug fixing #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 35 additions & 12 deletions example/lib/main.dart
View file
Open in desktop
Expand Up @@ -82,24 +82,47 @@ class _MyHomePageState extends State<MyHomePage> {
title: 'Event 3',
icon: _eventIcon,
),
new Event(
date: new DateTime(2018, 12, 10),
title: 'Event 4',
icon: _eventIcon,
),
],
new DateTime(2018, 12, 25) : [
new Event(
date: new DateTime(2018, 12, 25),
title: 'Event 5',
icon: _eventIcon,
),
],
},
);

CalendarCarousel _calendarCarousel, _calendarCarouselNoHeader;

@override
void initState() {
/// Add more events to _markedDateMap EventList
_markedDateMap.add(new DateTime(2018, 12, 25), new Event(
date: new DateTime(2018, 12, 25),
title: 'Event 5',
icon: _eventIcon,
));

_markedDateMap.add(new DateTime(2018, 12, 10), new Event(
date: new DateTime(2018, 12, 10),
title: 'Event 4',
icon: _eventIcon,
));

_markedDateMap.addAll(new DateTime(2018, 12, 11), [
new Event(
date: new DateTime(2018, 12, 11),
title: 'Event 1',
icon: _eventIcon,
),
new Event(
date: new DateTime(2018, 12, 11),
title: 'Event 2',
icon: _eventIcon,
),
new Event(
date: new DateTime(2018, 12, 11),
title: 'Event 3',
icon: _eventIcon,
),
]);
super.initState();
}

@override
Widget build(BuildContext context) {
/// Example with custom icon
Expand Down
7 changes: 7 additions & 0 deletions lib/classes/event.dart
View file
Open in desktop
Expand Up @@ -10,4 +10,11 @@ class Event {
this.title,
this.icon
}) : assert(date != null);

@override
bool operator ==(other) {
return this.date == other.date
&& this.title == other.title
&& this.icon == other.icon;
}
}
20 changes: 7 additions & 13 deletions lib/classes/event_list.dart
View file
Open in desktop
Expand Up @@ -10,21 +10,15 @@ class EventList {


void add(DateTime date, Event event){
if(events != null && events.containsKey(date)) {
events[date].add(event);
}
else {
events = { date: [event] };
}
if(events == null) events = { date: [event] };
else if(!events.containsKey(date)) events[date] = [ event ];
else events[date].add(event);
}

void addAll(DateTime date, List<Event> events){
if(this.events != null && this.events.containsKey(date)) {
this.events[date].addAll(events);
}
else {
this.events = { date: events };
}
if(this.events == null) this.events = { date: events };
else if(!this.events.containsKey(date)) this.events[date] = events;
else this.events[date].addAll(events);
}

bool remove(DateTime date, Event event){
Expand All @@ -36,7 +30,7 @@ class EventList {
List<Event> removeAll(DateTime date) {
return events != null && events.containsKey(date)
? events.remove(date)
: true;
: [];
}

void clear(){
Expand Down