Merge branch 'release/v2.8.6'

README.md

@@ -46,7 +46,7 @@ Provide additional fonts for you project, or even create your custom font with j
 
 ## 1. Provide the gradle dependency
 ```gradle
-compile "com.mikepenz:iconics-core:2.8.5@aar"
+compile "com.mikepenz:iconics-core:2.8.6@aar"
 compile "com.android.support:appcompat-v7:${supportLibVersion}"
 ```
 

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 28501
-        versionName "2.8.5"
+        versionCode 28601
+        versionName "2.8.6"
         enforceUniquePackageName false
     }
 
@@ -67,12 +67,12 @@ dependencies {
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, expandable items
     // https://github.com/mikepenz/FastAdapter
-    compile 'com.mikepenz:fastadapter:2.5.2@aar'
-    compile 'com.mikepenz:fastadapter-commons:2.5.0@aar'
+    compile 'com.mikepenz:fastadapter:2.5.3@aar'
+    compile 'com.mikepenz:fastadapter-commons:2.5.3@aar'
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.9.0@aar') {
+    compile('com.mikepenz:materialdrawer:5.9.2@aar') {
         transitive = true
         exclude module: "fastadapter"
         exclude module: "iconics-core"

app/src/main/java/com/mikepenz/iconics/sample/IconsFragment.java

@@ -19,7 +19,6 @@
 
 import com.mikepenz.fastadapter.FastAdapter;
 import com.mikepenz.fastadapter.IAdapter;
-import com.mikepenz.fastadapter.IItem;
 import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.IconicsDrawable;
@@ -177,6 +176,11 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder viewHolder, int posit
             public void onViewDetachedFromWindow(RecyclerView.ViewHolder viewHolder, int position) {
 
             }
+
+            @Override
+            public boolean onFailedToRecycleView(RecyclerView.ViewHolder viewHolder, int position) {
+                return false;
+            }
         });
     }
 

build.gradle

@@ -2,31 +2,28 @@
 
 buildscript {
     repositories {
+        maven { url 'https://maven.google.com' }
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
-        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.novoda:bintray-release:0.5.0'
     }
 }
 
 ext {
     compileSdkVersion = 25
     buildToolsVersion = "25.0.2"
-    supportLibVersion = "25.3.1"
+    supportLibVersion = "25.4.0"
 
     minSdkVersion = 14
     targetSdkVersion = 25
 }
 
 allprojects {
     repositories {
+        maven { url 'https://maven.google.com' }
         jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.14'
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Apr 18 18:43:03 CEST 2017
+#Fri Jun 09 22:44:51 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

library-core/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2850
-        versionName "2.8.5"
+        versionCode 2860
+        versionName "2.8.6"
     }
     buildTypes {
         release {

library-core/gradle.properties

@@ -12,8 +12,8 @@
 # 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.
-VERSION_NAME=2.8.5
-VERSION_CODE=2850
+VERSION_NAME=2.8.6
+VERSION_CODE=2860
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core
 POM_PACKAGING=aar

library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java

@@ -774,6 +774,8 @@ public IconicsDrawable colorFilter(ColorFilter cf) {
 
     /**
      * Sets the opacity
+     * **NOTE** if you define a color (or as part of a colorStateList) with alpha
+     * the alpha value of that color will ALWAYS WIN!
      *
      * @param alpha
      * @return The current IconExtDrawable for chaining.
@@ -1058,7 +1060,7 @@ private void updateIconColor() {
         }
 
         int alpha = Color.alpha(color);
-        if (alpha != mAlpha) {
+        if (alpha != 255 && alpha != mAlpha) {
             setAlpha(alpha);
         } else if (invalidate) {
             invalidateSelf();

library-core/src/main/res/values/library_androidiconics_strings.xml

@@ -25,7 +25,7 @@
         This library allows you to include vector icons everywhere in your project. No limits are given. Scale with no limit, use any Color at any time, provide a contour, and many additional customizations
         ]]>
     </string>
-    <string name="library_AndroidIconics_libraryVersion">2.8.5</string>
+    <string name="library_AndroidIconics_libraryVersion">2.8.6</string>
     <string name="library_AndroidIconics_libraryWebsite">https://github.com/mikepenz/Android-Iconics</string>
     <string name="library_AndroidIconics_licenseId">apache_2_0</string>
     <string name="library_AndroidIconics_isOpenSource">true</string>