[MaterialCalendar] Fix NPE

PiperOrigin-RevId: 502984835
material-components · Jan 19, 2023 · c484ea7 · c484ea7
1 parent 4c31ab5
commit c484ea7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/datepicker/MaterialCalendar.java b/lib/java/com/google/android/material/datepicker/MaterialCalendar.java
@@ -302,9 +302,12 @@ public void onDraw(
             }
             int top = viewInRow.getTop() + calendarStyle.year.getTopInset();
             int bottom = viewInRow.getBottom() - calendarStyle.year.getBottomInset();
-            int left = row == firstRow ? firstView.getLeft() + firstView.getWidth() / 2 : 0;
+            int left =
+                row == firstRow && firstView != null
+                    ? firstView.getLeft() + firstView.getWidth() / 2
+                    : 0;
             int right =
-                row == lastRow
+                row == lastRow && lastView != null
                     ? lastView.getLeft() + lastView.getWidth() / 2
                     : recyclerView.getWidth();
             canvas.drawRect(left, top, right, bottom, calendarStyle.rangeFill);