Bug fixing - make sure deactivated date are not clickable

leocarona · Dec 13, 2019 · 6d130d2 · 6d130d2
1 parent 558e156
commit 6d130d2
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/rangedatepicker/src/main/java/com/savvi/rangedatepicker/MonthView.java b/rangedatepicker/src/main/java/com/savvi/rangedatepicker/MonthView.java
@@ -151,20 +151,24 @@ public void init(MonthDescriptor month, List<List<MonthCellDescriptor>> cells,
                     int dayOfWeek = c + 1;
                     Calendar calendar = Calendar.getInstance(timeZone, locale);
                     calendar.setTime(cell.getDate());
-                        cellView.setClickable(false);
-                        cellView.setSelected(false);
                     boolean isAnActivatedDate = activatedDates.contains(calendar);
                     boolean isDeactivatedDate = deactivatedDates.contains(dayOfWeek);
                     if (!isAnActivatedDate && !cell.isSelected())
                         cellView.setDeactivated(true);
+                    else
+                        cellView.setDeactivated(isDeactivatedDate);
 
-                    } else {
-                        cellView.setClickable(!displayOnly);
+                    if (isDeactivatedDate)
+                        cellView.setSelected(false);
+                    else
                         cellView.setSelected(cell.isSelected());
-                        cellView.setDeactivated(false);
-                    }
 
 
+                    if (isDeactivatedDate)
+                        cellView.setClickable(false);
+                    else
+                        cellView.setClickable(!displayOnly);
+
                     cellView.setTag(cell);
 
                     if (null != decorators) {