diff --git a/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java b/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java index 6657e29bca..8d884efc9a 100644 --- a/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java +++ b/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java @@ -35,6 +35,7 @@ public interface OsmAndCustomizationConstants { String POI_OVERLAY_LABELS_ID = SHOW_ITEMS_ID_SCHEME + "poi_overlay_labels"; String TRANSPORT_ID = SHOW_ITEMS_ID_SCHEME + "transport"; String GPX_FILES_ID = SHOW_ITEMS_ID_SCHEME + "gpx_files"; + String WIKIPEDIA_ID = SHOW_ITEMS_ID_SCHEME + "wikipedia"; String MAP_MARKERS_ID = SHOW_ITEMS_ID_SCHEME + "map_markers"; String MAP_SOURCE_ID = SHOW_ITEMS_ID_SCHEME + "map_source"; String RECORDING_LAYER = SHOW_ITEMS_ID_SCHEME + "recording_layer"; @@ -71,6 +72,10 @@ public interface OsmAndCustomizationConstants { //Map Context Menu Actions: String MAP_CONTEXT_MENU_ACTIONS = "point.actions."; + String MAP_CONTEXT_MENU_ADD_ID = MAP_CONTEXT_MENU_ACTIONS + "add"; + String MAP_CONTEXT_MENU_MARKER_ID = MAP_CONTEXT_MENU_ACTIONS + "marker"; + String MAP_CONTEXT_MENU_SHARE_ID = MAP_CONTEXT_MENU_ACTIONS + "share"; + String MAP_CONTEXT_MENU_MORE_ID = MAP_CONTEXT_MENU_ACTIONS + "more"; String MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID = MAP_CONTEXT_MENU_ACTIONS + "directions_from"; String MAP_CONTEXT_MENU_SEARCH_NEARBY = MAP_CONTEXT_MENU_ACTIONS + "search_nearby"; String MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION = MAP_CONTEXT_MENU_ACTIONS + "change_m_position"; diff --git a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java index 1c1a5d88a3..6c5ead8955 100644 --- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java +++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java @@ -2015,14 +2015,21 @@ public class GPXUtilities { } else if (parse instanceof Track) { if (tag.equals("name")) { ((Track) parse).name = readText(parser, "name"); - } - if (tag.equals("desc")) { + } else if (tag.equals("desc")) { ((Track) parse).desc = readText(parser, "desc"); - } - if (tag.equals("trkseg")) { + } else if (tag.equals("trkseg")) { TrkSegment trkSeg = new TrkSegment(); ((Track) parse).segments.add(trkSeg); parserState.push(trkSeg); + } else if (tag.equals("trkpt") || tag.equals("rpt")) { + WptPt wptPt = parseWptAttributes(parser); + int size = ((Track) parse).segments.size(); + if (size == 0) { + ((Track) parse).segments.add(new TrkSegment()); + size++; + } + ((Track) parse).segments.get(size - 1).points.add(wptPt); + parserState.push(wptPt); } } else if (parse instanceof TrkSegment) { if (tag.equals("trkpt") || tag.equals("rpt")) { @@ -2061,8 +2068,10 @@ public class GPXUtilities { } else if (tag.equals("speed")) { try { String value = readText(parser, "speed"); - ((WptPt) parse).speed = Float.parseFloat(value); - parse.getExtensionsToWrite().put("speed", value); + if (!Algorithms.isEmpty(value)) { + ((WptPt) parse).speed = Float.parseFloat(value); + parse.getExtensionsToWrite().put("speed", value); + } } catch (NumberFormatException e) { } } else if (tag.equals("link")) { @@ -2224,7 +2233,7 @@ public class GPXUtilities { } return bounds; } - + public static void mergeGPXFileInto(GPXFile to, GPXFile from) { if (from == null) { return; diff --git a/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java b/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java index 78216f3616..877b95c119 100644 --- a/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java +++ b/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java @@ -42,7 +42,7 @@ public class IndexConstants { public static final String OSMAND_SETTINGS_FILE_EXT = ".osf"; - public static final String ROUTING_AND_RENDERING_FILE_EXT = ".xml"; + public static final String ROUTING_FILE_EXT = ".xml"; public static final String RENDERER_INDEX_EXT = ".render.xml"; //$NON-NLS-1$ @@ -73,4 +73,5 @@ public class IndexConstants { public static final String SETTINGS_DIR = "settings/"; //$NON-NLS-1$ public static final String TEMP_DIR = "temp/"; public static final String ROUTING_PROFILES_DIR = "routing/"; + public static final String PLUGINS_DIR = "plugins/"; } diff --git a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java index faab53994a..db84ec2297 100644 --- a/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java +++ b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java @@ -19,6 +19,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; import java.util.zip.GZIPInputStream; import gnu.trove.list.array.TIntArrayList; @@ -218,6 +220,13 @@ public class Amenity extends MapObject { return lng; } + public Set getSupportedContentLocales() { + Set supported = new TreeSet<>(); + supported.addAll(getNames("content", "en")); + supported.addAll(getNames("description", "en")); + return supported; + } + public List getNames(String tag, String defTag) { List l = new ArrayList(); for (String nm : getAdditionalInfo().keySet()) { diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java index 874759598d..0edd44aa6e 100644 --- a/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java +++ b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java @@ -36,7 +36,10 @@ public class MapPoiTypes { private PoiCategory otherCategory; private PoiCategory otherMapCategory; - static final String OSM_WIKI_CATEGORY = "osmwiki"; + public static final String WIKI_LANG = "wiki_lang"; + public static final String WIKI_PLACE = "wiki_place"; + public static final String OSM_WIKI_CATEGORY = "osmwiki"; + private PoiTranslator poiTranslator = null; private boolean init; Map poiTypesByTag = new LinkedHashMap(); @@ -127,6 +130,28 @@ public class MapPoiTypes { return lf; } + public PoiCategory getOsmwiki() { + for (PoiCategory category : categories) { + if (category.isWiki()) { + return category; + } + } + return null; + } + + public List getAllAvailableWikiLocales() { + List availableWikiLocales = new ArrayList<>(); + for (PoiType type : getOsmwiki().getPoiTypeByKeyName(WIKI_PLACE).getPoiAdditionals()) { + String name = type.getKeyName(); + String wikiLang = WIKI_LANG + ":"; + if (name != null && name.startsWith(wikiLang)) { + String locale = name.substring(wikiLang.length()); + availableWikiLocales.add(locale); + } + } + return availableWikiLocales; + } + private void sortList(List lf) { final Collator instance = Collator.getInstance(); Collections.sort(lf, new Comparator() { @@ -401,7 +426,7 @@ public class MapPoiTypes { } else if (name.equals("poi_type")) { if (lastCategory == null) { lastCategory = getOtherMapCategory(); - } + } if(!Algorithms.isEmpty(parser.getAttributeValue("", "deprecated_of"))){ String vl = parser.getAttributeValue("", "name"); String target = parser.getAttributeValue("", "deprecated_of"); @@ -595,7 +620,7 @@ public class MapPoiTypes { tp.setOsmValue(parser.getAttributeValue("", "value")); tp.setOsmEditTagValue(parser.getAttributeValue("", "edit_tag"), parser.getAttributeValue("", "edit_value")); - + tp.setOsmTag2(parser.getAttributeValue("", "tag2")); tp.setOsmValue2(parser.getAttributeValue("", "value2")); tp.setText("text".equals(parser.getAttributeValue("", "type"))); @@ -806,7 +831,7 @@ public class MapPoiTypes { poiTypesByTag.put(key, p); } } - + public String replaceDeprecatedSubtype(PoiCategory type, String subtype) { if(deprecatedTags.containsKey(subtype)) { return deprecatedTags.get(subtype); @@ -892,9 +917,9 @@ public class MapPoiTypes { } - - + + } diff --git a/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java index f92a7a66d3..de2da50d79 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java @@ -119,7 +119,7 @@ public class BinaryRoutePlanner { printMemoryConsumption("Memory occupied before exception : "); } if (ctx.memoryOverhead > ctx.config.memoryLimitation * 0.95) { - throw new IllegalStateException("There is no enough memory " + ctx.config.memoryLimitation / (1 << 20) + " Mb"); + throw new IllegalStateException("There is not enough memory " + ctx.config.memoryLimitation / (1 << 20) + " Mb"); } ctx.visitedSegments ++; if (forwardSearch) { diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java index 31d3397e97..cd8f0466f5 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java @@ -173,7 +173,7 @@ public class RouteSegmentResult implements StringExternalizable return res; } - private int[][] convertPointNames(int[][] nameTypes, Map rules) { + private int[][] convertPointNames(int[][] nameTypes, String[][] pointNames, Map rules) { if (nameTypes == null || nameTypes.length == 0) { return null; } @@ -185,7 +185,7 @@ public class RouteSegmentResult implements StringExternalizable for (int k = 0; k < types.length; k++) { int type = types[k]; String tag = object.region.quickGetEncodingRule(type).getTag(); - String name = object.pointNames[i][k]; + String name = pointNames[i][k]; RouteTypeRule rule = new RouteTypeRule(tag, name); Integer ruleId = rules.get(rule); if (ruleId == null) { @@ -281,7 +281,8 @@ public class RouteSegmentResult implements StringExternalizable if (object.pointNameTypes != null && start < object.pointNameTypes.length) { int[][] types = Arrays.copyOfRange(object.pointNameTypes, start, Math.min(end, object.pointNameTypes.length)); if (object.pointNames != null) { - bundle.putArray("pointNames", convertPointNames(types, rules)); + String[][] names = Arrays.copyOfRange(object.pointNames, start, Math.min(end, object.pointNames.length)); + bundle.putArray("pointNames", convertPointNames(types, names, rules)); } } } diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java index 14f26123a5..232b971f9f 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java @@ -29,7 +29,7 @@ public class RoutingConfiguration { // 1.1 tile load parameters (should not affect routing) public int ZOOM_TO_LOAD_TILES = 16; - public int memoryLimitation; + public long memoryLimitation; // 1.2 Build A* graph in backward/forward direction (can affect results) // 0 - 2 ways, 1 - direct way, -1 - reverse way @@ -98,12 +98,12 @@ public class RoutingConfiguration { i.ZOOM_TO_LOAD_TILES = parseSilentInt(getAttribute(i.router, "zoomToLoadTiles"), i.ZOOM_TO_LOAD_TILES); int desirable = parseSilentInt(getAttribute(i.router, "memoryLimitInMB"), 0); if(desirable != 0) { - i.memoryLimitation = desirable * (1 << 20); + i.memoryLimitation = desirable * (1l << 20); } else { if(memoryLimitMB == 0) { memoryLimitMB = DEFAULT_MEMORY_LIMIT; } - i.memoryLimitation = memoryLimitMB * (1 << 20); + i.memoryLimitation = memoryLimitMB * (1l << 20); } i.planRoadDirection = parseSilentInt(getAttribute(i.router, "planRoadDirection"), i.planRoadDirection); // i.planRoadDirection = 1; diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java index c72c5657fa..77e08443db 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java @@ -265,7 +265,7 @@ public class RoutingContext { - public RouteSegment loadRouteSegment(int x31, int y31, int memoryLimit) { + public RouteSegment loadRouteSegment(int x31, int y31, long memoryLimit) { long tileId = getRoutingTile(x31, y31, memoryLimit); TLongObjectHashMap excludeDuplications = new TLongObjectHashMap(); RouteSegment original = null; @@ -443,7 +443,7 @@ public class RoutingContext { } @SuppressWarnings("unused") - private long getRoutingTile(int x31, int y31, int memoryLimit) { + private long getRoutingTile(int x31, int y31, long memoryLimit) { // long now = System.nanoTime(); long xloc = x31 >> (31 - config.ZOOM_TO_LOAD_TILES); long yloc = y31 >> (31 - config.ZOOM_TO_LOAD_TILES); @@ -515,11 +515,11 @@ public class RoutingContext { - public boolean checkIfMemoryLimitCritical(int memoryLimit) { + public boolean checkIfMemoryLimitCritical(long memoryLimit) { return getCurrentEstimatedSize() > 0.9 * memoryLimit; } - public void unloadUnusedTiles(int memoryLimit) { + public void unloadUnusedTiles(long memoryLimit) { float desirableSize = memoryLimit * 0.7f; List list = new ArrayList(subregionTiles.size() / 2); int loaded = 0; @@ -805,4 +805,4 @@ public class RoutingContext { -} \ No newline at end of file +} diff --git a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java index 309101f720..5124d40cf4 100644 --- a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java +++ b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java @@ -39,7 +39,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import java.util.Map; import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -346,7 +345,7 @@ public class SearchUICore { } } - public void setFilterOrders(Map filterOrders) { + public void setFilterOrders(List filterOrders) { for (SearchCoreAPI capi : apis) { if (capi instanceof SearchAmenityTypesAPI) { ((SearchAmenityTypesAPI) capi).setFilterOrders(filterOrders); diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java index 449695c283..ed9924d69f 100644 --- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java +++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java @@ -639,7 +639,7 @@ public class SearchCoreFactory { private List customPoiFilters = new ArrayList<>(); private TIntArrayList customPoiFiltersPriorites = new TIntArrayList(); private MapPoiTypes types; - private Map filterOrders = new HashMap<>(); + private List filterOrders = new ArrayList<>(); public SearchAmenityTypesAPI(MapPoiTypes types) { super(ObjectType.POI_TYPE); @@ -656,7 +656,7 @@ public class SearchCoreFactory { this.customPoiFiltersPriorites.add(priority); } - public void setFilterOrders(Map filterOrders) { + public void setFilterOrders(List filterOrders) { this.filterOrders = filterOrders; } @@ -737,8 +737,8 @@ public class SearchCoreFactory { res.firstUnknownWordMatches = startMatch.matches(res.localeName); if (showTopFiltersOnly) { String stdFilterId = getStandardFilterId(pt); - if (filterOrders.containsKey(stdFilterId)) { - res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.get(stdFilterId); + if (filterOrders.contains(stdFilterId)) { + res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.indexOf(stdFilterId); resultMatcher.publish(res); } } else { @@ -754,8 +754,8 @@ public class SearchCoreFactory { res.object = csf; res.objectType = ObjectType.POI_TYPE; if (showTopFiltersOnly) { - if (filterOrders.containsKey(csf.getFilterId())) { - res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.get(csf.getFilterId()); + if (filterOrders.contains(csf.getFilterId())) { + res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.indexOf(csf.getFilterId()); resultMatcher.publish(res); } } else { diff --git a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java index c95d5aaf0e..6e9361ecb7 100644 --- a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java +++ b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java @@ -9,6 +9,7 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.BufferedReader; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.EOFException; import java.io.File; @@ -30,6 +31,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; /** @@ -104,6 +106,14 @@ public class Algorithms { return name.substring(i + 1); } + public static String getFileWithoutDirs(String name) { + int i = name.lastIndexOf(File.separator); + if (i != -1) { + return name.substring(i + 1); + } + return name; + } + public static File[] getSortedFilesVersions(File dir) { File[] listFiles = dir.listFiles(); if (listFiles != null) { @@ -464,9 +474,25 @@ public class Algorithms { return responseBody; } - public static String gzipToString(byte[] gzip) throws IOException { - GZIPInputStream gzipIs = new GZIPInputStream(new ByteArrayInputStream(gzip)); - return readFromInputStream(gzipIs).toString(); + public static String gzipToString(byte[] gzip) { + try { + GZIPInputStream gzipIs = new GZIPInputStream(new ByteArrayInputStream(gzip)); + return readFromInputStream(gzipIs).toString(); + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + + public static byte[] stringToGzip(String str) { + try { + ByteArrayOutputStream bous = new ByteArrayOutputStream(); + GZIPOutputStream gzout = new GZIPOutputStream(bous); + gzout.write(str.getBytes()); + gzout.close(); + return bous.toByteArray(); + } catch (IOException e) { + throw new IllegalStateException(e); + } } public static boolean removeAllFiles(File f) { diff --git a/OsmAnd-telegram/res/values-an/strings.xml b/OsmAnd-telegram/res/values-an/strings.xml index a6b3daec93..271f0790cd 100644 --- a/OsmAnd-telegram/res/values-an/strings.xml +++ b/OsmAnd-telegram/res/values-an/strings.xml @@ -1,2 +1,4 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-cs/strings.xml b/OsmAnd-telegram/res/values-cs/strings.xml index 202205a64d..1157f91b9a 100644 --- a/OsmAnd-telegram/res/values-cs/strings.xml +++ b/OsmAnd-telegram/res/values-cs/strings.xml @@ -68,4 +68,5 @@ Nemáme nasbíraná data pro daný den Žádná data Zvolte, v čem se měří vzdálenost. + Jednotky a formáty \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-da/strings.xml b/OsmAnd-telegram/res/values-da/strings.xml index a6a4a396dc..7ed4c1644b 100644 --- a/OsmAnd-telegram/res/values-da/strings.xml +++ b/OsmAnd-telegram/res/values-da/strings.xml @@ -12,7 +12,7 @@ Sidste tilgængelige placering Delingsstatus Deling: %1$s - aktiveret + Aktiveret Status Ingen GPX-forbindelse Ingen internetforbindelse @@ -243,7 +243,7 @@ Minimum logningshastighed Filter: ingen logning under den valgte hastighed GPX-indstillinger - Vi har ikke indsamlet data for den valgte dag + Der er ikke indsamlet data for den valgte dag Ingen data Slut Start diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml index d269b7e9cb..9b4b7776df 100644 --- a/OsmAnd-telegram/res/values-de/strings.xml +++ b/OsmAnd-telegram/res/values-de/strings.xml @@ -169,8 +169,8 @@ Die Freigabe ist eingeschaltet (ausschalten) Startet Abmeldevorgang - Schliesst - \"Standort\" einschalten\? + Schließt + „Standort“ einschalten\? Jetzt live Letzte Aktualisierung von Telegram Senden Standort als diff --git a/OsmAnd-telegram/res/values-es/strings.xml b/OsmAnd-telegram/res/values-es/strings.xml index b891000e85..e40701d3d3 100644 --- a/OsmAnd-telegram/res/values-es/strings.xml +++ b/OsmAnd-telegram/res/values-es/strings.xml @@ -257,7 +257,7 @@ Unidades de longitud Definir la unidad de velocidad. Unidad de velocidad - Tiempo después del cual se eliminarán los mensajes de ubicación almacenados en búfer + Tiempo máximo para almacenar puntos en el búfer Tiempo de expiración del búfer Sugerido Estado de OsmAnd Tracker @@ -267,4 +267,5 @@ Última actualización desde Telegram: hace %1$s Última respuesta: hace %1$s hace %1$s + ERR \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-et/strings.xml b/OsmAnd-telegram/res/values-et/strings.xml index 992f02e48c..126490e593 100644 --- a/OsmAnd-telegram/res/values-et/strings.xml +++ b/OsmAnd-telegram/res/values-et/strings.xml @@ -266,4 +266,5 @@ Viimane Telegram uuendus: %1$s tagasi Viimane vastus: %1$s tagasi %1$s tagasi + ERR \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-eu/strings.xml b/OsmAnd-telegram/res/values-eu/strings.xml index 200be3dc54..2f2ec29c63 100644 --- a/OsmAnd-telegram/res/values-eu/strings.xml +++ b/OsmAnd-telegram/res/values-eu/strings.xml @@ -202,7 +202,69 @@ OsmAnd Tracker-en egoera Atzera OsmAnd-era Azken erantzuna: %1$s - "Telegram-en azken eguneraketa duela %1$s" + Telegram-en azken eguneraketa duela %1$s Azken erantzuna duela %1$s duela %1$s + OsmAnd Tracker-ri esker, kokapena partekatu dezakezu eta besteena OsmAnd-en ikus.

Aplikazioak Telegram APIa erabiltzen du eta, beraz, Telegram kontua behar duzu. + Sartu zure Telegram-eko telefono zenbakia nazioarteko formatuan + OsmAnd Tracker atzeko planoan exekutatzen da pantaila itzalita dagoenean. + Hautatu kokapen-hornitzaileetako bat zure kokapena partekatzeko. + Aplikazioak ez du kokapena atzitzeko baimenik. + "Telegramek kode bat bidali dizu OsmAnd-ek zure kontuan saioa hasteko." + Bilaketa: Taldea edo kontaktua + Hautatu kokapena partekatzeko kontaktuak eta taldeak. + Ezarri denbora + Ezarri aukeratutako kontaktu eta taldeek zure kokapena denbora errealean ikusiko duten denbora. + Guztientzako ikusgai dagoen denbora + %1$d h + %1$d m + %1$d h %2$d m + Ezarri guztientzako ikusgai dagoen denbora + Sartu autentifikazio kodea + Ez daukat Telegram kontua + Erregistratutako Telegram kontua eta telefono zenbakia behar dituzu + Ondoren aplikazio hau erabil dezakezu. + Telegram kontua behar duzu kokapen-partekatzea erabiltzeko. + Telegramen izena ematea + Partekatzea aktibatuta dago (desaktibatu) + Iraungitzea + Partekatze-denbora + Ezarri kokapena partekatzeko gutxieneko tartea. + Ez da mugitzen + Kontaktu bat mugitu zen azken aldia. + Ezkutatu denbora jakin batean mugitu ez diren kontaktuak + OsmAnd konexioa + Aukeratu OsmAnd Tracker-ek posizioak bistaratzeko erabiliko duen OsmAnd bertsioa. + %1$s-n + Nola itzali OsmAnd Tracker Telegram-etik + Nola itzali OsmAnd Tracker Telegram-etik + Kokapena partekatzeko sarbidea baliogabetzeko. Ireki Telegram, joan Ezarpenak → Pribatutasuna eta segurtasuna → Saioak eta amaitu OsmAnd Tracker saioa atalera. + "Konektatu Internetera Telegram saioa behar bezala amaiatzeko." + Azken erantzuna + Kokapena partekatzea itzaltzen du hautatutako txat guztietan (%1$d). + Hautatu kontaktuak mapan bistaratzeko OsmAnd bertsioa. + Taldearen arabera + Izenaren arabera + Distantziaren arabera + Amaitu OsmAnd Tracker saioa\? + Ziur zaude OsmAnd Tracker saioa amaitu nahi duzula\? Ezingo duzu kokapena partekatu edo besteen kokapena ikusi + Zurekin kokapena partekatzen duten kontaktuak eta taldeak. + Partekatzen:% 1 $ s + Partekatze egoera + Azken kokapen eskuragarria + Oraindik ez da aurkitu + Oraindik ez da bidali + Atzeko planoan partekatzea + Itzali bateriaren optimizazioa OsmAnd Trackerrentzat, bat-batean itzali ez dadin bigarren planoan dagoela. + Bigarren planoko lana + Aldatu bateriaren optimizazio ezarpenak kokapena partekatzea egonkortzeko. + Telegram-en erantzunaren zain + Ezin da Telegrameko txatetara bidali: + Ondo bidali eta eguneratua + Eguneratutako azken kokapena: + Hainbat gailu Telegram kontu bakarrera konektatu nahi badituzu, gailu desberdinak erabili behar dituzu kokapena partekatzeko. + Telegrama bezeroan gailuaren IDa sortu eta ikusi dezakezu %1$s txat bota erabiliz. % 2 $ s + \"Jarraitu\" sakatuz, Telegram eta OsmAnd pribatutasun-politiken baldintzak onartzen dituzu. + OsmAnd tracker-ek Telegram plataforma irekia erabiltzen duten bezeroetako bat da. Zure kontaktuek Telegram-eko beste edozein bezero erabil dezakete. + Telegram-eko azken eguneratzea: %1$s \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-fr/strings.xml b/OsmAnd-telegram/res/values-fr/strings.xml index 297ea9808d..622a55faae 100644 --- a/OsmAnd-telegram/res/values-fr/strings.xml +++ b/OsmAnd-telegram/res/values-fr/strings.xml @@ -100,7 +100,7 @@ OsmAnd Tracker Telegram (l\'application de messagerie) est utilisée pour se connecter et communiquer avec d\'autres personnes. OsmAnd tracker est l\'un des clients qui utilise la plateforme ouverte Telegram. Vos contacts peuvent utiliser n\'importe quel autre client Telegram. - En appuyant sur « Continuer » vous acceptez les conditions des politiques de confidentialité de Telegram et d\'OsmAnd. + En appuyant sur « Continuer » vous acceptez les conditions des politiques de confidentialité de Telegram et d\'OsmAnd. Politique de confidentialité de Telegram Politique de confidentialité d\'OsmAnd Comment cela fonctionne @@ -144,4 +144,102 @@ Kilomètres/mètres Miles nautiques Miles / Mètres + nœuds + Plus tard + Mot de passe + Distance + Miles nautiques par heure (nœuds) + Par nom + Sélectionnez l\'apparence des messages contenant votre position. + Envoyer la position + Afficher dans OsmAnd + Dernière mise à jour depuis Telegram + Comment désactiver OsmAnd Tracker de Telegram + Comment désactiver OsmAnd Tracker de Telegram + Connectez-vous à Internet pour vous déconnecter correctement de Telegram. + Désactiver tout + Désactiver tout partage + Désactive le partage de position pour toutes les discussions sélectionnées (%1$d). + Sélectionnez la version OsmAnd à utiliser + Sélectionnez la version OsmAnd où les contacts seront affichés sur la carte. + Partage de l\'état + Mode arrière-plan + Chronologie + En direct maintenant + s + min + h + Bienvenue + Veuillez entrer votre numéro de téléphone Telegram au format international + Autorisation + Discussions actives + Afficher les utilisateurs sur la carte + Installer OsmAnd + Logo OsmAnd + Service OsmAnd Tracker + Partage de la position + Partager la position + Vous n\'êtes pas connecté·e + Activer la « position » \? + Fermeture + Déconnexion + Démarrage + Se déconnecter + Se connecter + Mot de passe Telegram + Entrez le mot de passe + Telegram vous a envoyé un code pour que OsmAnd se connecte à votre compte. + Code d\'authentification + Entrez le code + %1$d h %2$d min + %1$d h + %1$d min + Entrez le code d\'authentification + Entrez un numéro de téléphone + Je n\'ai pas dr compte Telegram + Vous pourrez ensuite utiliser cette appli. + Veuillez installer Telegram et créer un compte. + Vous avez besoin d\'un compte Telegram pour utiliser le partage de position. + Inscription à Telegram + Bot + En direct + Ouvrir OsmAnd + Désactiver le partage de position + Le partage est activé (désactiver) + Expire + Temps de partage + dans %1$s + Triper par + Par groupe + Par distance + Se déconnecter d\'OsmAnd Tracker \? + Êtes-vous sûr·e de vouloir vous déconnecter d\'OsmAnd Tracker ; vous ne pourrez pas partager votre position ni vous la position des autres \? + Contacts et groupes partageant leur position avec vous. + Partager la position comme + Ajouter un périphérique + Aucune connexion Internet + Aucune connexion GPS + Partage : %1$s + Dernière position disponible + Renvoyer la position + Pas encore trouvé + Pas encore envoyé + Aller aux paramètres + Partage en arrière-plan + Éteignez l\'optimisation de la batterie pour OsmAnd Tracker afin qu\'il ne soit pas soudainement désactivé lorsqu\'il est en arrière-plan. + Fonctionnement en arrière-plan + Changez les paramètres d\'optimisation de la batterie pour stabiliser le partage de la position. + Connexion à Internet + Localisation… + Démarrage + Envoi de la position + En attente de la réponse de Telegram + Impossible d\'envoyer dans les discussions Telegram : + Envoyé et mis à jour avec succès + Dernière position mise à jour : + Si vous voulez connecter plusieurs appareils à un même compte Telegram, vous devez utiliser un appareil différent pour partager votre position. + Vous pouvez créer et visualiser l\'identifiant du périphérique dans le client Telegram en utilisant le chat-bot %1$s. %2$s + Nommez votre nouveau périphérique en max 200 symboles. + Choisissez un nom que vous n\'avez pas encore utilisé + La surveillance est désactivée \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-hu/strings.xml b/OsmAnd-telegram/res/values-hu/strings.xml index 2c329c19e1..a187276fc1 100644 --- a/OsmAnd-telegram/res/values-hu/strings.xml +++ b/OsmAnd-telegram/res/values-hu/strings.xml @@ -246,7 +246,7 @@ Nincs adat Vég Kezdet - Alkalmazás + Alkalmaz Megjelenítendő időszak kijelölése Kezdő és záró dátum Mentett üzenetek diff --git a/OsmAnd-telegram/res/values-it/strings.xml b/OsmAnd-telegram/res/values-it/strings.xml index f6e3b38177..4a5b4218f4 100644 --- a/OsmAnd-telegram/res/values-it/strings.xml +++ b/OsmAnd-telegram/res/values-it/strings.xml @@ -90,8 +90,8 @@ Non ho un account di Telegram Inserisci un numero di telefono Inserisci il codice di autenticazione - %1$d h %2$d m - %1$d m + %1$d h %2$d min + %1$d min %1$d h Installa Condividi @@ -157,7 +157,7 @@ Miglia nautiche Miglia/metri h - m + min s OsmAnd tracker ti permette di condividere la tua posizione e di vedere quella di altri su OsmAnd.
diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml index 33680e1089..6b42727c8a 100644 --- a/OsmAnd-telegram/res/values-nb/strings.xml +++ b/OsmAnd-telegram/res/values-nb/strings.xml @@ -12,11 +12,11 @@ Sist tilgjengelige posisjon Delingsstatus Deling: %1$s - Påslått + Aktivert Status Ingen GPS-tilkobling Ingen internettilknytning - Skru av + Deaktiver Legg til enhet Del posisjon som Kontakter og grupper som deler sin posisjon med deg. @@ -24,7 +24,7 @@ Logg ut av OsmAnd-sporeren\? Navn Etter distanse - Etter navn + Ved navn Etter gruppe Sorter Sorter etter @@ -104,7 +104,7 @@ Velg en av posisjonstilbyderne for å dele din posisjon. Bakgrunnsmodus OsmAnd-sporeren kjører som nisse med skjermen av. - Distanse + Avstand Del posisjon Deler posisjon OsmAnd-sporertjeneste @@ -119,15 +119,13 @@ km m Kilometer i timen - Meter i sekunder + Meter per sekund Minutter per kilometer Nautiske mil i timen (knop) t min sek - - OsmAnd-sporeren lar deg dele din posisjon og se andres i OsmAnd.
-
Programmet belager seg på Telegram-API-et, så du må ha en Telegram-konto. + OsmAnd-sporeren lar deg dele din posisjon og se andres i OsmAnd.

Programmet belager seg på Telegram-API-et, så du må ha en Telegram-konto. Min posisjon Sist oppdaterte posisjon: Sendt og oppdatert @@ -138,8 +136,8 @@ Posisjonerer… Kobler til Internett yd - fot - mil + ft + mi nmi min/m min/km @@ -147,10 +145,10 @@ m/s km/t mph - Engelske mil i timen - Minutter per engelske mil - Engelske mil/fot - Engelske mil/yard + Engelsk mil i timen + Minutter per engelsk mil + Eng. mil/fot + Eng. mil/yard Kilometer/meter Nautiske mil Engelske mil/meter @@ -179,7 +177,7 @@ Tekst Kart og tekst Oppsyn er påskrudd - Oppsyn er avskrudd + Oppsyn er ikke aktivert Tid i bevegelse Gjennomsnittlig høyde Gjennomsnittsfart @@ -189,7 +187,7 @@ Tidslinje Telegram OsmAnd-sporeren er én av klientene som bruker Telegram. Dine kontakter kan bruke enhver annen Telegram-klient. - Ved å klikke \"Fortsett\" samtykker du til vilkårene i Telegram-personvernspraksisen, og OsmAnd-personvernspraksisen. + Du samtykker til vilkårene i personvernreglene til Telegram og OsmAnd ved å klikke «Fortsett». Godta Telegram-personvernspraksis Hvordan det virker @@ -212,7 +210,7 @@ Telegram (meldingsprogrammet) brukes til å komme i kontakt og snakke med folk. OsmAnd-personvernspraksis Oppdater OsmAnd for å vise data på kartet - Skru på oppsyn for å samle bevegelsesdata i historikk. + Aktiver oppsyn for å samle bevegelsesdata i historikk. Søk i kontaktliste Søk gjennom alle dine grupper og kontakter. Skriv kontakt- eller gruppenavn @@ -228,7 +226,7 @@ Port Tjener Forbindelse - Skru på + Aktiver Mellomtjenertype Tilkoblet Frakoblet @@ -240,10 +238,10 @@ Filter: Minimumsavstand for logging av nytt punkt Minimumsnøyaktighet for logging Filter: Ingen logging med mindre nøyaktigheten nås - Minimumshastighet ved logging + Minimumshastighet for logging Filter: Ingen logging under valgt hastighet GPX-innstillinger - Data for valgt dato mangler + Det er ikke samlet inn data for valgt dato Ingen data Slutt Start @@ -256,7 +254,7 @@ Enheter og formater Endre hva lengde måles i. Lengdeenhet - Definer en fartsenhet + Definer en fartsenhet. Fartsenhet Maksimal tid å lagre punkter i mellomlageret Utløpstid for mellomlager @@ -268,4 +266,5 @@ Siste oppdatering fra Telegram: %1$s siden Siste respons: %1$s siden %1$s siden + FEIL \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-pt-rPT/strings.xml b/OsmAnd-telegram/res/values-pt-rPT/strings.xml index 6e62b52439..1d32c5f8b3 100644 --- a/OsmAnd-telegram/res/values-pt-rPT/strings.xml +++ b/OsmAnd-telegram/res/values-pt-rPT/strings.xml @@ -16,7 +16,7 @@ Política de privacidade do OsmAnd %1$d m Última localização disponível - OsmAnd Tracker + Rastreador OsmAnd OsmAnd tracker é um dos clientes que usam a Plataforma aberta do Telegram . Seus contatos podem usar qualquer outro cliente Telegram. Quilômetros/metros no %1$s @@ -73,7 +73,7 @@ Quilômetros por hora Senha Distância mínima de registro - Salvar + Gravar Iniciar Adicionar aparelho Não foi possível adicionar novo aparelho @@ -188,7 +188,7 @@ Compartilhar localização h Como desativar o OsmAnd Tracker para Telegram - Nós não coletamos dados para o dia selecionado + Não coletamos dados para o dia selecionado Tempo de compartilhamento você não está logado no Ativar \"Localização\"\? @@ -234,7 +234,7 @@ Mostrar no OsmAnd Saindo Sair - Desabilitar + Desativar Digite o número de telefone Velocidade mínima de registro Desconectado @@ -261,4 +261,10 @@ Sugerido Estado do Rastreador de OsmAnd Voltar para OsmAnd + %1$s atrás + Última resposta: %1$s atrás + Última atualização do Telegram: 1$s atrás + Última resposta: %1$s + Última atualização do Telegram: %1$s + ERR \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-pt/strings.xml b/OsmAnd-telegram/res/values-pt/strings.xml index 71f9006403..fe4559ac9c 100644 --- a/OsmAnd-telegram/res/values-pt/strings.xml +++ b/OsmAnd-telegram/res/values-pt/strings.xml @@ -37,7 +37,7 @@ Aplicar Selecionar a hora para exibir Data de início - fim - Nós não coletamos dados para o dia selecionado + Não coletamos dados para o dia selecionado Configurações de GPX Chave Credenciais @@ -262,4 +262,10 @@ Sugerido Estado do Rastreador de OsmAnd Voltar para OsmAnd + %1$s atrás + Última resposta: %1$s atrás + Última atualização do Telegram: 1$s atrás + Última resposta: %1$s + Última atualização do Telegram: %1$s + ERR \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-ru/strings.xml b/OsmAnd-telegram/res/values-ru/strings.xml index c1c2124e85..8a232e948c 100644 --- a/OsmAnd-telegram/res/values-ru/strings.xml +++ b/OsmAnd-telegram/res/values-ru/strings.xml @@ -158,7 +158,7 @@ Политика конфиденциальности Telegram Политика конфиденциальности OsmAnd Получено точек GPX: %1$s - Внешний вид + Вид Показать количество собранных и отправленных точек GPS. Обновите OsmAnd для просмотра данных на карте Обновить diff --git a/OsmAnd-telegram/res/values-tr/strings.xml b/OsmAnd-telegram/res/values-tr/strings.xml index 3160ac48d4..a459a73acf 100644 --- a/OsmAnd-telegram/res/values-tr/strings.xml +++ b/OsmAnd-telegram/res/values-tr/strings.xml @@ -93,7 +93,7 @@ Telegram Telegram (mesajlaşma uygulaması) insanlarla bağlantı ve iletişim kurmak için kullanılmaktadır. OsmAnd Tracker, Telegram açık platformunu kullanan istemcilerden biridir. Kişileriniz başka herhangi bir Telegram istemcisini kullanabilir. - \"Devam et\" butonuna tıklayarak, Telegram ve OsmAnd Gizlilik Politikası koşullarını kabul etmiş olursunuz. + \"Devam et\" düğmesine tıklayarak, Telegram ve OsmAnd Gizlilik Politikası koşullarını kabul etmiş olursunuz. Kabul et Telegram Gizlilik Politikası OsmAnd Gizlilik Politikası @@ -160,8 +160,8 @@ Ada göre Gruba göre Sıralama kriteri - Kişilerin haritada görüntüleneceği OsmAnd versiyonunu seçin. - Kullanılacak OsmAnd versiyonunu seçin + Kişilerin haritada görüntüleneceği OsmAnd sürümünü seçin. + Kullanılacak OsmAnd sürümünü seçin Konum paylaşımını tüm seçili sohbetlere kapatır (%1$d). Tüm paylaşımı devre dışı bırak Hepsini kapat @@ -176,7 +176,7 @@ Bağlı hesap Hesap %1$s içinde - Konumları görüntülemek için OsmAnd Tracker\'ın kullandığı OsmAnd versiyonunu seçin. + Konumları görüntülemek için OsmAnd Tracker\'ın kullandığı OsmAnd sürümünü seçin. OsmAnd bağlan Belirli bir süre içinde hareket etmemiş kişileri gizle. Konum geçmişi @@ -213,7 +213,7 @@ Haritada göster OsmAnd Çevrim İçi GPS İzleyici Telefon numarası - Uluslararası formatta telefon numarası + Uluslararası biçimde telefon numarası Parola Kodu girin Kimlik doğrulama kodu @@ -240,8 +240,8 @@ Kullanıcıları haritada göster Aktif sohbetler Yetkilendirme - Lütfen Telegram telefon numaranızı uluslararası formatta girin - Hoşgeldiniz + Lütfen Telegram telefon numaranızı uluslararası biçimde girin + Hoş geldiniz sa dk sn @@ -251,7 +251,7 @@ Zaman çizelgesi Konum mesajlarınızda gösterilecek saat dilimini seçin. Saat dilimi - Birimler ve formatlar + Birimler ve biçimler Mesafe ölçüm birimini değiştir. Uzunluk birimleri Hız birimini tanımlayın. diff --git a/OsmAnd/assets/poi_categories.json b/OsmAnd/assets/poi_categories.json deleted file mode 100644 index f386828f4d..0000000000 --- a/OsmAnd/assets/poi_categories.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "categories": { - "special": { - "icons": [ - "special_star", - "special_star_stroked", - "special_marker", - "special_flag_stroke", - "special_house", - "special_building" - ] - }, - "amenity": { - "icons": [ - "amenity_bar", - "amenity_cafe", - "amenity_atm", - "amenity_biergarten", - "amenity_cinema", - "amenity_fire_station", - "amenity_parking" - ] - } - } -} \ No newline at end of file diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index edd12e7854..45dc9e96ec 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -45,10 +45,10 @@ android { defaultConfig { minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15 targetSdkVersion 28 - versionCode 356 + versionCode 370 versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode multiDexEnabled true - versionName "3.5.6" + versionName "3.7.0" versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png deleted file mode 100644 index 01afb085fd..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_compass_widget.png deleted file mode 100644 index af36e36892..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-hdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 150ec6b547..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 15fb01c0b4..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 8901c389b9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png deleted file mode 100644 index c1ba05be3b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_copy.png b/OsmAnd/res/drawable-hdpi/ic_action_copy.png deleted file mode 100644 index c62cd30a9a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png deleted file mode 100644 index a1a4129763..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gprint_dark.png deleted file mode 100644 index 0a639dc2eb..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png deleted file mode 100644 index 83b5e2dc93..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png deleted file mode 100644 index e7330eb803..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_home_dark.png deleted file mode 100644 index b2b58532b8..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_import.png b/OsmAnd/res/drawable-hdpi/ic_action_import.png deleted file mode 100644 index 1714a7e2bc..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_info_dark.png deleted file mode 100644 index cf6c396f6b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png deleted file mode 100644 index 988e4cf571..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png deleted file mode 100644 index e476eac718..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png deleted file mode 100644 index f0914e4aa9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png deleted file mode 100644 index 028221e52c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-hdpi/ic_action_previous_route.png deleted file mode 100644 index cf87b0a6c6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ruler.png b/OsmAnd/res/drawable-hdpi/ic_action_ruler.png deleted file mode 100644 index 947cbef786..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings.png b/OsmAnd/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index 9f462386e1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_travel.png b/OsmAnd/res/drawable-hdpi/ic_action_travel.png deleted file mode 100644 index 7e5309917d..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png deleted file mode 100644 index eca1da7c4f..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_work.png b/OsmAnd/res/drawable-hdpi/ic_action_work.png deleted file mode 100644 index 372258dc20..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png deleted file mode 100644 index 330da77fbd..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_map.png b/OsmAnd/res/drawable-hdpi/ic_map.png deleted file mode 100644 index 66407962a2..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-hdpi/ic_navigation_drawer.png deleted file mode 100644 index e99ca193e6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-hdpi/ic_plugin_srtm.png deleted file mode 100644 index 170aefa1c5..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png deleted file mode 100644 index 9235ce8668..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_compass_widget.png deleted file mode 100644 index c292db68dd..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-mdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 7b0315f985..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 825ef20d31..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 5a8551d5a4..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png deleted file mode 100644 index 1e329f8110..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_copy.png b/OsmAnd/res/drawable-mdpi/ic_action_copy.png deleted file mode 100644 index 82a96390f7..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png deleted file mode 100644 index 5f04a9bcae..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gprint_dark.png deleted file mode 100644 index ae443c661d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png deleted file mode 100644 index fc0a89d575..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png deleted file mode 100644 index fe04c8513e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_home_dark.png deleted file mode 100644 index 8e187c2263..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_import.png b/OsmAnd/res/drawable-mdpi/ic_action_import.png deleted file mode 100644 index 248d297466..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_info_dark.png deleted file mode 100644 index cdb944551e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png deleted file mode 100644 index 2dab1265c0..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png deleted file mode 100644 index 975cd200b8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png deleted file mode 100644 index 890646f66f..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png deleted file mode 100644 index 274be86f2e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-mdpi/ic_action_previous_route.png deleted file mode 100644 index 1f2b6e7394..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ruler.png b/OsmAnd/res/drawable-mdpi/ic_action_ruler.png deleted file mode 100644 index 54f82daeed..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings.png b/OsmAnd/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index bb2cc22048..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_travel.png b/OsmAnd/res/drawable-mdpi/ic_action_travel.png deleted file mode 100644 index d7335726be..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png deleted file mode 100644 index 59f63440a8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_work.png b/OsmAnd/res/drawable-mdpi/ic_action_work.png deleted file mode 100644 index 015800328d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png deleted file mode 100644 index ec2dac1101..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_map.png b/OsmAnd/res/drawable-mdpi/ic_map.png deleted file mode 100644 index 458117c9fe..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-mdpi/ic_navigation_drawer.png deleted file mode 100644 index 80409f3676..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-mdpi/ic_plugin_srtm.png deleted file mode 100644 index ce89e3758b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png deleted file mode 100644 index 8bfa9f6b72..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget.png deleted file mode 100644 index 0ad0e45980..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index bf9eb8b2d8..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 025303ba1d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 56a568c287..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png deleted file mode 100644 index ad49ad0f0d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_copy.png b/OsmAnd/res/drawable-xhdpi/ic_action_copy.png deleted file mode 100644 index a870b9c4b4..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png deleted file mode 100644 index f378f2faa7..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gprint_dark.png deleted file mode 100644 index 8dc22c65eb..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png deleted file mode 100644 index e7ea375f45..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png deleted file mode 100644 index 44f098aa98..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_home_dark.png deleted file mode 100644 index 1305c63173..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_import.png b/OsmAnd/res/drawable-xhdpi/ic_action_import.png deleted file mode 100644 index 699f1b417c..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_info_dark.png deleted file mode 100644 index fd864c66a0..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png deleted file mode 100644 index 731ac33b2b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png deleted file mode 100644 index 3219e7bbf1..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png deleted file mode 100644 index 92c3f3358e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png deleted file mode 100644 index cc841eb7be..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-xhdpi/ic_action_previous_route.png deleted file mode 100644 index 71da51f44d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ruler.png b/OsmAnd/res/drawable-xhdpi/ic_action_ruler.png deleted file mode 100644 index d1a65048ba..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings.png deleted file mode 100644 index 3972159d46..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_travel.png b/OsmAnd/res/drawable-xhdpi/ic_action_travel.png deleted file mode 100644 index 8dd368dd2e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png deleted file mode 100644 index a3efd50585..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_work.png b/OsmAnd/res/drawable-xhdpi/ic_action_work.png deleted file mode 100644 index 254e193254..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png deleted file mode 100644 index 7699bc55fb..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_map.png b/OsmAnd/res/drawable-xhdpi/ic_map.png deleted file mode 100644 index 67eb37ac50..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-xhdpi/ic_navigation_drawer.png deleted file mode 100644 index c3b6da6636..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-xhdpi/ic_plugin_srtm.png deleted file mode 100644 index a103242a3f..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png deleted file mode 100644 index fbb7f251cc..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget.png deleted file mode 100644 index 896382de6d..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 8385db87ff..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 57f3050e54..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 06b996b9cd..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png deleted file mode 100644 index c3c416f6d1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_copy.png b/OsmAnd/res/drawable-xxhdpi/ic_action_copy.png deleted file mode 100644 index f6155536f7..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_delete_dark.png deleted file mode 100644 index 151538d1ba..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_dark.png deleted file mode 100644 index 890f19e0cf..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png deleted file mode 100644 index e840eb5ff0..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png deleted file mode 100644 index 37037454f4..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_home_dark.png deleted file mode 100644 index 0956ccccb5..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_import.png b/OsmAnd/res/drawable-xxhdpi/ic_action_import.png deleted file mode 100644 index b802cf1ea8..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_info_dark.png deleted file mode 100644 index 957fcbe0da..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png deleted file mode 100644 index 2244702813..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png deleted file mode 100644 index dc6aa21733..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png deleted file mode 100644 index 53b09f0cb7..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png deleted file mode 100644 index 0ee6810890..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-xxhdpi/ic_action_previous_route.png deleted file mode 100644 index fca798f46a..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler.png b/OsmAnd/res/drawable-xxhdpi/ic_action_ruler.png deleted file mode 100644 index 9a51090661..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings.png deleted file mode 100644 index 0fac002ad8..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_travel.png b/OsmAnd/res/drawable-xxhdpi/ic_action_travel.png deleted file mode 100644 index db56fd2f91..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png deleted file mode 100644 index ba06d4920e..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_work.png b/OsmAnd/res/drawable-xxhdpi/ic_action_work.png deleted file mode 100644 index 7bea54d8eb..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png deleted file mode 100644 index b6a40f9d15..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_map.png b/OsmAnd/res/drawable-xxhdpi/ic_map.png deleted file mode 100644 index 49079a9e1b..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer.png deleted file mode 100644 index b007054f4e..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-xxhdpi/ic_plugin_srtm.png deleted file mode 100644 index 4c98804578..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget.png deleted file mode 100644 index d007519851..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 9367547567..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png deleted file mode 100644 index 05dfda08ca..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_gsave_dark.png deleted file mode 100644 index ca8ea70cad..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_previous_route.png deleted file mode 100644 index aad78c1730..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_work.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_work.png deleted file mode 100644 index 86aeafcb89..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable/bg_point_circle_contour.xml b/OsmAnd/res/drawable/bg_point_circle_contour.xml index 46d0f51ec8..26127a55d4 100644 --- a/OsmAnd/res/drawable/bg_point_circle_contour.xml +++ b/OsmAnd/res/drawable/bg_point_circle_contour.xml @@ -1,7 +1,11 @@ - - - - + + + diff --git a/OsmAnd/res/drawable/bg_point_octagon_contour.xml b/OsmAnd/res/drawable/bg_point_octagon_contour.xml new file mode 100644 index 0000000000..7c9c52528e --- /dev/null +++ b/OsmAnd/res/drawable/bg_point_octagon_contour.xml @@ -0,0 +1,11 @@ + + + diff --git a/OsmAnd/res/drawable/bg_point_square_contour.xml b/OsmAnd/res/drawable/bg_point_square_contour.xml index 1f492681f1..a09dff2ce4 100644 --- a/OsmAnd/res/drawable/bg_point_square_contour.xml +++ b/OsmAnd/res/drawable/bg_point_square_contour.xml @@ -1,10 +1,11 @@ + android:viewportWidth="48" + android:viewportHeight="48"> + android:fillColor="#00000000" + android:strokeColor="#727272"/> diff --git a/OsmAnd/res/drawable/btn_bg_border_inactive.xml b/OsmAnd/res/drawable/btn_bg_border_inactive.xml index 844747ac35..dcf60ef7ed 100644 --- a/OsmAnd/res/drawable/btn_bg_border_inactive.xml +++ b/OsmAnd/res/drawable/btn_bg_border_inactive.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/ic_action_bug_dark.xml b/OsmAnd/res/drawable/ic_action_bug_dark.xml new file mode 100644 index 0000000000..fe7b8af253 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_bug_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_cancel.xml b/OsmAnd/res/drawable/ic_action_cancel.xml new file mode 100644 index 0000000000..d82458bb25 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_cancel.xml @@ -0,0 +1,18 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_categories_search.xml b/OsmAnd/res/drawable/ic_action_categories_search.xml new file mode 100644 index 0000000000..afcb7d6230 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_categories_search.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_action_compass_widget.xml b/OsmAnd/res/drawable/ic_action_compass_widget.xml new file mode 100644 index 0000000000..108cfcdf2b --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_compass_widget.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_compass_widget_hide.xml b/OsmAnd/res/drawable/ic_action_compass_widget_hide.xml new file mode 100644 index 0000000000..0b1eb4b8cb --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_compass_widget_hide.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_context_menu.xml b/OsmAnd/res/drawable/ic_action_context_menu.xml new file mode 100644 index 0000000000..7733c21169 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_context_menu.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_action_coordinates_latitude.xml b/OsmAnd/res/drawable/ic_action_coordinates_latitude.xml new file mode 100644 index 0000000000..a7ee81cb1a --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_coordinates_latitude.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_coordinates_longitude.xml b/OsmAnd/res/drawable/ic_action_coordinates_longitude.xml new file mode 100644 index 0000000000..6c8e01f542 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_coordinates_longitude.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_coordinates_widget.xml b/OsmAnd/res/drawable/ic_action_coordinates_widget.xml new file mode 100644 index 0000000000..4cf5271120 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_coordinates_widget.xml @@ -0,0 +1,16 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_copy.xml b/OsmAnd/res/drawable/ic_action_copy.xml new file mode 100644 index 0000000000..ebb2b35c22 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_copy.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_delete_dark.xml b/OsmAnd/res/drawable/ic_action_delete_dark.xml new file mode 100644 index 0000000000..a05bd21abe --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_delete_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_drawer.xml b/OsmAnd/res/drawable/ic_action_drawer.xml new file mode 100644 index 0000000000..3d3a7ca8cc --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_drawer.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_action_gprint_dark.xml b/OsmAnd/res/drawable/ic_action_gprint_dark.xml new file mode 100644 index 0000000000..5f70128718 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_gprint_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_gsave_dark.xml b/OsmAnd/res/drawable/ic_action_gsave_dark.xml new file mode 100644 index 0000000000..a25a0996de --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_gsave_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_gshare_dark.xml b/OsmAnd/res/drawable/ic_action_gshare_dark.xml new file mode 100644 index 0000000000..edad7213e2 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_gshare_dark.xml @@ -0,0 +1,15 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_home_dark.xml b/OsmAnd/res/drawable/ic_action_home_dark.xml new file mode 100644 index 0000000000..b665594692 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_home_dark.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_action_import.xml b/OsmAnd/res/drawable/ic_action_import.xml new file mode 100644 index 0000000000..8bf929c6b3 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_import.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_info_dark.xml b/OsmAnd/res/drawable/ic_action_info_dark.xml new file mode 100644 index 0000000000..15cb857d72 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_info_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_marker_dark.xml b/OsmAnd/res/drawable/ic_action_marker_dark.xml new file mode 100644 index 0000000000..9dfc2cb852 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_marker_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_micro_dark.xml b/OsmAnd/res/drawable/ic_action_micro_dark.xml new file mode 100644 index 0000000000..e0224a0233 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_micro_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_parking_dark.xml b/OsmAnd/res/drawable/ic_action_parking_dark.xml new file mode 100644 index 0000000000..e0b15af75f --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_parking_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_photo_dark.xml b/OsmAnd/res/drawable/ic_action_photo_dark.xml new file mode 100644 index 0000000000..dac4cd7253 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_photo_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_previous_route.xml b/OsmAnd/res/drawable/ic_action_previous_route.xml new file mode 100644 index 0000000000..f4ecad8fa7 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_previous_route.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/OsmAnd/res/drawable/ic_action_ruler.xml b/OsmAnd/res/drawable/ic_action_ruler.xml new file mode 100644 index 0000000000..a0c4afb370 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_ruler.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_settings.xml b/OsmAnd/res/drawable/ic_action_settings.xml new file mode 100644 index 0000000000..bd93d68f88 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_settings.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_ski_touring.xml b/OsmAnd/res/drawable/ic_action_ski_touring.xml index 3ae35b6887..e1d7bd367b 100644 --- a/OsmAnd/res/drawable/ic_action_ski_touring.xml +++ b/OsmAnd/res/drawable/ic_action_ski_touring.xml @@ -4,16 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24"> - - - diff --git a/OsmAnd/res/drawable/ic_action_snowmobile.xml b/OsmAnd/res/drawable/ic_action_snowmobile.xml new file mode 100644 index 0000000000..0ed2b39f87 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_snowmobile.xml @@ -0,0 +1,14 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_travel.xml b/OsmAnd/res/drawable/ic_action_travel.xml new file mode 100644 index 0000000000..4875093f17 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_travel.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/OsmAnd/res/drawable/ic_action_ui_customization.xml b/OsmAnd/res/drawable/ic_action_ui_customization.xml new file mode 100644 index 0000000000..710a5a0a64 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_ui_customization.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/OsmAnd/res/drawable/ic_action_video_dark.xml b/OsmAnd/res/drawable/ic_action_video_dark.xml new file mode 100644 index 0000000000..8a1561bc17 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_video_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_work.xml b/OsmAnd/res/drawable/ic_action_work.xml new file mode 100644 index 0000000000..4656d02c65 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_work.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/OsmAnd/res/drawable/ic_configure_screen_dark.xml b/OsmAnd/res/drawable/ic_configure_screen_dark.xml new file mode 100644 index 0000000000..f3f7b78cac --- /dev/null +++ b/OsmAnd/res/drawable/ic_configure_screen_dark.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_layer_bottom.xml b/OsmAnd/res/drawable/ic_layer_bottom.xml index 15b4b96c79..5c4ed3a666 100644 --- a/OsmAnd/res/drawable/ic_layer_bottom.xml +++ b/OsmAnd/res/drawable/ic_layer_bottom.xml @@ -4,11 +4,16 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:pathData="M17.7143,12L22,15L12,22L2,15L6.2857,12L12,16L17.7143,12Z" + android:fillColor="#ffffff"/> + diff --git a/OsmAnd/res/drawable/ic_map.xml b/OsmAnd/res/drawable/ic_map.xml new file mode 100644 index 0000000000..48040318f4 --- /dev/null +++ b/OsmAnd/res/drawable/ic_map.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_navigation_drawer.xml b/OsmAnd/res/drawable/ic_navigation_drawer.xml new file mode 100644 index 0000000000..34b1b9881f --- /dev/null +++ b/OsmAnd/res/drawable/ic_navigation_drawer.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_plugin_srtm.xml b/OsmAnd/res/drawable/ic_plugin_srtm.xml new file mode 100644 index 0000000000..9562493d37 --- /dev/null +++ b/OsmAnd/res/drawable/ic_plugin_srtm.xml @@ -0,0 +1,15 @@ + + + + diff --git a/OsmAnd/res/drawable/img_settings_device_top_dark.xml b/OsmAnd/res/drawable/img_settings_device_top_dark.xml new file mode 100644 index 0000000000..378e02cf7d --- /dev/null +++ b/OsmAnd/res/drawable/img_settings_device_top_dark.xml @@ -0,0 +1,12 @@ + + + + diff --git a/OsmAnd/res/drawable/img_settings_device_top_light.xml b/OsmAnd/res/drawable/img_settings_device_top_light.xml new file mode 100644 index 0000000000..b20891747d --- /dev/null +++ b/OsmAnd/res/drawable/img_settings_device_top_light.xml @@ -0,0 +1,12 @@ + + + + diff --git a/OsmAnd/res/drawable/map_action_ski_touring.xml b/OsmAnd/res/drawable/map_action_ski_touring.xml new file mode 100644 index 0000000000..f771350bd8 --- /dev/null +++ b/OsmAnd/res/drawable/map_action_ski_touring.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/OsmAnd/res/drawable/map_action_snowmobile.xml b/OsmAnd/res/drawable/map_action_snowmobile.xml new file mode 100644 index 0000000000..83463f1f5f --- /dev/null +++ b/OsmAnd/res/drawable/map_action_snowmobile.xml @@ -0,0 +1,15 @@ + + + + diff --git a/OsmAnd/res/layout/bottom_sheet_item_title.xml b/OsmAnd/res/layout/bottom_sheet_item_title.xml index d8ebd46514..1736b7148a 100644 --- a/OsmAnd/res/layout/bottom_sheet_item_title.xml +++ b/OsmAnd/res/layout/bottom_sheet_item_title.xml @@ -5,13 +5,15 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_title_height" + android:layout_height="wrap_content" android:ellipsize="end" android:gravity="center_vertical" - android:maxLines="1" + android:maxLines="5" android:minHeight="@dimen/bottom_sheet_title_height" android:paddingLeft="@dimen/content_padding" android:paddingRight="@dimen/content_padding" + android:paddingTop="@dimen/content_padding_small" + android:paddingBottom="@dimen/content_padding_small" android:textAppearance="@style/TextAppearance.ListItemTitle" osmand:typeface="@string/font_roboto_medium" tools:text="Some Title" diff --git a/OsmAnd/res/layout/bottom_sheet_item_title_with_checkbox.xml b/OsmAnd/res/layout/bottom_sheet_item_title_with_checkbox.xml new file mode 100644 index 0000000000..cede7a0e86 --- /dev/null +++ b/OsmAnd/res/layout/bottom_sheet_item_title_with_checkbox.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/OsmAnd/res/layout/bottom_sheet_item_title_with_swith_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_title_with_swith_56dp.xml new file mode 100644 index 0000000000..c347f4b20f --- /dev/null +++ b/OsmAnd/res/layout/bottom_sheet_item_title_with_swith_56dp.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + diff --git a/OsmAnd/res/layout/context_menu_action_item.xml b/OsmAnd/res/layout/context_menu_action_item.xml new file mode 100644 index 0000000000..25c18a1845 --- /dev/null +++ b/OsmAnd/res/layout/context_menu_action_item.xml @@ -0,0 +1,31 @@ + + + + + + + + + diff --git a/OsmAnd/res/layout/dash_item_with_description_72dp.xml b/OsmAnd/res/layout/dash_item_with_description_72dp.xml new file mode 100644 index 0000000000..cf4bdf9f36 --- /dev/null +++ b/OsmAnd/res/layout/dash_item_with_description_72dp.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/edit_arrangement_list_fragment.xml b/OsmAnd/res/layout/edit_arrangement_list_fragment.xml index 2ec9131aee..ee9654d322 100644 --- a/OsmAnd/res/layout/edit_arrangement_list_fragment.xml +++ b/OsmAnd/res/layout/edit_arrangement_list_fragment.xml @@ -8,11 +8,7 @@ - - - - + android:layout_height="wrap_content" /> + android:layout_marginStart="@dimen/list_content_padding_large" /> + android:layout_marginLeft="@dimen/settings_divider_margin_start" + android:layout_marginStart="@dimen/settings_divider_margin_start" /> + android:paddingEnd="@dimen/list_header_padding" + android:paddingRight="@dimen/list_header_padding"> + android:layout_width="@dimen/favorites_icon_size" + android:layout_height="match_parent" + android:layout_gravity="center_vertical"> + tools:visibility="visible" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:contentDescription="@string/favorite" + android:scaleType="center" + tools:src="@drawable/bg_point_circle"/> + android:layout_marginStart="@dimen/favorites_icon_right_margin" + android:layout_marginLeft="@dimen/favorites_icon_right_margin" + android:layout_marginEnd="@dimen/favorites_icon_right_margin" + android:layout_marginRight="@dimen/favorites_icon_right_margin" + android:paddingTop="@dimen/context_menu_padding_margin_small" + android:paddingBottom="@dimen/context_menu_padding_margin_small"> + tools:text="@string/lorem_ipsum" /> + android:textSize="@dimen/default_desc_text_size" + tools:text="100500 km" /> + android:layout_marginStart="@dimen/list_item_button_padding" + android:layout_marginLeft="@dimen/list_item_button_padding" + android:contentDescription="@string/favorite_category_name" + android:src="@drawable/ic_small_group" /> + android:textSize="@dimen/default_desc_text_size" /> + android:visibility="gone" /> + android:visibility="gone" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_import.xml b/OsmAnd/res/layout/fragment_import.xml index ffc6165836..31237e535e 100644 --- a/OsmAnd/res/layout/fragment_import.xml +++ b/OsmAnd/res/layout/fragment_import.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/activity_background_basic"> + android:background="?attr/activity_background_color"> + android:background="?attr/activity_background_color"> + android:background="?attr/activity_background_color"> + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/gpx_track_select_dialog.xml b/OsmAnd/res/layout/gpx_track_select_dialog.xml new file mode 100644 index 0000000000..3a2c2ab41d --- /dev/null +++ b/OsmAnd/res/layout/gpx_track_select_dialog.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/gpx_track_select_item.xml b/OsmAnd/res/layout/gpx_track_select_item.xml new file mode 100644 index 0000000000..21e925e64b --- /dev/null +++ b/OsmAnd/res/layout/gpx_track_select_item.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OsmAnd/res/layout/list_group_title_with_descr.xml b/OsmAnd/res/layout/list_group_title_with_descr.xml index 5d2e429a58..4c48d7ba5e 100644 --- a/OsmAnd/res/layout/list_group_title_with_descr.xml +++ b/OsmAnd/res/layout/list_group_title_with_descr.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:minHeight="48dp" + android:minHeight="@dimen/setting_list_item_large_height" android:background="?attr/bg_color" android:gravity="center" android:orientation="vertical" @@ -34,9 +34,9 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="10dp" - android:textColor="?android:textColorPrimary" - android:textSize="@dimen/default_sub_text_size" + android:paddingTop="@dimen/content_padding_small" + android:textColor="@color/preference_category_title" + android:textSize="@dimen/default_desc_text_size" osmand:typeface="@string/font_roboto_medium" tools:text="Download map"/> @@ -44,18 +44,13 @@ android:id="@+id/description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="4dp" + android:paddingTop="@dimen/content_padding_half" + android:paddingBottom="@dimen/content_padding" android:textColor="?android:textColorSecondary" - android:textSize="@dimen/default_sub_text_size" - android:paddingBottom="10dp" + android:textSize="@dimen/default_desc_text_size" + osmand:typeface="@string/font_roboto_regular" tools:text="For view contour lines on the map, you need to download contour line map of this region."/> - - \ No newline at end of file diff --git a/OsmAnd/res/layout/list_item_description_with_image.xml b/OsmAnd/res/layout/list_item_description_with_image.xml new file mode 100644 index 0000000000..72f94ed955 --- /dev/null +++ b/OsmAnd/res/layout/list_item_description_with_image.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/list_item_icon_and_download.xml b/OsmAnd/res/layout/list_item_icon_and_download.xml index c4297147ce..7290321289 100644 --- a/OsmAnd/res/layout/list_item_icon_and_download.xml +++ b/OsmAnd/res/layout/list_item_icon_and_download.xml @@ -1,107 +1,123 @@ + android:gravity="center_vertical" + android:minHeight="@dimen/setting_list_item_large_height"> + android:layout_marginLeft="@dimen/list_content_padding" + android:layout_marginEnd="@dimen/list_content_padding" + android:layout_marginRight="@dimen/list_content_padding" + tools:src="@drawable/ic_map" /> - + android:layout_height="0dp" + android:layout_weight="1" + android:orientation="horizontal"> - + - + + + + + + + + + + +