From 2a4ec6fcc1ada142f38917ca26929c02a2268090 Mon Sep 17 00:00:00 2001
From: Yuri Lukyanov <y.snaky@gmail.com>
Date: Tue, 12 Dec 2017 10:38:14 +0400
Subject: [PATCH] Rename attrs tint & tintMode

This is to avoid conflicts with the last appcompat-v7 library
---
 .../lib/graphics/drawable/VectorDrawable.java             | 8 ++++----
 lib/src/main/res/values/attrs.xml                         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/bettervectordrawable/lib/graphics/drawable/VectorDrawable.java b/lib/src/main/java/com/bettervectordrawable/lib/graphics/drawable/VectorDrawable.java
index 3c4efa3..f485a04 100644
--- a/lib/src/main/java/com/bettervectordrawable/lib/graphics/drawable/VectorDrawable.java
+++ b/lib/src/main/java/com/bettervectordrawable/lib/graphics/drawable/VectorDrawable.java
@@ -84,9 +84,9 @@
  * <dt><code>android:viewportHeight</code></dt>
  * <dd>Used to define the height of the viewport space. Viewport is basically
  * the virtual canvas where the paths are drawn on.</dd>
- * <dt><code>android:tint</code></dt>
+ * <dt><code>android:tintEx</code></dt>
  * <dd>The color to apply to the drawable as a tint. By default, no tint is applied.</dd>
- * <dt><code>android:tintMode</code></dt>
+ * <dt><code>android:tintModeEx</code></dt>
  * <dd>The Porter-Duff blending mode for the tint color. The default value is src_in.</dd>
  * <dt><code>android:autoMirrored</code></dt>
  * <dd>Indicates if the drawable needs to be mirrored when its layout direction is
@@ -538,11 +538,11 @@ private void updateStateFromTypedArray(TypedArray a) throws XmlPullParserExcepti
         state.mChangingConfigurations |= TypedArrayExtension.getChangingConfigurations(a);
         // Extract the theme attributes, if any.
         state.mThemeAttrs = extractThemeAttrs(a);
-        final int tintMode = a.getInt(R.styleable.VectorDrawable_tintMode, -1);
+        final int tintMode = a.getInt(R.styleable.VectorDrawable_tintModeEx, -1);
         if (tintMode != -1) {
             state.mTintMode = parseTintMode(tintMode, Mode.SRC_IN);
         }
-        final ColorStateList tint = a.getColorStateList(R.styleable.VectorDrawable_tint);
+        final ColorStateList tint = a.getColorStateList(R.styleable.VectorDrawable_tintEx);
         if (tint != null) {
             state.mTint = tint;
         }
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
index 1e5faac..804142d 100644
--- a/lib/src/main/res/values/attrs.xml
+++ b/lib/src/main/res/values/attrs.xml
@@ -17,10 +17,10 @@
 <resources>
     <!-- If set, specifies the color to apply to the drawable as a tint. By default,
          no tint is applied. May be a color state list. -->
-    <attr name="tint" />
+    <attr name="tintEx" />
     <!-- When a tint color is set, specifies its Porter-Duff blending mode. The
          default value is src_in, which treats the drawable as an alpha mask. -->
-    <attr name="tintMode">
+    <attr name="tintModeEx">
         <!-- The tint is drawn on top of the drawable.
              [Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
         <enum name="src_over" value="3" />
@@ -57,10 +57,10 @@
     <declare-styleable name="VectorDrawable">
         <!-- If set, specifies the color to apply to the drawable as a tint. By default,
                  no tint is applied. May be a color state list. -->
-        <attr name="tint" />
+        <attr name="tintEx" />
         <!-- When a tint color is set, specifies its Porter-Duff blending mode. The
                  default value is src_in, which treats the drawable as an alpha mask. -->
-        <attr name="tintMode" />
+        <attr name="tintModeEx" />
         <!-- Indicates if the drawable needs to be mirrored when its layout direction is
                  RTL (right-to-left). -->
         <attr name="autoMirrored" />