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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-03-11 14:44:41 +01:00
commit 255bd1e593
4 changed files with 89 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -2285,4 +2285,5 @@ If you need help with OsmAnd application, please contact our support team: suppo
<string name="number_of_contributors">Number of contributors</string>
<string name="number_of_edits">Number of edits</string>
<string name="reports_for">Report for</string>
<string name="file_name_containes_illegal_char">File name contains illegal character</string>
</resources>

127
OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
View file

@ -14,6 +14,8 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.view.ActionMode;
import android.support.v7.widget.PopupMenu;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
@ -70,21 +72,23 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
public class LocalIndexesFragment extends OsmandExpandableListFragment implements DownloadEvents {
public static final Pattern ILLEGAL_FILE_NAME_CHARACTERS = Pattern.compile("[?:\"*|/\\<>]");
private LoadLocalIndexTask asyncLoader;
private Map<String, IndexItem> filesToUpdate = new HashMap<String, IndexItem>();
private Map<String, IndexItem> filesToUpdate = new HashMap<>();
private LocalIndexesAdapter listAdapter;
private AsyncTask<LocalIndexInfo, ?, ?> operationTask;
private boolean selectionMode = false;
private Set<LocalIndexInfo> selectedItems = new LinkedHashSet<LocalIndexInfo>();
private Set<LocalIndexInfo> selectedItems = new LinkedHashSet<>();
protected static int DELETE_OPERATION = 1;
protected static int BACKUP_OPERATION = 2;
protected static int RESTORE_OPERATION = 3;
protected static final int DELETE_OPERATION = 1;
protected static final int BACKUP_OPERATION = 2;
protected static final int RESTORE_OPERATION = 3;
private ContextMenuAdapter optionsMenuAdapter;
private ActionMode actionMode;
@ -154,11 +158,11 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
public void reloadData() {
List<IndexItem> itemsToUpdate = getDownloadActivity().getDownloadThread().getIndexes().getItemsToUpdate();
filesToUpdate.clear();
for(IndexItem ii : itemsToUpdate) {
for (IndexItem ii : itemsToUpdate) {
filesToUpdate.put(ii.getTargetFileName(), ii);
}
LoadLocalIndexTask current = asyncLoader;
if(current == null || current.getStatus() == AsyncTask.Status.FINISHED ||
if (current == null || current.getStatus() == AsyncTask.Status.FINISHED ||
current.isCancelled() || current.getResult() != null) {
asyncLoader = new LoadLocalIndexTask();
asyncLoader.execute();
@ -247,32 +251,67 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
final String originalName = xt == -1 ? f.getName() : f.getName().substring(0, xt);
final EditText editText = new EditText(a);
editText.setText(originalName);
b.setView(editText);
b.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onClick(DialogInterface dialog, int which) {
String newName = editText.getText().toString() + ext;
File dest = new File(f.getParentFile(), newName);
if (dest.exists()) {
AccessibleToast.makeText(a, R.string.file_with_name_already_exists, Toast.LENGTH_LONG).show();
} else {
if (!dest.getParentFile().exists()) {
dest.getParentFile().mkdirs();
}
if (f.renameTo(dest)) {
if (callback != null) {
callback.run();
}
} else {
AccessibleToast.makeText(a, R.string.file_can_not_be_renamed, Toast.LENGTH_LONG).show();
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
Editable text = editText.getText();
if (text.length() >= 1) {
if (ILLEGAL_FILE_NAME_CHARACTERS.matcher(text).find()) {
editText.setError(a.getString(R.string.file_name_containes_illegal_char));
}
}
}
});
b.setView(editText);
// Behaviour will be overwritten later;
b.setPositiveButton(R.string.shared_string_save, null);
b.setNegativeButton(R.string.shared_string_cancel, null);
b.show();
final AlertDialog alertDialog = b.create();
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
String newName = editText.getText().toString() + ext;
if (ILLEGAL_FILE_NAME_CHARACTERS.matcher(newName).find()) {
Toast.makeText(a, R.string.file_name_containes_illegal_char,
Toast.LENGTH_LONG).show();
return;
}
File dest = new File(f.getParentFile(), newName);
if (dest.exists()) {
AccessibleToast.makeText(a, R.string.file_with_name_already_exists,
Toast.LENGTH_LONG).show();
return;
} else {
if (!dest.getParentFile().exists()) {
dest.getParentFile().mkdirs();
}
if (f.renameTo(dest)) {
if (callback != null) {
callback.run();
}
} else {
AccessibleToast.makeText(a, R.string.file_can_not_be_renamed,
Toast.LENGTH_LONG).show();
}
}
alertDialog.dismiss();
}
});
}
});
alertDialog.show();
}
}
@ -338,11 +377,6 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
public static class LocalIndexOperationTask extends AsyncTask<LocalIndexInfo, LocalIndexInfo, String> {
protected static int DELETE_OPERATION = 1;
protected static int BACKUP_OPERATION = 2;
@ -371,6 +405,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
return new File(i.getPathToData());
}
private OsmandApplication getMyApplication() {
return (OsmandApplication) a.getApplication();
}
@ -400,6 +435,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
return new File(i.getPathToData());
}
@Override
protected String doInBackground(LocalIndexInfo... params) {
int count = 0;
@ -731,7 +767,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
}
public void openSelectionMode(int stringRes, int darkIcon, DialogInterface.OnClickListener listener,
public void openSelectionMode(int stringRes, int darkIcon, DialogInterface.OnClickListener listener,
EnumSet<LocalIndexType> filter) {
if (filter != null) {
listAdapter.filterCategories(filter);
@ -740,12 +776,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
protected class LocalIndexesAdapter extends OsmandBaseExpandableListAdapter {
Map<LocalIndexInfo, List<LocalIndexInfo>> data = new LinkedHashMap<LocalIndexInfo, List<LocalIndexInfo>>();
List<LocalIndexInfo> category = new ArrayList<LocalIndexInfo>();
Map<LocalIndexInfo, List<LocalIndexInfo>> data = new LinkedHashMap<>();
List<LocalIndexInfo> category = new ArrayList<>();
List<LocalIndexInfo> filterCategory = null;
int warningColor;
int okColor;
@ -829,10 +863,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
public void filterCategories(EnumSet<LocalIndexType> types) {
List<LocalIndexInfo> filter = new ArrayList<LocalIndexInfo>();
List<LocalIndexInfo> filter = new ArrayList<>();
List<LocalIndexInfo> source = filterCategory == null ? category : filterCategory;
for (LocalIndexInfo info : source) {
if(types.contains(info.getType())) {
if (types.contains(info.getType())) {
filter.add(info);
}
}
@ -841,7 +875,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
public void filterCategories(boolean backup) {
List<LocalIndexInfo> filter = new ArrayList<LocalIndexInfo>();
List<LocalIndexInfo> filter = new ArrayList<>();
List<LocalIndexInfo> source = filterCategory == null ? category : filterCategory;
for (LocalIndexInfo info : source) {
if (info.isBackupedData() == backup) {
@ -904,10 +938,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
private String getNameToDisplay(LocalIndexInfo child) {
String mapName = FileNameTranslationHelper.getFileName(ctx,
return FileNameTranslationHelper.getFileName(ctx,
ctx.getMyApplication().getResourceManager().getOsmandRegions(),
child.getFileName());
return mapName;
}
@Override
@ -1055,7 +1088,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
if (child.getSize() >= 0) {
if(builder.length() > 0) {
if (builder.length() > 0) {
builder.append(" • ");
}
if (child.getSize() > 100) {
@ -1065,8 +1098,8 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
}
if(!Algorithms.isEmpty(child.getDescription())){
if(builder.length() > 0) {
if (!Algorithms.isEmpty(child.getDescription())) {
if (builder.length() > 0) {
builder.append(" • ");
}
builder.append(child.getDescription());
@ -1098,7 +1131,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
private Drawable getContentIcon(DownloadActivity context, int resourceId) {
return context.getMyApplication().getIconsCache().getContentIcon(resourceId);
}
private Drawable getContentIcon(DownloadActivity context, int resourceId, int colorId) {
return context.getMyApplication().getIconsCache().getIcon(resourceId, colorId);
}
@ -1155,7 +1188,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
return true;
}
});
optionsMenu.show();
}
@ -1197,7 +1230,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
}
}.execute(new Object[]{fnExt});
}.execute(fnExt);
}

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

@ -158,6 +158,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
return;
}
updateCurrentTrack(getView(), getActivity(), app);
@SuppressWarnings("ConstantConditions")
final CheckBox checkbox = (CheckBox) getView().findViewById(R.id.check_local_index);
checkbox.setVisibility(selectionMode && showOnMapMode ? View.VISIBLE : View.GONE);
if (selectionMode && showOnMapMode) {
@ -566,7 +567,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
@Override
protected List<GpxInfo> doInBackground(Activity... params) {
List<GpxInfo> result = new ArrayList<GpxInfo>();
List<GpxInfo> result = new ArrayList<>();
loadGPXData(app.getAppPath(IndexConstants.GPX_INDEX_DIR), result, this);
return result;
}

14
OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
View file

@ -15,6 +15,7 @@ import android.text.style.ImageSpan;
import android.view.MenuItem;
import android.widget.ImageView;
import net.osmand.IndexConstants;
import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
@ -34,19 +35,16 @@ import java.util.List;
*/
public class FavoritesActivity extends TabActivity {
// private static final String FAVOURITES_INFO = "FAVOURITES_INFO";
private static final String TRACKS = "TRACKS";
public static final int GPX_TAB = R.string.shared_string_my_tracks;
public static final int FAV_TAB = R.string.shared_string_my_favorites;
// private static final String SELECTED_TRACK = "SELECTED_TRACK";
public static String TAB_PARAM = "TAB_PARAM";
protected List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
private int tabSize;
@Override
public void onCreate(Bundle icicle) {
((OsmandApplication) getApplication()).applyTheme(this);
super.onCreate(icicle);
//noinspection ConstantConditions
getSupportActionBar().setTitle(R.string.shared_string_my_places);
getSupportActionBar().setElevation(0);
@ -77,7 +75,7 @@ public class FavoritesActivity extends TabActivity {
}
private List<TabItem> getTabItems() {
File[] lf = ((OsmandApplication) getApplication()).getAppPath(TRACKS).listFiles();
File[] lf = ((OsmandApplication) getApplication()).getAppPath(IndexConstants.GPX_INDEX_DIR).listFiles();
boolean hasGpx = false;
if (lf != null) {
for (File t : lf) {
@ -88,7 +86,7 @@ public class FavoritesActivity extends TabActivity {
}
}
List<TabItem> mTabs = new ArrayList<TabItem>();
List<TabItem> mTabs = new ArrayList<>();
mTabs.add(getTabIndicator(R.string.shared_string_my_favorites, FavoritesTreeFragment.class));
if (hasGpx) {
mTabs.add(getTabIndicator(R.string.shared_string_my_tracks, AvailableGPXFragment.class));
@ -99,7 +97,7 @@ public class FavoritesActivity extends TabActivity {
@Override
public void onAttachFragment(Fragment fragment) {
fragList.add(new WeakReference<Fragment>(fragment));
fragList.add(new WeakReference<>(fragment));
}
@Override