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

Merge pull request #9910 from osmandapp/fix_track_sorting_38

Browse source 
Fix track sorting
This commit is contained in:
vshcherb 2020-09-28 18:33:36 +02:00 committed by GitHub
commit 019197c2a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -45,6 +45,7 @@ import androidx.appcompat.widget.SearchView;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.Collator;
import net.osmand.FileUtils; import net.osmand.FileUtils;
import net.osmand.FileUtils.RenameCallback; import net.osmand.FileUtils.RenameCallback;
import net.osmand.GPXUtilities; import net.osmand.GPXUtilities;
@ -53,6 +54,7 @@ import net.osmand.GPXUtilities.GPXTrackAnalysis;
import net.osmand.GPXUtilities.Track; import net.osmand.GPXUtilities.Track;
import net.osmand.GPXUtilities.WptPt; import net.osmand.GPXUtilities.WptPt;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.OsmAndCollator;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.ItemClickListener; import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
@ -85,7 +87,6 @@ import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandSettings.TracksSortByMode; import net.osmand.plus.settings.backend.OsmandSettings.TracksSortByMode;
import java.io.File; import java.io.File;
import java.text.Collator;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -165,8 +166,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
super.onAttach(activity); super.onAttach(activity);
this.app = (OsmandApplication) getActivity().getApplication(); this.app = (OsmandApplication) getActivity().getApplication();
sortByMode = app.getSettings().TRACKS_SORT_BY_MODE.get(); sortByMode = app.getSettings().TRACKS_SORT_BY_MODE.get();
final Collator collator = Collator.getInstance();
collator.setStrength(Collator.SECONDARY);
currentRecording = new GpxInfo(app.getSavingTrackHelper().getCurrentGpx(), getString(R.string.shared_string_currently_recording_track)); currentRecording = new GpxInfo(app.getSavingTrackHelper().getCurrentGpx(), getString(R.string.shared_string_currently_recording_track));
currentRecording.currentlyRecordingTrack = true; currentRecording.currentlyRecordingTrack = true;
asyncLoader = new LoadGpxTask(); asyncLoader = new LoadGpxTask();
@ -950,26 +949,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
for (GpxInfo v : values) { for (GpxInfo v : values) {
allGpxAdapter.addLocalIndexInfo(v); allGpxAdapter.addLocalIndexInfo(v);
} }
// disable sort
// allGpxAdapter.sort();
allGpxAdapter.notifyDataSetChanged(); allGpxAdapter.notifyDataSetChanged();
} }
public void setResult(List<GpxInfo> result) {
this.result = result;
allGpxAdapter.clear();
if (result != null) {
for (GpxInfo v : result) {
allGpxAdapter.addLocalIndexInfo(v);
}
// disable sort
// allGpxAdapter.sort();
allGpxAdapter.refreshSelected();
allGpxAdapter.notifyDataSetChanged();
onPostExecute(result);
}
}
@Override @Override
protected void onPostExecute(List<GpxInfo> result) { protected void onPostExecute(List<GpxInfo> result) {
this.result = result; this.result = result;
@ -989,17 +971,18 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
} }
// This file could be sorted in different way for folders // This file could be sorted in different way for folders
// now folders are also sorted by last modified date // now folders are also sorted by last modified date
final Collator collator = OsmAndCollator.primaryCollator();
Arrays.sort(listFiles, new Comparator<File>() { Arrays.sort(listFiles, new Comparator<File>() {
@Override @Override
public int compare(File f1, File f2) { public int compare(File f1, File f2) {
if (sortByMode == TracksSortByMode.BY_NAME_ASCENDING) { if (sortByMode == TracksSortByMode.BY_NAME_ASCENDING) {
return f1.getName().compareTo(f2.getName()); return collator.compare(f1.getName(), (f2.getName()));
} else if (sortByMode == TracksSortByMode.BY_NAME_DESCENDING) { } else if (sortByMode == TracksSortByMode.BY_NAME_DESCENDING) {
return -f1.getName().compareTo(f2.getName()); return -collator.compare(f1.getName(), (f2.getName()));
} else { } else {
// here we could guess date from file name '2017-08-30 ...' - first part date // here we could guess date from file name '2017-08-30 ...' - first part date
if (f1.lastModified() == f2.lastModified()) { if (f1.lastModified() == f2.lastModified()) {
return -f1.getName().compareTo(f2.getName()); return -collator.compare(f1.getName(), (f2.getName()));
} }
return -((f1.lastModified() < f2.lastModified()) ? -1 : ((f1.lastModified() == f2.lastModified()) ? 0 : 1)); return -((f1.lastModified() < f2.lastModified()) ? -1 : ((f1.lastModified() == f2.lastModified()) ? 0 : 1));
} }
@ -1096,21 +1079,22 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
public void refreshSelected() { public void refreshSelected() {
selected.clear(); selected.clear();
selected.addAll(getSelectedGpx()); selected.addAll(getSelectedGpx());
final Collator collator = OsmAndCollator.primaryCollator();
Collections.sort(selected, new Comparator<GpxInfo>() { Collections.sort(selected, new Comparator<GpxInfo>() {
@Override @Override
public int compare(GpxInfo i1, GpxInfo i2) { public int compare(GpxInfo i1, GpxInfo i2) {
if (sortByMode == TracksSortByMode.BY_NAME_ASCENDING) { if (sortByMode == TracksSortByMode.BY_NAME_ASCENDING) {
return i1.getName().toLowerCase().compareTo(i2.getName().toLowerCase()); return collator.compare(i1.getName(), i2.getName());
} else if (sortByMode == TracksSortByMode.BY_NAME_DESCENDING) { } else if (sortByMode == TracksSortByMode.BY_NAME_DESCENDING) {
return -i1.getName().toLowerCase().compareTo(i2.getName().toLowerCase()); return -collator.compare(i1.getName(), i2.getName());
} else { } else {
if (i1.file == null || i2.file == null) { if (i1.file == null || i2.file == null) {
return i1.getName().toLowerCase().compareTo(i2.getName().toLowerCase()); return collator.compare(i1.getName(), i2.getName());
} }
long time1 = i1.file.lastModified(); long time1 = i1.file.lastModified();
long time2 = i2.file.lastModified(); long time2 = i2.file.lastModified();
if (time1 == time2) { if (time1 == time2) {
return i1.getName().toLowerCase().compareTo(i2.getName().toLowerCase()); return collator.compare(i1.getName(), i2.getName());
} }
return -((time1 < time2) ? -1 : ((time1 == time2) ? 0 : 1)); return -((time1 < time2) ? -1 : ((time1 == time2) ? 0 : 1));
} }
@ -1175,15 +1159,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
data.get(category.get(found)).add(info); data.get(category.get(found)).add(info);
} }
public void sort() {
Collections.sort(category, new Comparator<String>() {
@Override
public int compare(String lhs, String rhs) {
return lhs.toLowerCase().compareTo(rhs.toLowerCase());
}
});
}
@Override @Override
public GpxInfo getChild(int groupPosition, int childPosition) { public GpxInfo getChild(int groupPosition, int childPosition) {
if (isSelectedGroup(groupPosition)) { if (isSelectedGroup(groupPosition)) {