From d170fa709351946d151b4e7e83e23aa61ffebe36 Mon Sep 17 00:00:00 2001
From: code-mc <codecrafted.info@gmail.com>
Date: Mon, 7 Mar 2016 01:22:40 +0100
Subject: [PATCH] fixed color transparincy not picked up in xml files

---
 README.md                                     |  2 +-
 app/app.iml                                   |  1 +
 app/build.gradle                              |  8 ++++-
 app/src/main/res/layout/activity_main.xml     | 36 ++++++++++++++-----
 build.gradle                                  |  2 +-
 materialiconlib/build.gradle                  |  2 +-
 .../MaterialDrawableBuilder.java              |  5 ++-
 7 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 19a574a..bf5c0ff 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ You don't have to worry about android including the file twice in your apk. Andr
 
 ```groovy
 dependencies {
-    compile 'net.steamcrafted:materialiconlib:1.0.8'
+    compile 'net.steamcrafted:materialiconlib:1.0.9'
 }
 ```
 
diff --git a/app/app.iml b/app/app.iml
index ee23b35..0bb5941 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -72,6 +72,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/2.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
diff --git a/app/build.gradle b/app/build.gradle
index f31565c..9de40f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,6 +19,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
@@ -26,5 +32,5 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'de.hdodenhof:circleimageview:2.0.0'
     /*compile project(':materialiconlib')*/
-    compile 'net.steamcrafted:materialiconlib:1.0.8'
+    compile project(":materialiconlib")
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 735e6fd..ebb6dbe 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -73,13 +73,31 @@
 
 
 
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/listview"
-    android:numColumns="5"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <net.steamcrafted.materialiconlib.MaterialIconView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="96dp"
+        app:materialIcon="file"
+        app:materialIconColor="#3300FF00"
+
+        android:id="@+id/file_icon"
+        android:background="#A0C"
+        />
+
+    <GridView
+        android:layout_below="@+id/file_icon"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/listview"
+        android:numColumns="5"
+        android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"/>
+</RelativeLayout>
 
diff --git a/build.gradle b/build.gradle
index 9405f3f..00100a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,4 +16,4 @@ allprojects {
     repositories {
         jcenter()
     }
-}
+}
\ No newline at end of file
diff --git a/materialiconlib/build.gradle b/materialiconlib/build.gradle
index f6a88a0..ce683bb 100644
--- a/materialiconlib/build.gradle
+++ b/materialiconlib/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'net.steamcrafted'
     PUBLISH_ARTIFACT_ID = 'materialiconlib'
-    PUBLISH_VERSION = '1.0.8'
+    PUBLISH_VERSION = '1.0.9'
 }
 
 android {
diff --git a/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java b/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java
index 4b0419e..3ba4f6c 100644
--- a/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java
+++ b/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java
@@ -128,9 +128,7 @@ public MaterialDrawableBuilder setSizePx(int size) {
      */
     public MaterialDrawableBuilder setColor(int color) {
         paint.setColor(color);
-        if(Color.alpha(color) != 255){
-            paint.setAlpha(Color.alpha(color));
-        }
+        setAlpha(Color.alpha(color));
         return this;
     }
 
@@ -262,6 +260,7 @@ public void draw(Canvas canvas) {
             String textValue = MaterialIconUtils.getIconString(icon.ordinal());
             paint.getTextBounds(textValue, 0, 1, mCachedRect);
             float textBottom = (getBounds().height() - mCachedRect.height()) / 2f + mCachedRect.height() - mCachedRect.bottom;
+
             canvas.drawText(textValue, getBounds().width() / 2f, textBottom, paint);
         }