Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
gregkorossy committed Nov 13, 2017
2 parents 8767eb5 + 8a866b7 commit 2b9c64c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

New version: 27.0.1.0 (based on v27.0.1)

- No support preferences related changes.

**2017-10-27**

New version: 27.0.0.0 (based on v27.0.0)
Expand Down
24 changes: 15 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ If you would like to support me, you may donate some small amount via PayPal.
### 1. Add gradle dependency
First, **remove** the unnecessary lines of preference-v7 and preference-v14 from your gradle file as the bugfix contains both of them:
```gradle
compile 'com.android.support:preference-v7:27.0.0'
compile 'com.android.support:preference-v14:27.0.0'
compile 'com.android.support:preference-v7:27.0.1'
compile 'com.android.support:preference-v14:27.0.1'
```
And **add** this single line to your gradle file:
```gradle
compile 'com.takisoft.fix:preference-v7:27.0.0.0'
compile 'com.takisoft.fix:preference-v7:27.0.1.0'
```
> Notice the versioning: the first three numbers are *always* the same as the latest official library while the last number is for own updates. I try to keep it up-to-date but if, for whatever reasons, I wouldn't notice the new support library versions, just issue a ticket.
Expand Down Expand Up @@ -92,17 +92,17 @@ Now you can enjoy using the support preferences API without losing all your hair
There are additional preferences not part of the official support library, but decided to add them to some extra libraries. You can add all of them to your project using

```gradle
compile 'com.takisoft.fix:preference-v7-extras:27.0.0.0'
compile 'com.takisoft.fix:preference-v7-extras:27.0.1.0'
```

or one or more groups:

Preference | Dependency | Preview
-|-|-
[`RingtonePreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#ringtonepreference) | `compile 'com.takisoft.fix:preference-v7-ringtone:27.0.0.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/ringtone_api26.png)
[`DatePickerPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#datepickerpreference) | `compile 'com.takisoft.fix:preference-v7-datetimepicker:27.0.0.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/datepicker_api26.png)
[`TimePickerPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#timepickerpreference) | `compile 'com.takisoft.fix:preference-v7-datetimepicker:27.0.0.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/timepicker_api26.png)
[`ColorPickerPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#colorpickerpreference) | `compile 'com.takisoft.fix:preference-v7-colorpicker:27.0.0.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/colorpicker_api26_fixed.png)
[`RingtonePreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#ringtonepreference) | `compile 'com.takisoft.fix:preference-v7-ringtone:27.0.1.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/ringtone_api26.png)
[`DatePickerPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#datepickerpreference) | `compile 'com.takisoft.fix:preference-v7-datetimepicker:27.0.1.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/datepicker_api26.png)
[`TimePickerPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#timepickerpreference) | `compile 'com.takisoft.fix:preference-v7-datetimepicker:27.0.1.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/timepicker_api26.png)
[`ColorPickerPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#colorpickerpreference) | `compile 'com.takisoft.fix:preference-v7-colorpicker:27.0.1.0'` | ![API 15](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/colorpicker_api26_fixed.png)

---

Expand Down Expand Up @@ -148,7 +148,7 @@ The original implementation uses `?attr/textAppearanceSmall` as the message styl
---

## Version
The current stable version is **27.0.0.0**.
The current stable version is **27.0.1.0**.

## Notes #
This demo / bugfix is set to work on API level 14+.
Expand All @@ -167,6 +167,12 @@ API 15 | API 21 | API 26

### Changelog

**2017-11-13**

New version: 27.0.1.0 (based on v27.0.1)

- No support preferences related changes.

**2017-10-27**

New version: 27.0.0.0 (based on v27.0.0)
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
project.ext.buildToolsVersion = '27.0.0'
project.ext.buildToolsVersion = '27.0.1'
project.ext.minSdkVersion = 14
project.ext.sdkVersion = 27
project.ext.supportLibraryVersion = '27.0.0'
project.ext.supportLibraryVersionPrefix = '27.0.0'
project.ext.supportLibraryVersion = '27.0.1'
project.ext.supportLibraryVersionPrefix = '27.0.1'
project.ext.supportLibraryVersionSuffix = ''
project.ext.fixLibraryVersion = '0'

Expand Down
2 changes: 1 addition & 1 deletion preference-v7-colorpicker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ext {
dependencies {
implementation project(':preference-v7')
implementation "com.android.support:appcompat-v7:${rootProject.supportLibraryVersion}"
api 'com.takisoft.fix:colorpicker:1.0.0'
api 'com.takisoft.fix:colorpicker:1.0.1'
}

//apply from: 'https://raw.githubusercontent.com/numetriclabz/jcenter/master/installv.gradle'
Expand Down
2 changes: 1 addition & 1 deletion preference-v7-datetimepicker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ext {

dependencies {
implementation project(':preference-v7')
api 'com.takisoft.fix:datetimepicker:1.0.3'
api 'com.takisoft.fix:datetimepicker:1.0.4'
}

//apply from: 'https://raw.githubusercontent.com/numetriclabz/jcenter/master/installv.gradle'
Expand Down

0 comments on commit 2b9c64c

Please sign in to comment.