From 4559aaa19fb97015a5c3c4b559108ac9b641eae2 Mon Sep 17 00:00:00 2001 From: Ioannis Cherouvim <743305+cherouvim@users.noreply.github.com> Date: Thu, 18 Oct 2018 10:02:40 +0300 Subject: [PATCH] typo: calender -> calendar --- gradle.properties | 2 +- .../CompactCalendarController.java | 148 +++++++++--------- .../CompactCalendarView.java | 4 +- .../CompactCalendarControllerTest.java | 20 +-- .../CompactCalendarHelper.java | 68 ++++---- .../github/com/sample/ApplicationTest.java | 34 ++-- .../github/com/sample/CompactCalendarTab.java | 30 ++-- 7 files changed, 153 insertions(+), 153 deletions(-) diff --git a/gradle.properties b/gradle.properties index d84e6c89..d2b951c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,4 @@ systemProp.http.nonProxyHosts=localhost,127.0.01 POM_URL=https\://github.com/SundeepK/CompactCalendarView POM_SCM_CONNECTION=scm\:git@github.com\:SundeepK/CompactCalendarView.git POM_LICENCE_NAME=The MIT License (MIT) -POM_DESCRIPTION=An android library which provides a compact calender view +POM_DESCRIPTION=An android library which provides a compact calendar view diff --git a/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarController.java b/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarController.java index af565937..14ed86ce 100755 --- a/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarController.java +++ b/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarController.java @@ -85,8 +85,8 @@ class CompactCalendarController { private Direction currentDirection = Direction.NONE; private Date currentDate = new Date(); private Locale locale; - private Calendar currentCalender; - private Calendar todayCalender; + private Calendar currentCalendar; + private Calendar todayCalendar; private Calendar calendarWithFirstDayOfMonth; private Calendar eventsCalendar; private EventsContainer eventsContainer; @@ -101,10 +101,10 @@ class CompactCalendarController { private int multiEventIndicatorColor; private int currentDayBackgroundColor; private int currentDayTextColor; - private int calenderTextColor; + private int calendarTextColor; private int currentSelectedDayBackgroundColor; private int currentSelectedDayTextColor; - private int calenderBackgroundColor = Color.WHITE; + private int calendarBackgroundColor = Color.WHITE; private int otherMonthDaysTextColor; private TimeZone timeZone; @@ -118,7 +118,7 @@ private enum Direction { } CompactCalendarController(Paint dayPaint, OverScroller scroller, Rect textSizeRect, AttributeSet attrs, - Context context, int currentDayBackgroundColor, int calenderTextColor, + Context context, int currentDayBackgroundColor, int calendarTextColor, int currentSelectedDayBackgroundColor, VelocityTracker velocityTracker, int multiEventIndicatorColor, EventsContainer eventsContainer, Locale locale, TimeZone timeZone) { @@ -126,9 +126,9 @@ private enum Direction { this.scroller = scroller; this.textSizeRect = textSizeRect; this.currentDayBackgroundColor = currentDayBackgroundColor; - this.calenderTextColor = calenderTextColor; + this.calendarTextColor = calendarTextColor; this.currentSelectedDayBackgroundColor = currentSelectedDayBackgroundColor; - this.otherMonthDaysTextColor = calenderTextColor; + this.otherMonthDaysTextColor = calendarTextColor; this.velocityTracker = velocityTracker; this.multiEventIndicatorColor = multiEventIndicatorColor; this.eventsContainer = eventsContainer; @@ -144,12 +144,12 @@ private void loadAttributes(AttributeSet attrs, Context context) { TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.CompactCalendarView, 0, 0); try { currentDayBackgroundColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentDayBackgroundColor, currentDayBackgroundColor); - calenderTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarTextColor, calenderTextColor); - currentDayTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentDayTextColor, calenderTextColor); + calendarTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarTextColor, calendarTextColor); + currentDayTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentDayTextColor, calendarTextColor); otherMonthDaysTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarOtherMonthDaysTextColor, otherMonthDaysTextColor); currentSelectedDayBackgroundColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentSelectedDayBackgroundColor, currentSelectedDayBackgroundColor); - currentSelectedDayTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentSelectedDayTextColor, calenderTextColor); - calenderBackgroundColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarBackgroundColor, calenderBackgroundColor); + currentSelectedDayTextColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarCurrentSelectedDayTextColor, calendarTextColor); + calendarBackgroundColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarBackgroundColor, calendarBackgroundColor); multiEventIndicatorColor = typedArray.getColor(R.styleable.CompactCalendarView_compactCalendarMultiEventIndicatorColor, multiEventIndicatorColor); textSize = typedArray.getDimensionPixelSize(R.styleable.CompactCalendarView_compactCalendarTextSize, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, textSize, context.getResources().getDisplayMetrics())); @@ -167,8 +167,8 @@ private void loadAttributes(AttributeSet attrs, Context context) { } private void init(Context context) { - currentCalender = Calendar.getInstance(timeZone, locale); - todayCalender = Calendar.getInstance(timeZone, locale); + currentCalendar = Calendar.getInstance(timeZone, locale); + todayCalendar = Calendar.getInstance(timeZone, locale); calendarWithFirstDayOfMonth = Calendar.getInstance(timeZone, locale); eventsCalendar = Calendar.getInstance(timeZone, locale); tempPreviousMonthCalendar = Calendar.getInstance(timeZone, locale); @@ -176,8 +176,8 @@ private void init(Context context) { // make setMinimalDaysInFirstWeek same across android versions eventsCalendar.setMinimalDaysInFirstWeek(1); calendarWithFirstDayOfMonth.setMinimalDaysInFirstWeek(1); - todayCalender.setMinimalDaysInFirstWeek(1); - currentCalender.setMinimalDaysInFirstWeek(1); + todayCalendar.setMinimalDaysInFirstWeek(1); + currentCalendar.setMinimalDaysInFirstWeek(1); tempPreviousMonthCalendar.setMinimalDaysInFirstWeek(1); setFirstDayOfWeek(firstDayOfWeekToDraw); @@ -188,16 +188,16 @@ private void init(Context context) { dayPaint.setFlags(Paint.ANTI_ALIAS_FLAG); dayPaint.setTypeface(Typeface.SANS_SERIF); dayPaint.setTextSize(textSize); - dayPaint.setColor(calenderTextColor); + dayPaint.setColor(calendarTextColor); dayPaint.getTextBounds("31", 0, "31".length(), textSizeRect); textHeight = textSizeRect.height() * 3; textWidth = textSizeRect.width() * 2; - todayCalender.setTime(new Date()); - setToMidnight(todayCalender); + todayCalendar.setTime(new Date()); + setToMidnight(todayCalendar); - currentCalender.setTime(currentDate); - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, -monthsScrolledSoFar, 0); + currentCalendar.setTime(currentDate); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, -monthsScrolledSoFar, 0); initScreenDensityRelatedValues(context); @@ -223,7 +223,7 @@ private void initScreenDensityRelatedValues(Context context) { } } - private void setCalenderToFirstDayOfMonth(Calendar calendarWithFirstDayOfMonth, Date currentDate, int scrollOffset, int monthOffset) { + private void setCalendarToFirstDayOfMonth(Calendar calendarWithFirstDayOfMonth, Date currentDate, int scrollOffset, int monthOffset) { setMonthOffset(calendarWithFirstDayOfMonth, currentDate, scrollOffset, monthOffset); calendarWithFirstDayOfMonth.set(Calendar.DAY_OF_MONTH, 1); } @@ -313,8 +313,8 @@ void setFirstDayOfWeek(int day){ setUseWeekDayAbbreviation(useThreeLetterAbbreviation); eventsCalendar.setFirstDayOfWeek(day); calendarWithFirstDayOfMonth.setFirstDayOfWeek(day); - todayCalender.setFirstDayOfWeek(day); - currentCalender.setFirstDayOfWeek(day); + todayCalendar.setFirstDayOfWeek(day); + currentCalendar.setFirstDayOfWeek(day); tempPreviousMonthCalendar.setFirstDayOfWeek(day); } @@ -326,8 +326,8 @@ void setCurrentSelectedDayTextColor(int currentSelectedDayTextColor) { this.currentSelectedDayTextColor = currentSelectedDayTextColor; } - void setCalenderBackgroundColor(int calenderBackgroundColor) { - this.calenderBackgroundColor = calenderBackgroundColor; + void setCalendarBackgroundColor(int calendarBackgroundColor) { + this.calendarBackgroundColor = calendarBackgroundColor; } void setCurrentDayBackgroundColor(int currentDayBackgroundColor) { @@ -358,7 +358,7 @@ private void scrollNext() { monthsScrolledSoFar = monthsScrolledSoFar - 1; accumulatedScrollOffset.x = monthsScrolledSoFar * width; if(shouldSelectFirstDayOfMonthOnScroll){ - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentCalender.getTime(), 0, 1); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentCalendar.getTime(), 0, 1); setCurrentDate(calendarWithFirstDayOfMonth.getTime()); } performMonthScrollCallback(); @@ -368,7 +368,7 @@ private void scrollPrev() { monthsScrolledSoFar = monthsScrolledSoFar + 1; accumulatedScrollOffset.x = monthsScrolledSoFar * width; if(shouldSelectFirstDayOfMonthOnScroll){ - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentCalender.getTime(), 0, -1); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentCalendar.getTime(), 0, -1); setCurrentDate(calendarWithFirstDayOfMonth.getTime()); } performMonthScrollCallback(); @@ -443,27 +443,27 @@ void onDraw(Canvas canvas) { } else if (animationStatus == ANIMATE_INDICATORS) { drawCalendarWhileAnimatingIndicators(canvas); } else { - drawCalenderBackground(canvas); - drawScrollableCalender(canvas); + drawCalendarBackground(canvas); + drawScrollableCalendar(canvas); } } private void drawCalendarWhileAnimatingIndicators(Canvas canvas) { - dayPaint.setColor(calenderBackgroundColor); + dayPaint.setColor(calendarBackgroundColor); dayPaint.setStyle(Paint.Style.FILL); canvas.drawCircle(0, 0, growFactor, dayPaint); dayPaint.setStyle(Paint.Style.STROKE); dayPaint.setColor(Color.WHITE); - drawScrollableCalender(canvas); + drawScrollableCalendar(canvas); } private void drawCalendarWhileAnimating(Canvas canvas) { - background.setColor(calenderBackgroundColor); + background.setColor(calendarBackgroundColor); background.setStyle(Paint.Style.FILL); canvas.drawCircle(0, 0, growFactor, background); dayPaint.setStyle(Paint.Style.STROKE); dayPaint.setColor(Color.WHITE); - drawScrollableCalender(canvas); + drawScrollableCalendar(canvas); } void onSingleTapUp(MotionEvent e) { @@ -475,7 +475,7 @@ void onSingleTapUp(MotionEvent e) { int dayColumn = Math.round((paddingLeft + e.getX() - paddingWidth - paddingRight) / widthPerDay); int dayRow = Math.round((e.getY() - paddingHeight) / heightPerDay); - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, monthsScrolledSoFar(), 0); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, monthsScrolledSoFar(), 0); int firstDayOfMonth = getDayOfWeek(calendarWithFirstDayOfMonth); @@ -489,8 +489,8 @@ void onSingleTapUp(MotionEvent e) { && dayOfMonth >= 0) { calendarWithFirstDayOfMonth.add(Calendar.DATE, dayOfMonth); - currentCalender.setTimeInMillis(calendarWithFirstDayOfMonth.getTimeInMillis()); - performOnDayClickCallback(currentCalender.getTime()); + currentCalendar.setTimeInMillis(calendarWithFirstDayOfMonth.getTimeInMillis()); + performOnDayClickCallback(currentCalendar.getTime()); } } @@ -565,10 +565,10 @@ private void handleHorizontalScrolling() { handleSmoothScrolling(velocityX); currentDirection = Direction.NONE; - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, monthsScrolledSoFar(), 0); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, monthsScrolledSoFar(), 0); - if (calendarWithFirstDayOfMonth.get(Calendar.MONTH) != currentCalender.get(Calendar.MONTH) && shouldSelectFirstDayOfMonthOnScroll) { - setCalenderToFirstDayOfMonth(currentCalender, currentDate, monthsScrolledSoFar(), 0); + if (calendarWithFirstDayOfMonth.get(Calendar.MONTH) != currentCalendar.get(Calendar.MONTH) && shouldSelectFirstDayOfMonthOnScroll) { + setCalendarToFirstDayOfMonth(currentCalendar, currentDate, monthsScrolledSoFar(), 0); } } @@ -648,9 +648,9 @@ void setCurrentDate(Date dateTimeMonth) { accumulatedScrollOffset.x = 0; scroller.startScroll(0, 0, 0, 0); currentDate = new Date(dateTimeMonth.getTime()); - currentCalender.setTime(currentDate); - todayCalender = Calendar.getInstance(timeZone, locale); - setToMidnight(currentCalender); + currentCalendar.setTime(currentDate); + todayCalendar = Calendar.getInstance(timeZone, locale); + setToMidnight(currentCalendar); } private void setToMidnight(Calendar calendar) { @@ -714,7 +714,7 @@ boolean computeScroll() { return false; } - private void drawScrollableCalender(Canvas canvas) { + private void drawScrollableCalendar(Canvas canvas) { if (isRtl) { drawNextMonth(canvas, -1); drawCurrentMonth(canvas); @@ -727,12 +727,12 @@ private void drawScrollableCalender(Canvas canvas) { } private void drawNextMonth(Canvas canvas, int offset) { - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, -monthsScrolledSoFar, offset); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, -monthsScrolledSoFar, offset); drawMonth(canvas, calendarWithFirstDayOfMonth, (width * (-monthsScrolledSoFar + 1))); } private void drawCurrentMonth(Canvas canvas) { - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, monthsScrolledSoFar(), 0); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, monthsScrolledSoFar(), 0); drawMonth(canvas, calendarWithFirstDayOfMonth, width * -monthsScrolledSoFar); } @@ -741,7 +741,7 @@ private int monthsScrolledSoFar() { } private void drawPreviousMonth(Canvas canvas, int offset) { - setCalenderToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, -monthsScrolledSoFar, offset); + setCalendarToFirstDayOfMonth(calendarWithFirstDayOfMonth, currentDate, -monthsScrolledSoFar, offset); drawMonth(canvas, calendarWithFirstDayOfMonth, (width * (-monthsScrolledSoFar - 1))); } @@ -751,24 +751,24 @@ private void calculateXPositionOffset() { } } - private void drawCalenderBackground(Canvas canvas) { - dayPaint.setColor(calenderBackgroundColor); + private void drawCalendarBackground(Canvas canvas) { + dayPaint.setColor(calendarBackgroundColor); dayPaint.setStyle(Paint.Style.FILL); canvas.drawRect(0, 0, width, height, dayPaint); dayPaint.setStyle(Paint.Style.STROKE); - dayPaint.setColor(calenderTextColor); + dayPaint.setColor(calendarTextColor); } - void drawEvents(Canvas canvas, Calendar currentMonthToDrawCalender, int offset) { - int currentMonth = currentMonthToDrawCalender.get(Calendar.MONTH); - List uniqEvents = eventsContainer.getEventsForMonthAndYear(currentMonth, currentMonthToDrawCalender.get(Calendar.YEAR)); + void drawEvents(Canvas canvas, Calendar currentMonthToDrawCalendar, int offset) { + int currentMonth = currentMonthToDrawCalendar.get(Calendar.MONTH); + List uniqEvents = eventsContainer.getEventsForMonthAndYear(currentMonth, currentMonthToDrawCalendar.get(Calendar.YEAR)); - boolean shouldDrawCurrentDayCircle = currentMonth == todayCalender.get(Calendar.MONTH); - boolean shouldDrawSelectedDayCircle = currentMonth == currentCalender.get(Calendar.MONTH); + boolean shouldDrawCurrentDayCircle = currentMonth == todayCalendar.get(Calendar.MONTH); + boolean shouldDrawSelectedDayCircle = currentMonth == currentCalendar.get(Calendar.MONTH); - int todayDayOfMonth = todayCalender.get(Calendar.DAY_OF_MONTH); - int currentYear = todayCalender.get(Calendar.YEAR); - int selectedDayOfMonth = currentCalender.get(Calendar.DAY_OF_MONTH); + int todayDayOfMonth = todayCalendar.get(Calendar.DAY_OF_MONTH); + int currentYear = todayCalendar.get(Calendar.YEAR); + int selectedDayOfMonth = currentCalendar.get(Calendar.DAY_OF_MONTH); float indicatorOffset = bigCircleIndicatorRadius / 2; if (uniqEvents != null) { for (int i = 0; i < uniqEvents.size(); i++) { @@ -869,22 +869,22 @@ int getDayOfWeek(Calendar calendar) { return dayOfWeek; } - void drawMonth(Canvas canvas, Calendar monthToDrawCalender, int offset) { - drawEvents(canvas, monthToDrawCalender, offset); + void drawMonth(Canvas canvas, Calendar monthToDrawCalendar, int offset) { + drawEvents(canvas, monthToDrawCalendar, offset); //offset by one because we want to start from Monday - int firstDayOfMonth = getDayOfWeek(monthToDrawCalender); + int firstDayOfMonth = getDayOfWeek(monthToDrawCalendar); - boolean isSameMonthAsToday = monthToDrawCalender.get(Calendar.MONTH) == todayCalender.get(Calendar.MONTH); - boolean isSameYearAsToday = 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 isSameMonthAsToday = monthToDrawCalendar.get(Calendar.MONTH) == todayCalendar.get(Calendar.MONTH); + boolean isSameYearAsToday = monthToDrawCalendar.get(Calendar.YEAR) == todayCalendar.get(Calendar.YEAR); + boolean isSameMonthAsCurrentCalendar = monthToDrawCalendar.get(Calendar.MONTH) == currentCalendar.get(Calendar.MONTH) && + monthToDrawCalendar.get(Calendar.YEAR) == currentCalendar.get(Calendar.YEAR); + int todayDayOfMonth = todayCalendar.get(Calendar.DAY_OF_MONTH); boolean isAnimatingWithExpose = animationStatus == EXPOSE_CALENDAR_ANIMATION; - int maximumMonthDay = monthToDrawCalender.getActualMaximum(Calendar.DAY_OF_MONTH); + int maximumMonthDay = monthToDrawCalendar.getActualMaximum(Calendar.DAY_OF_MONTH); - tempPreviousMonthCalendar.setTimeInMillis(monthToDrawCalender.getTimeInMillis()); + tempPreviousMonthCalendar.setTimeInMillis(monthToDrawCalendar.getTimeInMillis()); tempPreviousMonthCalendar.add(Calendar.MONTH, -1); int maximumPreviousMonthDay = tempPreviousMonthCalendar.getActualMaximum(Calendar.DAY_OF_MONTH); @@ -912,23 +912,23 @@ void drawMonth(Canvas canvas, Calendar monthToDrawCalender, int offset) { if (dayRow == 0) { // first row, so draw the first letter of the day if (shouldDrawDaysHeader) { - dayPaint.setColor(calenderTextColor); + dayPaint.setColor(calendarTextColor); dayPaint.setTypeface(Typeface.DEFAULT_BOLD); dayPaint.setStyle(Paint.Style.FILL); - dayPaint.setColor(calenderTextColor); + dayPaint.setColor(calendarTextColor); canvas.drawText(dayColumnNames[colDirection], xPosition, paddingHeight, dayPaint); dayPaint.setTypeface(Typeface.DEFAULT); } } else { int day = ((dayRow - 1) * 7 + colDirection + 1) - firstDayOfMonth; - int defaultCalenderTextColorToUse = calenderTextColor; - if (currentCalender.get(Calendar.DAY_OF_MONTH) == day && isSameMonthAsCurrentCalendar && !isAnimatingWithExpose) { + int defaultCalendarTextColorToUse = calendarTextColor; + if (currentCalendar.get(Calendar.DAY_OF_MONTH) == day && isSameMonthAsCurrentCalendar && !isAnimatingWithExpose) { drawDayCircleIndicator(currentSelectedDayIndicatorStyle, canvas, xPosition, yPosition, currentSelectedDayBackgroundColor); - defaultCalenderTextColorToUse = currentSelectedDayTextColor; + defaultCalendarTextColorToUse = currentSelectedDayTextColor; } else if (isSameYearAsToday && isSameMonthAsToday && todayDayOfMonth == day && !isAnimatingWithExpose) { // TODO calculate position of circle in a more reliable way drawDayCircleIndicator(currentDayIndicatorStyle, canvas, xPosition, yPosition, currentDayBackgroundColor); - defaultCalenderTextColorToUse = currentDayTextColor; + defaultCalendarTextColorToUse = currentDayTextColor; } if (day <= 0) { if (displayOtherMonthDays) { @@ -946,7 +946,7 @@ void drawMonth(Canvas canvas, Calendar monthToDrawCalender, int offset) { } } else { dayPaint.setStyle(Paint.Style.FILL); - dayPaint.setColor(defaultCalenderTextColorToUse); + dayPaint.setColor(defaultCalendarTextColorToUse); canvas.drawText(String.valueOf(day), xPosition, yPosition, dayPaint); } } diff --git a/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java b/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java index 904c5bcd..78296f6d 100755 --- a/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java +++ b/library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarView.java @@ -121,8 +121,8 @@ public void setUseThreeLetterAbbreviation(boolean useThreeLetterAbbreviation){ invalidate(); } - public void setCalendarBackgroundColor(final int calenderBackgroundColor) { - compactCalendarController.setCalenderBackgroundColor(calenderBackgroundColor); + public void setCalendarBackgroundColor(final int calendarBackgroundColor) { + compactCalendarController.setCalendarBackgroundColor(calendarBackgroundColor); invalidate(); } diff --git a/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarControllerTest.java b/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarControllerTest.java index 91a944b0..0ff5d80f 100644 --- a/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarControllerTest.java +++ b/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarControllerTest.java @@ -86,7 +86,7 @@ public void testManualScrollAndGestureScrollPlayNicelyTogether(){ when(motionEvent.getAction()).thenReturn(MotionEvent.ACTION_UP); - //Scroll enough to push calender to next month + //Scroll enough to push calendar to next month underTest.onScroll(motionEvent, motionEvent, 600, 0); underTest.onDraw(canvas); underTest.onTouch(motionEvent); @@ -180,7 +180,7 @@ public void testListenerIsCalledOnMonthScroll(){ //Sun, 08 Feb 2015 00:00:00 GMT underTest.setCurrentDate(new Date(1423353600000L)); - //Scroll enough to push calender to next month + //Scroll enough to push calendar to next month underTest.onScroll(motionEvent, motionEvent, 600, 0); underTest.onDraw(canvas); underTest.onTouch(motionEvent); @@ -228,13 +228,13 @@ public void testItReturnsFirstDayOfMonthAfterDateHasBeenSet(){ @Test public void testItReturnsFirstDayOfMonth(){ - Calendar currentCalender = Calendar.getInstance(); - currentCalender.set(Calendar.DAY_OF_MONTH, 1); - currentCalender.set(Calendar.HOUR_OF_DAY, 0); - currentCalender.set(Calendar.MINUTE, 0); - currentCalender.set(Calendar.SECOND, 0); - currentCalender.set(Calendar.MILLISECOND, 0); - Date expectFirstDayOfMonth = currentCalender.getTime(); + Calendar currentCalendar = Calendar.getInstance(); + currentCalendar.set(Calendar.DAY_OF_MONTH, 1); + currentCalendar.set(Calendar.HOUR_OF_DAY, 0); + currentCalendar.set(Calendar.MINUTE, 0); + currentCalendar.set(Calendar.SECOND, 0); + currentCalendar.set(Calendar.MILLISECOND, 0); + Date expectFirstDayOfMonth = currentCalendar.getTime(); Date actualDate = underTest.getFirstDayOfCurrentMonth(); @@ -284,7 +284,7 @@ public void testItDrawsFirstLetterOfEachDay(){ } @Test - public void testItDrawsDaysOnCalender(){ + public void testItDrawsDaysOnCalendar(){ //simulate Feb month underTest.setGrowProgress(1000); //set grow progress so that it simulates the calendar being open when(calendar.get(Calendar.DAY_OF_WEEK)).thenReturn(1); diff --git a/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarHelper.java b/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarHelper.java index be71e945..ecb894dd 100644 --- a/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarHelper.java +++ b/library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarHelper.java @@ -21,23 +21,23 @@ public static List getOneEventPerDayForMonth(int start, int days, long ti //generate one event per a day for a month public static List getOneEventPerDayForMonth(int start, int days, long timeStamp, int color) { - Calendar currentCalender = Calendar.getInstance(Locale.getDefault()); + Calendar currentCalendar = Calendar.getInstance(Locale.getDefault()); List events = new ArrayList<>(); for(int i = start; i < days; i++){ - setDateTime(timeStamp, currentCalender, i); - events.add(new Event(color, currentCalender.getTimeInMillis())); + setDateTime(timeStamp, currentCalendar, i); + events.add(new Event(color, currentCalendar.getTimeInMillis())); } return events; } public static List getEvents(int start, int days, long timeStamp) { - Calendar currentCalender = Calendar.getInstance(Locale.getDefault()); + Calendar currentCalendar = Calendar.getInstance(Locale.getDefault()); List events = new ArrayList<>(); for(int i = start; i < days; i++){ - setDateTime(timeStamp, currentCalender, i); + setDateTime(timeStamp, currentCalendar, i); List eventList = new ArrayList<>(); - eventList.add(new Event(Color.BLUE, currentCalender.getTimeInMillis())); - Events eventsObject = new Events(currentCalender.getTimeInMillis(), eventList); + eventList.add(new Event(Color.BLUE, currentCalendar.getTimeInMillis())); + Events eventsObject = new Events(currentCalendar.getTimeInMillis(), eventList); events.add(eventsObject); } return events; @@ -45,58 +45,58 @@ public static List getEvents(int start, int days, long timeStamp) { public static List getDayEventWith2EventsPerDay(int start, int days, long timeStamp) { - Calendar currentCalender = Calendar.getInstance(Locale.getDefault()); + Calendar currentCalendar = Calendar.getInstance(Locale.getDefault()); List events = new ArrayList<>(); for(int i = start; i < days; i++){ - setDateTime(timeStamp, currentCalender, i); + setDateTime(timeStamp, currentCalendar, i); List eventList = new ArrayList<>(); - eventList.add(new Event(Color.BLUE, currentCalender.getTimeInMillis())); - eventList.add(new Event(Color.RED, currentCalender.getTimeInMillis() + 3600 * 1000)); - Events eventsObject = new Events(currentCalender.getTimeInMillis(), eventList); + eventList.add(new Event(Color.BLUE, currentCalendar.getTimeInMillis())); + eventList.add(new Event(Color.RED, currentCalendar.getTimeInMillis() + 3600 * 1000)); + Events eventsObject = new Events(currentCalendar.getTimeInMillis(), eventList); events.add(eventsObject); } return events; } public static List getDayEventWithMultipleEventsPerDay(int start, int days, long timeStamp) { - Calendar currentCalender = Calendar.getInstance(Locale.getDefault()); + Calendar currentCalendar = Calendar.getInstance(Locale.getDefault()); List events = new ArrayList<>(); for(int i = start; i < days; i++){ - setDateTime(timeStamp, currentCalender, i); - List eventsList = Arrays.asList(new Event(Color.BLUE, currentCalender.getTimeInMillis()), - new Event(Color.RED, currentCalender.getTimeInMillis() + 3600 * 1000), - new Event(Color.RED, currentCalender.getTimeInMillis() + (3600 * 2) * 1000), - new Event(Color.RED, currentCalender.getTimeInMillis() + (3600 * 3) * 1000)); - Events eventsObject = new Events(currentCalender.getTimeInMillis(), eventsList); + setDateTime(timeStamp, currentCalendar, i); + List eventsList = Arrays.asList(new Event(Color.BLUE, currentCalendar.getTimeInMillis()), + new Event(Color.RED, currentCalendar.getTimeInMillis() + 3600 * 1000), + new Event(Color.RED, currentCalendar.getTimeInMillis() + (3600 * 2) * 1000), + new Event(Color.RED, currentCalendar.getTimeInMillis() + (3600 * 3) * 1000)); + Events eventsObject = new Events(currentCalendar.getTimeInMillis(), eventsList); events.add(eventsObject); } return events; } public static Map> getMultipleEventsForEachDayAsMap(int start, int days, long timeStamp) { - Calendar currentCalender = Calendar.getInstance(Locale.getDefault()); + Calendar currentCalendar = Calendar.getInstance(Locale.getDefault()); Map> epochMillisToEvents = new HashMap<>(); for(int i = start; i < days; i++){ - setDateTime(timeStamp, currentCalender, i); + setDateTime(timeStamp, currentCalendar, i); List eventList = new ArrayList<>(); - List events = Arrays.asList(new Event(Color.BLUE, currentCalender.getTimeInMillis()), - new Event(Color.RED, currentCalender.getTimeInMillis() + 3600 * 1000), - new Event(Color.RED, currentCalender.getTimeInMillis() + (3600 * 2) * 1000), - new Event(Color.RED, currentCalender.getTimeInMillis() + (3600 * 3) * 1000)); + List events = Arrays.asList(new Event(Color.BLUE, currentCalendar.getTimeInMillis()), + new Event(Color.RED, currentCalendar.getTimeInMillis() + 3600 * 1000), + new Event(Color.RED, currentCalendar.getTimeInMillis() + (3600 * 2) * 1000), + new Event(Color.RED, currentCalendar.getTimeInMillis() + (3600 * 3) * 1000)); eventList.addAll(events); - epochMillisToEvents.put(currentCalender.getTimeInMillis(), eventList); + epochMillisToEvents.put(currentCalendar.getTimeInMillis(), eventList); } return epochMillisToEvents; } - public static void setDateTime(long timeStamp, Calendar currentCalender, int i) { - currentCalender.setTimeInMillis(timeStamp); - currentCalender.set(Calendar.DATE, 1); - currentCalender.set(Calendar.HOUR_OF_DAY, 0); - currentCalender.set(Calendar.MINUTE, 0); - currentCalender.set(Calendar.SECOND, 0); - currentCalender.set(Calendar.MILLISECOND, 0); - currentCalender.add(Calendar.DATE, i); + public static void setDateTime(long timeStamp, Calendar currentCalendar, int i) { + currentCalendar.setTimeInMillis(timeStamp); + currentCalendar.set(Calendar.DATE, 1); + currentCalendar.set(Calendar.HOUR_OF_DAY, 0); + currentCalendar.set(Calendar.MINUTE, 0); + currentCalendar.set(Calendar.SECOND, 0); + currentCalendar.set(Calendar.MILLISECOND, 0); + currentCalendar.add(Calendar.DATE, i); } public static long setTimeToMidnightAndGet(Calendar cal, long epoch) { diff --git a/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java b/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java index 716cb7a2..a34cff2c 100644 --- a/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java +++ b/sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java @@ -80,11 +80,11 @@ public void setUp() throws Exception { @Test public void testItDrawsEventsRtl(){ - Calendar currentCalender = Calendar.getInstance(); - currentCalender.set(Calendar.DAY_OF_MONTH, 1); - currentCalender.set(Calendar.ERA, GregorianCalendar.AD); - currentCalender.set(Calendar.YEAR, 2015); - currentCalender.set(Calendar.MONTH, Calendar.MARCH); + Calendar currentCalendar = Calendar.getInstance(); + currentCalendar.set(Calendar.DAY_OF_MONTH, 1); + currentCalendar.set(Calendar.ERA, GregorianCalendar.AD); + currentCalendar.set(Calendar.YEAR, 2015); + currentCalendar.set(Calendar.MONTH, Calendar.MARCH); compactCalendarView.setIsRtl(true); //Sun, 08 Feb 2015 00:00:00 GMT @@ -93,7 +93,7 @@ public void testItDrawsEventsRtl(){ addEvents(Calendar.MARCH, 2015); scrollCalendarBackwardsBy(1); - assertEquals(getEventsFor(Calendar.MARCH, 2015), compactCalendarView.getEventsForMonth(currentCalender.getTime())); + assertEquals(getEventsFor(Calendar.MARCH, 2015), compactCalendarView.getEventsForMonth(currentCalendar.getTime())); syncToolbarDate(); @@ -663,23 +663,23 @@ public void run() { } private List getEventsFor(final int month, final int year){ - Calendar currentCalender = Calendar.getInstance(); - currentCalender.setTime(new Date()); - currentCalender.set(Calendar.DAY_OF_MONTH, 1); - Date firstDayOfMonth = currentCalender.getTime(); + Calendar currentCalendar = Calendar.getInstance(); + currentCalendar.setTime(new Date()); + currentCalendar.set(Calendar.DAY_OF_MONTH, 1); + Date firstDayOfMonth = currentCalendar.getTime(); List events = new ArrayList<>(); for (int i = 0; i < 6; i++) { - currentCalender.setTime(firstDayOfMonth); + currentCalendar.setTime(firstDayOfMonth); if (month > -1) { - currentCalender.set(Calendar.MONTH, month); + currentCalendar.set(Calendar.MONTH, month); } if (year > -1) { - currentCalender.set(Calendar.ERA, GregorianCalendar.AD); - currentCalender.set(Calendar.YEAR, year); + currentCalendar.set(Calendar.ERA, GregorianCalendar.AD); + currentCalendar.set(Calendar.YEAR, year); } - currentCalender.add(Calendar.DATE, i); - setToMidnight(currentCalender); - long timeInMillis = currentCalender.getTimeInMillis(); + currentCalendar.add(Calendar.DATE, i); + setToMidnight(currentCalendar); + long timeInMillis = currentCalendar.getTimeInMillis(); events.addAll(getEvents(timeInMillis, i)); } return events; diff --git a/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java b/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java index 7d1b44a1..8236b48b 100644 --- a/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java +++ b/sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java @@ -34,7 +34,7 @@ public class CompactCalendarTab extends Fragment { private static final String TAG = "MainActivity"; - private Calendar currentCalender = Calendar.getInstance(Locale.getDefault()); + private Calendar currentCalendar = Calendar.getInstance(Locale.getDefault()); private SimpleDateFormat dateFormatForDisplaying = new SimpleDateFormat("dd-M-yyyy hh:mm:ss a", Locale.getDefault()); private SimpleDateFormat dateFormatForMonth = new SimpleDateFormat("MMM - yyyy", Locale.getDefault()); private boolean shouldShow = false; @@ -248,33 +248,33 @@ private void loadEventsForYear(int year) { } private void logEventsByMonth(CompactCalendarView compactCalendarView) { - currentCalender.setTime(new Date()); - currentCalender.set(Calendar.DAY_OF_MONTH, 1); - currentCalender.set(Calendar.MONTH, Calendar.AUGUST); + currentCalendar.setTime(new Date()); + currentCalendar.set(Calendar.DAY_OF_MONTH, 1); + currentCalendar.set(Calendar.MONTH, Calendar.AUGUST); List dates = new ArrayList<>(); for (Event e : compactCalendarView.getEventsForMonth(new Date())) { dates.add(dateFormatForDisplaying.format(e.getTimeInMillis())); } Log.d(TAG, "Events for Aug with simple date formatter: " + dates); - Log.d(TAG, "Events for Aug month using default local and timezone: " + compactCalendarView.getEventsForMonth(currentCalender.getTime())); + Log.d(TAG, "Events for Aug month using default local and timezone: " + compactCalendarView.getEventsForMonth(currentCalendar.getTime())); } private void addEvents(int month, int year) { - currentCalender.setTime(new Date()); - currentCalender.set(Calendar.DAY_OF_MONTH, 1); - Date firstDayOfMonth = currentCalender.getTime(); + currentCalendar.setTime(new Date()); + currentCalendar.set(Calendar.DAY_OF_MONTH, 1); + Date firstDayOfMonth = currentCalendar.getTime(); for (int i = 0; i < 6; i++) { - currentCalender.setTime(firstDayOfMonth); + currentCalendar.setTime(firstDayOfMonth); if (month > -1) { - currentCalender.set(Calendar.MONTH, month); + currentCalendar.set(Calendar.MONTH, month); } if (year > -1) { - currentCalender.set(Calendar.ERA, GregorianCalendar.AD); - currentCalender.set(Calendar.YEAR, year); + currentCalendar.set(Calendar.ERA, GregorianCalendar.AD); + currentCalendar.set(Calendar.YEAR, year); } - currentCalender.add(Calendar.DATE, i); - setToMidnight(currentCalender); - long timeInMillis = currentCalender.getTimeInMillis(); + currentCalendar.add(Calendar.DATE, i); + setToMidnight(currentCalendar); + long timeInMillis = currentCalendar.getTimeInMillis(); List events = getEvents(timeInMillis, i);