@@ -373,6 +373,7 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
373
373
}
374
374
}
375
375
376
+ // Iterate through each day.
376
377
for (int dayNumber = leftDaysWithGaps + 1 ;
377
378
dayNumber <= leftDaysWithGaps + mNumberOfVisibleDays + 1 ;
378
379
dayNumber ++) {
@@ -405,11 +406,14 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
405
406
i ++;
406
407
}
407
408
}
409
+
410
+ // Draw the lines for hours.
408
411
canvas .drawLines (hourLines , mHourSeparatorPaint );
409
412
410
413
// Draw the events.
411
414
drawEvents (day , startPixel , canvas );
412
415
416
+ // In the next iteration, start from the next day.
413
417
startPixel += mWidthPerDay + mColumnGap ;
414
418
}
415
419
@@ -440,8 +444,6 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
440
444
*/
441
445
private void drawEvents (Calendar date , float startFromPixel , Canvas canvas ) {
442
446
if (mEventRects != null && mEventRects .size () > 0 ) {
443
-
444
-
445
447
for (int i = 0 ; i < mEventRects .size (); i ++) {
446
448
if (isSameDay (mEventRects .get (i ).event .getStartTime (), date )) {
447
449
@@ -460,6 +462,7 @@ private void drawEvents(Calendar date, float startFromPixel, Canvas canvas) {
460
462
float right = startFromPixel + mWidthPerDay ;
461
463
if (left < mHeaderColumnWidth ) left = mHeaderColumnWidth ;
462
464
465
+ // Draw the event and the event name on top of it.
463
466
RectF eventRectF = new RectF (left , top , right , bottom );
464
467
if (bottom > mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight /2 && left < right &&
465
468
eventRectF .right > mHeaderColumnWidth &&
@@ -469,7 +472,6 @@ eventRectF.top < getHeight() &&
469
472
left < right
470
473
) {
471
474
mEventRects .get (i ).rectF = eventRectF ;
472
-
473
475
mEventBackgroundPaint .setColor (mEventRects .get (i ).event .getColor () == 0 ? mDefaultEventColor : mEventRects .get (i ).event .getColor ());
474
476
canvas .drawRect (mEventRects .get (i ).rectF , mEventBackgroundPaint );
475
477
drawText (mEventRects .get (i ).event .getName (), mEventRects .get (i ).rectF , canvas , originalTop , startFromPixel );
@@ -515,7 +517,6 @@ else if (lineHeight >= availableHeight) {
515
517
mTextLayout .draw (canvas );
516
518
canvas .restore ();
517
519
518
-
519
520
}
520
521
521
522
@@ -541,7 +542,6 @@ public EventRect(WeekViewEvent event, RectF rectF) {
541
542
*/
542
543
private void getMoreEvents (Calendar day ) {
543
544
544
-
545
545
// Delete all events if its not current month +- 1.
546
546
deleteFarMonths (day );
547
547
@@ -605,7 +605,6 @@ private void deleteFarMonths(Calendar currentDay) {
605
605
606
606
Calendar nextMonth = (Calendar ) currentDay .clone ();
607
607
nextMonth .add (Calendar .MONTH , 1 );
608
- int max = nextMonth .getActualMaximum (Calendar .DAY_OF_MONTH );
609
608
nextMonth .set (Calendar .DAY_OF_MONTH , nextMonth .getActualMaximum (Calendar .DAY_OF_MONTH ));
610
609
nextMonth .set (Calendar .HOUR_OF_DAY , 12 );
611
610
nextMonth .set (Calendar .MINUTE , 59 );
0 commit comments