Merge branch 'develop'

gregkorossy · May 11, 2018 · a4eed83 · a4eed83
2 parents 639b471 + e41be3d
commit a4eed83
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+**2018-05-11**
+
+New version: 27.1.1.1 (based on v27.1.1)
+
+- No support preferences related changes in the support library.
+- Bug fixes (#153, #149, #155, #152).
+
 **2018-04-10**
 
 New version: 27.1.1.0 (based on v27.1.1)

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.1'
-compile 'com.android.support:preference-v14:27.1.1'
+implementation 'com.android.support:preference-v7:27.1.1'
+implementation '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.1.0'
+implementation 'com.takisoft.fix:preference-v7:27.1.1.1'
 ```
 > 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.1.0'
+implementation 'com.takisoft.fix:preference-v7-extras:27.1.1.1'
 ```
 
 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.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)
+[`RingtonePreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#ringtonepreference) | `compile 'com.takisoft.fix:preference-v7-ringtone:27.1.1.1'` | ![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.1'` | ![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.1'` | ![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.1'` | ![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.1'` | ![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.1.0**.
+The current stable version is **27.1.1.1**.
 
 ## Notes #
 This demo / bugfix is set to work on API level 14+.
@@ -168,28 +168,19 @@ API 15 | API 21 | API 26
 
 ### Changelog
 
-**2018-04-10**
+**2018-05-11**
 
-New version: 27.1.1.0 (based on v27.1.1)
+New version: 27.1.1.1 (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)
+- Bug fixes (#153, #149, #155, #152).
 
-- According to bug fixes section of the [changelog](https://developer.android.com/topic/libraries/support-library/revisions.html#27-1-0) of revision 27.1.0: _Preferences library uses attributes that will not work on old versions of Android_ has been fixed.
-- Some bug fixes.
-
-**2017-12-01**
+**2018-04-10**
 
-New version: 27.0.2.0 (based on v27.0.2)
+New version: 27.1.1.0 (based on v27.1.1)
 
-- Added [`AutoSummaryEditTextPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#autosummaryedittextpreference) that shows the entered text automatically in the summary.
-- Added [`SimpleMenuPreference`](https://github.com/Gericop/Android-Support-Preference-V7-Fix/wiki/Preference-types#simplemenupreference) that shows a nicely animated popup menu for displaying entries on API 21+, and a `ListPreference` on pre-Lollipop devices.
-- Removed obsolete (pre-v14) resources.
-- Small bug fixes.
+- No support preferences related changes in the support library.
+- Some bug fixes (see #147 for more info).
 
 > For older changelogs, check out the [CHANGELOG](CHANGELOG.md) file.
 

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ project.ext.sdkVersion = 27
 project.ext.supportLibraryVersion = '27.1.1'
 project.ext.supportLibraryVersionPrefix = '27.1.1'
 project.ext.supportLibraryVersionSuffix = ''
-project.ext.fixLibraryVersion = '0'
+project.ext.fixLibraryVersion = '1'
 
 project.ext.extrasLibraryVersionSuffix = ''
 
@@ -16,7 +16,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

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
@@ -29,5 +29,6 @@
     android:textSize="16sp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
+    android:focusable="true"
     android:gravity="center_vertical"
     tools:text="test\ntest\ntest\ntest" />
diff --git a/preference-v7-simplemenu/src/main/res/values-night/colors.xml b/preference-v7-simplemenu/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="preference_simple_menu_background">#303030</color>
+</resources>