Merge branch 'develop'

gregkorossy · Apr 10, 2018 · 639b471 · 639b471
2 parents 099990a + c18c2f1
commit 639b471
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 263 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+**2018-04-10**
+
+New version: 27.1.1.0 (based on v27.1.1)
+
+- No support preferences related changes in the support library.
+- Some bug fixes (see #147 for more info).
+
 **2018-02-28**
 
 New version: 27.1.0.0 (based on v27.1.0)

diff --git a/README.md b/README.md
@@ -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.1.0'
-compile 'com.android.support:preference-v14:27.1.0'
+compile 'com.android.support:preference-v7:27.1.1'
+compile 'com.android.support:preference-v14:27.1.1'
 ```
 And **add** this single line to your gradle file:
 ```gradle
-compile 'com.takisoft.fix:preference-v7:27.1.0.0'
+compile 'com.takisoft.fix:preference-v7:27.1.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.
 
@@ -92,18 +92,18 @@ 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.1.0.0'
+compile 'com.takisoft.fix:preference-v7-extras:27.1.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.1.0.0'` | ![API 26](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.1.0.0'` | ![API 26](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.1.0.0'` | ![API 26](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.1.0.0'` | ![API 26](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/colorpicker_api26_fixed.png)
-[`SimpleMenuPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#simplemenupreference) | `compile 'com.takisoft.fix:preference-v7-simplemenu:27.1.0.0'` | ![API 26](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/simplemenu_api26.png)
+[`RingtonePreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#ringtonepreference) | `compile 'com.takisoft.fix:preference-v7-ringtone:27.1.1.0'` | ![API 26](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.1.1.0'` | ![API 26](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.1.1.0'` | ![API 26](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.1.1.0'` | ![API 26](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/colorpicker_api26_fixed.png)
+[`SimpleMenuPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#simplemenupreference) | `compile 'com.takisoft.fix:preference-v7-simplemenu:27.1.1.0'` | ![API 26](https://raw.githubusercontent.com/Gericop/Android-Support-Preference-V7-Fix/master/images/simplemenu_api26.png)
 
 ---
 
@@ -149,7 +149,7 @@ The original implementation uses `?attr/textAppearanceSmall` as the message styl
 ---
 
 ## Version
-The current stable version is **27.1.0.0**.
+The current stable version is **27.1.1.0**.
 
 ## Notes #
 This demo / bugfix is set to work on API level 14+.
@@ -168,6 +168,13 @@ API 15 | API 21 | API 26
 
 ### Changelog
 
+**2018-04-10**
+
+New version: 27.1.1.0 (based on v27.1.1)
+
+- No support preferences related changes in the support library.
+- Some bug fixes (see #147 for more info).
+
 **2018-02-28**
 
 New version: 27.1.0.0 (based on v27.1.0)

diff --git a/build.gradle b/build.gradle
@@ -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.1'
+project.ext.buildToolsVersion = '27.0.3'
 project.ext.minSdkVersion = 14
 project.ext.sdkVersion = 27
-project.ext.supportLibraryVersion = '27.1.0'
-project.ext.supportLibraryVersionPrefix = '27.1.0'
+project.ext.supportLibraryVersion = '27.1.1'
+project.ext.supportLibraryVersionPrefix = '27.1.1'
 project.ext.supportLibraryVersionSuffix = ''
 project.ext.fixLibraryVersion = '0'
 
@@ -13,10 +13,11 @@ buildscript {
     repositories {
         jcenter()
         maven { url "https://maven.google.com" }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 25 20:17:43 CEST 2017
+#Tue Apr 03 22:42:27 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/.../src/main/java/com/takisoft/fix/support/v7/preference/widget/ForegroundCheckTextView.java b/.../src/main/java/com/takisoft/fix/support/v7/preference/widget/ForegroundCheckTextView.java
diff --git a/preference-v7-simplemenu/src/main/res/drawable/simple_menu_item_background.xml b/preference-v7-simplemenu/src/main/res/drawable/simple_menu_item_background.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape>
-            <solid android:color="#18000000"/>
-        </shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <selector>
+            <item android:state_checked="true">
+                <shape>
+                    <solid android:color="#18000000"/>
+                </shape>
+            </item>
+            <item android:drawable="@android:color/transparent"/>
+        </selector>
     </item>
-    <item android:drawable="@android:color/transparent"/>
-</selector>
+    <item android:drawable="?android:attr/selectableItemBackground"/>
+</layer-list>
diff --git a/preference-v7-simplemenu/src/main/res/layout/simple_menu_item.xml b/preference-v7-simplemenu/src/main/res/layout/simple_menu_item.xml
@@ -17,12 +17,11 @@
 ** limitations under the License.
 */
 -->
-<com.takisoft.fix.support.v7.preference.widget.ForegroundCheckTextView
+<CheckedTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
     android:background="@drawable/simple_menu_item_background"
-    android:foreground="?android:selectableItemBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="48dp"

diff --git a/preference-v7-simplemenu/src/main/res/values-night/colors.xml b/preference-v7-simplemenu/src/main/res/values-night/colors.xml
diff --git a/preference-v7-simplemenu/src/main/res/values/attrs.xml b/preference-v7-simplemenu/src/main/res/values/attrs.xml
@@ -5,12 +5,6 @@
         <attr name="simpleMenuPreferenceStyle" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="ForegroundCheckTextView">
-        <attr name="android:foregroundGravity"/>
-        <attr name="android:foreground"/>
-        <attr name="pref_foregroundInsidePadding" format="boolean"/>
-    </declare-styleable>
-
     <declare-styleable name="SimpleMenuPreference">
         <attr name="pref_popupStyle" format="reference"/>
     </declare-styleable>