Skip to content

Feature/text color for past days #227

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

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

Feature/text color for past days #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e7bf09
Implement feature
Aug 4, 2017
6800ec2
Fix logic
Aug 4, 2017
3b397ee
Use todayCalender instead currentCalender
Aug 4, 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
21 changes: 16 additions & 5 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 @@ -105,6 +105,7 @@ class CompactCalendarController {
private int currentSelectedDayTextColor;
private int calenderBackgroundColor = Color.WHITE;
private int otherMonthDaysTextColor;
private int pastDaysTextColor;
private TimeZone timeZone;

/**
Expand All @@ -128,6 +129,7 @@ private enum Direction {
this.calenderTextColor = calenderTextColor;
this.currentSelectedDayBackgroundColor = currentSelectedDayBackgroundColor;
this.otherMonthDaysTextColor = calenderTextColor;
this.pastDaysTextColor = calenderTextColor;
this.velocityTracker = velocityTracker;
this.multiEventIndicatorColor = multiEventIndicatorColor;
this.eventsContainer = eventsContainer;
Expand All @@ -146,6 +148,7 @@ private void loadAttributes(AttributeSet attrs, Context context) {
calenderTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarTextColor, calenderTextColor);
currentDayTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentDayTextColor, calenderTextColor);
otherMonthDaysTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarOtherMonthDaysTextColor, otherMonthDaysTextColor);
pastDaysTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarPastDaysTextColor, calenderTextColor);
currentSelectedDayBackgroundColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentSelectedDayBackgroundColor, currentSelectedDayBackgroundColor);
currentSelectedDayTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentSelectedDayTextColor, calenderTextColor);
calenderBackgroundColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarBackgroundColor, calenderBackgroundColor);
Expand Down Expand Up @@ -837,11 +840,17 @@ void drawMonth(Canvas canvas, Calendar monthToDrawCalender, int offset) {
//offset by one because we want to start from Monday
int firstDayOfMonth = getDayOfWeek(monthToDrawCalender);

boolean isSameMonthAsToday = monthToDrawCalender.get(Calendar.MONTH) == todayCalender.get(Calendar.MONTH);
boolean isSameYearAsToday = monthToDrawCalender.get(Calendar.YEAR) == todayCalender.get(Calendar.YEAR);
int currentDayOfMonth = currentCalender.get(Calendar.DAY_OF_MONTH);
int todayDayOfMonth = todayCalender.get(Calendar.DAY_OF_MONTH);

boolean isSameMonthAsToday = monthToDrawCalender.get(Calendar.MONTH) == todayCalender.get(Calendar.MONTH)
&& monthToDrawCalender.get(Calendar.YEAR) == todayCalender.get(Calendar.YEAR);
boolean isSameMonthAsCurrentCalendar = monthToDrawCalender.get(Calendar.MONTH) == currentCalender.get(Calendar.MONTH) &&
monthToDrawCalender.get(Calendar.YEAR) == currentCalender.get(Calendar.YEAR);
int todayDayOfMonth = todayCalender.get(Calendar.DAY_OF_MONTH);
boolean isPastMonth = monthToDrawCalender.get(Calendar.YEAR) < todayCalender.get(Calendar.YEAR)
|| monthToDrawCalender.get(Calendar.YEAR) == todayCalender.get(Calendar.YEAR)
&& monthToDrawCalender.get(Calendar.MONTH) < todayCalender.get(Calendar.MONTH);

boolean isAnimatingWithExpose = animationStatus == EXPOSE_CALENDAR_ANIMATION;

int maximumMonthDay = monthToDrawCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
Expand Down Expand Up @@ -879,13 +888,15 @@ 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 (currentDayOfMonth == day && isSameMonthAsCurrentCalendar && !isAnimatingWithExpose) {
drawDayCircleIndicator(currentSelectedDayIndicatorStyle, canvas, xPosition, yPosition, currentSelectedDayBackgroundColor);
defaultCalenderTextColorToUse = currentSelectedDayTextColor;
} else if (isSameYearAsToday && isSameMonthAsToday && todayDayOfMonth == day && !isAnimatingWithExpose) {
} else if (isSameMonthAsToday && todayDayOfMonth == day && !isAnimatingWithExpose) {
// TODO calculate position of circle in a more reliable way
drawDayCircleIndicator(currentDayIndicatorStyle, canvas, xPosition, yPosition, currentDayBackgroundColor);
defaultCalenderTextColorToUse = currentDayTextColor;
} else if (isPastMonth || isSameMonthAsToday && todayDayOfMonth > day) {
defaultCalenderTextColorToUse = pastDaysTextColor;
}
if (day <= 0) {
if (displayOtherMonthDays) {
Expand Down
1 change: 1 addition & 0 deletions library/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
<attr name="compactCalendarDisplayOtherMonthDays" format="boolean"/>
<attr name="compactCalendarShouldSelectFirstDayOfMonthOnScroll" format="boolean"/>
<attr name="compactCalendarOtherMonthDaysTextColor" format="color"/>
<attr name="compactCalendarPastDaysTextColor" format="color"/>
</declare-styleable>
</resources>