fix: Fix issue 217 -- LoginActivity crash when run in Android 4.2.2

openMF · Mar 26, 2018 · cac0c2b · cac0c2b
1 parent c2a3743
commit cac0c2b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 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
@@ -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,23 @@ public class LoginActivity extends FineractBaseActivity implements LoginContract
  @Inject
  PreferencesHelper preferencesHelper;
 
+ private void setDrawableLeftOfEditText(EditText editText, int drawableResource){
+ VectorDrawableCompat vectorDrawableCompat = VectorDrawableCompat.create(getResources(), drawableResource, null);
+ editText.setCompoundDrawables(vectorDrawableCompat, null, null, null);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ editText.setCompoundDrawablesRelativeWithIntrinsicBounds(vectorDrawableCompat, 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
@@ -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"