Merge pull request #10 from wordpress-mobile/merge-wpa

Merge changes from WPAndroid + Gradle and style config updates

Author: aforcier

WordPressLoginFlow/build.gradle

@@ -1,10 +1,10 @@
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -17,8 +17,8 @@ repositories {
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
@@ -35,8 +35,12 @@ dependencies {
         exclude group: "com.mcxiaoke.volley"
     }
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:animated-vector-drawable:28.0.0'
+    implementation 'com.android.support:support-media-compat:28.0.0'
+    implementation 'com.android.support:support-v13:28.0.0'
+    implementation 'com.android.support:gridlayout-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 
     api 'com.google.android.gms:play-services-auth:15.0.1'
 

WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPLoginInputRow.java

@@ -1,13 +1,18 @@
 package org.wordpress.android.login.widgets;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.SparseArray;
@@ -70,7 +75,21 @@ private void init(Context context, AttributeSet attrs) {
 
             try {
                 if (a.hasValue(R.styleable.wpLoginInputRow_wpIconDrawable)) {
-                    mIcon.setImageResource(a.getResourceId(R.styleable.wpLoginInputRow_wpIconDrawable, 0));
+                    int iconResId = a.getResourceId(R.styleable.wpLoginInputRow_wpIconDrawable,
+                            R.drawable.ic_user_grey_24dp);
+                    int tintResId = a.getResourceId(R.styleable.wpLoginInputRow_wpIconDrawableTint,
+                            R.color.login_input_icon_color);
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        mIcon.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(context, tintResId)));
+                        mIcon.setImageResource(iconResId);
+                    } else {
+                        Drawable drawable = context.getResources().getDrawable(iconResId);
+                        DrawableCompat.setTint(drawable, context.getResources().getColor(tintResId));
+                        DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
+                        mIcon.setImageDrawable(drawable);
+                    }
+
                     mIcon.setVisibility(View.VISIBLE);
                 } else {
                     mIcon.setVisibility(View.GONE);

WordPressLoginFlow/src/main/res/layout/login_input_row.xml

@@ -15,8 +15,8 @@
         android:layout_marginRight="@dimen/margin_extra_large"
         android:layout_marginEnd="@dimen/margin_extra_large"
         android:importantForAccessibility="no"
-        android:tint="@color/login_input_icon_color"
-        app:srcCompat="@drawable/ic_user_grey_24dp"/>
+        tools:srcCompat="@drawable/ic_user_grey_24dp"
+        tools:tint="@color/login_input_icon_color"/>
 
     <org.wordpress.android.util.widgets.WPTextInputLayout
         android:layout_centerVertical="true"

WordPressLoginFlow/src/main/res/values/attrs.xml

@@ -6,6 +6,7 @@
     -->
     <declare-styleable name="wpLoginInputRow">
         <attr name="wpIconDrawable" format="reference"/>
+        <attr name="wpIconDrawableTint" format="color"/>
         <attr name="android:inputType" />
         <attr name="android:hint" />
         <attr name="android:imeOptions" />