From aa5163a9cbe0864cdb476f353b786163f009f29f Mon Sep 17 00:00:00 2001
From: Anton Malinskiy <anton@malinskiy.com>
Date: Mon, 13 Jul 2015 15:25:32 +0300
Subject: [PATCH 1/5] Add ignoreClass to Builder

Fixes chrisjenx/Calligraphy#152
---
 .../calligraphy/CalligraphyConfig.java        | 27 ++++++++++++++++++-
 .../calligraphy/CalligraphyFactory.java       |  2 +-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java
index c22148a..6f8fc8c 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java
@@ -13,7 +13,9 @@
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by chris on 20/12/2013
@@ -86,6 +88,10 @@ public static CalligraphyConfig get() {
      * Class Styles. Build from DEFAULT_STYLES and the builder.
      */
     private final Map<Class<? extends TextView>, Integer> mClassStyleAttributeMap;
+    /**
+     * Classes that will not be injected
+     */
+    private final Set<Class<?>> mIgnoredClassSet;
 
     protected CalligraphyConfig(Builder builder) {
         mIsFontSet = builder.isFontSet;
@@ -96,6 +102,7 @@ protected CalligraphyConfig(Builder builder) {
         final Map<Class<? extends TextView>, Integer> tempMap = new HashMap<>(DEFAULT_STYLES);
         tempMap.putAll(builder.mStyleClassMap);
         mClassStyleAttributeMap = Collections.unmodifiableMap(tempMap);
+        mIgnoredClassSet = Collections.unmodifiableSet(new HashSet<>(builder.mIgnoredClassSet));
     }
 
     /**
@@ -131,6 +138,15 @@ public int getAttrId() {
         return mAttrId;
     }
 
+    /**
+     *
+     * @param viewClass class to be ignored by Calligraphy
+     * @return true if class should not be injected, false otherwise
+     */
+    public boolean isIgnoredClass(Class<?> viewClass) {
+        return mIgnoredClassSet.contains(viewClass);
+    }
+
     public static class Builder {
         /**
          * Default AttrID if not set.
@@ -160,7 +176,10 @@ public static class Builder {
          * Additional Class Styles. Can be empty.
          */
         private Map<Class<? extends TextView>, Integer> mStyleClassMap = new HashMap<>();
-
+        /**
+         * Ignored classes. Can be empty.
+         */
+        private Set<Class<?>> mIgnoredClassSet = new HashSet<>();
         /**
          * This defaults to R.attr.fontPath. So only override if you want to use your own attrId.
          *
@@ -257,6 +276,12 @@ public Builder addCustomStyle(final Class<? extends TextView> styleClass, final
             return this;
         }
 
+        public Builder ignoreClass(final Class<?> clazz) {
+            if(clazz == null) return this;
+            mIgnoredClassSet.add(clazz);
+            return this;
+        }
+
         public CalligraphyConfig build() {
             this.isFontSet = !TextUtils.isEmpty(fontAssetPath);
             return new CalligraphyConfig(this);
diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
index ca45b62..9261af9 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
@@ -114,7 +114,7 @@ public View onViewCreated(View view, Context context, AttributeSet attrs) {
     }
 
     void onViewCreatedInternal(View view, final Context context, AttributeSet attrs) {
-        if (view instanceof TextView) {
+        if (!CalligraphyConfig.get().isIgnoredClass(view.getClass()) && view instanceof TextView) {
             // Fast path the setting of TextView's font, means if we do some delayed setting of font,
             // which has already been set by use we skip this TextView (mainly for inflating custom,
             // TextView's inside the Toolbar/ActionBar).

From c30fa1d94c5e3b6269bb1b0de983b1c445f08ebe Mon Sep 17 00:00:00 2001
From: Anton Malinskiy <anton@malinskiy.com>
Date: Mon, 13 Jul 2015 15:25:51 +0300
Subject: [PATCH 2/5] Add sample IconTextView in to CalligraphySample

---
 CalligraphySample/build.gradle                               | 2 ++
 .../chrisjenx/calligraphy/sample/CalligraphyApplication.java | 3 +++
 CalligraphySample/src/main/res/layout/fragment_main.xml      | 5 +++++
 CalligraphySample/src/main/res/values/strings.xml            | 1 +
 4 files changed, 11 insertions(+)

diff --git a/CalligraphySample/build.gradle b/CalligraphySample/build.gradle
index 27e8c65..d3f76fc 100644
--- a/CalligraphySample/build.gradle
+++ b/CalligraphySample/build.gradle
@@ -32,5 +32,7 @@ dependencies {
     compile 'com.android.support:support-v4:22.1.1'
     compile 'com.android.support:appcompat-v7:22.1.1'
 
+    compile 'com.malinskiy:materialicons:1.0.2'
+
     compile 'com.jakewharton:butterknife:5.1.2'
 }
diff --git a/CalligraphySample/src/main/java/uk/co/chrisjenx/calligraphy/sample/CalligraphyApplication.java b/CalligraphySample/src/main/java/uk/co/chrisjenx/calligraphy/sample/CalligraphyApplication.java
index 7af7454..c6ad02a 100644
--- a/CalligraphySample/src/main/java/uk/co/chrisjenx/calligraphy/sample/CalligraphyApplication.java
+++ b/CalligraphySample/src/main/java/uk/co/chrisjenx/calligraphy/sample/CalligraphyApplication.java
@@ -2,6 +2,8 @@
 
 import android.app.Application;
 
+import com.malinskiy.materialicons.widget.IconTextView;
+
 import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 /**
@@ -17,6 +19,7 @@ public void onCreate() {
                         .setDefaultFontPath("fonts/Roboto-ThinItalic.ttf")
                         .setFontAttrId(R.attr.fontPath)
                         .addCustomStyle(TextField.class, R.attr.textFieldStyle)
+                        .ignoreClass(IconTextView.class)
                         .build()
         );
     }
diff --git a/CalligraphySample/src/main/res/layout/fragment_main.xml b/CalligraphySample/src/main/res/layout/fragment_main.xml
index 4c7bc46..2e2f7ed 100644
--- a/CalligraphySample/src/main/res/layout/fragment_main.xml
+++ b/CalligraphySample/src/main/res/layout/fragment_main.xml
@@ -106,6 +106,11 @@
             android:layout_height="wrap_content"
             android:text="@string/custom_view_style_text"/>
 
+        <com.malinskiy.materialicons.widget.IconTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/defined_ingore_class"/>
+
         <Button
             android:id="@+id/button_default"
             android:layout_width="wrap_content"
diff --git a/CalligraphySample/src/main/res/values/strings.xml b/CalligraphySample/src/main/res/values/strings.xml
index 56c3803..95eb089 100644
--- a/CalligraphySample/src/main/res/values/strings.xml
+++ b/CalligraphySample/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="defined_in_appears">\nThis has the font path defined in the Views TextAppearance as Oswald.\n</string>
     <string name="defined_in_appears_caps">\nThis has the font path defined in the Views TextAppearance as Oswald. textAllCaps is applied.\n</string>
     <string name="defined_custom_view">\nThis is a custom TextView with Oswald font.\n</string>
+    <string name="defined_ingore_class">Ignore class works for iconify libraries for {zmdi-android} {zmdi-favorite}</string>
     <string name="defined_view_stub">\nThis is a TextView inflated from a ViewStub.\n</string>
     <string name="defined_view_stub_font_path">\nThis is a TextView inflated from a ViewStub w/ fontPath declared.\n</string>
 

From c32d9f74275eb812ce33734affe1743278b75bd4 Mon Sep 17 00:00:00 2001
From: Anton Malinskiy <anton@malinskiy.com>
Date: Mon, 13 Jul 2015 16:00:50 +0300
Subject: [PATCH 3/5] Add calligraphyIgnore attribute to ignore views by
 Calligraphy

---
 .../calligraphy/CalligraphyFactory.java       |  5 ++++-
 .../calligraphy/CalligraphyUtils.java         | 21 +++++++++++++++++++
 calligraphy/src/main/res/values/attrs.xml     |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
index 9261af9..72326b1 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
@@ -114,7 +114,10 @@ public View onViewCreated(View view, Context context, AttributeSet attrs) {
     }
 
     void onViewCreatedInternal(View view, final Context context, AttributeSet attrs) {
-        if (!CalligraphyConfig.get().isIgnoredClass(view.getClass()) && view instanceof TextView) {
+        if (!CalligraphyConfig.get().isIgnoredClass(view.getClass()) &&
+                !CalligraphyUtils.pullIgnoredFromView(context, attrs) &&
+                view instanceof TextView) {
+
             // Fast path the setting of TextView's font, means if we do some delayed setting of font,
             // which has already been set by use we skip this TextView (mainly for inflating custom,
             // TextView's inside the Toolbar/ActionBar).
diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java
index 11737bf..929b262 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java
@@ -170,6 +170,27 @@ static String pullFontPathFromView(Context context, AttributeSet attrs, int attr
                 : attrs.getAttributeValue(null, attributeName);
     }
 
+    /**
+     * Tries to pull the Ingored Attribute directly from the View.
+     * @param context     Activity Context
+     * @param attrs       View Attributes
+     * @return false if attribute is not defined or added to View
+     */
+    static boolean pullIgnoredFromView(Context context, AttributeSet attrs) {
+        if (attrs == null)
+            return false;
+
+        final String attributeName;
+        try {
+            attributeName = context.getResources().getResourceEntryName(R.attr.calligraphyIgnore);
+        } catch (Resources.NotFoundException e) {
+            // invalid attribute ID
+            return false;
+        }
+
+        return attrs.getAttributeBooleanValue(null, attributeName, false);
+    }
+
     /**
      * Tries to pull the Font Path from the View Style as this is the next decendent after being
      * defined in the View's xml.
diff --git a/calligraphy/src/main/res/values/attrs.xml b/calligraphy/src/main/res/values/attrs.xml
index 02c6672..aced706 100644
--- a/calligraphy/src/main/res/values/attrs.xml
+++ b/calligraphy/src/main/res/values/attrs.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="fontPath" format="string"/>
+    <attr name="calligraphyIgnore" format="boolean"/>
 </resources>
\ No newline at end of file

From 92375fb2bdc80f8985449a332ce1aa3b5f7dcc0c Mon Sep 17 00:00:00 2001
From: Anton Malinskiy <anton@malinskiy.com>
Date: Mon, 13 Jul 2015 16:01:17 +0300
Subject: [PATCH 4/5] Add example for calligraphyIgnore attribute

---
 .../src/main/res/layout/fragment_main.xml              | 10 +++++++++-
 CalligraphySample/src/main/res/values/strings.xml      |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CalligraphySample/src/main/res/layout/fragment_main.xml b/CalligraphySample/src/main/res/layout/fragment_main.xml
index 2e2f7ed..b07de3c 100644
--- a/CalligraphySample/src/main/res/layout/fragment_main.xml
+++ b/CalligraphySample/src/main/res/layout/fragment_main.xml
@@ -109,7 +109,15 @@
         <com.malinskiy.materialicons.widget.IconTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/defined_ingore_class"/>
+            android:text="@string/defined_ignore_class"/>
+
+        <com.malinskiy.materialicons.widget.IconButton
+            calligraphyIgnore="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp"
+            android:text="@string/defined_ignore_attribute"/>
 
         <Button
             android:id="@+id/button_default"
diff --git a/CalligraphySample/src/main/res/values/strings.xml b/CalligraphySample/src/main/res/values/strings.xml
index 95eb089..20241d8 100644
--- a/CalligraphySample/src/main/res/values/strings.xml
+++ b/CalligraphySample/src/main/res/values/strings.xml
@@ -11,7 +11,8 @@
     <string name="defined_in_appears">\nThis has the font path defined in the Views TextAppearance as Oswald.\n</string>
     <string name="defined_in_appears_caps">\nThis has the font path defined in the Views TextAppearance as Oswald. textAllCaps is applied.\n</string>
     <string name="defined_custom_view">\nThis is a custom TextView with Oswald font.\n</string>
-    <string name="defined_ingore_class">Ignore class works for iconify libraries for {zmdi-android} {zmdi-favorite}</string>
+    <string name="defined_ignore_class">\nIgnore class works for iconify libraries for {zmdi-android} {zmdi-favorite}</string>
+    <string name="defined_ignore_attribute">\nIgnore attribute works too {zmdi-thumb-up}</string>
     <string name="defined_view_stub">\nThis is a TextView inflated from a ViewStub.\n</string>
     <string name="defined_view_stub_font_path">\nThis is a TextView inflated from a ViewStub w/ fontPath declared.\n</string>
 

From fbb47b09ebf99cee1d7f29b827d271122e014bb3 Mon Sep 17 00:00:00 2001
From: Anton Malinskiy <anton@malinskiy.com>
Date: Mon, 13 Jul 2015 20:07:36 +0300
Subject: [PATCH 5/5] Move isIgnoredClass to CalligraphyUtils

---
 .../co/chrisjenx/calligraphy/CalligraphyConfig.java   | 10 +++-------
 .../co/chrisjenx/calligraphy/CalligraphyFactory.java  |  2 +-
 .../uk/co/chrisjenx/calligraphy/CalligraphyUtils.java | 11 +++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java
index 6f8fc8c..09728c8 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyConfig.java
@@ -2,6 +2,7 @@
 
 import android.os.Build;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -138,13 +139,8 @@ public int getAttrId() {
         return mAttrId;
     }
 
-    /**
-     *
-     * @param viewClass class to be ignored by Calligraphy
-     * @return true if class should not be injected, false otherwise
-     */
-    public boolean isIgnoredClass(Class<?> viewClass) {
-        return mIgnoredClassSet.contains(viewClass);
+    public Set<Class<?>> getIgnoredClassSet() {
+        return mIgnoredClassSet;
     }
 
     public static class Builder {
diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
index 72326b1..38203c4 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyFactory.java
@@ -114,7 +114,7 @@ public View onViewCreated(View view, Context context, AttributeSet attrs) {
     }
 
     void onViewCreatedInternal(View view, final Context context, AttributeSet attrs) {
-        if (!CalligraphyConfig.get().isIgnoredClass(view.getClass()) &&
+        if (!CalligraphyUtils.isIgnoredClass(view, CalligraphyConfig.get()) &&
                 !CalligraphyUtils.pullIgnoredFromView(context, attrs) &&
                 view instanceof TextView) {
 
diff --git a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java
index 929b262..13cb1aa 100644
--- a/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java
+++ b/calligraphy/src/main/java/uk/co/chrisjenx/calligraphy/CalligraphyUtils.java
@@ -14,6 +14,7 @@
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.TypedValue;
+import android.view.View;
 import android.widget.TextView;
 
 /**
@@ -350,6 +351,16 @@ static boolean canCheckForV7Toolbar() {
         return sToolbarCheck;
     }
 
+    /**
+     *
+     * @param view view to check for ignore
+     * @param config current Calligraphy config
+     * @return
+     */
+    static boolean isIgnoredClass(View view, CalligraphyConfig config) {
+        return config.getIgnoredClassSet().contains(view.getClass());
+    }
+
     private CalligraphyUtils() {
     }