Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix hints and length

Browse source
This commit is contained in:
PavelRatushny 2017-10-24 17:08:10 +03:00
parent fbec5509d5
commit dbd56ddfe6
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/fragment_coordinate_input_dialog.xml
View file

@ -77,7 +77,6 @@
<studio.carbonylgroup.textfieldboxes.ExtendedEditText <studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:inputType="number" android:inputType="number"
android:hint="50:00.0000"
android:id="@+id/latitude_edit_text" android:id="@+id/latitude_edit_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -97,7 +96,6 @@
<studio.carbonylgroup.textfieldboxes.ExtendedEditText <studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:inputType="number" android:inputType="number"
android:hint="50:00.0000"
android:id="@+id/longitude_edit_text" android:id="@+id/longitude_edit_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>

43
OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
View file

@ -50,6 +50,9 @@ public class CoordinateInputDialogFragment extends DialogFragment {
private static final int DEGREES_MAX_LENGTH = 6; private static final int DEGREES_MAX_LENGTH = 6;
private static final int MINUTES_MAX_LENGTH = 9; private static final int MINUTES_MAX_LENGTH = 9;
private static final int SECONDS_MAX_LENGTH = 12; private static final int SECONDS_MAX_LENGTH = 12;
private static final String DEGREES_HINT = "50.000";
private static final String MINUTES_HINT = "50:00.000";
private static final String SECONDS_HINT = "50:00:00.000";
private boolean lightTheme; private boolean lightTheme;
private boolean useOsmandKeyboard = true; private boolean useOsmandKeyboard = true;
@ -328,9 +331,11 @@ public class CoordinateInputDialogFragment extends DialogFragment {
if (resId != 0) { if (resId != 0) {
OsmandTextFieldBoxes textFieldBox = mainView.findViewById(resId); OsmandTextFieldBoxes textFieldBox = mainView.findViewById(resId);
if (b) { if (b) {
AndroidUtils.hideSoftKeyboard(getActivity(), view);
textFieldBox.setHasFocus(true); textFieldBox.setHasFocus(true);
} else { } else {
if (useOsmandKeyboard) {
AndroidUtils.hideSoftKeyboard(getActivity(), view);
}
textFieldBox.setHasFocus(false); textFieldBox.setHasFocus(false);
} }
} }
@ -345,6 +350,7 @@ public class CoordinateInputDialogFragment extends DialogFragment {
editText.setOnLongClickListener(editTextOnLongClickListener); editText.setOnLongClickListener(editTextOnLongClickListener);
editText.setOnFocusChangeListener(focusChangeListener); editText.setOnFocusChangeListener(focusChangeListener);
} }
changeEditTextHints();
} }
private CoordinateInputBottomSheetDialogFragment.CoordinateInputFormatChangeListener createCoordinateInputFormatChangeListener() { private CoordinateInputBottomSheetDialogFragment.CoordinateInputFormatChangeListener createCoordinateInputFormatChangeListener() {
@ -352,7 +358,7 @@ public class CoordinateInputDialogFragment extends DialogFragment {
@Override @Override
public void onCoordinateFormatChanged(int format) { public void onCoordinateFormatChanged(int format) {
coordinateFormat = format; coordinateFormat = format;
changeEditTextLengths(); changeEditTextHints();
} }
@Override @Override
@ -383,29 +389,28 @@ public class CoordinateInputDialogFragment extends DialogFragment {
.setImageDrawable(iconsCache.getThemedIcon(show ? R.drawable.ic_action_arrow_down : R.drawable.ic_action_arrow_up)); .setImageDrawable(iconsCache.getThemedIcon(show ? R.drawable.ic_action_arrow_down : R.drawable.ic_action_arrow_up));
} }
private void changeEditTextLengths() {
int maxLength;
if (coordinateFormat == PointDescription.FORMAT_DEGREES) {
maxLength = DEGREES_MAX_LENGTH;
} else if (coordinateFormat == PointDescription.FORMAT_MINUTES) {
maxLength = MINUTES_MAX_LENGTH;
} else {
maxLength = SECONDS_MAX_LENGTH;
}
InputFilter[] filtersArray = new InputFilter[] {new InputFilter.LengthFilter(maxLength)};
for (ExtendedEditText extendedEditText : extendedEditTexts) {
if (extendedEditText.getId() != R.id.name_edit_text) {
extendedEditText.setFilters(filtersArray);
}
}
}
public void changeKeyboardInBoxes() { public void changeKeyboardInBoxes() {
for (OsmandTextFieldBoxes textFieldBox : textFieldBoxes) { for (OsmandTextFieldBoxes textFieldBox : textFieldBoxes) {
textFieldBox.setUseOsmandKeyboard(useOsmandKeyboard); textFieldBox.setUseOsmandKeyboard(useOsmandKeyboard);
} }
} }
private void changeEditTextHints() {
String hint;
if (coordinateFormat == PointDescription.FORMAT_DEGREES) {
hint = DEGREES_HINT;
} else if (coordinateFormat == PointDescription.FORMAT_MINUTES) {
hint = MINUTES_HINT;
} else {
hint = SECONDS_HINT;
}
for (ExtendedEditText editText : extendedEditTexts) {
if (editText.getId() != R.id.name_edit_text) {
editText.setHint(hint);
}
}
}
private MapActivity getMapActivity() { private MapActivity getMapActivity() {
return (MapActivity) getActivity(); return (MapActivity) getActivity();
} }