From b9f540b999a2892af0521186e76daf1b35a4b772 Mon Sep 17 00:00:00 2001 From: Mario Rossi Date: Thu, 26 Mar 2020 10:09:14 +0000 Subject: [PATCH 01/21] Added translation using Weblate (Neapolitan) --- OsmAnd/res/values-nap/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 OsmAnd/res/values-nap/phrases.xml diff --git a/OsmAnd/res/values-nap/phrases.xml b/OsmAnd/res/values-nap/phrases.xml new file mode 100644 index 0000000000..a6b3daec93 --- /dev/null +++ b/OsmAnd/res/values-nap/phrases.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 73090884d976ae61ff10f2b9072329a0b64f0da7 Mon Sep 17 00:00:00 2001 From: Hakuchi Date: Thu, 26 Mar 2020 00:23:33 +0000 Subject: [PATCH 02/21] Translated using Weblate (German) Currently translated at 99.7% (3236 of 3244 strings) --- OsmAnd/res/values-de/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 23a8928f2e..6f90492317 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -24,7 +24,7 @@ Mautstelle Stoppzeichen Verkehrsberuhigung - Geschwindigkeitskontrolle + Blitzer Verkehrswarnung Favoriten in der Nähe Nahegelegene POI @@ -95,7 +95,7 @@ Auswahl eines Straßen-Farbschemas: Straßenfarbschema Warnungen anzeigen… - Verkehrswarnungen (Tempolimits, Stoppzeichen, Rüttelschwellen, Tunnel), stationäre Radarkontrollen und Fahrspuranzeige konfigurieren. + Verkehrswarnungen (Tempolimits, Stoppzeichen, Rüttelschwellen, Tunnel), Blitzerwarner und Fahrspuranzeige konfigurieren. Kompass verwenden, wenn keine andere Richtungsbestimmung möglich ist. Kompass verwenden Keine Autobahnen @@ -115,10 +115,10 @@ \n- Direktes Herunterladen von Länder- oder Regionenkarten aus der App heraus \n- Darstellung mehrerer überlagerter Kartenschichten wie GPX oder Navigations-Tracks, POIs (Orte von Interesse), Favoriten, Höhenlinien, ÖPNV-Haltestellen, zusätzliche Karten mit wählbarer Transparenz \n- Offline Adress- und POI-Suche -\n- Offlinenavigation für mittlere Entfernungen +\n- Offlinenavigation für mittlere Entfernungen \n- Auto-, Fahrrad- und Fußgänger-Modus wahlweise mit: \n - automatischer Tag-Nacht-Umschaltung der Anzeige -\n - geschwindigkeitsabhängigem Kartenmaßstab +\n - geschwindigkeitsabhängiger Kartenmaßstab \n - Kartenausrichtung nach Kompass oder Bewegungsrichtung \n - Fahrspuranzeige, Geschwindigkeitswarnung, aufgenommenen oder TTS-Sprachansagen \n @@ -1116,7 +1116,7 @@ Erweiterte Schärfentiefe (EDOF) Makrofokus-Modus (Nahaufnahme) Ansagen… - Ansagen zu Straßennamen, Verkehrswarnungen (Stoppzeichen, Rüttelschwellen), stationäre Radarkontrollen und Tempolimits konfigurieren. + Ansagen zu Straßennamen, Verkehrswarnungen (Stoppzeichen, Rüttelschwellen), Blitzerwarnern und Tempolimits konfigurieren. Straßennamen (TTS) FPS-Debug-Info Fahrregion wählen: USA, Europa, GB, Asien usw. @@ -3547,7 +3547,7 @@ Lon %2$s App-Standard (%s) Neuberechnung deaktivieren Mindestabstand für Neuberechnung der Route - "Die Route wird neu berechnet, wenn der Abstand zur Route größer ist als der festgelegte Wert " + Die Route wird neu berechnet, wenn der Abstand zur Route größer ist als der festgelegte Wert Benutzerdefiniertes Profil Winkel: %s° Winkel From d3863d5ca2f2886cfc372d8cb8eb82ae59ee8592 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 26 Mar 2020 05:18:47 +0000 Subject: [PATCH 03/21] Translated using Weblate (German) Currently translated at 99.7% (3236 of 3244 strings) --- OsmAnd/res/values-de/strings.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 6f90492317..ffe28cb622 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -3585,4 +3585,21 @@ Lon %2$s Wählen Sie die Entfernung, nach der die Route neu berechnet wird. Neuberechnung der Route im Falle einer Abweichung Die Route wird neu berechnet, wenn die Entfernung von der Route zur aktuellen Position größer als der ausgewählte Wert ist. + Alle Daten aus %1$s werden importiert. Sie können die Schaltflächen unten verwenden, um den benötigten Teil der Anwendung zu öffnen, um sie zu verwalten. + Quadrat + Raute + Kreis + Form auswählen + Gruppe auswählen + Beschreibung hinzufügen + Beschreibung löschen + Eine Schaltfläche zum Ein- und Ausblenden der Geländeebene auf der Karte. + Gelände einblenden + Gelände ausblenden + Gelände ein-/ausblenden + Schummerung + Zoomstufen + Transparenz + Stellen Sie die minimale und maximale Zoomstufe ein, bei der die Ebene angezeigt wird. + Gelände \ No newline at end of file From 7bcedbf1f9f5a796e4109f31083452a8e20b7da9 Mon Sep 17 00:00:00 2001 From: anonymous Date: Thu, 26 Mar 2020 01:34:40 +0000 Subject: [PATCH 04/21] Translated using Weblate (German) Currently translated at 99.9% (3797 of 3798 strings) --- OsmAnd/res/values-de/phrases.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 7005ec5752..7fd67fc948 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -2004,7 +2004,7 @@ mit Geschäften Einzelhandel Fahrradeinzelhandel: nein - Verkauf + Reparatur Fahrradreparatur: nein Verleih Fahrradverleih: nein @@ -3672,9 +3672,9 @@ Zufahrt Wohnwagen: nein Zufahrt Wohnmobil: nein Anbindung Linienbus: nein - Reisebuszufahrt: ja - Reisebuszufahrt: ausgewiesen - Reisebuszufahrt: nein + Zufahrt Reisebus: ja + Zufahrt Reisebus: ausgewiesen + Zufahrt Reisebus: nein Zufahrt Ski: ja Zufahrt Ski: nein Zufahrt Schneemobil: privat @@ -3683,8 +3683,8 @@ Zufahrt öffentliche Verkehrsmittel: ja Zufahrt öffentliche Verkehrsmittel: ausgewiesen Zufahrt öffentliche Verkehrsmittel: nein - Zufahrt Bus: ja - Zufahrt Bus: nein + Zufahrt Fernbus: ja + Zufahrt Fernbus: nein Zufahrt Schneemobil: nein Zufahrt landwirtschaftliche Fahrzeuge: ja Zufahrt landwirtschaftliche Fahrzeuge: nein From 8224f33f640519380dc5213fb6530e21eba2f79c Mon Sep 17 00:00:00 2001 From: Hakuchi Date: Thu, 26 Mar 2020 01:39:02 +0000 Subject: [PATCH 05/21] Translated using Weblate (German) Currently translated at 99.9% (3797 of 3798 strings) --- OsmAnd/res/values-de/phrases.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 7fd67fc948..040c019a0d 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3736,7 +3736,7 @@ Bargeldbezug Betreiber der Bargeldauszahlungen Bargeldbezugsart: Kasse - Bargeldbezugsart: Selbstzahlerkasse + Bargeldbezugsart: Selbstbedienungskasse Bargeldbezugslimit Bargeldbezugswährung Bargeldbezug: Kauf erforderlich @@ -3805,7 +3805,7 @@ Kontrastiert Falsch Stand - Standtyp + Unterstand Typ Primitiv Wasserstand: teilweise überflutet Wasserstand: überflutet @@ -3820,5 +3820,5 @@ Trinkwassernachfüllung: ja Trinkwassernachfüllung: nein Trinkwassernachfüllnetz - Internetzugang Gebühr für Kunden + \ No newline at end of file From e3c179e6d1b2662a5cb74da1479fc3649a54fab6 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 26 Mar 2020 02:29:12 +0000 Subject: [PATCH 06/21] Translated using Weblate (German) Currently translated at 99.9% (3797 of 3798 strings) --- OsmAnd/res/values-de/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 040c019a0d..32b94f9d14 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3804,7 +3804,7 @@ Nur wenn Gehen erlaubt ist Kontrastiert Falsch - Stand + Unterstand Unterstand Typ Primitiv Wasserstand: teilweise überflutet From 46064351675ae2ac943da7978fbbe280cbf528f2 Mon Sep 17 00:00:00 2001 From: Dima-1 Date: Thu, 26 Mar 2020 23:15:42 +0200 Subject: [PATCH 07/21] Fix get poi_category from resource, fix UI --- OsmAnd/.gitignore | 1 + OsmAnd/build.gradle | 11 +++-- OsmAnd/res/layout/point_editor_button.xml | 45 ++++++++++--------- .../res/layout/point_editor_fragment_new.xml | 9 ++-- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore index e5e11b5485..59c852486d 100644 --- a/OsmAnd/.gitignore +++ b/OsmAnd/.gitignore @@ -50,6 +50,7 @@ use/ osmand.properties osmand.xml assets/style.css +assets/poi_categories.json assets/help/*.html assets/help/images assets/help/screens diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 7dac21bbef..edd12e7854 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -323,7 +323,6 @@ task cleanNoTranslate(type: Delete) { delete('res/values/no_translate.xml') } - task collectFonts(type: Copy) { from "../../resources/fonts" from "../../resources/rendering_styles/fonts" @@ -339,7 +338,6 @@ task collectHelpContentsStyle(type: Copy) { into "assets" } - task collectHelpContentsAssets(type: Copy) { from("../../help/website/help") { include "about.html" @@ -351,11 +349,15 @@ task collectHelpContentsAssets(type: Copy) { from("../../help/website/feature_articles") { include "*.html" } - into "assets/feature_articles" } - +task copyPoiCategiry(type: Copy) { + from("../../resources/poi") { + include "poi_categories.json" + } + into "assets" +} task copyStyleIcons(type: Copy) { from "../../resources/rendering_styles/style-icons/" @@ -378,6 +380,7 @@ task collectExternalResources { updateNoTranslate, validateTranslate, copyWidgetIcons, + copyPoiCategiry, downloadWorldMiniBasemap Gradle gradle = getGradle() diff --git a/OsmAnd/res/layout/point_editor_button.xml b/OsmAnd/res/layout/point_editor_button.xml index d869f6b275..7f0fe380eb 100644 --- a/OsmAnd/res/layout/point_editor_button.xml +++ b/OsmAnd/res/layout/point_editor_button.xml @@ -9,26 +9,31 @@ android:paddingRight="9dp" android:paddingBottom="4dp"> - - - + android:layout_height="wrap_content"> - + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml index f7871b1634..497df33362 100644 --- a/OsmAnd/res/layout/point_editor_fragment_new.xml +++ b/OsmAnd/res/layout/point_editor_fragment_new.xml @@ -100,8 +100,8 @@ + android:paddingBottom="@dimen/content_padding_half"> Date: Fri, 27 Mar 2020 03:48:00 +0000 Subject: [PATCH 08/21] Translated using Weblate (German) Currently translated at 100.0% (3798 of 3798 strings) --- OsmAnd/res/values-de/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 32b94f9d14..8260666f5e 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3820,5 +3820,5 @@ Trinkwassernachfüllung: ja Trinkwassernachfüllung: nein Trinkwassernachfüllnetz - + Internetzugangs Gebühr für Kunden \ No newline at end of file From d78886267622a4a6be86e9dd5bb2ae28b0fcfe2d Mon Sep 17 00:00:00 2001 From: Hakuchi Date: Fri, 27 Mar 2020 03:42:38 +0000 Subject: [PATCH 09/21] Translated using Weblate (German) Currently translated at 99.9% (3241 of 3244 strings) --- OsmAnd/res/values-de/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index ffe28cb622..a7aead9a5c 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -3602,4 +3602,9 @@ Lon %2$s Transparenz Stellen Sie die minimale und maximale Zoomstufe ein, bei der die Ebene angezeigt wird. Gelände + Hänge + Aktivieren Sie diese Option, um die Schatten- oder Hangkarte anzuzeigen. Weitere Informationen zu diesen Kartentypen finden Sie auf unserer Website + Legende + Lesen Sie mehr über Hänge in %1$s. + Zusätzliche Karten sind erforderlich, um Hänge auf der Karte anzuzeigen. \ No newline at end of file From 13d8a00d25dc2b5779d39f5d586cd6305514d928 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Thu, 26 Mar 2020 17:01:00 +0000 Subject: [PATCH 10/21] Translated using Weblate (Basque) Currently translated at 100.0% (3244 of 3244 strings) --- OsmAnd/res/values-eu/strings.xml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index e519de1142..433f5f05cd 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -3452,7 +3452,7 @@ Area honi dagokio: %1$s x %2$s Albo-efektua: Zehaztasunaren arabera iragaztearen ondorioz, puntuak falta daitezke, adibidez, zubien azpian, zuhaitzen azpian, eraikin altuen artean, edo eguraldi jakin batzuekin. Gomendioa: Zaila da zer grabatuko den eta zer ez aurreikustea, agian egokiena iragazki hau desaktibatzea da. Berrantolatu kategoriak - Kategoria pertsonalizatuak gehitu ditzakezu, beharrezkotzat jotzen ez dituzun kategoriak ezkutatu, eta zerrendaren ordena aldatu. Zerrenda profilekin inportatu eta esportatu daiteke. + Aldatu zerrendaren ordena, ezkutatu behar ez dituzun kategoriak. Aldaketa guztiak profilekin inportatu eta esportatu daiteke. Kategoria pertsonalizatu berri bat gehi dezakezu behar diren kategoria bat edo batzuk hautatuta. Lehenetsitakoak berrezartzea ordenazio irizpidea instalazioaren unekora itzuliko du. Eskuragarri @@ -3586,4 +3586,31 @@ Area honi dagokio: %1$s x %2$s Gehitutako elementuak Inportazioa burututa %1$s-ko datu guztiak inportatuta, beheko botoiak erabili ditzakezu kudeatzeko behar duzun aplikazioaren atala irekitzeko. + Ibilbidea birkalkulatuko da ibilbidetik uneko punturainoko distantzia hautatutako balioa baino handiagoa bada. + Hautatu ibilbidea birkalkulatzeko distantzia. + Birkalkulatu ibilbidea desbideratzekotan + Laukia + Erronboa + Zirkulua + Hautatu forma + Hautatu taldea + Gehitu deskripzioa + Ezabatu deskripzioa + Mapako terreno geruza erakutsi edo ezkutatzeko botoia. + Erakutsi terrenoa + Ezkutatu terrenoa + Erakutsi/ezkutatu terrenoa + Maldak + Erliebea + Gaitu erliebea edo malda mapa ikusteko. Mapa mota honi buruz gehiago irakur dezakezu gure gunean + Legenda + Zoom mailak + Gardentasuna + Gehiago irakurri dezakezu maldei buruz hemen: %1$s. + Mapa gehigarriak behar dira Maldak mapan ikusteko. + Mapa gehigarriak behar dira erliebea mapan ikusteko. + Ezarri geruza bistaratuko den gutxieneko eta gehieneko zoom maila. + Malda terrenoaren koloreztatutako ikuspegiak dira. + Eman erliebea mapari itzalak erabiliz maldak, gailurrak eta behe-lauak erakusteko. + Terrenoa \ No newline at end of file From 9e89516805548812d303e18d7bc1fc5f922b4a29 Mon Sep 17 00:00:00 2001 From: Mario Rossi Date: Thu, 26 Mar 2020 10:42:15 +0000 Subject: [PATCH 11/21] Translated using Weblate (Italian) Currently translated at 90.1% (2924 of 3244 strings) --- OsmAnd/res/values-it/strings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index dd25ad98cf..e54c2b20e6 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -3568,4 +3568,26 @@ Rappresenta l\'area: %1$s x %2$s Ripristinare tutte le impostazioni del profilo\? Salvataggio del nuovo profilo Impossibile fare una copia di salvataggio del profilo. + Sei sicuro di voler eliminare i dati registrati\? + Importazione dei dati da %1$s + Importazione in corso + Oggetti aggiunti + Importazione completata + Tutti i dati sono stati importati da %1$s, puoi utilizzare i bottoni sottostanti per aprire e gestire le parti dell\' applicazione di cui necessiti. + Il percorso verrà ricalcolato quando la distanza tra il percorso e la propria posizione è maggiore del valore selezionato. + Seleziona dopo che distanza effettuare il ricalcolo del percorso. + Ricalcola il percorso in caso di deviazione + Quadrato + Rombo + Cerchio + Seleziona la forma + Seleziona il gruppo + Aggiungi descrizione + Elimina descrizione + Un bottone per mostrare o nascondere la vista rilievo sulla mappa. + Mostra rilievo + Nascondi rilievo + Mostra/nascondi rilievo + Pendenze + Rilievi ombra \ No newline at end of file From b6820690118ef25a0f665aa87a0692d3a7e17e27 Mon Sep 17 00:00:00 2001 From: Hakuchi Date: Fri, 27 Mar 2020 03:49:56 +0000 Subject: [PATCH 12/21] Translated using Weblate (German) Currently translated at 100.0% (3798 of 3798 strings) --- OsmAnd/res/values-de/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 8260666f5e..3ce60f792b 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3820,5 +3820,5 @@ Trinkwassernachfüllung: ja Trinkwassernachfüllung: nein Trinkwassernachfüllnetz - Internetzugangs Gebühr für Kunden + Internetzugangsgebühr für Kunden \ No newline at end of file From 190576a3751b4608fb2a01e7cf26613188a59bc2 Mon Sep 17 00:00:00 2001 From: Alexander Gabilondo Date: Thu, 26 Mar 2020 21:55:58 +0000 Subject: [PATCH 13/21] Translated using Weblate (Basque) Currently translated at 76.4% (204 of 267 strings) Translation: OsmAnd/Telegram Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/eu/ --- OsmAnd-telegram/res/values-eu/strings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OsmAnd-telegram/res/values-eu/strings.xml b/OsmAnd-telegram/res/values-eu/strings.xml index d34b0b82ef..200be3dc54 100644 --- a/OsmAnd-telegram/res/values-eu/strings.xml +++ b/OsmAnd-telegram/res/values-eu/strings.xml @@ -194,4 +194,15 @@ Zehaztu abiadura unitatea. Abiadura unitatea ERR + Hautatu ordu-zona zure kokapen-mezuetan erakusteko. + Ordu zona + Bufferraren puntuak gordetzeko gehieneko denbora + Bufferraren iraungitze-denbora + Iradokita + OsmAnd Tracker-en egoera + Atzera OsmAnd-era + Azken erantzuna: %1$s + "Telegram-en azken eguneraketa duela %1$s" + Azken erantzuna duela %1$s + duela %1$s \ No newline at end of file From d2f05625f6e910dbae8439ad95aa9e4a47d5214a Mon Sep 17 00:00:00 2001 From: Dima-1 Date: Fri, 27 Mar 2020 16:37:56 +0200 Subject: [PATCH 14/21] Fix UI, fix count gpx points in category --- OsmAnd/res/drawable/ripple_solid_dark_6dp.xml | 9 ++ .../res/drawable/ripple_solid_light_6dp.xml | 9 ++ .../res/layout/point_editor_fragment_new.xml | 18 +-- .../FavoritePointEditorFragmentNew.java | 33 +++-- .../editors/PointEditorFragmentNew.java | 123 +++++++++++------- .../editors/WptPtEditorFragmentNew.java | 10 +- 6 files changed, 132 insertions(+), 70 deletions(-) create mode 100644 OsmAnd/res/drawable/ripple_solid_dark_6dp.xml create mode 100644 OsmAnd/res/drawable/ripple_solid_light_6dp.xml diff --git a/OsmAnd/res/drawable/ripple_solid_dark_6dp.xml b/OsmAnd/res/drawable/ripple_solid_dark_6dp.xml new file mode 100644 index 0000000000..0c7c583814 --- /dev/null +++ b/OsmAnd/res/drawable/ripple_solid_dark_6dp.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/ripple_solid_light_6dp.xml b/OsmAnd/res/drawable/ripple_solid_light_6dp.xml new file mode 100644 index 0000000000..4a0883938a --- /dev/null +++ b/OsmAnd/res/drawable/ripple_solid_light_6dp.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml index 497df33362..b31c52530c 100644 --- a/OsmAnd/res/layout/point_editor_fragment_new.xml +++ b/OsmAnd/res/layout/point_editor_fragment_new.xml @@ -22,8 +22,6 @@ android:layout_height="@dimen/dashboard_map_toolbar" android:background="?attr/card_and_list_background_basic" android:minHeight="@dimen/dashboard_map_toolbar" - app:contentInsetLeft="72dp" - app:contentInsetStart="72dp" osmand:subtitleTextColor="?android:textColorPrimary" osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar" osmand:titleTextColor="?android:textColorPrimary"> @@ -37,6 +35,8 @@ android:scaleType="center" android:src="@drawable/ic_action_replace" android:layout_marginRight="@dimen/content_padding_half" + android:layout_marginStart="@dimen/content_padding_half" + android:layout_marginLeft="@dimen/content_padding_half" android:layout_marginEnd="@dimen/content_padding_half" /> @@ -191,7 +191,7 @@ android:text="@string/select_group" android:textColor="?android:textColorSecondary" android:textSize="@dimen/default_desc_text_size" - osmand:typeface="@string/font_roboto_regular" /> + osmand:typeface="@string/font_roboto_medium" /> + osmand:typeface="@string/font_roboto_medium" /> + osmand:typeface="@string/font_roboto_medium" /> + osmand:typeface="@string/font_roboto_medium" /> + osmand:typeface="@string/font_roboto_medium" /> + osmand:typeface="@string/font_roboto_medium" /> diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java index 816dd89d26..f4b6c09e64 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java @@ -47,14 +47,14 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { private BackgroundType backgroundType = BackgroundType.CIRCLE; @Nullable - FavouritesDbHelper helper; + private FavouritesDbHelper helper; private boolean autoFill; private boolean saved; private int defaultColor; @Override - public void onAttach(Context context) { + public void onAttach(@NonNull Context context) { super.onAttach(context); MapActivity mapActivity = getMapActivity(); if (mapActivity != null) { @@ -129,7 +129,7 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { return editor; } - public FavoritePointEditor getFavoritePointEditor() { + private FavoritePointEditor getFavoritePointEditor() { return editor; } @@ -422,17 +422,23 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { @Override public Set getCategories() { Set categories = new LinkedHashSet<>(); - for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) { - categories.add(fg.getDisplayName(getMyApplication())); + FavouritesDbHelper helper = getHelper(); + if (helper != null) { + for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) { + categories.add(fg.getDisplayName(getMyApplication())); + } } return categories; } @Override - public int getCategoryPoints(String category) { - for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) { - if (fg.getDisplayName(getMyApplication()).equals(category)) { - return fg.getPoints().size(); + public int getCategoryPointsCount(String category) { + FavouritesDbHelper helper = getHelper(); + if (helper != null) { + for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) { + if (fg.getDisplayName(getMyApplication()).equals(category)) { + return fg.getPoints().size(); + } } } return 0; @@ -440,9 +446,12 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew { @Override public int getCategoryColor(String category) { - for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) { - if (fg.getDisplayName(getMyApplication()).equals(category)) { - return fg.getColor(); + FavouritesDbHelper helper = getHelper(); + if (helper != null) { + for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) { + if (fg.getDisplayName(getMyApplication()).equals(category)) { + return fg.getColor(); + } } } return defaultColor; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java index 0ace25c96b..61136d3c7d 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java @@ -1,15 +1,12 @@ package net.osmand.plus.mapcontextmenu.editors; -import android.annotation.TargetApi; import android.app.Activity; -import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Build; import android.os.Bundle; import android.os.IBinder; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,7 +35,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.textfield.TextInputLayout; import net.osmand.AndroidUtils; -import net.osmand.data.FavouritePoint; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; @@ -59,8 +55,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Set; +import static net.osmand.data.FavouritePoint.*; import static net.osmand.plus.FavouritesDbHelper.FavoriteGroup.PERSONAL_CATEGORY; import static net.osmand.plus.FavouritesDbHelper.FavoriteGroup.isPersonalCategoryDisplayName; +import static net.osmand.util.Algorithms.capitalizeFirstLetter; public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { @@ -73,13 +71,13 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { private int selectedIcon; @ColorInt private int selectedColor; - private FavouritePoint.BackgroundType selectedShape = FavouritePoint.BackgroundType.CIRCLE; + private BackgroundType selectedShape = BackgroundType.CIRCLE; private ImageView nameIcon; private GroupAdapter groupListAdapter; private int scrollViewY; private RecyclerView groupRecyclerView; private String selectedIconCategory; - private LinkedHashMap group; + private LinkedHashMap iconCategories; private OsmandApplication app; @Override @@ -284,6 +282,12 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { private View createColorItemView(@ColorRes final int color, final FlowLayout rootView) { FrameLayout colorItemView = (FrameLayout) UiUtilities.getInflater(getContext(), nightMode) .inflate(R.layout.point_editor_button, rootView, false); + ImageView outline = colorItemView.findViewById(R.id.outline); + outline.setImageDrawable( + UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle_contour), + ContextCompat.getColor(app, + nightMode ? R.color.stroked_buttons_and_links_outline_dark + : R.color.stroked_buttons_and_links_outline_light))); ImageView backgroundCircle = colorItemView.findViewById(R.id.background); AndroidUtils.setBackground(backgroundCircle, UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle), color)); @@ -304,8 +308,9 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { ImageView icon = oldColor.findViewById(R.id.icon); icon.setImageDrawable(UiUtilities.tintDrawable(icon.getDrawable(), R.color.icon_color_default_light)); } - if (rootView.findViewWithTag(color) != null) { - rootView.findViewWithTag(color).findViewById(R.id.outline).setVisibility(View.VISIBLE); + View newColor = rootView.findViewWithTag(color); + if (newColor != null) { + newColor.findViewById(R.id.outline).setVisibility(View.VISIBLE); } ((TextView) view.findViewById(R.id.color_name)).setText(ColorDialogs.getColorName(color)); selectedColor = color; @@ -317,18 +322,16 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { private void createShapeSelector() { FlowLayout selectShape = view.findViewById(R.id.select_shape); - for (FavouritePoint.BackgroundType backgroundType : FavouritePoint.BackgroundType.values()) { + for (BackgroundType backgroundType : BackgroundType.values()) { selectShape.addView(createShapeItemView(backgroundType, selectShape), new FlowLayout.LayoutParams(0, 0)); } } - private View createShapeItemView(final FavouritePoint.BackgroundType backgroundType, final FlowLayout rootView) { + private View createShapeItemView(final BackgroundType backgroundType, final FlowLayout rootView) { FrameLayout shapeItemView = (FrameLayout) UiUtilities.getInflater(getContext(), nightMode) .inflate(R.layout.point_editor_button, rootView, false); ImageView background = shapeItemView.findViewById(R.id.background); - AndroidUtils.setBackground(background, - UiUtilities.tintDrawable(ContextCompat.getDrawable(app, backgroundType.getIconId()), - ContextCompat.getColor(app, R.color.divider_color_light))); + setShapeSelectorBackground(backgroundType, background); ImageView outline = shapeItemView.findViewById(R.id.outline); outline.setImageDrawable(getOutlineDrawable(backgroundType.getIconId())); background.setOnClickListener(new View.OnClickListener() { @@ -344,22 +347,21 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { private Drawable getOutlineDrawable(int iconId) { String iconName = app.getResources().getResourceName(iconId); int iconRes = app.getResources().getIdentifier(iconName + "_contour", "drawable", app.getPackageName()); - return app.getUIUtilities().getIcon(iconRes, R.color.divider_color_light); + return app.getUIUtilities().getIcon(iconRes, + nightMode ? R.color.stroked_buttons_and_links_outline_dark : R.color.stroked_buttons_and_links_outline_light); } - private void updateShapeSelector(FavouritePoint.BackgroundType backgroundType, View rootView) { + private void updateShapeSelector(BackgroundType backgroundType, View rootView) { View oldShape = rootView.findViewWithTag(selectedShape); if (oldShape != null) { oldShape.findViewById(R.id.outline).setVisibility(View.INVISIBLE); ImageView background = oldShape.findViewById(R.id.background); - AndroidUtils.setBackground(background, - UiUtilities.tintDrawable(ContextCompat.getDrawable(app, selectedShape.getIconId()), - ContextCompat.getColor(app, R.color.divider_color_light))); + setShapeSelectorBackground(selectedShape, background); } - rootView.findViewWithTag(backgroundType).findViewById(R.id.outline).setVisibility(View.VISIBLE); + View newShape = rootView.findViewWithTag(backgroundType); + newShape.findViewById(R.id.outline).setVisibility(View.VISIBLE); ((TextView) rootView.findViewById(R.id.shape_name)).setText(backgroundType.getNameId()); - - ImageView background = rootView.findViewWithTag(backgroundType).findViewById(R.id.background); + ImageView background = newShape.findViewById(R.id.background); AndroidUtils.setBackground(background, UiUtilities.tintDrawable(ContextCompat.getDrawable(app, backgroundType.getIconId()), selectedColor)); @@ -368,15 +370,23 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { updateNameIcon(); } + private void setShapeSelectorBackground(BackgroundType backgroundType, ImageView background) { + AndroidUtils.setBackground(background, + UiUtilities.tintDrawable(ContextCompat.getDrawable(app, backgroundType.getIconId()), + ContextCompat.getColor(app, + nightMode ? R.color.inactive_buttons_and_links_bg_dark + : R.color.inactive_buttons_and_links_bg_light))); + } + private void createIconSelector() { - group = new LinkedHashMap<>(); + iconCategories = new LinkedHashMap<>(); try { JSONObject obj = new JSONObject(loadJSONFromAsset()); JSONObject categories = obj.getJSONObject("categories"); for (int i = 0; i < categories.length(); i++) { JSONArray names = categories.names(); JSONObject icons = categories.getJSONObject(names.get(i).toString()); - group.put(names.get(i).toString(), icons.getJSONArray("icons")); + iconCategories.put(names.get(i).toString(), icons.getJSONArray("icons")); } } catch (JSONException e) { e.printStackTrace(); @@ -386,19 +396,19 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { } private String getInitCategory() { - for (int j = 0; j < group.values().size(); j++) { - JSONArray iconJsonArray = (JSONArray) group.values().toArray()[j]; + for (int j = 0; j < iconCategories.values().size(); j++) { + JSONArray iconJsonArray = (JSONArray) iconCategories.values().toArray()[j]; for (int i = 0; i < iconJsonArray.length(); i++) { try { if (iconJsonArray.getString(i).equals(getNameFromIconId(getIconId()))) { - return (String) group.keySet().toArray()[j]; + return (String) iconCategories.keySet().toArray()[j]; } } catch (JSONException e) { e.printStackTrace(); } } } - return group.keySet().iterator().next(); + return iconCategories.keySet().iterator().next(); } private String getNameFromIconId(int iconId) { @@ -408,7 +418,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { private void createIconForCategory() { FlowLayout selectIcon = view.findViewById(R.id.select_icon); selectIcon.removeAllViews(); - JSONArray iconJsonArray = group.get(selectedIconCategory); + JSONArray iconJsonArray = iconCategories.get(selectedIconCategory); if (iconJsonArray != null) { List iconNameList = new ArrayList<>(); for (int i = 0; i < iconJsonArray.length(); i++) { @@ -418,12 +428,12 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { e.printStackTrace(); } } - GroupNameAdapter groupNameListAdapter = new GroupNameAdapter(); - groupNameListAdapter.setItems(new ArrayList<>(group.keySet())); + IconCategoriesAdapter iconCategoriesAdapter = new IconCategoriesAdapter(); + iconCategoriesAdapter.setItems(new ArrayList<>(iconCategories.keySet())); RecyclerView groupNameRecyclerView = view.findViewById(R.id.group_name_recycler_view); - groupNameRecyclerView.setAdapter(groupNameListAdapter); + groupNameRecyclerView.setAdapter(iconCategoriesAdapter); groupNameRecyclerView.setLayoutManager(new LinearLayoutManager(app, RecyclerView.HORIZONTAL, false)); - groupNameListAdapter.notifyDataSetChanged(); + iconCategoriesAdapter.notifyDataSetChanged(); for (String name : iconNameList) { selectIcon.addView(createIconItemView(name, selectIcon), new FlowLayout.LayoutParams(0, 0)); } @@ -433,10 +443,14 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { private View createIconItemView(final String iconName, final ViewGroup rootView) { FrameLayout iconItemView = (FrameLayout) UiUtilities.getInflater(getContext(), nightMode) .inflate(R.layout.point_editor_button, rootView, false); + ImageView outline = iconItemView.findViewById(R.id.outline); + outline.setImageDrawable( + UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle_contour), + ContextCompat.getColor(app, + nightMode ? R.color.stroked_buttons_and_links_outline_dark + : R.color.stroked_buttons_and_links_outline_light))); ImageView backgroundCircle = iconItemView.findViewById(R.id.background); - AndroidUtils.setBackground(backgroundCircle, - UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle), - ContextCompat.getColor(app, R.color.divider_color_light))); + setIconSelectorBackground(backgroundCircle); ImageView icon = iconItemView.findViewById(R.id.icon); icon.setVisibility(View.VISIBLE); final int iconRes = app.getResources().getIdentifier("mx_" + iconName, "drawable", app.getPackageName()); @@ -456,11 +470,8 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { if (oldIcon != null) { oldIcon.findViewById(R.id.outline).setVisibility(View.INVISIBLE); ImageView background = oldIcon.findViewById(R.id.background); - AndroidUtils.setBackground(background, - UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle), - ContextCompat.getColor(app, R.color.divider_color_light))); + setIconSelectorBackground(background); } - View icon = rootView.findViewWithTag(iconRes); if (icon != null) { icon.findViewById(R.id.outline).setVisibility(View.VISIBLE); @@ -473,6 +484,14 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { updateNameIcon(); } + private void setIconSelectorBackground(ImageView backgroundCircle) { + AndroidUtils.setBackground(backgroundCircle, + UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle), + ContextCompat.getColor(app, nightMode + ? R.color.inactive_buttons_and_links_bg_dark + : R.color.inactive_buttons_and_links_bg_light))); + } + private void updateNameIcon() { if (nameIcon != null) { nameIcon.setImageDrawable(getNameIcon()); @@ -652,11 +671,11 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { public abstract int getCategoryColor(String category); - public abstract int getCategoryPoints(String category); + public abstract int getCategoryPointsCount(String category); public abstract void setColor(int color); - public abstract void setBackgroundType(FavouritePoint.BackgroundType backgroundType); + public abstract void setBackgroundType(BackgroundType backgroundType); public abstract void setIcon(int iconId); @@ -674,7 +693,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { public abstract int getPointColor(); - public abstract FavouritePoint.BackgroundType getBackgroundType(); + public abstract BackgroundType getBackgroundType(); public abstract int getIconId(); @@ -776,7 +795,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { int color = categoryColor == 0 ? getDefaultColor() : categoryColor; holder.groupIcon.setImageDrawable(UiUtilities.tintDrawable( ContextCompat.getDrawable(app, R.drawable.ic_action_folder), color)); - holder.pointsCounter.setText(String.valueOf(getCategoryPoints(group))); + holder.pointsCounter.setText(String.valueOf(getCategoryPointsCount(group))); int strokeColor; int strokeWidth; if (selectedItemName != null && selectedItemName.equals(items.get(position))) { @@ -784,17 +803,20 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { R.color.active_color_primary_dark : R.color.active_color_primary_light); strokeWidth = 2; } else { - strokeColor = ContextCompat.getColor(app, R.color.divider_color_light); + strokeColor = ContextCompat.getColor(app, nightMode ? R.color.stroked_buttons_and_links_outline_dark + : R.color.stroked_buttons_and_links_outline_light); strokeWidth = 1; } - GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.bg_select_group_button_outline); + GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, + R.drawable.bg_select_group_button_outline); if (rectContourDrawable != null) { rectContourDrawable.setStroke(AndroidUtils.dpToPx(app, strokeWidth), strokeColor); holder.groupButton.setImageDrawable(rectContourDrawable); } } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - AndroidUtils.setBackground(app, holder.groupButton, nightMode, R.drawable.ripple_solid_light, R.drawable.ripple_solid_dark); + AndroidUtils.setBackground(app, holder.groupButton, nightMode, R.drawable.ripple_solid_light_6dp, + R.drawable.ripple_solid_dark_6dp); } } @@ -833,7 +855,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { } } - class GroupNameAdapter extends RecyclerView.Adapter { + class IconCategoriesAdapter extends RecyclerView.Adapter { List items; @@ -862,11 +884,13 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { textView.setTextColor(ContextCompat.getColor(app, R.color.preference_category_title)); GradientDrawable buttonBackground = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.bg_select_icon_group_button).mutate(); - buttonBackground.setStroke(AndroidUtils.dpToPx(app, 1), ContextCompat.getColor(app, R.color.divider_color_light)); + buttonBackground.setStroke(AndroidUtils.dpToPx(app, 1), ContextCompat.getColor(app, + nightMode ? R.color.stroked_buttons_and_links_outline_dark + : R.color.stroked_buttons_and_links_outline_light)); buttonBackground.setColor(ContextCompat.getColor(app, R.color.color_transparent)); AndroidUtils.setBackground(holder.button, buttonBackground); } - textView.setText(category); + textView.setText(capitalizeFirstLetter(category)); holder.button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -886,6 +910,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment { static class NameViewHolder extends RecyclerView.ViewHolder { final TextView buttonText; final LinearLayout button; + NameViewHolder(@NonNull View itemView) { super(itemView); buttonText = itemView.findViewById(R.id.button_text); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java index 99d6423f54..a4b3d17dab 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java @@ -31,6 +31,7 @@ import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener; import net.osmand.util.Algorithms; import java.io.File; +import java.util.List; import java.util.Map; import java.util.Set; @@ -449,7 +450,14 @@ public class WptPtEditorFragmentNew extends PointEditorFragmentNew { } @Override - public int getCategoryPoints(String category) { + public int getCategoryPointsCount(String category) { + WptPtEditor editor = getWptPtEditor(); + if (editor != null) { + List points = editor.getGpxFile().getPointsByCategories().get(category); + if (points != null) { + return points.size(); + } + } return 0; } From fb07417c5eabe2ad956d8847809295aec6c523db Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 27 Mar 2020 19:02:04 +0200 Subject: [PATCH 15/21] Update favorites shapes sizes --- OsmAnd/res/drawable/bg_point_octagon.xml | 10 +++++----- OsmAnd/res/drawable/bg_point_square.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/drawable/bg_point_octagon.xml b/OsmAnd/res/drawable/bg_point_octagon.xml index 31cb20bb90..3485c408c0 100644 --- a/OsmAnd/res/drawable/bg_point_octagon.xml +++ b/OsmAnd/res/drawable/bg_point_octagon.xml @@ -1,9 +1,9 @@ + android:width="36dp" + android:height="36dp" + android:viewportWidth="36" + android:viewportHeight="36"> diff --git a/OsmAnd/res/drawable/bg_point_square.xml b/OsmAnd/res/drawable/bg_point_square.xml index f964af876a..c6128d83e3 100644 --- a/OsmAnd/res/drawable/bg_point_square.xml +++ b/OsmAnd/res/drawable/bg_point_square.xml @@ -1,9 +1,9 @@ + android:width="36dp" + android:height="36dp" + android:viewportWidth="36" + android:viewportHeight="36"> From 51e1fbcbd9f80860b878288343e14db04824be54 Mon Sep 17 00:00:00 2001 From: WaldiS Date: Fri, 27 Mar 2020 16:41:40 +0000 Subject: [PATCH 16/21] Translated using Weblate (Polish) Currently translated at 99.3% (3223 of 3245 strings) --- OsmAnd/res/values-pl/strings.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 5650ceca58..a9f9dd2b7e 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -3459,7 +3459,7 @@ Reprezentuje obszar: %1$s x %2$s Uwierzytelniono Efekt uboczny: trasa nie będzie zawierała sekcji, w których nie zostało spełnione kryterium minimalnej prędkości (np. podczas pchania roweru pod strome wzgórze). Nie będzie również zawierała informacji o czasach odpoczynku, np. przerwach. Ma to wpływ na analizę i przetwarzanie końcowe, np. przy próbie określenia całkowitej długości trasy, czasu w ruchu lub średniej prędkości. Zmień układ kategorii - Można dodać niestandardowe kategorie, ukryć kategorie, które są niepotrzebne i zmienić kolejność sortowania listy. Listę można importować i eksportować wraz z profilami. + Zmień kolejność sortowania listy, ukryj niepotrzebne kategorie. Wszystkie zmiany można importować lub eksportować za pomocą profili. Można dodać nową, niestandardową kategorię wybierając jedną lub kilka potrzebnych kategorii. Dostępne Dodaj niestandardową kategorię @@ -3576,4 +3576,26 @@ Reprezentuje obszar: %1$s x %2$s Dodano elementy Zakończono importowanie Zaimportowano wszystkie dane z %1$s. Można użyć poniższych przycisków, aby otworzyć wymaganą cześć aplikacji w celu zarządzania nią. + Trasa zostanie ponownie obliczona, jeśli odległość od trasy do bieżącej lokalizacji jest większa niż wybrana wartość. + Wybierz odległość, po której trasa zostanie ponownie obliczona. + Przelicz trasę w przypadku odchylenia + Wybierz grupę + Dodaj opis + Usuń opis + Przycisk do wyświetlania lub ukrywania warstwy terenu na mapie. + Pokaż teren + Ukryj miejscowości + Pokaż/Ukryj miejscowości + Stoki + Włącz, aby wyświetlić mapę wzgórza lub stoku. Możesz przeczytać więcej o tego rodzaju mapach na naszej stronie + Legenda + Poziom powiększenia + Przejrzystość + Więcej informacji o stokach można przeczytać w %1$s. + Dodatkowe mapy są potrzebne do wyświetlania stoków na mapie. + Ustaw minimalny i maksymalny poziom powiększenia, na których będzie wyświetlana warstwa. + Nachylenie to pokolorowane wizualizacje terenu. + Mapa Hillshade wykorzystująca ciemne odcienie do pokazania stoków, szczytów i nizin. + Teren + %1$s z %2$s \ No newline at end of file From 393792739719437ff8e72f02e3910e2a9a5da4bc Mon Sep 17 00:00:00 2001 From: anonymous Date: Fri, 27 Mar 2020 17:06:35 +0000 Subject: [PATCH 17/21] Translated using Weblate (Polish) Currently translated at 99.3% (3223 of 3245 strings) --- OsmAnd/res/values-pl/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index a9f9dd2b7e..c20e731766 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -3598,4 +3598,8 @@ Reprezentuje obszar: %1$s x %2$s Mapa Hillshade wykorzystująca ciemne odcienie do pokazania stoków, szczytów i nizin. Teren %1$s z %2$s + Kwadrat + Romb + Okrąg + Wybierz kształt \ No newline at end of file From 28150fd061e3f3f63d5bb7638980925efabeb117 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Fri, 27 Mar 2020 13:57:56 +0000 Subject: [PATCH 18/21] Translated using Weblate (Basque) Currently translated at 100.0% (3245 of 3245 strings) --- OsmAnd/res/values-eu/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index 433f5f05cd..3a17e1ee45 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -3613,4 +3613,5 @@ Area honi dagokio: %1$s x %2$s Malda terrenoaren koloreztatutako ikuspegiak dira. Eman erliebea mapari itzalak erabiliz maldak, gailurrak eta behe-lauak erakusteko. Terrenoa + %1$s / %2$s \ No newline at end of file From 35c1862aa9102e64a4f67d60072740a24d9f4ee8 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Fri, 27 Mar 2020 16:55:37 +0000 Subject: [PATCH 19/21] Translated using Weblate (Catalan) Currently translated at 94.1% (3055 of 3245 strings) --- OsmAnd/res/values-ca/strings.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index b8bd2da69f..dcb128f310 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -3551,4 +3551,21 @@ Abasta l\'àrea: %1$s x %2$s Es tornarà a calcular una nova ruta si la distància de la posició actual respecte la ruta vigent supera el valor seleccionat. Seleccioneu la desviació per sobre de la qual es tornarà a calcular la ruta. Recalcula la ruta cas de desviament + Quadrat + Rombe + Cercle + Seleccioneu forma + Seleccioneu grup + Afegiu una descripció + Suprimeix la descripció + Un botó per mostrar o amagar la capa de terreny al mapa. + Mostra el terreny + Amaga el terreny + Mostra/amaga el terreny + Ombrejat del relleu + Llegenda + Nivells de zoom + Transparència + Es necessiten mapes addicionals per veure l\'ombrejat de relleu al mapa. + %1$s de %2$s \ No newline at end of file From 4d0545979409023ca2d073814c59e839f2a54c77 Mon Sep 17 00:00:00 2001 From: ssantos Date: Fri, 27 Mar 2020 16:52:22 +0000 Subject: [PATCH 20/21] Translated using Weblate (Portuguese) Currently translated at 83.7% (2719 of 3245 strings) --- OsmAnd/res/values-pt/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index a47c804876..028668e7b9 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -3432,7 +3432,7 @@ Escolha o ícone, cor e nome Editar lista de perfis Perfil selecionado - Ao clicar em %1$s perderá todas as suas alterações. + Tocar em %1$s descartará todas as suas alterações. Todas as configurações de perfil serão redefinidas para o estado após a instalação. Redefinir todas as configurações de perfil para o padrão\? %1$s %2$s From cafec3d79968c10cd80ad395e724350a0ad85100 Mon Sep 17 00:00:00 2001 From: Ahmad Alfrhood Date: Fri, 27 Mar 2020 10:59:07 +0000 Subject: [PATCH 21/21] Translated using Weblate (Arabic) Currently translated at 100.0% (3245 of 3245 strings) --- OsmAnd/res/values-ar/strings.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index d07f272a03..fbb15098b3 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -3540,4 +3540,32 @@ العناصر المضافة اكتمل الاستيراد يتم استيراد جميع البيانات من %1$s، يمكنك استخدام الأزرار أدناه لفتح الجزء المطلوب من التطبيق لإدارته. + سيتم إعادة حساب المسار إذا كانت المسافة من المسار إلى الموقع الحالي أكثر من القيمة المحددة. + حدد المسافة التي سيتم بعدها إعادة حساب المسار. + إعادة حساب المسار في حالة الانحراف + مربع + معين + دائرة + تحديد الشكل + تحديد المجموعة + إضافة وصف + حذف الوصف + زر لإظهار طبقة التضاريس أو إخفائها على الخريطة. + إظهار التضاريس + إخفاء التضاريس + إظهار/إخفاء التضاريس + المنحدرات + التضاريس + تمكين لعرض المنحدرات أو خريطة التضاريس. يمكنك قراءة المزيد عن أنواع الخرائط هذه على موقعنا + عنوان تفسيري + مستويات التكبير + الشفافية + يمكنك قراءة المزيد عن المنحدرات في %1$s. + تحتاج لخرائط إضافية لعرض المنحدرات على الخريطة. + تحتاج إلى خرائط إضافية لعرض التضاريس على الخريطة. + تعيين مستويات التكبير/التصغير الدنيا والقصوى التي سيتم عرض الطبقة بها. + المنحدر الملون ملائم للتضاريس. + خريطة التضاريس تستخدم ظلال داكنة لإظهار المنحدرات والقمم والأراضي المنخفضة. + التضاريس + %1$s من %2$s \ No newline at end of file