Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added the attribute 'disableBackgroundForSelectedDay' #250

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added the attribute 'disableBackgroundForSelectedDay' #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ccbdc6
no highlighting for current selected day
IVleafclover Nov 12, 2017
eccb377
added the attribute 'disableBackgroundForSelectedDay' to not draw the…
IVleafclover Nov 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class CompactCalendarController {
private boolean shouldDrawIndicatorsBelowSelectedDays = false;
private boolean displayOtherMonthDays = false;
private boolean shouldSelectFirstDayOfMonthOnScroll = true;
private boolean disableBackgroundForSelectedDay = false;

private CompactCalendarViewListener listener;
private VelocityTracker velocityTracker = null;
Expand Down Expand Up @@ -236,6 +237,10 @@ private void setMonthOffset(Calendar calendarWithFirstDayOfMonth, Date currentDa
calendarWithFirstDayOfMonth.set(Calendar.MILLISECOND, 0);
}

void disableBackgroundForSelectedDay(boolean disableBackgroundForSelectedDay) {
this.disableBackgroundForSelectedDay = disableBackgroundForSelectedDay;
}

void setShouldSelectFirstDayOfMonthOnScroll(boolean shouldSelectFirstDayOfMonthOnScroll){
this.shouldSelectFirstDayOfMonthOnScroll = shouldSelectFirstDayOfMonthOnScroll;
}
Expand Down Expand Up @@ -766,15 +771,15 @@ void drawEvents(Canvas canvas, Calendar currentMonthToDrawCalender, int offset)
boolean isSameDayAsCurrentDay = shouldDrawCurrentDayCircle && (todayDayOfMonth == dayOfMonth) && (eventYear == currentYear);
boolean isCurrentSelectedDay = shouldDrawSelectedDayCircle && (selectedDayOfMonth == dayOfMonth);

if (shouldDrawIndicatorsBelowSelectedDays || (!shouldDrawIndicatorsBelowSelectedDays && !isSameDayAsCurrentDay && !isCurrentSelectedDay) || animationStatus == EXPOSE_CALENDAR_ANIMATION) {
if (shouldDrawIndicatorsBelowSelectedDays || (!shouldDrawIndicatorsBelowSelectedDays && !isSameDayAsCurrentDay && (!isCurrentSelectedDay || disableBackgroundForSelectedDay)) || animationStatus == EXPOSE_CALENDAR_ANIMATION) {
if (eventIndicatorStyle == FILL_LARGE_INDICATOR || eventIndicatorStyle == NO_FILL_LARGE_INDICATOR) {
Event event = eventsList.get(0);
drawEventIndicatorCircle(canvas, xPosition, yPosition, event.getColor());
} else {
yPosition += indicatorOffset;
// offset event indicators to draw below selected day indicators
// this makes sure that they do no overlap
if (shouldDrawIndicatorsBelowSelectedDays && (isSameDayAsCurrentDay || isCurrentSelectedDay)) {
if (shouldDrawIndicatorsBelowSelectedDays && (isSameDayAsCurrentDay || (isCurrentSelectedDay && !disableBackgroundForSelectedDay))) {
yPosition += indicatorOffset;
}

Expand Down Expand Up @@ -879,7 +884,7 @@ void drawMonth(Canvas canvas, Calendar monthToDrawCalender, int offset) {
} else {
int day = ((dayRow - 1) * 7 + dayColumn + 1) - firstDayOfMonth;
int defaultCalenderTextColorToUse = calenderTextColor;
if (currentCalender.get(Calendar.DAY_OF_MONTH) == day && isSameMonthAsCurrentCalendar && !isAnimatingWithExpose) {
if (currentCalender.get(Calendar.DAY_OF_MONTH) == day && isSameMonthAsCurrentCalendar && !isAnimatingWithExpose && !disableBackgroundForSelectedDay) {
drawDayCircleIndicator(currentSelectedDayIndicatorStyle, canvas, xPosition, yPosition, currentSelectedDayBackgroundColor);
defaultCalenderTextColorToUse = currentSelectedDayTextColor;
} else if (isSameYearAsToday && isSameMonthAsToday && todayDayOfMonth == day && !isAnimatingWithExpose) {
Expand Down
4 changes: 4 additions & 0 deletions library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ public Date getFirstDayOfCurrentMonth(){
return compactCalendarController.getFirstDayOfCurrentMonth();
}

public void disableBackgroundForSelectedDay(boolean disableBackgroundForSelectedDay){
compactCalendarController.disableBackgroundForSelectedDay(disableBackgroundForSelectedDay);
}

public void shouldDrawIndicatorsBelowSelectedDays(boolean shouldDrawIndicatorsBelowSelectedDays){
compactCalendarController.shouldDrawIndicatorsBelowSelectedDays(shouldDrawIndicatorsBelowSelectedDays);
}
Expand Down