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

Replace " " with "_"; remove unnecessary constant

Browse source
This commit is contained in:
Alex 2017-08-04 13:49:30 +03:00
parent 10d70a522c
commit c4a1019530
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,11 +45,11 @@ import java.util.LinkedList;
import java.util.Locale; import java.util.Locale;
import static net.osmand.plus.GPXUtilities.GPXFile; import static net.osmand.plus.GPXUtilities.GPXFile;
import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX;
public class MeasurementToolFragment extends Fragment { public class MeasurementToolFragment extends Fragment {
public static final String TAG = "MeasurementToolFragment"; public static final String TAG = "MeasurementToolFragment";
private static final String EXT = ".gpx";
private MeasurementToolBarController toolBarController; private MeasurementToolBarController toolBarController;
private TextView distanceTv; private TextView distanceTv;
@ -211,13 +211,13 @@ public class MeasurementToolFragment extends Fragment {
final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map); final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
showOnMapToggle.setChecked(true); showOnMapToggle.setChecked(true);
final String suggestedName = new SimpleDateFormat("yyyy-M-dd hh-mm E", Locale.US).format(new Date()); final String suggestedName = new SimpleDateFormat("yyyy-M-dd_HH-mm_EEE", Locale.US).format(new Date());
String displayedName = suggestedName; String displayedName = suggestedName;
File fout = new File(dir, suggestedName + EXT); File fout = new File(dir, suggestedName + GPX_SUFFIX);
int ind = 1; int ind = 1;
while (fout.exists()) { while (fout.exists()) {
displayedName = suggestedName + " " + (++ind); displayedName = suggestedName + "_" + (++ind);
fout = new File(dir, displayedName + EXT); fout = new File(dir, displayedName + GPX_SUFFIX);
} }
nameEt.setText(displayedName); nameEt.setText(displayedName);
nameEt.setSelection(displayedName.length()); nameEt.setSelection(displayedName.length());
@ -236,7 +236,7 @@ public class MeasurementToolFragment extends Fragment {
@Override @Override
public void afterTextChanged(Editable editable) { public void afterTextChanged(Editable editable) {
if (new File(dir, editable.toString() + EXT).exists()) { if (new File(dir, editable.toString() + GPX_SUFFIX).exists()) {
fileExistsTv.setVisibility(View.VISIBLE); fileExistsTv.setVisibility(View.VISIBLE);
} else { } else {
fileExistsTv.setVisibility(View.INVISIBLE); fileExistsTv.setVisibility(View.INVISIBLE);
@ -252,12 +252,12 @@ public class MeasurementToolFragment extends Fragment {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
final String name = nameEt.getText().toString(); final String name = nameEt.getText().toString();
String fileName = name + EXT; String fileName = name + GPX_SUFFIX;
if (textChanged[0]) { if (textChanged[0]) {
File fout = new File(dir, fileName); File fout = new File(dir, fileName);
int ind = 1; int ind = 1;
while (fout.exists()) { while (fout.exists()) {
fileName = name + " " + (++ind) + EXT; fileName = name + "_" + (++ind) + GPX_SUFFIX;
fout = new File(dir, fileName); fout = new File(dir, fileName);
} }
} }
@ -322,6 +322,7 @@ public class MeasurementToolFragment extends Fragment {
} else { } else {
Toast.makeText(activity, warning, Toast.LENGTH_LONG).show(); Toast.makeText(activity, warning, Toast.LENGTH_LONG).show();
} }
activity.refreshMap();
} }
if (progressDialog != null && progressDialog.isShowing()) { if (progressDialog != null && progressDialog.isShowing()) {
progressDialog.dismiss(); progressDialog.dismiss();