Skip to content

Added feature to reload manager on Date min and max set #1

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

Added feature to reload manager on Date min and max set #1

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
6 changes: 5 additions & 1 deletion app/src/main/java/com/github/gfranks/collapsible/calendar/sample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ protected void onCreate(Bundle savedInstanceState) {
mCalendarView = (CollapsibleCalendarView) findViewById(R.id.calendar);
mListView = (ListView) findViewById(R.id.calendar_event_list);

mCalendarView.setMaxDate(LocalDate.now());
mCalendarView.setMinDate(LocalDate.now().minusYears(1));
mCalendarView.setListener(this);
mCalendarView.addEvents(getEvents());
}

private List<Event> getEvents() {
List<Event> events = new ArrayList<>();
for (int i=0; i<20; i++) {
events.add(new Event("Event " + (i+1), System.currentTimeMillis() + (86400000 * i)));
events.add(new Event("Event " + (i+1), System.currentTimeMillis() - (86400000 * i)));
}
return events;
}
Expand All @@ -51,6 +53,8 @@ public void onDateSelected(LocalDate date, List<Event> events) {
}
}



@Override
public void onMonthChanged(LocalDate date) {
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Aug 18 16:15:51 EDT 2015
#Wed Nov 02 16:30:15 CDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
14 changes: 12 additions & 2 deletions library/src/main/java/com/github/gfranks/collapsible/calendar/CollapsibleCalendarView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class CollapsibleCalendarView extends LinearLayout implements View.OnClic
private ResizeManager mResizeManager;
private boolean mInitialized;
private final GestureDetector mGestureDetector;

CollapsibleState startingState = CollapsibleState.MONTH;
public CollapsibleCalendarView(Context context) {
this(context, null);
}
Expand All @@ -78,7 +78,7 @@ public CollapsibleCalendarView(Context context, AttributeSet attrs) {
public CollapsibleCalendarView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);

CollapsibleState startingState = CollapsibleState.MONTH;

if (attrs != null) {
TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.CollapsibleCalendarView, 0, 0);
try {
Expand Down Expand Up @@ -252,6 +252,7 @@ public LocalDate getMinDate() {

public void setMinDate(LocalDate minDate) {
getManager().setMinDate(minDate);
reload_manager();
}

public LocalDate getMaxDate() {
Expand All @@ -260,6 +261,7 @@ public LocalDate getMaxDate() {

public void setMaxDate(LocalDate maxDate) {
getManager().setMaxDate(maxDate);
reload_manager();
}

public void setTitle(String text) {
Expand Down Expand Up @@ -619,6 +621,14 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
}
}


private void reload_manager(){
if (mManager != null) {
mManager = new CalendarManager(LocalDate.now(), startingState, getManager().getMinDate(), getManager().getMaxDate());

}
}

private class RecycleBin {
private final Queue<View> mViews = new LinkedList<>();

Expand Down