pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Used new translation.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-04-07 17:20:38 +03:00 • committed by Alex Zolotarev
parent b89fcf2e2b
commit 94d4a57904
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -15,6 +15,7 @@ import com.mapswithme.maps.bookmarks.data.Metadata;
import com.mapswithme.maps.editor.data.TimeFormatUtils;
import com.mapswithme.maps.editor.data.Timetable;
import com.mapswithme.maps.widget.CustomTextInputLayout;
import com.mapswithme.util.InputUtils;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.UiUtils;
@ -75,8 +76,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
if (!Editor.nativeIsHouseValid(text))
{
// TODO set correct error text
mInputHouseNumber.setError("invalid house number");
mInputHouseNumber.setError(getString(R.string.error_enter_correct_house_number));
return;
}
@ -117,7 +117,14 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
private boolean validateFields()
{
return Editor.nativeIsHouseValid(getHouseNumber());
if (!Editor.nativeIsHouseValid(getHouseNumber()))
{
mEtHouseNumber.requestFocus();
InputUtils.showKeyboard(mEtHouseNumber);
return false;
}
return true;
}
public String getName()

8
android/src/com/mapswithme/maps/editor/EditorHostFragment.java
View file

@ -157,13 +157,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
private boolean setEdits()
{
final boolean set = ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
if (!set)
// TODO set correct text R.string.error_enter_correct_house_number
showMistakeDialog(R.string.editor_correct_mistake);
return set;
return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
}
@Override