Fixed HeaderHeight for real

Author: Jesse Hoobergs

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -494,29 +494,8 @@ protected void onDraw(Canvas canvas) {
         drawTimeColumnAndAxes(canvas);
     }
 
-    private void drawTimeColumnAndAxes(Canvas canvas) {
-        // Draw the background color for the header column.
-        canvas.drawRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight(), mHeaderColumnBackgroundPaint);
-
-        // Clip to paint in left column only.
-        canvas.clipRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight(), Region.Op.REPLACE);
-
-        for (int i = 0; i < 24; i++) {
-            float top = mHeaderHeight + mHeaderRowPadding * 2 + mCurrentOrigin.y + mHourHeight * i + mHeaderMarginBottom;
-
-            // Draw the text if its y position is not outside of the visible area. The pivot point of the text is the point at the bottom-right corner.
-            String time = getDateTimeInterpreter().interpretTime(i);
-            if (time == null)
-                throw new IllegalStateException("A DateTimeInterpreter must not return null time");
-            if (top < getHeight()) canvas.drawText(time, mTimeTextWidth + mHeaderColumnPadding, top + mTimeTextHeight, mTimeTextPaint);
-        }
-    }
-
-    private void drawHeaderRowAndEvents(Canvas canvas) {
-        // Calculate the available width for each day.
-        mHeaderColumnWidth = mTimeTextWidth + mHeaderColumnPadding *2;
-        mWidthPerDay = getWidth() - mHeaderColumnWidth - mColumnGap * (mNumberOfVisibleDays - 1);
-        mWidthPerDay = mWidthPerDay/mNumberOfVisibleDays;
+    private void calculateHeaderHeight(){
+        //Make sure the header is the right size (depends on AllDay events)
         boolean containsAllDayEvent = false;
         if (mEventRects != null && mEventRects.size() > 0) {
             for (int dayNumber = 0;
@@ -536,17 +515,39 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
                 }
             }
         }
-        float newHeaderHeight;
         if(containsAllDayEvent) {
-            newHeaderHeight = mHeaderTextHeight + (mAllDayEventHeight + mHeaderMarginBottom);
+            mHeaderHeight = mHeaderTextHeight + (mAllDayEventHeight + mHeaderMarginBottom);
         }
         else{
-            newHeaderHeight = mHeaderTextHeight;
+            mHeaderHeight = mHeaderTextHeight;
         }
-        if(newHeaderHeight!=mHeaderHeight){
-            mHeaderHeight = newHeaderHeight;
-            postInvalidate();
+    }
+
+    private void drawTimeColumnAndAxes(Canvas canvas) {
+        // Draw the background color for the header column.
+        canvas.drawRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight(), mHeaderColumnBackgroundPaint);
+
+        // Clip to paint in left column only.
+        canvas.clipRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight(), Region.Op.REPLACE);
+
+        for (int i = 0; i < 24; i++) {
+            float top = mHeaderHeight + mHeaderRowPadding * 2 + mCurrentOrigin.y + mHourHeight * i + mHeaderMarginBottom;
+
+            // Draw the text if its y position is not outside of the visible area. The pivot point of the text is the point at the bottom-right corner.
+            String time = getDateTimeInterpreter().interpretTime(i);
+            if (time == null)
+                throw new IllegalStateException("A DateTimeInterpreter must not return null time");
+            if (top < getHeight()) canvas.drawText(time, mTimeTextWidth + mHeaderColumnPadding, top + mTimeTextHeight, mTimeTextPaint);
         }
+    }
+
+    private void drawHeaderRowAndEvents(Canvas canvas) {
+        // Calculate the available width for each day.
+        mHeaderColumnWidth = mTimeTextWidth + mHeaderColumnPadding *2;
+        mWidthPerDay = getWidth() - mHeaderColumnWidth - mColumnGap * (mNumberOfVisibleDays - 1);
+        mWidthPerDay = mWidthPerDay/mNumberOfVisibleDays;
+
+        calculateHeaderHeight(); //Make sure the header is the right size (depends on AllDay events)
 
         Calendar today = today();
 
@@ -1003,6 +1004,7 @@ else if (periodToFetch == mFetchedPeriod+1){
                 sortAndCacheEvents(previousPeriodEvents);
                 sortAndCacheEvents(currentPeriodEvents);
                 sortAndCacheEvents(nextPeriodEvents);
+                calculateHeaderHeight();
 
                 mPreviousPeriodEvents = previousPeriodEvents;
                 mCurrentPeriodEvents = currentPeriodEvents;