Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Add disabled days to calendar date picker #223

Merged
CedricGatay merged 6 commits into from
Feb 1, 2016
Merged

Add disabled days to calendar date picker #223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49f3846
Add disabled days to calendar date picker
TylerMcCraw Dec 21, 2015
26098c8
Fixed issue with retaining disabled days
TylerMcCraw Dec 28, 2015
5fe010b
Extending existing enabled check for changing text color
TylerMcCraw Dec 29, 2015
cbbfa6e
Changed disabled days to SparseArray from HashMap
TylerMcCraw Dec 29, 2015
fded9d1
Minor fixes for disabled days
TylerMcCraw Jan 29, 2016
db80149
Merge remote-tracking branch 'upstream/master' into feature/disableddays
TylerMcCraw Jan 29, 2016
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
Prev Previous commit
Merge remote-tracking branch 'upstream/master' into feature/disableddays 
# Conflicts:
#	library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java
#	sample/src/main/res/values/colors.xml
  • Loading branch information
@TylerMcCraw
TylerMcCraw authored and Tyler McCraw committed Jan 29, 2016
commit db80149b67dd5177d6532864dc45a0cd98b7cf71
2 changes: 1 addition & 1 deletion ...a/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ public void setDisabledDays(@NonNull SparseArray<CalendarDay> disabledDays) {
}
}

public void setOnDateSetListener(OnDateSetListener listener) {
public CalendarDatePickerDialogFragment setOnDateSetListener(OnDateSetListener listener) {
mCallBack = listener;
return this;
}
Expand Down
2 changes: 2 additions & 0 deletions sample/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@
<color name="custom_tp_divider">#808080</color>

<color name="custom_tp_disabled_day">#f44336</color>
<color name="colorPrimary">#dec01a</color>
<color name="colorPrimaryDark">#FFBCA211</color>
</resources>
You are viewing a condensed version of this merge commit. You can view the full changes here.