diff --git a/androidbase-utils/build.gradle b/androidbase-utils/build.gradle index a824bd9..94f3420 100644 --- a/androidbase-utils/build.gradle +++ b/androidbase-utils/build.gradle @@ -28,6 +28,6 @@ dependencies { }) compile 'com.android.support:appcompat-v7:25.1.0' compile 'com.android.support:design:25.1.0' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-core:1.0.51' + compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-core:1.0.53' testCompile 'junit:junit:4.12' } diff --git a/androidbase-utils/src/main/java/com/mr_apps/androidbaseutils/Utils.java b/androidbase-utils/src/main/java/com/mr_apps/androidbaseutils/Utils.java index 19e77bc..cd736d1 100644 --- a/androidbase-utils/src/main/java/com/mr_apps/androidbaseutils/Utils.java +++ b/androidbase-utils/src/main/java/com/mr_apps/androidbaseutils/Utils.java @@ -1,13 +1,16 @@ package com.mr_apps.androidbaseutils; import android.content.Context; +import android.content.res.ColorStateList; +import android.graphics.Color; import android.location.Location; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.util.DisplayMetrics; -//import com.mr_apps.androidbase.custom_views.WarningTextInputLayout; +import com.mr_apps.androidbasecore.custom_views.WarningTextInputLayout; /** * Class that provides generic utils @@ -164,13 +167,13 @@ public static int dpToPx(Context context, int dp) { return dp * (metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT); } - /*public static void passwordToggleDrawableColor(Context context, WarningTextInputLayout warningTextInputLayout) { + public static void passwordToggleDrawableColor(Context context, WarningTextInputLayout warningTextInputLayout) { if (warningTextInputLayout.isErrorEnabled()) { warningTextInputLayout.setPasswordVisibilityToggleTintList(new ColorStateList(new int[][]{ new int[]{android.R.attr.state_enabled}, }, new int[]{ - ContextCompat.getColor(context, com.mr_apps.androidbase.R.color.errorRed), + ContextCompat.getColor(context, R.color.errorRed), } )); } else { @@ -182,5 +185,5 @@ public static int dpToPx(Context context, int dp) { } )); } - }*/ + } } diff --git a/androidbase/build.gradle b/androidbase/build.gradle index f9d8d7b..50a329e 100644 --- a/androidbase/build.gradle +++ b/androidbase/build.gradle @@ -60,6 +60,6 @@ dependencies { compile 'com.github.chrisbanes:PhotoView:1.2.6' compile 'com.facebook.android:facebook-android-sdk:4.10.0' compile 'com.viewpagerindicator:library:2.4.1' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-core:1.0.52' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-utils:1.0.52' + compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-core:1.0.53' + compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-utils:1.0.53' } diff --git a/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseLoginActivity.java b/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseLoginActivity.java index 1358e92..1a23e89 100644 --- a/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseLoginActivity.java +++ b/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseLoginActivity.java @@ -34,7 +34,7 @@ import com.google.android.gms.common.api.GoogleApiClient; import com.mr_apps.androidbase.R; import com.mr_apps.androidbase.activity.AbstractBaseActivity; -import com.mr_apps.androidbase.custom_views.WarningTextInputLayout; +import com.mr_apps.androidbasecore.custom_views.WarningTextInputLayout; import com.mr_apps.androidbaseutils.DrawableUtils; import com.mr_apps.androidbaseutils.Logger; import com.mr_apps.androidbaseutils.Utils; diff --git a/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseRegistrazioneActivity.java b/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseRegistrazioneActivity.java index 4b46c2d..d86f71e 100644 --- a/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseRegistrazioneActivity.java +++ b/androidbase/src/main/java/com/mr_apps/androidbase/account/BaseRegistrazioneActivity.java @@ -13,7 +13,7 @@ import com.mr_apps.androidbase.R; import com.mr_apps.androidbase.activity.AbstractBaseActivity; -import com.mr_apps.androidbase.custom_views.WarningTextInputLayout; +import com.mr_apps.androidbasecore.custom_views.WarningTextInputLayout; import com.mr_apps.androidbaseutils.DrawableUtils; import com.mr_apps.androidbaseutils.TextViewUtils; diff --git a/androidbase/src/main/java/com/mr_apps/androidbase/custom_views/WarningTextInputLayout.java b/androidbase/src/main/java/com/mr_apps/androidbase/custom_views/WarningTextInputLayout.java deleted file mode 100644 index ce65881..0000000 --- a/androidbase/src/main/java/com/mr_apps/androidbase/custom_views/WarningTextInputLayout.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.mr_apps.androidbase.custom_views; - -import android.content.Context; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.support.design.widget.TextInputLayout; -import android.support.graphics.drawable.VectorDrawableCompat; -import android.support.v4.content.ContextCompat; -import android.util.AttributeSet; -import android.widget.EditText; - -import com.mr_apps.androidbase.R; - -/** - * Custom view used to create a TextInputLayout that displays a red warning drawable instead of the red text below the edit text - * - * @author Mattia Ruggiero - */ -public class WarningTextInputLayout extends TextInputLayout { - - boolean isErrorEnabled = false; - - public WarningTextInputLayout(Context context) { - super(context); - } - - public WarningTextInputLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void setErrorEnabled(boolean enabled) { - EditText edit = getEditText(); - if (edit != null) { - if (enabled) { - edit.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.errorRed), PorterDuff.Mode.SRC_ATOP); - setHintTextAppearance(R.style.HintErrorStyle); - Drawable warning = Build.VERSION.SDK_INT >= 21 ? ContextCompat.getDrawable(getContext(), R.drawable.ic_warning_24dp) : VectorDrawableCompat.create(getContext().getResources(), R.drawable.ic_warning_24dp, null); - if (warning != null) - warning.setColorFilter(ContextCompat.getColor(getContext(), R.color.errorRed), PorterDuff.Mode.SRC_ATOP); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) - edit.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, warning, null); - else - edit.setCompoundDrawablesWithIntrinsicBounds(null, null, warning, null); - - } else { - if (Build.VERSION.SDK_INT >= 21) { - edit.getBackground().clearColorFilter(); - } else { - edit.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.colorAccent), PorterDuff.Mode.SRC_ATOP); - } - setHintTextAppearance(R.style.HintStyle); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) - edit.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, null); - else - edit.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null); - } - isErrorEnabled = enabled; - } - } - - @Override - public boolean isErrorEnabled() { - return isErrorEnabled; - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - setErrorEnabled(false); - } -} diff --git a/androidbase/src/main/res/drawable/ic_warning_24dp.xml b/androidbase/src/main/res/drawable/ic_warning_24dp.xml deleted file mode 100644 index b3a9e03..0000000 --- a/androidbase/src/main/res/drawable/ic_warning_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/androidbase/src/main/res/values/styles.xml b/androidbase/src/main/res/values/styles.xml index 3d430f9..010435b 100644 --- a/androidbase/src/main/res/values/styles.xml +++ b/androidbase/src/main/res/values/styles.xml @@ -87,12 +87,6 @@ ?attr/selectableItemBackgroundBorderless - -