From 91a2089542d1cadc81ac518ecd6effcba7549122 Mon Sep 17 00:00:00 2001 From: Alexander Marchuk Date: Tue, 10 May 2016 12:42:42 +0300 Subject: [PATCH] [android][editor] fix: Turn invalid building number into red. --- .../src/com/mapswithme/maps/editor/EditorFragment.java | 6 +++--- android/src/com/mapswithme/util/UiUtils.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index 2330b4f9cc..5a05741508 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -98,7 +98,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe private final SparseArray mMetaBlocks = new SparseArray<>(7); private TextView mReset; - protected EditorHostFragment mParent; + private EditorHostFragment mParent; @Nullable @Override @@ -130,11 +130,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe if (!Editor.nativeIsHouseValid(text)) { - mInputHouseNumber.setError(getString(R.string.error_enter_correct_house_number)); + UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number); return; } - mInputHouseNumber.setError(null); + UiUtils.setInputError(mInputHouseNumber, 0); } }); mZipcode.setText(Editor.nativeGetZipCode()); diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index a635a69189..6000008b98 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -15,6 +15,7 @@ import android.support.annotation.DrawableRes; import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.annotation.StringRes; +import android.support.design.widget.TextInputLayout; import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.text.TextUtils; @@ -315,6 +316,13 @@ public final class UiUtils + resources.getResourceEntryName(resId)); } + public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error) + { + layout.setError(error == 0 ? null : layout.getContext().getString(error)); + layout.getEditText().setTextColor(error == 0 ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary) + : layout.getContext().getResources().getColor(R.color.base_red)); + } + // utility class private UiUtils() {} }