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

Deleted primary_text_field_boxes_color

Browse source
This commit is contained in:
Chumva 2018-02-13 18:46:39 +02:00
parent 3e858affea
commit 60b7859f6a
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/colors.xml
View file

@ -2,8 +2,6 @@
<resources>
<color name="switch_track_color_measure_instruments">#c5d2e6</color>
<color name="primary_text_field_boxes_color">#ff8800</color>
<color name="mapillary_color">#3db878</color>
<color name="mapillary_color_pressed">#3a9f73</color>
<color name="mapillary_action_bar">#14c45d</color>

2
OsmAnd/src/net/osmand/plus/mapmarkers/RenameMarkerBottomSheetDialogFragment.java
View file

@ -65,7 +65,7 @@ public class RenameMarkerBottomSheetDialogFragment extends BottomSheetDialogFrag
((TextInputLayout) textBox).setHintTextAppearance(R.style.OsmandDarkTheme_MarkerFragment);
} else if (textBox instanceof OsmandTextFieldBoxes) {
((OsmandTextFieldBoxes) textBox).activate(true);
((OsmandTextFieldBoxes) textBox).setPrimaryColor(getResources().getColor(R.color.primary_text_field_boxes_color));
((OsmandTextFieldBoxes) textBox).setPrimaryColor(ContextCompat.getColor(mapActivity,R.color.color_dialog_buttons_dark));
}
}
nameEditText.setText(marker.getName(mapActivity));

19
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -1119,7 +1119,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
final String name = nameEt.getText().toString();
String fileName = name + GPX_SUFFIX;
if (textChanged[0]) {
@ -1131,7 +1130,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
}
}
saveNewGpx(dir, fileName, showOnMapToggle.isChecked(), saveType, false);
}
})
.setNegativeButton(R.string.shared_string_cancel, null);
@ -1155,18 +1153,15 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
warningTextView.setVisibility(View.VISIBLE);
warningTextView.setText(R.string.file_with_name_already_exists);
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
} else if (editable.toString().trim().isEmpty()) {
warningTextView.setVisibility(View.VISIBLE);
warningTextView.setText(R.string.enter_the_file_name);
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
} else {
warningTextView.setVisibility(View.INVISIBLE);
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
}
textChanged[0] = true;
}
});
}
@ -1181,13 +1176,13 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
}
private void saveGpx(final File dir,
final String fileName,
final boolean showOnMap,
final GPXFile gpx,
final boolean openTrackActivity,
final NewGpxData.ActionType actionType,
final SaveType saveType,
final boolean close) {
final String fileName,
final boolean showOnMap,
final GPXFile gpx,
final boolean openTrackActivity,
final NewGpxData.ActionType actionType,
final SaveType saveType,
final boolean close) {
new AsyncTask<Void, Void, String>() {