From 961b23aa552868db02ab8bb0686dfb5a6ca2851b Mon Sep 17 00:00:00 2001
From: Daniel Sugiarto Setyabudi <danielsugiarto89@gmail.com>
Date: Tue, 27 Mar 2018 10:45:53 +0700
Subject: [PATCH] fix: Fix issue 217 -- LoginActivity crash when run in Android
 4.2.2

---
 .../fineract/ui/online/login/LoginActivity.java    | 14 ++++++++++++++
 app/src/main/res/layout/activity_login.xml         |  6 ------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java
index 9956991..3da5925 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java
@@ -1,7 +1,9 @@
 package org.apache.fineract.ui.online.login;
 
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.graphics.drawable.VectorDrawableCompat;
 import android.text.TextUtils;
 import android.widget.EditText;
 import android.widget.Toast;
@@ -41,12 +43,24 @@ public class LoginActivity extends FineractBaseActivity implements LoginContract
     @Inject
     PreferencesHelper preferencesHelper;
 
+    private void setDrawableLeftOfEditText(EditText editText, int drawableResource) {
+        VectorDrawableCompat vdc =
+                VectorDrawableCompat.create(getResources(), drawableResource, null);
+        editText.setCompoundDrawables(vdc, null, null, null);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            editText.setCompoundDrawablesRelativeWithIntrinsicBounds(vdc, null, null, null);
+        }
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getActivityComponent().inject(this);
         setContentView(R.layout.activity_login);
         ButterKnife.bind(this);
+        setDrawableLeftOfEditText(etTenant, R.drawable.ic_tenant_black_24dp);
+        setDrawableLeftOfEditText(etUsername, R.drawable.ic_person_black_24dp);
+        setDrawableLeftOfEditText(etPassword, R.drawable.ic_password_black_24dp);
         loginPresenter.attachView(this);
         setActionBarTitle(getString(R.string.fineract_account));
         preferencesHelper.clear();
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 707c1b9..d1f832b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -52,8 +52,6 @@
 
                     <EditText
                         style="@style/Base.TextAppearance.AppCompat.Medium"
-                        android:drawableLeft="@drawable/ic_tenant_black_24dp"
-                        android:drawableStart="@drawable/ic_tenant_black_24dp"
                         android:drawablePadding="@dimen/layout_padding_8dp"
                         android:hint="@string/tenant"
                         android:id="@+id/et_tenant"
@@ -69,8 +67,6 @@
 
                     <EditText
                         style="@style/Base.TextAppearance.AppCompat.Medium"
-                        android:drawableLeft="@drawable/ic_person_black_24dp"
-                        android:drawableStart="@drawable/ic_person_black_24dp"
                         android:drawablePadding="@dimen/layout_padding_8dp"
                         android:hint="@string/username"
                         android:id="@+id/et_username"
@@ -87,8 +83,6 @@
 
                     <EditText
                         style="@style/Base.TextAppearance.AppCompat.Medium"
-                        android:drawableLeft="@drawable/ic_password_black_24dp"
-                        android:drawableStart="@drawable/ic_password_black_24dp"
                         android:drawablePadding="@dimen/layout_padding_8dp"
                         android:hint="@string/password"
                         android:id="@+id/et_password"