Merge branch 'release/v2.7.2'

mikepenz · Aug 3, 2016 · 8759055 · 8759055
2 parents 1f1623d + 0cea1ff
commit 8759055
Show file tree

Hide file tree

Showing 9 changed files with 1,587 additions and 14 deletions.
diff --git a/README.md b/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.7.1@aar"
+compile "com.mikepenz:iconics-core:2.7.2@aar"
 compile "com.android.support:appcompat-v7:${supportLibVersion}"
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 27101
-        versionName "2.7.1.1"
+        versionCode 27201
+        versionName "2.7.2.1"
         enforceUniquePackageName false
     }
 

diff --git a/app/src/main/res/layout/activity_playground.xml b/app/src/main/res/layout/activity_playground.xml
@@ -93,15 +93,15 @@
                     android:layout_height="72dp"
                     android:background="#ffcccc"
                     app:iiv_color="#666666"
-                    app:iiv_icon="faw-android" />
+                    app:iiv_icon="@string/faw_android" />
 
                 <!-- android:iiv_size -->
                 <com.mikepenz.iconics.view.IconicsImageView
                     android:layout_width="72dp"
                     android:layout_height="72dp"
                     android:background="#ccffcc"
                     app:iiv_color="#666666"
-                    app:iiv_icon="faw-android"
+                    app:iiv_icon="@string/faw_android"
                     app:iiv_size="16dp" />
 
                 <!-- android:iiv_padding -->
@@ -110,7 +110,7 @@
                     android:layout_height="72dp"
                     android:background="#ccccff"
                     app:iiv_color="#666666"
-                    app:iiv_icon="faw-android"
+                    app:iiv_icon="@string/faw_android"
                     app:iiv_padding="16dp" />
 
                 <!-- android:padding -->
@@ -120,7 +120,7 @@
                     android:background="#ffffcc"
                     android:padding="16dp"
                     app:iiv_color="#666666"
-                    app:iiv_icon="faw-android" />
+                    app:iiv_icon="@string/faw_android" />
 
             </LinearLayout>
 

diff --git a/fontawesome-typeface-library/src/main/res/values/font_fontawesome.xml b/fontawesome-typeface-library/src/main/res/values/font_fontawesome.xml
diff --git a/google-material-typeface-library/src/main/res/values/font_addon.xml b/google-material-typeface-library/src/main/res/values/font_addon.xml
diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2710
-        versionName "2.7.1"
+        versionCode 2720
+        versionName "2.7.2"
     }
     buildTypes {
         release {

diff --git a/library-core/gradle.properties b/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.7.1
-VERSION_CODE=2710
+VERSION_NAME=2.7.2
+VERSION_CODE=2720
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core
 POM_PACKAGING=aar
diff --git a/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java b/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java
@@ -851,6 +851,16 @@ public boolean setState(int[] stateSet) {
         return super.setState(stateSet);
     }
 
+    @Override
+    protected boolean onStateChange(int[] stateSet) {
+        if (mTint != null && mTintMode != null) {
+            mTintFilter = updateTintFilter(mTint, mTintMode);
+            invalidateSelf();
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public int getIntrinsicWidth() {
         return mSizeX;
@@ -871,6 +881,7 @@ public int getOpacity() {
     public void setAlpha(int alpha) {
         mIconPaint.setAlpha(alpha);
         mAlpha = alpha;
+        invalidateSelf();
     }
 
     @Override
@@ -1001,11 +1012,11 @@ private void offsetIcon(Rect viewBounds) {
      * Ensures the tint filter is consistent with the current tint color and
      * mode.
      */
-    PorterDuffColorFilter updateTintFilter(ColorStateList tint, PorterDuff.Mode tintMode) {
+    private PorterDuffColorFilter updateTintFilter(ColorStateList tint, PorterDuff.Mode tintMode) {
         if (tint == null || tintMode == null) {
             return null;
         }
-        // setMode, setColor of PorterDuffColorFilter are not public method in SDK v7.
+        // setMode, setColor of PorterDuffColorFilter are not public method in SDK v7. (Thanks @Google still not accessible in API v24)
         // Therefore we create a new one all the time here. Don't expect this is called often.
         final int color = tint.getColorForState(getState(), Color.TRANSPARENT);
         return new PorterDuffColorFilter(color, tintMode);

diff --git a/library-core/src/main/res/values/library_androidiconics_strings.xml b/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.7.1</string>
+    <string name="library_AndroidIconics_libraryVersion">2.7.2</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>