From 8109cb40e5d1b0f30b1072417ab6b14e236ca062 Mon Sep 17 00:00:00 2001
From: Scot Scriven <scot.scriven@gmail.com>
Date: Fri, 24 Mar 2017 11:29:19 +0100
Subject: [PATCH] Handle drawable vector for Pre Lollipop

---
 .../openfood/utils/CustomEditTextView.java    | 64 +++++++++++++++++++
 .../github/scrachx/openfood/utils/Utils.java  |  2 -
 app/src/main/res/layout/activity_login.xml    |  9 +--
 .../main/res/layout/fragment_find_product.xml |  4 +-
 app/src/main/res/values/attrs.xml             | 10 +++
 5 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/CustomEditTextView.java
 create mode 100644 app/src/main/res/values/attrs.xml

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/CustomEditTextView.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/CustomEditTextView.java
new file mode 100644
index 000000000000..48f89915ed60
--- /dev/null
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/CustomEditTextView.java
@@ -0,0 +1,64 @@
+package openfoodfacts.github.scrachx.openfood.utils;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.support.v7.content.res.AppCompatResources;
+import android.support.v7.widget.AppCompatEditText;
+import android.util.AttributeSet;
+
+import openfoodfacts.github.scrachx.openfood.R;
+
+/**
+ * Based on <a href="http://stackoverflow.com/questions/35761636/is-it-possible-to-use-vectordrawable-in-buttons-and-textviews-using-androiddraw</a>
+ */
+public class CustomEditTextView extends AppCompatEditText {
+
+    public CustomEditTextView(Context context) {
+        super(context);
+    }
+    public CustomEditTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initAttrs(context, attrs);
+    }
+    public CustomEditTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initAttrs(context, attrs);
+    }
+
+    void initAttrs(Context context, AttributeSet attrs) {
+        if (attrs != null) {
+            TypedArray attributeArray = context.obtainStyledAttributes(
+                    attrs,
+                    R.styleable.CustomEditTextView);
+
+            Drawable drawableLeft = null;
+            Drawable drawableRight = null;
+            Drawable drawableBottom = null;
+            Drawable drawableTop = null;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                drawableLeft = attributeArray.getDrawable(R.styleable.CustomEditTextView_drawableLeftCompat);
+                drawableRight = attributeArray.getDrawable(R.styleable.CustomEditTextView_drawableRightCompat);
+                drawableBottom = attributeArray.getDrawable(R.styleable.CustomEditTextView_drawableBottomCompat);
+                drawableTop = attributeArray.getDrawable(R.styleable.CustomEditTextView_drawableTopCompat);
+            } else {
+                final int drawableLeftId = attributeArray.getResourceId(R.styleable.CustomEditTextView_drawableLeftCompat, -1);
+                final int drawableRightId = attributeArray.getResourceId(R.styleable.CustomEditTextView_drawableRightCompat, -1);
+                final int drawableBottomId = attributeArray.getResourceId(R.styleable.CustomEditTextView_drawableBottomCompat, -1);
+                final int drawableTopId = attributeArray.getResourceId(R.styleable.CustomEditTextView_drawableTopCompat, -1);
+
+                if (drawableLeftId != -1)
+                    drawableLeft = AppCompatResources.getDrawable(context, drawableLeftId);
+                if (drawableRightId != -1)
+                    drawableRight = AppCompatResources.getDrawable(context, drawableRightId);
+                if (drawableBottomId != -1)
+                    drawableBottom = AppCompatResources.getDrawable(context, drawableBottomId);
+                if (drawableTopId != -1)
+                    drawableTop = AppCompatResources.getDrawable(context, drawableTopId);
+            }
+            setCompoundDrawablesWithIntrinsicBounds(drawableLeft, drawableTop, drawableRight, drawableBottom);
+            attributeArray.recycle();
+        }
+    }
+}
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java
index f14dbf8a188e..b8e711f3d964 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java
@@ -7,9 +7,7 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.VectorDrawable;
 import android.os.Build;
 import android.support.annotation.DrawableRes;
 import android.support.graphics.drawable.VectorDrawableCompat;
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 137e9f54d91b..8528f2a67ed1 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <include layout="@layout/toolbar" />
@@ -19,14 +20,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <EditText
+            <openfoodfacts.github.scrachx.openfood.utils.CustomEditTextView
                 android:id="@+id/editTextLogin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginLeft="@dimen/spacing_normal"
                 android:layout_marginRight="@dimen/spacing_normal"
-                android:drawableLeft="@drawable/ic_person_grey_24dp"
+                app:drawableLeftCompat="@drawable/ic_person_grey_24dp"
                 android:drawablePadding="10dip"
                 android:ems="10"
                 android:hint="@string/hintLogin"
@@ -40,14 +41,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <EditText
+            <openfoodfacts.github.scrachx.openfood.utils.CustomEditTextView
                 android:id="@+id/editTextPass"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginLeft="@dimen/spacing_normal"
                 android:layout_marginRight="@dimen/spacing_normal"
-                android:drawableLeft="@drawable/ic_vpn_key_grey_24dp"
+                app:drawableLeftCompat="@drawable/ic_vpn_key_grey_24dp"
                 android:drawablePadding="10dip"
                 android:ems="10"
                 android:hint="@string/hintPass"
diff --git a/app/src/main/res/layout/fragment_find_product.xml b/app/src/main/res/layout/fragment_find_product.xml
index 576b4f1b4358..a9d928916198 100644
--- a/app/src/main/res/layout/fragment_find_product.xml
+++ b/app/src/main/res/layout/fragment_find_product.xml
@@ -14,7 +14,7 @@
         android:layout_marginStart="@dimen/spacing_normal"
         app:srcCompat="@drawable/img_scan" />
 
-    <EditText
+    <openfoodfacts.github.scrachx.openfood.utils.CustomEditTextView
         android:id="@+id/editTextBarcode"
         android:layout_width="match_parent"
         android:layout_height="70dp"
@@ -22,7 +22,7 @@
         android:layout_marginRight="@dimen/spacing_normal"
         android:layout_marginTop="@dimen/spacing_normal"
         android:background="@drawable/edittext_full"
-        android:drawableLeft="@drawable/ic_search_black"
+        app:drawableLeftCompat="@drawable/ic_search_black"
         android:drawablePadding="10dip"
         android:ems="10"
         android:hint="@string/hintBarcode"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 000000000000..e70f5e8b6ca1
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <declare-styleable name="CustomEditTextView">
+        <attr name="drawableLeftCompat" format="reference"/>
+        <attr name="drawableRightCompat" format="reference"/>
+        <attr name="drawableTopCompat" format="reference"/>
+        <attr name="drawableBottomCompat" format="reference"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file