Merge branch 'release/v1.7.9'

Author: mikepenz

README.md

@@ -42,7 +42,7 @@ Provide additional fonts for you project, or even create your custom font with j
 ##1. Provide the gradle dependency
 ```gradle
 dependencies {
-	compile 'com.mikepenz:iconics-core:1.7.8@aar'
+	compile 'com.mikepenz:iconics-core:1.7.9@aar'
 }
 ```
 

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 178
-        versionName "1.7.8"
+        versionCode 179
+        versionName "1.7.9"
         enforceUniquePackageName false
     }
 

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

@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.drawable.StateListDrawable;
 import android.os.Bundle;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -32,6 +33,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -83,6 +85,15 @@ protected void onCreate(Bundle savedInstanceState) {
                 .on(b4)
                 .build();
 
+
+        //Show how to style the text of an existing button (NOT WORKING AT THE MOMENT)
+        ImageButton b6 = (ImageButton) findViewById(R.id.test6);
+
+        StateListDrawable iconStateListDrawable = new StateListDrawable();
+        iconStateListDrawable.addState(new int[]{android.R.attr.state_pressed}, new IconicsDrawable(this, FontAwesome.Icon.faw_thumbs_o_up).sizeDp(48).color(Color.parseColor("#aaFF0000")).contourWidthDp(1));
+        iconStateListDrawable.addState(new int[]{}, new IconicsDrawable(this, FontAwesome.Icon.faw_thumbs_o_up).sizeDp(48).color(Color.parseColor("#aa00FF00")).contourWidthDp(2));
+        b6.setImageDrawable(iconStateListDrawable);
+
         ListView listView = (ListView) findViewById(R.id.list);
 
         IconicsDrawable iconicsDrawableBase = new IconicsDrawable(this).actionBar().color(Color.GREEN).backgroundColor(Color.RED);

app/src/main/res/layout/activity_playground.xml

@@ -192,15 +192,23 @@
                 android:orientation="horizontal">
 
                 <com.mikepenz.iconics.view.IconicsButton
-                    android:layout_width="120dp"
+                    android:layout_width="0dp"
                     android:layout_height="60dp"
+                    android:layout_weight="1"
                     android:text="{faw-adjust} Button" />
 
                 <Button
                     android:id="@+id/test4"
-                    android:layout_width="120dp"
+                    android:layout_width="0dp"
                     android:layout_height="60dp"
+                    android:layout_weight="1"
                     android:text="{gmd-poll} Button" />
+
+                <ImageButton
+                    android:id="@+id/test6"
+                    android:layout_width="0dp"
+                    android:layout_height="60dp"
+                    android:layout_weight="1" />
             </LinearLayout>
 
 

library-core/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
-        versionName "1.7.8"
+        versionCode 19
+        versionName "1.7.9"
     }
     buildTypes {
         release {
@@ -25,5 +25,5 @@ if (project.hasProperty('pushall') || project.hasProperty('librarycoreonly')) {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.1.0'
+    compile 'com.android.support:appcompat-v7:23.1.0'
 }

library-core/gradle.properties

@@ -32,8 +32,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=1.7.8
-VERSION_CODE=178
+VERSION_NAME=1.7.9
+VERSION_CODE=179
 
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core

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

@@ -39,7 +39,6 @@
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
@@ -48,6 +47,7 @@
 import android.support.annotation.ColorRes;
 import android.support.annotation.DimenRes;
 import android.support.v4.content.ContextCompat;
+import android.text.TextPaint;
 import android.util.Log;
 
 import com.mikepenz.iconics.typeface.IIcon;
@@ -131,7 +131,12 @@ protected IconicsDrawable(Context context, final ITypeface typeface, final IIcon
     }
 
     private void prepare() {
-        mIconPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mIconPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        mIconPaint.setStyle(Paint.Style.FILL);
+        mIconPaint.setTextAlign(Paint.Align.CENTER);
+        mIconPaint.setUnderlineText(false);
+        mIconPaint.setAntiAlias(true);
+
         mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
         mContourPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -776,7 +781,7 @@ public int getIntrinsicHeight() {
 
     @Override
     public int getOpacity() {
-        return PixelFormat.OPAQUE;
+        return this.mAlpha;
     }
 
 
@@ -805,6 +810,11 @@ public void setColorFilter(ColorFilter cf) {
         mIconPaint.setColorFilter(cf);
     }
 
+    @Override
+    public void clearColorFilter() {
+        mIconPaint.setColorFilter(null);
+    }
+
     /**
      * Creates a BitMap to use in Widgets or anywhere else
      *

library-core/src/main/java/com/mikepenz/iconics/view/IconicsCompatButton.java

@@ -0,0 +1,40 @@
+package com.mikepenz.iconics.view;
+
+import android.content.Context;
+import android.os.Build;
+import android.support.v7.widget.AppCompatButton;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.mikepenz.iconics.Iconics;
+
+public class IconicsCompatButton extends AppCompatButton {
+
+    public IconicsCompatButton(Context context) {
+        super(context);
+    }
+
+    public IconicsCompatButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public IconicsCompatButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void setText(CharSequence text, TextView.BufferType type) {
+        // NOTES:
+        // 1. Need to disable the All Caps option to make Spannable work properly!
+        // 2. This method will be called from the constructor of the super class
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            setAllCaps(false);
+        }
+
+        if (!isInEditMode()) {
+            super.setText(new Iconics.IconicsBuilder().ctx(getContext()).on(text).build(), type);
+        } else {
+            super.setText(text, type);
+        }
+    }
+}

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">1.7.8</string>
+    <string name="library_AndroidIconics_libraryVersion">1.7.9</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>