From cfd31b3e1b67c6fa8f06f3ab02093e53e5e58e31 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Mon, 28 Sep 2015 03:04:57 +0200 Subject: [PATCH 01/14] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 0b457cd026..62724510f5 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -89,7 +89,7 @@ 運行\n 應用程式在背景運轉 - 停止\n 在背景運轉 + 停止\n在背景執行 GPS 喚醒間隔：%s 繼續 要解鎖螢幕，按下鎖圖示 @@ -2119,4 +2119,7 @@ 我的最愛資訊 增加到我的最愛 道路 - +旅程錄製 + 導航 + 在背景執行 + From 53f89ced02a82c029ca1e1aca6a10e416b88cea7 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 28 Sep 2015 04:15:40 +0200 Subject: [PATCH 02/14] Translated using Weblate (Danish) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-da/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 114bd7e026..c261a05687 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2140,4 +2140,7 @@ Veje Favorit information Tilføj favorit - + Optag ture + Navigation + Kører i baggrunden + From 64e9964f674feb6945834fc4aececd97b84983d3 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Mon, 28 Sep 2015 08:46:15 +0200 Subject: [PATCH 03/14] Translated using Weblate (Catalan) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-ca/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 4bbbe7dc0b..506f2f868a 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -2131,4 +2131,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Es perdran tots els canvis no desats. Voleu continuar? %1$s baixades pendents Carreteres - +Enregistrament de trajectes + Navegació + Execució en procés de fons + From 44223fcca486167108daae4867a13606e9815a5b Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 28 Sep 2015 09:04:27 +0200 Subject: [PATCH 04/14] Translated using Weblate (Italian) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-it/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 42fe9e3a37..2acb239379 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2184,4 +2184,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Informazioni preferite Aggiungi preferito Strade - +Registrazione viaggio + Navigazione + Avviato in backgroung + From c87c1b4eedbd8bab6a0472745740b38907a5ca18 Mon Sep 17 00:00:00 2001 From: Matej U Date: Mon, 28 Sep 2015 09:27:23 +0200 Subject: [PATCH 05/14] Translated using Weblate (Slovenian) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-sl/strings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index af8234c47d..f3b86869db 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1990,4 +1990,9 @@ Vse neshranjene spremembe bodo izgubljene. Ali želite nadaljevati? %1$s prejemov v vrsti Poti - +Beleženje poti + Navigacija + Delovanje v ozadju + Podrobnosti o točki + Dodaj priljubljeno + From 0f6c3935248cc9b8d62b06e51f4a1cfe701adbdf Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 28 Sep 2015 12:29:51 +0200 Subject: [PATCH 06/14] Translated using Weblate (Belarusian) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-be/strings.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index e34a4db02e..fe86c6db31 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1459,7 +1459,7 @@ Спыніць сэсыю OsMo Запусьціць сэсыю OSMo - Выбранае адаслана праз OsmAnd + Упадабанае адаслана праз OsmAnd Разлічыць маршрут паміж кропкамі Зьмены ў 1.8: * Разьлік маршруту паміж маршрутнымі пунктамі GPX-сьледу @@ -2080,14 +2080,14 @@ Дадаць гадзіны працы Тып POI Калі ласка, пазначце тып POI. -Gpx-файл з мецазнаходжаньнем заўваг +GPX-файл зь мецазнаходжаньнем заўваг Месцазнаходжаньні Колькасьць радкоў на галоўным экране %1$s грамадзкі аб\'ект выдаліць Працоўныя дні Нядаўнія месцы - Упадабанае + Упадабаныя Пасьпяхова захаваны ў: %1$s Паказаць GPX POI будуць выдаленыя, як толькі вы загрузіце вашы зьмены @@ -2103,4 +2103,7 @@ Дарогі Зьвесткі пра ўпадабанае Дадаць упадабанае - + Запіс падарожжа + Навігацыя + Працуе ў фоне + From 80798e4f8ebd82ffe3eff149fed92b1a59d084b1 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Mon, 28 Sep 2015 14:56:08 +0300 Subject: [PATCH 07/14] Downdload map design in progress. Voice now has no aggreagation. Icons. Back is now working. --- .../plus/download/DownloadActivityType.java | 92 ++++++++++++++----- .../net/osmand/plus/download/IndexItem.java | 52 ++++++++++- .../plus/download/UpdatesIndexFragment.java | 6 +- .../IndexItemCategoryWithSubcat.java | 49 +++++----- .../MapsInCategoryFragment.java | 3 +- .../NewLocalIndexesFragment.java | 10 -- .../SubcategoriesFragment.java | 31 +++++-- 7 files changed, 166 insertions(+), 77 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java index f066c81f62..c3d4cb5add 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java @@ -1,6 +1,8 @@ package net.osmand.plus.download; import android.content.Context; +import android.os.Parcel; +import android.os.Parcelable; import net.osmand.AndroidUtils; import net.osmand.IndexConstants; @@ -24,34 +26,53 @@ import java.util.Map; import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT; -public class DownloadActivityType { +public class DownloadActivityType implements Parcelable { private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.yyyy"); - private static Map byTag = new HashMap(); + private static Map byTag = new HashMap<>(); public static final DownloadActivityType NORMAL_FILE = new DownloadActivityType(R.string.download_regular_maps, "map"); - public static final DownloadActivityType VOICE_FILE = new DownloadActivityType(R.string.voices, "voice"); + public static final DownloadActivityType VOICE_FILE = + new DownloadActivityType(R.string.voices, R.drawable.ic_action_volume_up, "voice"); public static final DownloadActivityType ROADS_FILE = new DownloadActivityType(R.string.download_roads_only_maps, "road_map"); - public static final DownloadActivityType SRTM_COUNTRY_FILE = new DownloadActivityType(R.string.download_srtm_maps, "srtm_map"); - public static final DownloadActivityType HILLSHADE_FILE = new DownloadActivityType(R.string.download_hillshade_maps, "hillshade"); - public static final DownloadActivityType WIKIPEDIA_FILE = new DownloadActivityType(R.string.download_wikipedia_maps, "wikimap"); + public static final DownloadActivityType SRTM_COUNTRY_FILE = + new DownloadActivityType(R.string.download_srtm_maps, + R.drawable.ic_plugin_srtm, "srtm_map"); + public static final DownloadActivityType HILLSHADE_FILE = + new DownloadActivityType(R.string.download_hillshade_maps, + R.drawable.ic_action_hillshade_dark, "hillshade"); + public static final DownloadActivityType WIKIPEDIA_FILE = + new DownloadActivityType(R.string.download_wikipedia_maps, + R.drawable.ic_world_globe_dark, "wikimap"); public static final DownloadActivityType LIVE_UPDATES_FILE = new DownloadActivityType(R.string.download_live_updates, "live_updates"); - private int resource; - private String[] tags; + private final int stringResource; + private final int iconResource; - public DownloadActivityType(int resource, String... tags) { - this.resource = resource; - this.tags = tags; - for(String st : tags) { - byTag.put(st, this); - } + private String tag; + + public DownloadActivityType(int stringResource, int iconResource, String tag) { + this.stringResource = stringResource; + this.tag = tag; + byTag.put(tag, this); + this.iconResource = iconResource; } - public int getResource(){ - return resource; + public DownloadActivityType(int stringResource, String tag) { + this.stringResource = stringResource; + this.tag = tag; + byTag.put(tag, this); + iconResource = R.drawable.ic_map; } - + + public int getStringResource(){ + return stringResource; + } + + public int getIconResource() { + return iconResource; + } + public String getTag() { - return tags[0]; + return tag; } @@ -66,7 +87,7 @@ public class DownloadActivityType { } public String getString(Context c) { - return c.getString(resource); + return c.getString(stringResource); } public static DownloadActivityType getIndexType(String tagName) { @@ -271,8 +292,7 @@ public class DownloadActivityType { if (l == -1) { l = fileName.length(); } - String s = fileName.substring(0, l); - return s; + return fileName.substring(0, l); } else if (this == HILLSHADE_FILE) { return fileName.replace('_', ' '); } else if (this == LIVE_UPDATES_FILE) { @@ -322,8 +342,7 @@ public class DownloadActivityType { if (l == -1) { l = fileName.length(); } - String s = fileName.substring(0, l); - return s; + return fileName.substring(0, l); } if (this == LIVE_UPDATES_FILE) { if(fileName.indexOf('.') > 0){ @@ -341,5 +360,32 @@ public class DownloadActivityType { } + @Override + public int describeContents() { + return 0; + } + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(this.stringResource); + dest.writeInt(this.iconResource); + dest.writeString(this.tag); + } + + protected DownloadActivityType(Parcel in) { + this.stringResource = in.readInt(); + this.iconResource = in.readInt(); + this.tag = in.readString(); + byTag.put(tag, this); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public DownloadActivityType createFromParcel(Parcel source) { + return new DownloadActivityType(source); + } + + public DownloadActivityType[] newArray(int size) { + return new DownloadActivityType[size]; + } + }; } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/download/IndexItem.java b/OsmAnd/src/net/osmand/plus/download/IndexItem.java index f46e2d6f1d..32cd89b083 100644 --- a/OsmAnd/src/net/osmand/plus/download/IndexItem.java +++ b/OsmAnd/src/net/osmand/plus/download/IndexItem.java @@ -1,6 +1,8 @@ package net.osmand.plus.download; import android.content.Context; +import android.os.Parcel; +import android.os.Parcelable; import android.support.annotation.NonNull; import net.osmand.IndexConstants; @@ -18,7 +20,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -public class IndexItem implements Comparable, HasName { +public class IndexItem implements Comparable, HasName, Parcelable { private static final Log log = PlatformUtil.getLog(IndexItem.class); String description; @@ -114,9 +116,9 @@ public class IndexItem implements Comparable, HasName { @Override public int compareTo(@NonNull IndexItem another) { - if(another == null) { - return -1; - } +// if(another == null) { +// return -1; +// } return getFileName().compareTo(another.getFileName()); } @@ -146,7 +148,7 @@ public class IndexItem implements Comparable, HasName { @Override public String getName() { - return initializedName; + return initializedName + " must be fixed"; } public void setName(String initializedName) { @@ -166,4 +168,44 @@ public class IndexItem implements Comparable, HasName { ", extra=" + extra + '}'; } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(this.description); + dest.writeString(this.fileName); + dest.writeString(this.size); + dest.writeLong(this.timestamp); + dest.writeLong(this.contentSize); + dest.writeLong(this.containerSize); + dest.writeParcelable(this.type, flags); + dest.writeByte(extra ? (byte) 1 : (byte) 0); + dest.writeString(this.initializedName); + } + + protected IndexItem(Parcel in) { + this.description = in.readString(); + this.fileName = in.readString(); + this.size = in.readString(); + this.timestamp = in.readLong(); + this.contentSize = in.readLong(); + this.containerSize = in.readLong(); + this.type = in.readParcelable(DownloadActivityType.class.getClassLoader()); + this.extra = in.readByte() != 0; + this.initializedName = in.readString(); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public IndexItem createFromParcel(Parcel source) { + return new IndexItem(source); + } + + public IndexItem[] newArray(int size) { + return new IndexItem[size]; + } + }; } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java index ed80abada6..e57954d7a7 100644 --- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java @@ -40,7 +40,7 @@ public class UpdatesIndexFragment extends OsmAndListFragment { private OsmandRegions osmandRegions; private java.text.DateFormat format; private UpdateIndexAdapter listAdapter; - List indexItems = new ArrayList(); + List indexItems = new ArrayList<>(); @Override @@ -233,7 +233,7 @@ public class UpdatesIndexFragment extends OsmAndListFragment { private void filterExisting() { final Map listAlreadyDownloaded = DownloadActivity.downloadListIndexThread.getDownloadedIndexFileNames(); - final List filtered = new ArrayList(); + final List filtered = new ArrayList<>(); for (IndexItem fileItem : listAdapter.getIndexFiles()) { if (fileItem.isAlreadyDownloaded(listAlreadyDownloaded)) { filtered.add(fileItem); @@ -329,7 +329,7 @@ public class UpdatesIndexFragment extends OsmAndListFragment { } private String getMapDescription(IndexItem item){ - String typeName = getTypeName(item, item.getType().getResource()); + String typeName = getTypeName(item, item.getType().getStringResource()); String date = item.getDate(format); String size = item.getSizeDescription(getActivity()); return typeName + " " + date + " " + size; diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java index 22e5f6b3f6..1b7610fd34 100644 --- a/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java +++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java @@ -9,7 +9,6 @@ import net.osmand.OsmAndCollator; import net.osmand.PlatformUtil; import net.osmand.map.OsmandRegions; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.IndexItem; @@ -133,30 +132,32 @@ public class IndexItemCategoryWithSubcat implements Comparable parent, View view, int position, long id) { - LOG.debug("onItemClick()"); - - } - }); View header = inflater.inflate(R.layout.local_index_fragment_header, listView, false); initMemoryConsumedCard(header); @@ -116,7 +108,6 @@ public class NewLocalIndexesFragment extends OsmAndListFragment { fragmentTransaction.addToBackStack(null); MapsInCategoryFragment.createInstance(mAdapter.getItem(position-1)) .show(fragmentTransaction, MapsInCategoryFragment.TAG); - LOG.debug("onListItemClick()"); } private DownloadActivity getDownloadActivity() { @@ -124,7 +115,6 @@ public class NewLocalIndexesFragment extends OsmAndListFragment { } public void onCategorizationFinished(List filtered, List cats) { - LOG.debug("cats=" + cats); mAdapter.clear(); mAdapter.addAll(cats); } diff --git a/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java b/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java index 169f242ced..145cb42e59 100644 --- a/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java @@ -20,6 +20,7 @@ import net.osmand.plus.IconsCache; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; +import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.IndexItem; import net.osmand.plus.helpers.HasName; @@ -38,8 +39,9 @@ public class SubcategoriesFragment extends Fragment { assert category != null; ListView listView = new ListView(getActivity()); + final OsmandApplication application = (OsmandApplication) getActivity().getApplication(); final MapFilesAdapter mAdapter = new MapFilesAdapter(getActivity(), - ((OsmandApplication) getActivity().getApplication()).getIconsCache()); + application.getIconsCache(), application); listView.setAdapter(mAdapter); mAdapter.addAll(category.items); mAdapter.addAll(category.subcats); @@ -51,8 +53,7 @@ public class SubcategoriesFragment extends Fragment { }); View freeVersionBanner = inflater.inflate(R.layout.free_version_banner, listView, false); - final OsmandSettings settings = - ((OsmandApplication) getActivity().getApplication()).getSettings(); + final OsmandSettings settings = application.getSettings(); DownloadsUiInitHelper.initFreeVersionBanner(freeVersionBanner, settings, getResources()); listView.addHeaderView(freeVersionBanner); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -85,10 +86,12 @@ public class SubcategoriesFragment extends Fragment { private static class MapFilesAdapter extends ArrayAdapter { private final IconsCache iconsCache; + private final OsmandApplication application; - public MapFilesAdapter(Context context, IconsCache iconsCache) { + public MapFilesAdapter(Context context, IconsCache iconsCache, OsmandApplication application) { super(context, R.layout.two_line_with_images_list_item); this.iconsCache = iconsCache; + this.application = application; } @Override @@ -117,20 +120,28 @@ public class SubcategoriesFragment extends Fragment { stringBuilder.append(resources.getString(mapType)); stringBuilder.append(", "); } - LOG.debug("stringBuilder=" + stringBuilder); - stringBuilder.delete(stringBuilder.capacity() - 3, stringBuilder.capacity()); + stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.capacity()); viewHolder.descrTextView.setText(stringBuilder.toString()); } else { // TODO replace with string constant viewHolder.descrTextView.setText("Others"); } + viewHolder.leftImageView.setImageDrawable(iconsCache.getContentIcon(R.drawable.ic_map)); LOG.debug("category.types=" + category.types); + } else if (item instanceof IndexItem) { + IndexItem indexItem = (IndexItem) item; + if (indexItem.getType() == DownloadActivityType.VOICE_FILE) { + viewHolder.nameTextView.setText(indexItem.getVisibleName(getContext(), + application.getRegions())); + } else { + viewHolder.nameTextView.setText(indexItem.getType().getString(getContext())); + } + viewHolder.descrTextView.setText(indexItem.getSizeDescription(getContext())); + viewHolder.leftImageView.setImageResource(indexItem.getType().getIconResource()); } else { - viewHolder.nameTextView.setText(item.getName()); - // TODO replace with real values - viewHolder.descrTextView.setText("Temp values"); + throw new IllegalArgumentException("Item must be of type IndexItem or " + + "IndexItemCategory but is of type:" + item.getClass()); } - viewHolder.leftImageView.setImageDrawable(iconsCache.getContentIcon(R.drawable.ic_map)); return convertView; } From 7e5d3222ba83b15b33eafde0e058c1ecc381620a Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 28 Sep 2015 04:18:44 +0200 Subject: [PATCH 08/14] Translated using Weblate (Danish) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index c261a05687..63fe99a01c 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2138,7 +2138,7 @@ Simuler ved brug af optaget GPX eller beregnet rute %1$s filhentninger tilbage Veje -Favorit information +Favoritinformation Tilføj favorit Optag ture Navigation From afcacc43438263306160b34d1441d0cd2556a11d Mon Sep 17 00:00:00 2001 From: fluks Date: Mon, 28 Sep 2015 01:06:51 +0200 Subject: [PATCH 09/14] Translated using Weblate (Finnish) Currently translated at 44.9% (778 of 1730 strings) --- OsmAnd/res/values-fi/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index ce2ad5767b..ba1d4774bb 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -894,4 +894,5 @@ Näytä tiedot POI-nimet Navigoi kohteeseen - + Keskeytä musiikki + From 7b12eeac84f8a7a2bddbcfd2cc2988d210dc2b19 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 28 Sep 2015 12:14:27 +0200 Subject: [PATCH 10/14] Translated using Weblate (Italian) Currently translated at 100.0% (1730 of 1730 strings) --- OsmAnd/res/values-it/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 2acb239379..f622e4254a 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2140,7 +2140,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Contorno in grassetto Pericolo Configura il pannello di controllo - La carta era nascosta + La scheda è stata nascosta Annulla azione Salta OsmAnd @@ -2158,14 +2158,14 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Chiude alle File GPX con note locali Località - Nome + nome amenità Informazioni di contatto Descrizione Aggiungi orari di apertura Tipo di PDI Numero di righe del cruscotto %1$s -Per favore specifica il tipo si PDI. +Per favore specifica il tipo di PDI. elimina Giorni lavorativi Luoghi recenti From 52d377b009041887f266313a23cfef5c6b575f82 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Mon, 28 Sep 2015 18:29:40 +0300 Subject: [PATCH 11/14] Context menu - fixed crashes, landscape layout --- .../res/layout/point_editor_fragment_land.xml | 246 ++++++++++++++++++ .../src/net/osmand/data/FavouritePoint.java | 10 + .../plus/mapcontextmenu/MapContextMenu.java | 22 +- .../MapContextMenuFragment.java | 7 +- .../editors/FavoritePointEditor.java | 13 +- .../editors/FavoritePointEditorFragment.java | 46 ++-- .../mapcontextmenu/editors/PointEditor.java | 5 +- .../editors/PointEditorFragment.java | 45 +++- .../editors/dialogs/CategoryDialogs.java | 5 + 9 files changed, 358 insertions(+), 41 deletions(-) create mode 100644 OsmAnd/res/layout/point_editor_fragment_land.xml create mode 100644 OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/dialogs/CategoryDialogs.java diff --git a/OsmAnd/res/layout/point_editor_fragment_land.xml b/OsmAnd/res/layout/point_editor_fragment_land.xml new file mode 100644 index 0000000000..a06be57cb0 --- /dev/null +++ b/OsmAnd/res/layout/point_editor_fragment_land.xml @@ -0,0 +1,246 @@ + + + + + + + + + + +