Skip to content

typo: calender -> calendar #301

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
cherouvim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

typo: calender -> calendar #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ systemProp.http.nonProxyHosts=localhost,127.0.01
POM_URL=https\://github.com/SundeepK/CompactCalendarView
POM_SCM_CONNECTION=scm\:[email protected]\: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
148 changes: 74 additions & 74 deletions library/src/main/java/com/github/sundeepk/compactcalendarview/CompactCalendarController.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 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 @@ -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();
}

Expand Down
20 changes: 10 additions & 10 deletions .../src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down
68 changes: 34 additions & 34 deletions library/src/test/java/com/github/sundeepk/compactcalendarview/CompactCalendarHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,82 +21,82 @@ public static List<Event> getOneEventPerDayForMonth(int start, int days, long ti

//generate one event per a day for a month
public static List<Event> getOneEventPerDayForMonth(int start, int days, long timeStamp, int color) {
Calendar currentCalender = Calendar.getInstance(Locale.getDefault());
Calendar currentCalendar = Calendar.getInstance(Locale.getDefault());
List<Event> 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<Events> getEvents(int start, int days, long timeStamp) {
Calendar currentCalender = Calendar.getInstance(Locale.getDefault());
Calendar currentCalendar = Calendar.getInstance(Locale.getDefault());
List<Events> events = new ArrayList<>();
for(int i = start; i < days; i++){
setDateTime(timeStamp, currentCalender, i);
setDateTime(timeStamp, currentCalendar, i);
List<Event> 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;
}


public static List<Events> getDayEventWith2EventsPerDay(int start, int days, long timeStamp) {
Calendar currentCalender = Calendar.getInstance(Locale.getDefault());
Calendar currentCalendar = Calendar.getInstance(Locale.getDefault());
List<Events> events = new ArrayList<>();
for(int i = start; i < days; i++){
setDateTime(timeStamp, currentCalender, i);
setDateTime(timeStamp, currentCalendar, i);
List<Event> 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<Events> getDayEventWithMultipleEventsPerDay(int start, int days, long timeStamp) {
Calendar currentCalender = Calendar.getInstance(Locale.getDefault());
Calendar currentCalendar = Calendar.getInstance(Locale.getDefault());
List<Events> events = new ArrayList<>();
for(int i = start; i < days; i++){
setDateTime(timeStamp, currentCalender, i);
List<Event> 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<Event> 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<Long, List<Event>> getMultipleEventsForEachDayAsMap(int start, int days, long timeStamp) {
Calendar currentCalender = Calendar.getInstance(Locale.getDefault());
Calendar currentCalendar = Calendar.getInstance(Locale.getDefault());
Map<Long, List<Event>> epochMillisToEvents = new HashMap<>();
for(int i = start; i < days; i++){
setDateTime(timeStamp, currentCalender, i);
setDateTime(timeStamp, currentCalendar, i);
List<Event> eventList = new ArrayList<>();
List<Event> 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<Event> 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) {
Expand Down
34 changes: 17 additions & 17 deletions sample/src/androidTest/java/sundeepk/github/com/sample/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();

Expand Down Expand Up @@ -663,23 +663,23 @@ public void run() {
}

private List<Event> 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<Event> 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;
Expand Down
30 changes: 15 additions & 15 deletions sample/src/main/java/sundeepk/github/com/sample/CompactCalendarTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String> 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<Event> events = getEvents(timeInMillis, i);

Expand Down