Skip to content

Commit

Permalink
Merge pull request prolificinteractive#303 from prolificinteractive/f…
Browse files Browse the repository at this point in the history
…uture-1.x

Release 1.3.0
  • Loading branch information
ekchang committed May 16, 2016
2 parents 108ca59 + 9efd42d commit cb03a86
Show file tree
Hide file tree
Showing 33 changed files with 671 additions and 362 deletions.
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
Change Log
==========
Version 1.3.0 *(2016-05-16)*
----------------------------

* New: MCV `goToNext` and `goToPrevious` API to programmatically trigger paging
* New: Allow users to click on dates outside of current month with `setAllowClickDaysOutsideCurrentMonth`
* New: Set tile width/height separately rather than single tile size
* New: Attributes: mcv_tileWidth, mcv_tileHeight, mcv_calendarMode
* Change: `CalendarMode.WEEK` officially marked `@Experimental`, use with caution
* Change: `getTileSize` is deprecated, use `getTileWidth` and `getTileHeight`. `setTileSize` still works as a convenience method to set width and height at the same time.
* Fix: Issue with arrow not enabled when setting maxDate
* Fix: Issue with number of pages not calculated correctly with maxDate causing last page to be unreachable
* Fix: TalkBack content descriptions for pager view, forward/back arrows, and ability to set them manually
* Fix: Crash while in Week mode when `CalendarPagerAdapter#getItemPosition` is called
* Fix: Calendar Mode is retained on restore instance state
* Fix: Min/Max date range is retained on restore instance state
* Issue: Week mode - Restore instance state shows the previous week of the one that was saved
* Issue: Week mode - Some combinations of first day of week, min/max date can cause the last week not to be pagable

Version 1.2.1 *(2016-05-05)*
----------------------------
Expand All @@ -21,7 +38,7 @@ Version 1.1.0 *(2015-10-19)*
* New: Ability to disable month swiping with `setPagingEnabled()`
* Fix [#149](https://github.com/prolificinteractive/material-calendarview/issues/149):
save selected dates as a typed List instead of an array.
* Change: Some preformance optimizations
* Change: Some performance optimizations

Version 1.0.1 *(2015-09-30)*
----------------------------
Expand Down
19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2016 Prolific Interactive

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
202 changes: 0 additions & 202 deletions LICENSE.txt

This file was deleted.

46 changes: 28 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img src="/images/ic_launcher-web.png" width="300px" />
<img src="/images/hero.png"/>

Material Calendar View [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Material%20Calendar%20View-blue.svg?style=flat)](https://android-arsenal.com/details/1/1531)
======================
Expand All @@ -11,10 +11,11 @@ and feel, rather than 100% parity with the platform's implementation.
Usage
-----

1. Add `compile 'com.prolificinteractive:material-calendarview:1.2.1'` to your dependencies.
1. Add `compile 'com.prolificinteractive:material-calendarview:1.3.0'` to your dependencies.
2. Add `MaterialCalendarView` into your layouts or view hierarchy.
3. Set a `OnDateSelectedListener` or call `MaterialCalendarView.getSelectedDates()` when you need it.


[Javadoc Available Here](http://prolificinteractive.github.io/material-calendarview/)

Example:
Expand All @@ -29,6 +30,20 @@ Example:
app:mcv_selectionColor="#00F"
/>
```
#### @Experimental
`CalendarMode.WEEK` and all week mode functionality is officially marked `@Experimental`. All APIs
marked `@Experimental` are subject to change quickly and should not be used in production code. They
are allowed for testing and feedback.

Major Change in 1.3.0
---------------------
* Breaking change: `getTileSize` is deprecated. Use `getTileWidth` or `getTileHeight`.
* Added `goToNext` and `goToPrevious` API to programmatically trigger paging
* Allow users to click on dates outside of current month with `setAllowClickDaysOutsideCurrentMonth`
* Set tile width/height separately rather than single tile size with `setTileWidth` and `setTileHeight`
* Attributes: mcv_tileWidth, mcv_tileHeight, mcv_calendarMode

See other changes in the [CHANGELOG](/CHANGELOG.md).

Major Change in 1.2.0
---------------------
Expand Down Expand Up @@ -82,19 +97,14 @@ Contributing

Would you like to contribute? Fork us and send a pull request! Be sure to checkout our issues first.

License
=======

>Copyright 2016 Prolific Interactive
>
>Licensed under the Apache License, Version 2.0 (the "License");
>you may not use this file except in compliance with the License.
>You may obtain a copy of the License at
>
> http://www.apache.org/licenses/LICENSE-2.0
>
>Unless required by applicable law or agreed to in writing, software
>distributed under the License is distributed on an "AS IS" BASIS,
>WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>See the License for the specific language governing permissions and
>limitations under the License.
## License

Material Calendar View is Copyright (c) 2016 Prolific Interactive. It may be redistributed under the terms specified in the [LICENSE] file.

[LICENSE]: /LICENSE

## Maintainers

![prolific](https://s3.amazonaws.com/prolificsitestaging/logos/Prolific_Logo_Full_Color.png)

Material Calendar View is maintained and funded by Prolific Interactive. The names and logos are trademarks of Prolific Interactive.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ allprojects {
repositories {
jcenter()
// Here for convience when testing new releases
//maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
// maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
// Is Release Build?
ext.isReleaseVersion = has("release")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# org.gradle.parallel=true

GROUP=com.prolificinteractive
VERSION_NAME=1.2.1
VERSION_CODE=13
VERSION_NAME=1.3.0
VERSION_CODE=14

POM_PACKAGING=aar
POM_NAME=Material CalendarView
Expand Down
Binary file added images/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/ic_launcher-web.png
Binary file not shown.
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
}

dependencies {
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:support-v4:23.4.0'

testCompile 'junit:junit:4.12'
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.prolificinteractive.materialcalendarview;

@Experimental
public enum CalendarMode {

MONTHS(6),
Expand Down
Loading

0 comments on commit cb03a86

Please sign in to comment.