CalendarView.java updated to fix drawing bugs

See the comments for why I changed what I changed. Feel free to remove them if you'd like.