Merge branch 'master' of github.com:osmandapp/Osmand
This commit is contained in:
Victor Shcherb
commit
36c5f48afc
38 changed files with 361 additions and 148 deletions
|
|
@ -10,6 +10,7 @@
|
|||
tools:context="net.osmand.plus.osmedit.EditPoiDialogFragment">
|
||||
|
||||
<android.support.design.widget.TabLayout
|
||||
android:theme="?attr/appbar_layout_theme"
|
||||
android:id="@+id/tab_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -2012,9 +2012,16 @@
|
|||
<string name="live_update">Актуализиране на момента</string>
|
||||
<string name="update_now">Актуализирай сега</string>
|
||||
<string name="route_distance">Разстояние:</string>
|
||||
<string name="route_duration">Време за пътуване:</string>
|
||||
<string name="route_duration">Продължителност:</string>
|
||||
<string name="missing_write_external_storage_permission">Приложението няма разрешение да използва SD картата</string>
|
||||
<string name="no_location_permission">Приложението няма разрешение да ползва данни за местоположение.</string>
|
||||
<string name="no_camera_permission">Приложението няма разрешение да ползва камерата.</string>
|
||||
<string name="no_microphone_permission">Приложението няма разрешение да ползва микрофона.</string>
|
||||
</resources>
|
||||
<string name="live_updates">Актуализации онлайн</string>
|
||||
<string name="available_maps">Достъпни карти</string>
|
||||
<string name="select_voice_provider">Изберете гласов пакет</string>
|
||||
<string name="select_voice_provider_descr">Изберете или свалете гласов пакет на Вашия език</string>
|
||||
<string name="impassable_road_desc">Изберете пътищата, които да се избегнат при навигация</string>
|
||||
<string name="shared_string_sound">Звук</string>
|
||||
<string name="last_update">Последна актуализация: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1888,4 +1888,9 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
|
|||
<string name="no_microphone_permission">L\'aplicació no té autorització per utilitzar el micròfon.</string>
|
||||
<string name="impassable_road_desc">Indiqueu les vies que voleu evitar en la navegació</string>
|
||||
<string name="shared_string_sound">So</string>
|
||||
</resources>
|
||||
<string name="live_updates">Actualitzacions al moment</string>
|
||||
<string name="available_maps">Mapes disponibles</string>
|
||||
<string name="select_voice_provider">Seleccioneu guiatge de veu</string>
|
||||
<string name="select_voice_provider_descr">Seleccioneu o baixeu el guiatge de veu per al vostre idioma</string>
|
||||
<string name="last_update">Darrera actualització: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2197,4 +2197,7 @@
|
|||
<string name="shared_string_sound">Lyd</string>
|
||||
<string name="select_voice_provider">Vælg stemmevejledning</string>
|
||||
<string name="select_voice_provider_descr">Vælg eller hent stemmevejledning på eget sprog</string>
|
||||
</resources>
|
||||
<string name="live_updates">Realtidsopdateringer</string>
|
||||
<string name="available_maps">Tilgængelige kort</string>
|
||||
<string name="last_update">Sidst opdateret: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2003,7 +2003,7 @@
|
|||
<string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
|
||||
<string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Dashboard kann umgangen werden, falls menü-basierte App-Steuerung gewünscht ist\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr … "</string>
|
||||
<string name="osm_save_offline">Offline speichern</string>
|
||||
<string name="osm_edit_modified_poi">geänderter OSM-POI</string>
|
||||
<string name="osm_edit_modified_poi">Geänderter OSM-POI</string>
|
||||
<string name="osm_edit_deleted_poi">Gelöschter OSM-POI</string>
|
||||
<string name="context_menu_item_open_note">OSM-Notiz erstellen</string>
|
||||
<string name="osm_edit_reopened_note">Wiedereröffnete OSM-Notiz</string>
|
||||
|
|
@ -2084,4 +2084,7 @@
|
|||
<string name="shared_string_sound">Ton</string>
|
||||
<string name="select_voice_provider">Sprachansage auswählen</string>
|
||||
<string name="select_voice_provider_descr">Sprachansage für deine Sprache auswählen oder herunterladen</string>
|
||||
</resources>
|
||||
<string name="live_updates">Live Aktualisierungen</string>
|
||||
<string name="available_maps">Verfügbare Karten</string>
|
||||
<string name="last_update">Letzte Aktualisierung: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2017,4 +2017,7 @@
|
|||
<string name="shared_string_sound">Sonido</string>
|
||||
<string name="select_voice_provider">Elija el aviso de voz</string>
|
||||
<string name="select_voice_provider_descr">Elija o descargue el aviso de voz para su idioma</string>
|
||||
</resources>
|
||||
<string name="live_updates">Actualizaciones en vivo</string>
|
||||
<string name="available_maps">Mapas disponibles</string>
|
||||
<string name="last_update">Última actualización: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2016,4 +2016,7 @@
|
|||
<string name="shared_string_sound">Sonido</string>
|
||||
<string name="select_voice_provider">Seleccione el aviso de voz</string>
|
||||
<string name="select_voice_provider_descr">Seleccione o descargue el aviso de voz para su idioma</string>
|
||||
</resources>
|
||||
<string name="live_updates">Actualizaciones en vivo</string>
|
||||
<string name="available_maps">Mapas disponibles</string>
|
||||
<string name="last_update">Última actualización: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2084,4 +2084,7 @@
|
|||
<string name="shared_string_sound">Son</string>
|
||||
<string name="select_voice_provider">Sélectionnez la voix de guidage</string>
|
||||
<string name="select_voice_provider_descr">Sélectionnez et téléchargez la voix de guidage pour votre langue</string>
|
||||
</resources>
|
||||
<string name="live_updates">Mises à jour en temps réel</string>
|
||||
<string name="available_maps">Cartes disponibles</string>
|
||||
<string name="last_update">Dernière mise à jour : %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
|
||||
<string name="gpx_visibility_txt">Láthatóság</string>
|
||||
<string name="gpx_tags_txt">Címkék</string>
|
||||
|
|
@ -2050,7 +2051,21 @@
|
|||
<string name="rendering_attr_horseRoutes_name">Lovaglóutak</string>
|
||||
<string name="no_address_found">Ismeretlen cím</string>
|
||||
<string name="looking_up_address">Cím keresése</string>
|
||||
<string name="only_download_over_wifi">Letöltés csak WiFi kapcsolaton</string>
|
||||
<string name="only_download_over_wifi">Letöltés csak WiFi-n</string>
|
||||
<string name="live_update">Élő frissítés</string>
|
||||
<string name="update_now">Frissítés most</string>
|
||||
</resources>
|
||||
<string name="live_updates">Élő frissítések</string>
|
||||
<string name="available_maps">Elérhető térképek</string>
|
||||
<string name="select_voice_provider">Hangutasítás kiválasztása</string>
|
||||
<string name="select_voice_provider_descr">Válaszd ki és töltsd le a nyelvednek megfelelő hangutasítást</string>
|
||||
<string name="impassable_road_desc">Válaszd ki azokat az utakat, amiket el szeretnél kerülni</string>
|
||||
<string name="shared_string_sound">Hang</string>
|
||||
<string name="no_location_permission">Az alkalmazásnak nincs jogosultsága elérni a helyadatokat.</string>
|
||||
<string name="no_camera_permission">Az alkalmazásnak nincs jogosultsága elérni a kamerát.</string>
|
||||
<string name="no_microphone_permission">Az alkalmazásnak nincs jogosultsága elérni a mikrofont.</string>
|
||||
<string name="route_distance">Távolság:</string>
|
||||
<string name="route_duration">Idő:</string>
|
||||
<string name="update_every">Frissítési gyakoriság</string>
|
||||
<string name="missing_write_external_storage_permission">Az alkalmazásnak nincs jogosultsága elérni az SD kártyát.</string>
|
||||
<string name="last_update">Utolsó frissítés: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2068,7 +2068,7 @@
|
|||
<string name="osn_add_dialog_error">C\'è stato un errore: la nota non è stata creata</string>
|
||||
<string name="osn_close_dialog_success">La nota è stata chiusa con successo</string>
|
||||
<string name="osn_close_dialog_error">È stato generato un errore: la nota non è stata chiusa</string>
|
||||
<string name="shared_string_commit">Sottoponi</string>
|
||||
<string name="shared_string_commit">Invia</string>
|
||||
|
||||
<string name="rendering_attr_currentTrackColor_description">Colore del GPX</string>
|
||||
<string name="rendering_attr_currentTrackWidth_description">Larghezza del GPX</string>
|
||||
|
|
@ -2112,4 +2112,7 @@
|
|||
<string name="shared_string_sound">Suono</string>
|
||||
<string name="select_voice_provider">Selezionare la guida vocale</string>
|
||||
<string name="select_voice_provider_descr">Seleziona o scarica la guida vocale per la tua lingua</string>
|
||||
</resources>
|
||||
<string name="live_updates">Live updates</string>
|
||||
<string name="available_maps">Mappe disponibili</string>
|
||||
<string name="last_update">Ultimo aggiornamento: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<string name="native_rendering">Interne kaartgeneratie</string>
|
||||
|
||||
<string name="test_voice_prompts">Test stem-instructies</string>
|
||||
<string name="switch_to_raster_map_to_see">Geen offline vectorkaart aanwezig voor deze locatie. Je kan deze downloaden via Instellingen (Kaartbeheer), of overschakelen naar online kaarten; activeer hiervoor de "online maps" plugin.</string>
|
||||
<string name="switch_to_raster_map_to_see">Geen offline vectorkaart aanwezig voor deze locatie. Je kan deze downloaden via Instellingen (Kaartbeheer), of overschakelen naar online kaarten; activeer hiervoor de Online Kaarten-plugin.</string>
|
||||
|
||||
<string name="send_files_to_osm">GPX-bestanden naar openstreetmap sturen?</string>
|
||||
<string name="gpx_visibility_txt">Zichtbaarheid</string>
|
||||
|
|
@ -514,7 +514,7 @@
|
|||
<string name="route_tshl">Sla scherp linksaf en volg</string>
|
||||
<string name="route_tsll">Sla licht linksaf en volg</string>
|
||||
<string name="route_tu">Keer om en volg</string>
|
||||
<string name="route_head">Koers</string>
|
||||
<string name="route_head">Volg</string>
|
||||
<string name="first_time_continue">Ga door</string>
|
||||
<string name="first_time_download">Download regio\'s</string>
|
||||
<string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of deze zelf aanmaken. Daarna kan je de kaart bekijken, navigeren en adressen, interessepunten en openbaar vervoer opzoeken.</string>
|
||||
|
|
@ -550,7 +550,7 @@
|
|||
<string name="update_poi_is_not_available_for_zoom">Het vernieuwen van interessepunten is niet beschikbaar bij lage zoomniveaus</string>
|
||||
<string name="context_menu_item_update_poi">Interessepunt bijwerken</string>
|
||||
<string name="context_menu_item_update_map_confirm">Lokale gegevens via internet bijwerken?</string>
|
||||
<string name="search_history_city">Stad: {0}</string>
|
||||
<string name="search_history_city">Plaats: {0}</string>
|
||||
<string name="search_history_street">Straat: {0}, {1}</string>
|
||||
<string name="search_history_int_streets">Kruispunt: {0} x {1} in {2}</string>
|
||||
<string name="search_history_building">Gebouw: {0}, {1}, {2}</string>
|
||||
|
|
@ -561,7 +561,7 @@
|
|||
<string name="searching">Bezig met zoeken…</string>
|
||||
<string name="searching_address">Adres wordt gezocht…</string>
|
||||
<string name="search_osm_nominatim">Zoek adres met OSM Nominatim</string>
|
||||
<string name="hint_search_online">Online zoeken: Huisnummer, straat, stad</string>
|
||||
<string name="hint_search_online">Online zoeken: Huisnummer, Straat, Plaats</string>
|
||||
<string name="search_offline_address">Offline</string>
|
||||
<string name="search_online_address">Internet</string>
|
||||
<string name="max_level_download_tile">Max. online zoom</string>
|
||||
|
|
@ -633,7 +633,7 @@
|
|||
<string name="save_current_track_descr">Huidige GPX-track nu opslaan</string>
|
||||
<string name="save_current_track">Huidige GPX-track opslaan</string>
|
||||
<string name="save_track_interval">Registratie-interval bij navigatie</string>
|
||||
<string name="save_track_interval_descr">Kies logging-interval voor trackregistratie tijdens navigatie</string>
|
||||
<string name="save_track_interval_descr">Kies logging-interval voor GPX-track-opname tijdens navigatie</string>
|
||||
<string name="save_track_to_gpx_descrp">Tijdens het navigeren worden tracks gemaakt en opgeslagen</string>
|
||||
<string name="save_track_to_gpx">Track registreren tijdens navigatie</string>
|
||||
<string name="update_tile">Kaart bijwerken</string>
|
||||
|
|
@ -646,9 +646,9 @@
|
|||
<string name="use_english_names">Gebruik Engelse namen</string>
|
||||
<string name="app_settings">Programma-instellingen</string>
|
||||
<string name="search_address">Zoek adres</string>
|
||||
<string name="choose_building">Selecteer gebouw</string>
|
||||
<string name="choose_street">Selecteer straat</string>
|
||||
<string name="choose_city">Selecteer stad</string>
|
||||
<string name="choose_building">Kies Huisnummer</string>
|
||||
<string name="choose_street">Kies Straat</string>
|
||||
<string name="choose_city">Kies Plaats</string>
|
||||
<string name="ChooseCountry">Kies land</string>
|
||||
|
||||
|
||||
|
|
@ -673,13 +673,13 @@
|
|||
|
||||
<string name="search_button">Zoeken</string>
|
||||
<string name="search_activity">Zoeken</string>
|
||||
<string name="searchpoi_activity">Selecteer interessepunt</string>
|
||||
<string name="searchpoi_activity">Kies Interessepunt</string>
|
||||
<string name="search_POI_level_btn">Zoek meer</string>
|
||||
<string name="incremental_search_city">Zoek stad incrementeel</string>
|
||||
<string name="incremental_search_city">Zoek plaats</string>
|
||||
<string name="incremental_search_street">Zoek naar straatnaam</string>
|
||||
<string name="incremental_search_building">Zoek naar gebouw</string>
|
||||
<string name="choose_available_region">Kies een regio</string>
|
||||
<string name="choose_intersected_street">Selecteer zijstraat</string>
|
||||
<string name="choose_intersected_street">Kies Zijstraat</string>
|
||||
<string name="Closest_Amenities">Dichtstbijzijnde voorzieningen</string>
|
||||
<string name="app_mode_default">Kaart bekijken</string>
|
||||
<string name="app_mode_car">Auto</string>
|
||||
|
|
@ -696,12 +696,12 @@
|
|||
|
||||
<string name="search_address_top_text">Adres kiezen</string>
|
||||
<string name="search_address_region">Regio</string>
|
||||
<string name="search_address_city">Stad</string>
|
||||
<string name="search_address_city">Plaats</string>
|
||||
<string name="search_address_street">Straat</string>
|
||||
<string name="search_address_building">Huisnummer</string>
|
||||
<string name="search_address_building_option">Gebouw</string>
|
||||
<string name="search_address_street_option">Zijstraat</string>
|
||||
<string name="search_tabs_location">Locatie</string>
|
||||
<string name="search_tabs_location">Coördinaten</string>
|
||||
|
||||
|
||||
<string name="context_menu_item_update_map">Kaart bijwerken</string>
|
||||
|
|
@ -762,7 +762,7 @@
|
|||
<string name="confirm_interrupt_download">Downloaden afbreken?</string>
|
||||
<string name="basemap_was_selected_to_download">De basiskaart is nodig voor OsmAnd en is al geselecteerd om te downloaden.</string>
|
||||
|
||||
<string name="map_online_plugin_is_not_installed">Activeer de online kaarten-plugin om andere kaartbronnen te kunnen selecteren</string>
|
||||
<string name="map_online_plugin_is_not_installed">Activeer de Online Kaarten-plugin om andere kaartbronnen te kunnen selecteren</string>
|
||||
<string name="map_online_data">Online (raster-) kaarten</string>
|
||||
<string name="map_online_data_descr">Gebruik online kaarten (download en bewaar deze op SD-kaart)</string>
|
||||
<string name="shared_string_online_maps">Online kaarten</string>
|
||||
|
|
@ -775,8 +775,8 @@
|
|||
|
||||
|
||||
|
||||
<string name="osmand_development_plugin_description">Deze plug-in toont de instellingen voor ontwikkel- en debug-opties, zoals route test en simulatie, schermweergave-prestaties, en spraaksturing. Deze instellingen zijn bedoeld voor programmeurs die OsmAnd willen verbeteren en zijn niet nodig voor normaal gebruik.</string>
|
||||
<string name="plugins_screen">Plugin-manager</string>
|
||||
<string name="osmand_development_plugin_description">Deze plugin toont de instellingen voor ontwikkel- en debug-opties, zoals routetest en -simulatie, schermweergave-prestaties, en spraaksturing. Deze instellingen zijn bedoeld voor programmeurs die OsmAnd willen verbeteren en zijn niet nodig voor normaal gebruik.</string>
|
||||
<string name="plugins_screen">Plugins beheren</string>
|
||||
|
||||
<string name="prefs_plugins_descr">Schakel plugins in voor speciale functies en extra instellingen</string>
|
||||
<string name="prefs_plugins">Plugin-manager</string>
|
||||
|
|
@ -869,7 +869,7 @@
|
|||
|
||||
|
||||
<string name="map_widget_parking">Parkeren</string>
|
||||
<string name="map_widget_monitoring">Trackregistratie</string>
|
||||
<string name="map_widget_monitoring">GPX-Track opnemen</string>
|
||||
<string name="map_widget_speed">Snelheid</string>
|
||||
<string name="map_widget_distance">Afstand tot bestemming</string>
|
||||
<string name="map_widget_altitude">Hoogte</string>
|
||||
|
|
@ -974,7 +974,7 @@
|
|||
<string name="intermediate_point">"Tussenpunt %1$s"</string>
|
||||
<string name="gps_not_available">Schakel GPS in via de instellingen</string>
|
||||
<string name="map_widget_show_destination_arrow">Toon richting van de bestemming</string>
|
||||
<string name="enable_plugin_monitoring_services">Activeer de GPX-track-plugin om de afgelegde weg vast te leggen (GPX-track, online tracking)</string>
|
||||
<string name="enable_plugin_monitoring_services">Activeer de GPX-Track opnemen- Plugin om de afgelegde weg vast te leggen (GPX-track, online tracking)</string>
|
||||
<string name="non_optimal_route_calculation">Bereken mogelijk niet-optimale route voor lange afstanden</string>
|
||||
<string name="rendering_attr_roadColors_description">Kies kleurschema voor wegen:</string>
|
||||
<string name="rendering_attr_roadColors_name">Kleurschema voor wegen</string>
|
||||
|
|
@ -1014,8 +1014,8 @@
|
|||
<string name="download_srtm_maps">Hoogtelijnen</string>
|
||||
|
||||
|
||||
<string name="audionotes_plugin_description">De Audio/video notes plug-in bied de mogelijkheden voor het maken van audio-, foto- en videonotities tijdens een reis, direct via de knop in de kaartweergave, of via het menu voor een zelfgekozen punt op de kaart.</string>
|
||||
<string name="audionotes_plugin_name">Audio/video-notities</string>
|
||||
<string name="audionotes_plugin_description">De Audio/Video-Notities Plugin biedt de mogelijkheid voor het maken van audio-, foto- en videonotities tijdens een reis, direct via de knop in de kaartweergave, of via het menu bij een locatie op de kaart.</string>
|
||||
<string name="audionotes_plugin_name">Audio/Video-Notities</string>
|
||||
<string name="osmand_srtm_short_description_80_chars">OsmAnd-plugin voor offline hoogtelijnen</string>
|
||||
<string name="osmand_srtm_long_description_1000_chars">"Toon contourlijnen en een reliëflaag over de normale kaart. Uitermate praktisch voor sporters, wandelaars, trekkers, en iedereen die geïnteresseerd is in de hoogteverschillen van een landschap.\n\nDe wereldwijde gegevens (van 70 graden noorderbreedte tot 70 graden zuiderbreedte) zijn gebaseerd op metingen door SRTM (Shuttle Radar Topography Mission) en ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), een beeldvormend instrument aan boord van de satelliet Terra, het vlaggeschip van NASA\'s Earth Observing System. ASTER is een samenwerkingsverband tussen NASA, het Japanse Ministerie van Economie, Handel en Industrie (METI), en het Japan Space Systems (J-spacesystems). "</string>
|
||||
|
||||
|
|
@ -1033,13 +1033,13 @@
|
|||
<string name="recording_unavailable">niet beschikbaar</string>
|
||||
<string name="recording_context_menu_arecord">Maak een audionotitie</string>
|
||||
<string name="recording_context_menu_vrecord">Maak een videonotitie</string>
|
||||
<string name="layer_recordings">Opnamelaag</string>
|
||||
<string name="layer_recordings">Audio/Video-Notities</string>
|
||||
<string name="recording_can_not_be_played">Opname kan niet worden afgespeeld</string>
|
||||
<string name="recording_context_menu_delete">Wis opname</string>
|
||||
<string name="recording_context_menu_play">Afspelen</string>
|
||||
<string name="recording_description">Opname %1$s %3$s %2$s</string>
|
||||
<string name="recording_default_name">Opname</string>
|
||||
<string name="map_widget_av_notes">Audio/video-notities</string>
|
||||
<string name="map_widget_av_notes">Audio/Video-Notities</string>
|
||||
<string name="av_def_action_video">Video opnemen</string>
|
||||
<string name="av_def_action_audio">Audio opnemen</string>
|
||||
<string name="av_widget_action_descr">Kies standaardactie voor widget</string>
|
||||
|
|
@ -1053,11 +1053,11 @@
|
|||
<string name="recording_error">Fout opgetreden bij opnemen </string>
|
||||
<string name="recording_camera_not_available">Camera is niet beschikbaar</string>
|
||||
<string name="srtm_paid_version_msg">Overweeg om de hoogtelijnen-plugin (\"Contour lines\") te kopen in de Play-store om verdere ontwikkeling te ondersteunen.</string>
|
||||
<string name="srtm_paid_version_title">Hoogtelijnen-plugin</string>
|
||||
<string name="srtm_paid_version_title">Hoogtelijnen-Plugin</string>
|
||||
|
||||
<string name="intermediate_points_change_order">Volgorde wijzigen</string>
|
||||
<string name="dropbox_plugin_description">De Dropbox-plugin kan tracks en audio/video-notities synchroniseren met je Dropbox-account.</string>
|
||||
<string name="dropbox_plugin_name">Dropbox-plugin</string>
|
||||
<string name="dropbox_plugin_description">De Dropbox-Plugin kan tracks en Audio/Video-notities synchroniseren met je Dropbox-account.</string>
|
||||
<string name="dropbox_plugin_name">Dropbox-Plugin</string>
|
||||
<string name="recording_context_menu_show">Toon</string>
|
||||
<string name="recording_photo_description">Foto %1$s %2$s</string>
|
||||
<string name="av_def_action_picture">Neem een foto</string>
|
||||
|
|
@ -1094,7 +1094,7 @@
|
|||
|
||||
<string name="hno">Huisnummer</string>
|
||||
|
||||
<string name="monitoring_settings">Trip-registratie</string>
|
||||
<string name="monitoring_settings">GPX-track</string>
|
||||
<string name="monitoring_settings_descr">Configureer: hoe uw trips op te nemen</string>
|
||||
|
||||
<string name="street_name">Straatnaam</string>
|
||||
|
|
@ -1144,7 +1144,7 @@
|
|||
<string name="search_street_in_neighborhood_cities">Zoek straat in nabijgelegen plaatsen</string>
|
||||
<string name="intermediate_items_sort_return">De tussenpunten zijn opnieuw gesorteerd voor een optimale volgorde op de route van uw huidige positie naar uw eindbestemming.</string>
|
||||
<string name="intermediate_items_sort_by_distance">Sorteer kortste afstand</string>
|
||||
<string name="please_select_address">Kies eerst een stad of straat</string>
|
||||
<string name="please_select_address">Kies eerst een plaats of straat</string>
|
||||
<string name="context_menu_item_destination_point">Als bestemming\ninstellen</string>
|
||||
<string name="destination_point">Bestemming %1$s</string>
|
||||
|
||||
|
|
@ -1402,9 +1402,9 @@
|
|||
<string name="import_file_favourites">Punten bewaren als GPX-bestand of importeren in favorieten?</string>
|
||||
|
||||
|
||||
<string name="rendering_value_pink_name">roze</string>
|
||||
<string name="rendering_value_pink_name">Roze</string>
|
||||
|
||||
<string name="rendering_value_brown_name">bruin</string>
|
||||
<string name="rendering_value_brown_name">Bruin</string>
|
||||
|
||||
|
||||
|
||||
|
|
@ -1467,7 +1467,7 @@
|
|||
<string name="sort_by_distance">Sorteer op afstand</string>
|
||||
<string name="sort_by_name">Sorteer op naam</string>
|
||||
|
||||
<string name="none_selected_gpx">Geen GPX bestanden geselecteerd. Selecteer de gewenste track door er lang op te drukken.</string>
|
||||
<string name="none_selected_gpx">Geen GPX-bestanden geselecteerd. Selecteer de gewenste GPX-track door er lang op te drukken.</string>
|
||||
|
||||
<string name="local_index_select_gpx_file">Selecteer om te bekijken</string>
|
||||
<string name="route_descr_destination">Bestemming</string>
|
||||
|
|
@ -1564,7 +1564,7 @@
|
|||
<string name="save_track_interval_globally">Interval tussen geregistreerde punten</string>
|
||||
<string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus- en pendeltaxilijnen</string>
|
||||
<string name="confirm_every_run">Altijd vragen</string>
|
||||
<string name="save_global_track_interval_descr">Selecteer de loggings-interval voor de standaard track opname (te starten via de GPX opname widget op het kaartscherm)</string>
|
||||
<string name="save_global_track_interval_descr">Selecteer het loggings-interval voor de GPX-track-opname (te starten via de GPX-opname widget op het kaartscherm)</string>
|
||||
<string name="save_global_track_interval">Standaard loggings-interval</string>
|
||||
<string name="traffic_warning_speed_limit">Maximum snelheid</string>
|
||||
<string name="traffic_warning_border_control">Grenscontrole</string>
|
||||
|
|
@ -1690,7 +1690,7 @@
|
|||
<string name="plugin_touringview_descr">"Verandert de kaartstijl in \'Touring-weergave (meer contrast en detail)\'. Dit is een speciale, meer gedetailleerde weergave voor reizigers en professionele chauffeurs.\n\nDeze weergave biedt, op ieder zoom niveau van de kaart, de maximale hoeveelheid aan reisgegevens die beschikbaar is in de kaart (met name wegen, onverharde wegen, paden, en oriëntatiepunten).\n\nAlle soorten wegen zijn goed te herkennen door een eenduidige kleurcodering, wat bijvoorbeeld handig is bij het besturen van een groot voertuig.\n\nOok zijn er speciale touring-opties zoals fietsroutes en bergwandelpaden.\n\nEen speciale kaart downloaden is niet nodig; de weergave wordt gecreëerd van de gewone kaartgegevens.\n\nDeze weergave kan worden aan- en uitgezet door het kiezen van \'Touring-weergave (meer contrast en detail)\' onder \'Kaart instellen\' en dan \'Kaartstijl\'. "</string>
|
||||
<string name="plugin_nautical_descr">"Toon nautische gegevens op de kaart voor varen, zeilen, en andere vormen van watersport. Download ook het kaartbestand \'Zeebakens (wereld)\' om deze plugin te gebruiken.\n\nDeze plugin biedt alle nautische navigatietekens en kaartsymbolen voor de binnenvaart en voor navigatie bij de kust. In de beschrijving van elke navigatieteken staat de informatie die nodig is om hem te identificeren en over de betekenis (categorie, vorm, kleur, volgorde, referentie, enz.) ervan.\n\nOm weer de gewone kaart te zien kunt u de plugin uitschakelen of de \'Kaart stijl\' onder \'Kaart instellen\' veranderen. "</string>
|
||||
<string name="plugin_ski_name">Ski kaartweergave</string>
|
||||
<string name="plugin_ski_descr">"Toon gedetailleerde informatie over slalompistes, langlaufroutes, alpine ski routes, kabelbanen en skiliften wereldwijd. Routes en pistes worden getoond in een kleurcode naar moeilijkheidsgraad, en afgebeeld in een speciale \'Winter en ski\' kaartstijl die lijkt op een besneeuwd winterlandschap.\n\nHet activeren van deze weergave verandert de kaartstijl in \'Winter en ski\', met alle kenmerken van het landschap onder winterse omstandigheden. Deze weergave kan worden teruggedraaid door het de-activeren van de plug-in, of door het veranderen van de \'Kaart stijl\' onder \'Kaart Instellen\'. "</string>
|
||||
<string name="plugin_ski_descr">"Toon gedetailleerde informatie over slalompistes, langlaufroutes, alpine ski routes, kabelbanen en skiliften wereldwijd. Routes en pistes worden getoond in een kleurcode naar moeilijkheidsgraad, en afgebeeld in een speciale \'Winter en ski\' kaartstijl die lijkt op een besneeuwd winterlandschap.\n\nHet activeren van deze weergave verandert de kaartstijl in \'Winter en ski\', met alle kenmerken van het landschap onder winterse omstandigheden. Deze weergave kan worden teruggedraaid door het de-activeren van de plugin, of door het veranderen van de \'Kaart stijl\' onder \'Kaart Instellen\'. "</string>
|
||||
|
||||
|
||||
<string name="rename_failed">Hernoemen mislukt.</string>
|
||||
|
|
@ -1698,7 +1698,7 @@
|
|||
<string name="share_note">Deel opmerking</string>
|
||||
|
||||
<string name="location_on_map">Locatie:\n Lat %1$s\n Lon %2$s</string>
|
||||
<string name="notes">Opmerkingen</string>
|
||||
<string name="notes">AV-Notities</string>
|
||||
<string name="online_map">Online kaart</string>
|
||||
<string name="roads_only">Alleen wegen</string>
|
||||
<string name="free">"Vrij %1$s "</string>
|
||||
|
|
@ -1768,7 +1768,7 @@
|
|||
<string name="shared_string_favorites">Favorieten</string>
|
||||
<string name="shared_string_add_to_favorites">Voeg toe aan Favorieten</string>
|
||||
|
||||
<string name="shared_string_my_places">Mijn plaatsen</string>
|
||||
<string name="shared_string_my_places">Mijn Plaatsen</string>
|
||||
|
||||
|
||||
|
||||
|
|
@ -1797,8 +1797,8 @@
|
|||
<string name="shared_string_clear_all">Wis alles</string>
|
||||
<string name="shared_string_collapse">Inklappen</string>
|
||||
<string name="shared_string_my_location">Mijn positie</string>
|
||||
<string name="shared_string_my_favorites">Mijn Favorieten</string>
|
||||
<string name="shared_string_my_tracks">Mijn GPX-tracks</string>
|
||||
<string name="shared_string_my_favorites">Favorieten</string>
|
||||
<string name="shared_string_my_tracks">GPX-tracks</string>
|
||||
<string name="shared_string_currently_recording_track">Huidige GPX-track</string>
|
||||
<string name="local_osm_changes_upload_all_confirm">Je gaat %1$d wijzigingen ophalen. Weet je dat zeker?</string>
|
||||
<string name="confirmation_to_clear_history">Wil je de geschiedenis verwijderen?</string>
|
||||
|
|
@ -1901,7 +1901,7 @@
|
|||
<string name="rendering_value_translucent_blue_name">Doorschijnend blauw</string>
|
||||
<string name="rendering_value_purple_name">Paars</string>
|
||||
<string name="rendering_value_translucent_purple_name">Doorschijnend paars</string>
|
||||
<string name="restart_is_required">Om alle veranderingen op te slaan, moet de applicatie handmatig herstart worden.</string>
|
||||
<string name="restart_is_required">"OsmAnd wordt opnieuw opgestart, om de wijzigingen toe te passen."</string>
|
||||
<string name="lang_bn">Bengaals</string>
|
||||
<string name="lang_pms">Piëmontees</string>
|
||||
<string name="lang_bpy">Bishnupriya</string>
|
||||
|
|
@ -1917,7 +1917,7 @@
|
|||
<string name="lang_nn">Noors (Nynorsk)</string>
|
||||
<string name="lang_new">Newari / Nepalbhasa</string>
|
||||
<string name="lang_ms">Maleis</string>
|
||||
<string name="lang_ht">Haïtiaans Creools</string>
|
||||
<string name="lang_ht">Haïtiaans</string>
|
||||
<string name="lang_gl">Galicisch</string>
|
||||
<string name="lang_et">Estisch</string>
|
||||
<string name="lang_ceb">Cebuano</string>
|
||||
|
|
@ -1962,7 +1962,7 @@
|
|||
<string name="favourites_edit_dialog_title">Informatie over favoriet</string>
|
||||
<string name="simulate_your_location_stop_descr">Stop simulatie</string>
|
||||
<string name="simulate_your_location_descr">Routesimulatie met de berekende route of een GPX-track</string>
|
||||
<string name="av_locations_descr">GPX-bestand met aantekeningen</string>
|
||||
<string name="av_locations_descr">GPX-bestand met Audio/Video-notities</string>
|
||||
<string name="av_locations">Locaties</string>
|
||||
<string name="plugin_settings">Plugins</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Vermijd autotreinen</string>
|
||||
|
|
@ -2095,7 +2095,7 @@
|
|||
<string name="rendering_attr_roadStyle_description">Stijl van wegen</string>
|
||||
<string name="poi_dialog_reopen">Heropenen</string>
|
||||
<string name="activate_seamarks_plugin">Activeer de Zeebakens-plugin</string>
|
||||
<string name="activate_srtm_plugin">Activeer de SRTM-plugin</string>
|
||||
<string name="activate_srtm_plugin">Activeer de Hoogtelijnen-plugin</string>
|
||||
<string name="get_full_version">Volledige versie</string>
|
||||
<string name="save_poi_without_poi_type_message">Deze POI echt bewaren zonder het type aan te geven?</string>
|
||||
<string name="poi_context_menu_modify_osm_change">Verander OSM-wijziging</string>
|
||||
|
|
@ -2136,4 +2136,7 @@
|
|||
<string name="select_voice_provider_descr">Stembegeleiding voor uw taal kiezen of downloaden</string>
|
||||
<string name="impassable_road_desc">Kies wegen die vermeden moeten worden</string>
|
||||
<string name="shared_string_sound">Stembegeleiding</string>
|
||||
</resources>
|
||||
<string name="live_updates">Live Updates</string>
|
||||
<string name="available_maps">Beschikbare Kaarten</string>
|
||||
<string name="last_update">Laatste update: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2574,4 +2574,19 @@
|
|||
<string name="poi_judo">Judô</string>
|
||||
<string name="poi_futsal">Futsal</string>
|
||||
<string name="poi_squash">Squash</string>
|
||||
</resources>
|
||||
<string name="poi_parking_garage_boxes">Tipo: garagem box</string>
|
||||
<string name="poi_parking_carports">Tipo: garagem coberta</string>
|
||||
|
||||
<string name="poi_dojo">Dojo</string>
|
||||
|
||||
<string name="poi_gaelic_games">Jogos gaélicos</string>
|
||||
<string name="poi_running">Corrida</string>
|
||||
<string name="poi_netball">Netball</string>
|
||||
<string name="poi_karting">Kartismo</string>
|
||||
<string name="poi_disc_golf">Golfe de disco</string>
|
||||
<string name="poi_rc_car">Corrida de carrinho de controle remoto</string>
|
||||
<string name="poi_shuffleboard">Shuffleboard</string>
|
||||
<string name="poi_lacrosse">Lacrosse</string>
|
||||
<string name="poi_boxing">Pugilismo</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1963,4 +1963,9 @@
|
|||
<string name="no_microphone_permission">App não tem permissão para acessar o microfone.</string>
|
||||
<string name="impassable_road_desc">Escolha as vias que quer evitar durante a navegação</string>
|
||||
<string name="shared_string_sound">Som</string>
|
||||
</resources>
|
||||
<string name="live_updates">Atualização ao vivo</string>
|
||||
<string name="available_maps">Mapas disponíveis</string>
|
||||
<string name="select_voice_provider">Selecione a orientação por voz</string>
|
||||
<string name="select_voice_provider_descr">Selecione ou baixe a instrução por voz para o seu idioma</string>
|
||||
<string name="last_update">Última atualização: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2054,4 +2054,7 @@
|
|||
<string name="select_voice_provider_descr">Ischerta o iscàrriga sa boghe de ghia pro sa limba tua</string>
|
||||
<string name="impassable_road_desc">Ischerta sas istradas chi cheres istransire durante su nàvigu</string>
|
||||
<string name="shared_string_sound">Sonu</string>
|
||||
</resources>
|
||||
<string name="live_updates">Agiornamentos in tempus reale</string>
|
||||
<string name="available_maps">Mapas disponìbiles</string>
|
||||
<string name="last_update">Ùrtimu agiornamentu: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1965,4 +1965,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="no_microphone_permission">Aplikácia nemá oprávnenia na prístup k mikrofónu.</string>
|
||||
<string name="select_voice_provider">Zvoľte hlasové pokyny</string>
|
||||
<string name="select_voice_provider_descr">Vyberte alebo stiahnite hlasové pokyny pre váš jazyk</string>
|
||||
</resources>
|
||||
<string name="live_updates">Okamžité aktualizácie</string>
|
||||
<string name="available_maps">Dostupné mapy</string>
|
||||
<string name="last_update">Posledná aktualizácia: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="about_version">Верзија:</string>
|
||||
<string name="shared_string_about">Oko</string>
|
||||
<string name="about_settings_descr">Верзија инфо, лиценце, чланови пројекта</string>
|
||||
|
|
@ -398,7 +399,7 @@
|
|||
<string name="av_audio_format_descr">Изаберите облик за звучни излаз</string>
|
||||
<string name="av_audio_bitrate">Битски проток звука</string>
|
||||
<string name="av_audio_bitrate_descr">Изаберите битски проток звука</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Молим, изаберите тачну врсту тачке занимања или је прескочите. "</string>
|
||||
<string name="please_specify_poi_type_only_from_list">Молим, изаберите тачну врсту тачке занимања или је прескочите</string>
|
||||
<string name="access_from_map_description">Дугме изборника не покреће изборник, већ плочу полетника</string>
|
||||
<string name="access_from_map">Приступ са карте</string>
|
||||
<string name="show_on_start_description">„Искључи“ покреће екран мапе</string>
|
||||
|
|
@ -707,4 +708,34 @@
|
|||
<string name="osmo_group_by_invite">Уђи по позиву</string>
|
||||
<string name="osmo_group_information">Молим, прочитајте пре стварања скупа</string>
|
||||
<string name="gpx_wpt">Пролазна тачка</string>
|
||||
</resources>
|
||||
<string name="available_maps">Доступне карте</string>
|
||||
<string name="select_voice_provider">Изаберите гласовно навођење</string>
|
||||
<string name="select_voice_provider_descr">Изаберите или преузмите гласовно навођење свог језика</string>
|
||||
<string name="impassable_road_desc">Изаберите које путеве желите да избегавате током навођења</string>
|
||||
<string name="shared_string_sound">Звук</string>
|
||||
<string name="no_location_permission">Програм нема дозволу да приступи подацима о положају</string>
|
||||
<string name="no_camera_permission">Програм нема дозволу да приступи камери.</string>
|
||||
<string name="no_microphone_permission">Програм нема дозволу да приступи микрофону.</string>
|
||||
<string name="route_distance">Растојање:</string>
|
||||
<string name="route_duration">Време:</string>
|
||||
<string name="shared_string_near">Близу</string>
|
||||
<string name="live_updates">Надоградње уживо</string>
|
||||
<string name="no_address_found">Није одређена адреса</string>
|
||||
<string name="av_video_quality_low">Најнижа каквоћа</string>
|
||||
<string name="av_video_quality_high">Највиша каквоћа</string>
|
||||
<string name="av_video_quality">Каквоћа излаза слике</string>
|
||||
<string name="av_video_quality_descr">Изаберите својства излазног приказа</string>
|
||||
<string name="osm_edit_created_note">Направи белешку ОСМ-а</string>
|
||||
<string name="context_menu_item_delete_waypoint">Да ли избрисати пролазну тачку ГПИкс-а?</string>
|
||||
<string name="context_menu_item_edit_waypoint">Уреди пролазну тачку ГПИкс-а</string>
|
||||
<string name="share_osm_edits_subject">Уредбе ОСМ-а дељене на Османду</string>
|
||||
<string name="osm_edit_created_poi">Тачка занимања ОСМ-а је направљена</string>
|
||||
|
||||
<string name="nm">nm</string>
|
||||
<string name="nm_h">nmh</string>
|
||||
<string name="min_mile">min/m</string>
|
||||
<string name="min_km">min/km</string>
|
||||
<string name="m_s">m/s</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_description"/>
|
||||
<string name="routing_attr_avoid_shuttle_train_name"></string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2044,4 +2044,7 @@
|
|||
<string name="select_voice_provider_descr">Välj eller hämta röstvägledning för ditt språk</string>
|
||||
<string name="impassable_road_desc">Välj de vägar du vill undvika under navigering</string>
|
||||
<string name="shared_string_sound">Ljud</string>
|
||||
</resources>
|
||||
<string name="live_updates">Live-uppdateringar</string>
|
||||
<string name="available_maps">Tillgängliga kartor</string>
|
||||
<string name="last_update">Senaste uppdateringen: %s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2043,4 +2043,7 @@
|
|||
<string name="shared_string_sound">語音</string>
|
||||
<string name="select_voice_provider">選擇語音指引</string>
|
||||
<string name="select_voice_provider_descr">為您的語言選擇或下載語音指引</string>
|
||||
</resources>
|
||||
<string name="live_updates">即時更新</string>
|
||||
<string name="available_maps">可用地圖</string>
|
||||
<string name="last_update">最近的更新：%s</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import android.support.v4.app.ActivityCompat;
|
|||
import android.support.v4.app.NotificationCompat.Builder;
|
||||
import android.support.v4.widget.DrawerLayout;
|
||||
import android.support.v7.app.NotificationCompat;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.view.Gravity;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.MotionEvent;
|
||||
|
|
@ -176,8 +177,17 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
|
|||
// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
|
||||
setContentView(R.layout.main);
|
||||
|
||||
mapView = new OsmandMapTileView(this, getWindow().getDecorView().getWidth(),
|
||||
getWindow().getDecorView().getHeight());
|
||||
int statusBarHeight = 0;
|
||||
int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
|
||||
if (resourceId > 0) {
|
||||
statusBarHeight = getResources().getDimensionPixelSize(resourceId);
|
||||
}
|
||||
DisplayMetrics dm = new DisplayMetrics();
|
||||
getWindowManager().getDefaultDisplay().getMetrics(dm);
|
||||
int w = dm.widthPixels;
|
||||
int h = dm.heightPixels - statusBarHeight;
|
||||
|
||||
mapView = new OsmandMapTileView(this, w, h);
|
||||
if (app.getAppInitializer().checkAppVersionChanged(this)) {
|
||||
new WhatsNewDialogFragment().show(getSupportFragmentManager(), null);
|
||||
}
|
||||
|
|
@ -552,22 +562,24 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
|
|||
if (dashboardOnMap.isVisible()) {
|
||||
dashboardOnMap.hideDashboard();
|
||||
}
|
||||
// remember if map should come back to isMapLinkedToLocation=true
|
||||
mapViewTrackingUtilities.setMapLinkedToLocation(false);
|
||||
|
||||
if (mapLabelToShow != null && !mapLabelToShow.contextMenuDisabled()) {
|
||||
mapContextMenu.setMapCenter(latLonToShow);
|
||||
mapContextMenu.setMapPosition(mapView.getMapPosition());
|
||||
mapContextMenu.setCenterMarker(true);
|
||||
mapContextMenu.setMapZoom(settings.getMapZoomToShow());
|
||||
if (mapLayers.getMapControlsLayer().getMapRouteInfoMenu().isVisible()) {
|
||||
mapContextMenu.showMinimized(latLonToShow, mapLabelToShow, toShow);
|
||||
mapLayers.getMapControlsLayer().getMapRouteInfoMenu().updateMenu();
|
||||
} else {
|
||||
mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
|
||||
}
|
||||
}
|
||||
if (!latLonToShow.equals(cur)) {
|
||||
} else if (!latLonToShow.equals(cur)) {
|
||||
mapView.getAnimatedDraggingThread().startMoving(latLonToShow.getLatitude(),
|
||||
latLonToShow.getLongitude(), settings.getMapZoomToShow(), true);
|
||||
}
|
||||
// remember if map should come back to isMapLinkedToLocation=true
|
||||
mapViewTrackingUtilities.setMapLinkedToLocation(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class AudioVideoNoteMenuBuilder extends MenuBuilder {
|
|||
DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(view.getContext());
|
||||
DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext());
|
||||
Date date = new Date(recording.getFile().lastModified());
|
||||
buildRow(view, R.drawable.ic_action_data, dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, 0);
|
||||
buildRow(view, R.drawable.ic_action_data, dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, 0, false);
|
||||
|
||||
buildPlainMenuItems(view);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ public class LiveUpdatesActivity extends AbstractDownloadActivity {
|
|||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
getMyApplication().applyTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_livie_updates);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@ package net.osmand.plus.liveupdates;
|
|||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.DrawableRes;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v7.widget.SwitchCompat;
|
||||
|
|
@ -309,6 +311,9 @@ public class LiveUpdatesFragment extends Fragment {
|
|||
OsmandApplication context = fragment.getMyActivity().getMyApplication();
|
||||
final OsmandSettings.CommonPreference<Boolean> shouldUpdatePreference =
|
||||
preferenceLiveUpdatesOn(item, fragment.getSettings());
|
||||
IncrementalChangesManager changesManager = context.getResourceManager().getChangesManager();
|
||||
final String fileNameWithoutExtension =
|
||||
Algorithms.getFileNameWithoutExtension(new File(item.getFileName()));
|
||||
|
||||
nameTextView.setText(getNameToDisplay(item));
|
||||
if (shouldUpdatePreference.get()) {
|
||||
|
|
@ -316,26 +321,25 @@ public class LiveUpdatesFragment extends Fragment {
|
|||
final UpdateFrequency frequency = UpdateFrequency.values()[frequencyId];
|
||||
subheaderTextView.setText(frequency.toString());
|
||||
subheaderTextView.setTextColor(fragment.getActivity().getResources()
|
||||
.getColor(R.color.dashboard_blue));
|
||||
icon.setImageDrawable(context.getIconsCache().getContentIcon(R.drawable.ic_map));
|
||||
icon.setImageDrawable(context.getIconsCache().getIcon(R.drawable.ic_map, R.color.dashboard_blue));
|
||||
options.setImageResource(R.drawable.ic_overflow_menu_white);
|
||||
.getColor(R.color.osmand_orange));
|
||||
icon.setImageDrawable(context.getIconsCache().getIcon(R.drawable.ic_map, R.color.osmand_orange));
|
||||
options.setImageDrawable(getSecondaryColorPaintedIcon(R.drawable.ic_overflow_menu_white));
|
||||
} else {
|
||||
String size;
|
||||
if (item.getSize() > 100) {
|
||||
size = DownloadActivity.formatMb.format(new Object[]{(float) item.getSize() / (1 << 10)});
|
||||
long updatesSize = changesManager.getUpdatesSize(fileNameWithoutExtension);
|
||||
updatesSize /= (1 << 10);
|
||||
if (updatesSize > 100) {
|
||||
size = DownloadActivity.formatMb.format(new Object[]{(float) updatesSize / (1 << 10)});
|
||||
} else {
|
||||
size = item.getSize() + " KB";
|
||||
size = updatesSize + " KB";
|
||||
}
|
||||
subheaderTextView.setText(size);
|
||||
subheaderTextView.setTextColor(secondaryColor);
|
||||
icon.setImageDrawable(context.getIconsCache().getPaintedContentIcon(R.drawable.ic_map, secondaryColor));
|
||||
options.setImageResource(R.drawable.ic_action_plus);
|
||||
icon.setImageDrawable(getSecondaryColorPaintedIcon(R.drawable.ic_map));
|
||||
options.setImageDrawable(getSecondaryColorPaintedIcon(R.drawable.ic_action_plus));
|
||||
}
|
||||
IncrementalChangesManager cm = context.getResourceManager().getChangesManager();
|
||||
final String fileNameWithoutExtension =
|
||||
Algorithms.getFileNameWithoutExtension(new File(item.getFileName()));
|
||||
final long timestamp = cm.getTimestamp(fileNameWithoutExtension);
|
||||
|
||||
final long timestamp = changesManager.getTimestamp(fileNameWithoutExtension);
|
||||
String formattedDate = LiveUpdatesFragment.formatDateTime(fragment.getActivity(), timestamp);
|
||||
descriptionTextView.setText(context.getString(R.string.last_update, formattedDate));
|
||||
|
||||
|
|
@ -350,6 +354,11 @@ public class LiveUpdatesFragment extends Fragment {
|
|||
view.setOnClickListener(clickListener);
|
||||
}
|
||||
|
||||
private Drawable getSecondaryColorPaintedIcon(@DrawableRes int drawable) {
|
||||
return fragment.getMyActivity().getMyApplication().getIconsCache()
|
||||
.getPaintedContentIcon(drawable, secondaryColor);
|
||||
}
|
||||
|
||||
private String getNameToDisplay(LocalIndexInfo child) {
|
||||
String mapName = FileNameTranslationHelper.getFileName(fragment.getActivity(),
|
||||
fragment.getMyActivity().getMyApplication().getResourceManager().getOsmandRegions(),
|
||||
|
|
|
|||
|
|
@ -69,11 +69,11 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
|
|||
preferenceUpdateFrequency(localIndexInfo, getSettings());
|
||||
final OsmandSettings.CommonPreference<Integer> timeOfDayPreference =
|
||||
preferenceTimeOfDayToUpdate(localIndexInfo, getSettings());
|
||||
liveUpdatesSwitch.setChecked(liveUpdatePreference.get());
|
||||
liveUpdatesSwitch.setChecked(true);
|
||||
downloadOverWiFiSwitch.setChecked(downloadViaWiFiPreference.get());
|
||||
|
||||
builder.setView(view)
|
||||
.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
|
||||
.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
final int updateFrequencyInt = updateFrequencySpinner.getSelectedItemPosition();
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
|
||||
private LatLon mapCenter;
|
||||
private int mapPosition = 0;
|
||||
private boolean centerMarker;
|
||||
private int mapZoom;
|
||||
|
||||
private LatLon myLocation;
|
||||
private Float heading;
|
||||
|
|
@ -149,6 +151,18 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
this.mapCenter = mapCenter;
|
||||
}
|
||||
|
||||
public void setCenterMarker(boolean centerMarker) {
|
||||
this.centerMarker = centerMarker;
|
||||
}
|
||||
|
||||
public int getMapZoom() {
|
||||
return mapZoom;
|
||||
}
|
||||
|
||||
public void setMapZoom(int mapZoom) {
|
||||
this.mapZoom = mapZoom;
|
||||
}
|
||||
|
||||
public void updateMapCenter(LatLon mapCenter) {
|
||||
WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
|
||||
if (fragmentRef != null) {
|
||||
|
|
@ -261,9 +275,10 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
|
||||
public void show(LatLon latLon, PointDescription pointDescription, Object object) {
|
||||
if (init(latLon, pointDescription, object)) {
|
||||
if (!MapContextMenuFragment.showInstance(this, mapActivity, false)) {
|
||||
if (!MapContextMenuFragment.showInstance(this, mapActivity, centerMarker)) {
|
||||
active = false;
|
||||
}
|
||||
centerMarker = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
private boolean moving;
|
||||
private boolean nightMode;
|
||||
private boolean centered;
|
||||
private boolean initLayout = true;
|
||||
|
||||
private float skipHalfScreenStateLimit;
|
||||
|
||||
|
|
@ -687,9 +688,6 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
if (menu.displayDistanceDirection()) {
|
||||
getMapActivity().getMapViewTrackingUtilities().setContextMenu(menu);
|
||||
}
|
||||
if (centered) {
|
||||
centerMarkerLocation();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -705,6 +703,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
map.setLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
|
||||
}
|
||||
menu.setMapCenter(null);
|
||||
menu.setMapZoom(0);
|
||||
getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true);
|
||||
}
|
||||
|
||||
|
|
@ -763,9 +762,13 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
origMarkerY = view.getHeight() / 2;
|
||||
}
|
||||
|
||||
if (initLayout && centered) {
|
||||
centerMarkerLocation();
|
||||
}
|
||||
if (!moving) {
|
||||
doLayoutMenu();
|
||||
}
|
||||
initLayout = false;
|
||||
}
|
||||
|
||||
});
|
||||
|
|
@ -773,22 +776,27 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
|
||||
public void centerMarkerLocation() {
|
||||
centered = true;
|
||||
showOnMap(menu.getLatLon(), true, false, true, false);
|
||||
showOnMap(menu.getLatLon(), true, true, false);
|
||||
}
|
||||
|
||||
private void showOnMap(LatLon latLon, boolean updateCoords, boolean ignoreCoef, boolean needMove, boolean alreadyAdjusted) {
|
||||
private int getZoom() {
|
||||
int zoom = menu.getMapZoom();
|
||||
if (zoom == 0) {
|
||||
zoom = map.getZoom();
|
||||
}
|
||||
return zoom;
|
||||
}
|
||||
|
||||
private void showOnMap(LatLon latLon, boolean updateCoords, boolean needMove, boolean alreadyAdjusted) {
|
||||
AnimateDraggingMapThread thread = map.getAnimatedDraggingThread();
|
||||
int fZoom = map.getZoom();
|
||||
int fZoom = getZoom();
|
||||
double flat = latLon.getLatitude();
|
||||
double flon = latLon.getLongitude();
|
||||
|
||||
RotatedTileBox cp = map.getCurrentRotatedTileBox().copy();
|
||||
if (ignoreCoef) {
|
||||
cp.setCenterLocation(0.5f, 0.5f);
|
||||
} else {
|
||||
cp.setCenterLocation(0.5f, map.getMapPosition() == OsmandSettings.BOTTOM_CONSTANT ? 0.15f : 0.5f);
|
||||
}
|
||||
cp.setCenterLocation(0.5f, map.getMapPosition() == OsmandSettings.BOTTOM_CONSTANT ? 0.15f : 0.5f);
|
||||
cp.setLatLonCenter(flat, flon);
|
||||
cp.setZoom(fZoom);
|
||||
flat = cp.getLatFromPixel(cp.getPixWidth() / 2, cp.getPixHeight() / 2);
|
||||
flon = cp.getLonFromPixel(cp.getPixWidth() / 2, cp.getPixHeight() / 2);
|
||||
|
||||
|
|
@ -800,7 +808,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
}
|
||||
|
||||
if (!alreadyAdjusted) {
|
||||
LatLon adjustedLatLon = getAdjustedMarkerLocation(getPosY(), new LatLon(flat, flon), true);
|
||||
LatLon adjustedLatLon = getAdjustedMarkerLocation(getPosY(), new LatLon(flat, flon), true, fZoom);
|
||||
flat = adjustedLatLon.getLatitude();
|
||||
flon = adjustedLatLon.getLongitude();
|
||||
}
|
||||
|
|
@ -941,57 +949,72 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
}
|
||||
|
||||
private void adjustMapPosition(int y, boolean animated, boolean center) {
|
||||
LatLon latlon = getAdjustedMarkerLocation(y, menu.getLatLon(), center);
|
||||
map.getAnimatedDraggingThread().stopAnimatingSync();
|
||||
LatLon latlon = getAdjustedMarkerLocation(y, menu.getLatLon(), center, getZoom());
|
||||
|
||||
if (map.getLatitude() == latlon.getLatitude() && map.getLongitude() == latlon.getLongitude()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (animated) {
|
||||
showOnMap(latlon, false, true, true, true);
|
||||
showOnMap(latlon, false, true, true);
|
||||
} else {
|
||||
map.setLatLon(latlon.getLatitude(), latlon.getLongitude());
|
||||
}
|
||||
}
|
||||
|
||||
private LatLon getAdjustedMarkerLocation(int y, LatLon reqMarkerLocation, boolean center) {
|
||||
private LatLon getAdjustedMarkerLocation(int y, LatLon reqMarkerLocation, boolean center, int zoom) {
|
||||
double markerLat = reqMarkerLocation.getLatitude();
|
||||
double markerLon = reqMarkerLocation.getLongitude();
|
||||
RotatedTileBox box = map.getCurrentRotatedTileBox().copy();
|
||||
box.setCenterLocation(0.5f, map.getMapPosition() == OsmandSettings.BOTTOM_CONSTANT ? 0.15f : 0.5f);
|
||||
box.setZoom(zoom);
|
||||
int markerMapCenterX = (int)box.getPixXFromLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
|
||||
int markerMapCenterY = (int)box.getPixYFromLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
|
||||
float cpyOrig = box.getCenterPixelPoint().y;
|
||||
|
||||
box.setCenterLocation(0.5f, 0.5f);
|
||||
int markerX = (int)box.getPixXFromLatLon(markerLat, markerLon);
|
||||
int markerY = (int)box.getPixYFromLatLon(markerLat, markerLon);
|
||||
QuadPoint cp = box.getCenterPixelPoint();
|
||||
float cpx = cp.x;
|
||||
float cpy = cp.y;
|
||||
|
||||
float cpyDelta = menu.isLandscapeLayout() ? 0 : cpyOrig - cpy;
|
||||
|
||||
markerY += cpyDelta;
|
||||
y += cpyDelta;
|
||||
float origMarkerY = this.origMarkerY + cpyDelta;
|
||||
|
||||
LatLon latlon;
|
||||
if (center) {
|
||||
latlon = reqMarkerLocation;
|
||||
} else {
|
||||
latlon = mapCenter;
|
||||
latlon = box.getLatLonFromPixel(markerMapCenterX, markerMapCenterY);
|
||||
}
|
||||
if (menu.isLandscapeLayout()) {
|
||||
int markerX = (int)box.getPixXFromLatLon(markerLat, markerLon);
|
||||
int x = dpToPx(menu.getLandscapeWidthDp());
|
||||
if (markerX - markerPaddingXPx < x || markerX > origMarkerX) {
|
||||
int dx = (x + markerPaddingXPx) - markerX;
|
||||
int dy = 0;
|
||||
QuadPoint cp = box.getCenterPixelPoint();
|
||||
if (center) {
|
||||
int markerY = (int)box.getPixYFromLatLon(markerLat, markerLon);
|
||||
dy = (int)cp.y - markerY;
|
||||
dy = (int)cpy - markerY;
|
||||
} else {
|
||||
cpy = cpyOrig;
|
||||
}
|
||||
if (dx > 0 || center) {
|
||||
latlon = box.getLatLonFromPixel(cp.x - dx, cp.y - dy);
|
||||
latlon = box.getLatLonFromPixel(cpx - dx, cpy - dy);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int markerY = (int)box.getPixYFromLatLon(markerLat, markerLon);
|
||||
if (markerY + markerPaddingPx > y || markerY < origMarkerY) {
|
||||
int dx = 0;
|
||||
int dy = markerY - (y - markerPaddingPx);
|
||||
if (markerY - dy <= origMarkerY) {
|
||||
QuadPoint cp = box.getCenterPixelPoint();
|
||||
if (center) {
|
||||
int markerX = (int)box.getPixXFromLatLon(markerLat, markerLon);
|
||||
dx = markerX - (int)cp.x;
|
||||
dx = markerX - (int)cpx;
|
||||
}
|
||||
latlon = box.getLatLonFromPixel(cp.x + dx, cp.y + dy);
|
||||
latlon = box.getLatLonFromPixel(cpx + dx, cpy + dy);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1012,9 +1035,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
|
||||
private void doLayoutMenu() {
|
||||
final int posY = getPosY();
|
||||
setViewY(posY, true, true);
|
||||
setViewY(posY, true, !initLayout || !centered);
|
||||
updateMainViewLayout(posY);
|
||||
// centering = false;
|
||||
}
|
||||
|
||||
public void dismissMenu() {
|
||||
|
|
@ -1035,6 +1057,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
public void setFragmentVisibility(boolean visible) {
|
||||
if (visible) {
|
||||
view.setVisibility(View.VISIBLE);
|
||||
if (mapCenter != null) {
|
||||
map.setLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
|
||||
}
|
||||
adjustMapPosition(getPosY(), true, false);
|
||||
} else {
|
||||
view.setVisibility(View.GONE);
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@ package net.osmand.plus.mapcontextmenu;
|
|||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.text.ClipboardManager;
|
||||
import android.text.util.Linkify;
|
||||
import android.util.TypedValue;
|
||||
|
|
@ -40,11 +42,13 @@ public class MenuBuilder {
|
|||
private int iconId;
|
||||
private String text;
|
||||
private boolean needLinks;
|
||||
private boolean url;
|
||||
|
||||
public PlainMenuItem(int iconId, String text, boolean needLinks) {
|
||||
public PlainMenuItem(int iconId, String text, boolean needLinks, boolean url) {
|
||||
this.iconId = iconId;
|
||||
this.text = text;
|
||||
this.needLinks = needLinks;
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public int getIconId() {
|
||||
|
|
@ -58,6 +62,10 @@ public class MenuBuilder {
|
|||
public boolean isNeedLinks() {
|
||||
return needLinks;
|
||||
}
|
||||
|
||||
public boolean isUrl() {
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
public MenuBuilder(OsmandApplication app) {
|
||||
|
|
@ -80,7 +88,7 @@ public class MenuBuilder {
|
|||
|
||||
protected void buildPlainMenuItems(View view) {
|
||||
for (PlainMenuItem item : plainMenuItems) {
|
||||
buildRow(view, item.getIconId(), item.getText(), 0, item.isNeedLinks(), 0);
|
||||
buildRow(view, item.getIconId(), item.getText(), 0, item.isNeedLinks(), 0, item.isUrl());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -103,11 +111,11 @@ public class MenuBuilder {
|
|||
firstRow = false;
|
||||
}
|
||||
|
||||
protected View buildRow(View view, int iconId, String text, int textColor, boolean needLinks, int textLinesLimit) {
|
||||
return buildRow(view, getRowIcon(iconId), text, textColor, needLinks, textLinesLimit);
|
||||
protected View buildRow(View view, int iconId, String text, int textColor, boolean needLinks, int textLinesLimit, boolean isUrl) {
|
||||
return buildRow(view, getRowIcon(iconId), text, textColor, needLinks, textLinesLimit, isUrl);
|
||||
}
|
||||
|
||||
protected View buildRow(final View view, Drawable icon, final String text, int textColor, boolean needLinks, int textLinesLimit) {
|
||||
protected View buildRow(final View view, Drawable icon, final String text, int textColor, boolean needLinks, int textLinesLimit, boolean isUrl) {
|
||||
|
||||
if (!isFirstRow()) {
|
||||
buildRowDivider(view, false);
|
||||
|
|
@ -154,7 +162,9 @@ public class MenuBuilder {
|
|||
textView.setTextSize(16);
|
||||
textView.setTextColor(app.getResources().getColor(light ? R.color.ctx_menu_info_text_light : R.color.ctx_menu_info_text_dark));
|
||||
|
||||
if (needLinks) {
|
||||
if (isUrl) {
|
||||
textView.setTextColor(textView.getLinkTextColors());
|
||||
} else if (needLinks) {
|
||||
textView.setAutoLinkMask(Linkify.ALL);
|
||||
textView.setLinksClickable(true);
|
||||
}
|
||||
|
|
@ -173,6 +183,17 @@ public class MenuBuilder {
|
|||
llText.setLayoutParams(llTextViewParams);
|
||||
llText.addView(textView);
|
||||
|
||||
if (isUrl) {
|
||||
ll.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
intent.setData(Uri.parse(text));
|
||||
v.getContext().startActivity(intent);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
((LinearLayout) view).addView(ll);
|
||||
|
||||
rowBuilt();
|
||||
|
|
@ -248,8 +269,8 @@ public class MenuBuilder {
|
|||
public void buildCustomAddressLine(LinearLayout ll) {
|
||||
}
|
||||
|
||||
public void addPlainMenuItem(int iconId, String text, boolean needLinks) {
|
||||
plainMenuItems.add(new PlainMenuItem(iconId, text, needLinks));
|
||||
public void addPlainMenuItem(int iconId, String text, boolean needLinks, boolean isUrl) {
|
||||
plainMenuItems.add(new PlainMenuItem(iconId, text, needLinks, isUrl));
|
||||
}
|
||||
|
||||
public void clearPlainMenuItems() {
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ public abstract class MenuController extends BaseMenuController {
|
|||
|
||||
protected abstract void setObject(Object object);
|
||||
|
||||
public void addPlainMenuItem(int iconId, String text, boolean needLinks) {
|
||||
builder.addPlainMenuItem(iconId, text, needLinks);
|
||||
public void addPlainMenuItem(int iconId, String text, boolean needLinks, boolean isUrl) {
|
||||
builder.addPlainMenuItem(iconId, text, needLinks, isUrl);
|
||||
}
|
||||
|
||||
public void clearPlainMenuItems() {
|
||||
|
|
@ -139,7 +139,7 @@ public abstract class MenuController extends BaseMenuController {
|
|||
|
||||
protected void addMyLocationToPlainItems(LatLon latLon) {
|
||||
addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationName(getMapActivity(),
|
||||
latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", ""), false);
|
||||
latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", ""), false, false);
|
||||
}
|
||||
|
||||
public PointDescription getPointDescription() {
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
|
||||
buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app,
|
||||
amenity.getLocation().getLatitude(), amenity.getLocation().getLongitude(), true)
|
||||
.replaceAll("\n", ""), 0, false, 0);
|
||||
.replaceAll("\n", ""), 0, false, 0, false);
|
||||
}
|
||||
|
||||
public void buildAmenityRow(View view, AmenityInfoRow info) {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class FavouritePointMenuBuilder extends MenuBuilder {
|
|||
@Override
|
||||
public void buildInternal(View view) {
|
||||
if (!Algorithms.isEmpty(fav.getDescription())) {
|
||||
buildRow(view, R.drawable.ic_action_note_dark, fav.getDescription(), 0, true, 0);
|
||||
buildRow(view, R.drawable.ic_action_note_dark, fav.getDescription(), 0, true, 0, false);
|
||||
}
|
||||
|
||||
buildPlainMenuItems(view);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class GpxItemMenuBuilder extends MenuBuilder {
|
|||
String description = GpxUiHelper.getDescription(app, item.analysis, false);
|
||||
String[] lines = description.split("\n");
|
||||
for (String line : lines) {
|
||||
buildRow(view, R.drawable.ic_action_info_dark, line, 0, false, 0);
|
||||
buildRow(view, R.drawable.ic_action_info_dark, line, 0, false, 0, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,23 +34,23 @@ public class WptPtMenuBuilder extends MenuBuilder {
|
|||
DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext());
|
||||
Date date = new Date(wpt.time);
|
||||
buildRow(view, R.drawable.ic_action_data,
|
||||
dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, 0);
|
||||
dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, 0, false);
|
||||
}
|
||||
if (wpt.speed > 0) {
|
||||
buildRow(view, R.drawable.ic_action_speed,
|
||||
OsmAndFormatter.getFormattedSpeed((float)wpt.speed, app), 0, false, 0);
|
||||
OsmAndFormatter.getFormattedSpeed((float)wpt.speed, app), 0, false, 0, false);
|
||||
}
|
||||
if (!Double.isNaN(wpt.ele)) {
|
||||
buildRow(view, R.drawable.ic_action_altitude,
|
||||
OsmAndFormatter.getFormattedDistance((float) wpt.ele, app), 0, false, 0);
|
||||
OsmAndFormatter.getFormattedDistance((float) wpt.ele, app), 0, false, 0, false);
|
||||
}
|
||||
if (!Double.isNaN(wpt.hdop)) {
|
||||
buildRow(view, R.drawable.ic_action_gps_info,
|
||||
Algorithms.capitalizeFirstLetterAndLowercase(app.getString(R.string.plugin_distance_point_hdop)) + ": "
|
||||
+ OsmAndFormatter.getFormattedDistance((float)wpt.hdop, app), 0, false, 0);
|
||||
+ OsmAndFormatter.getFormattedDistance((float)wpt.hdop, app), 0, false, 0, false);
|
||||
}
|
||||
if (!Algorithms.isEmpty(wpt.desc)) {
|
||||
final View row = buildRow(view, R.drawable.ic_action_note_dark, wpt.desc, 0, true, 10);
|
||||
final View row = buildRow(view, R.drawable.ic_action_note_dark, wpt.desc, 0, true, 10, false);
|
||||
row.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ public class AmenityMenuController extends MenuController {
|
|||
if (resId == 0) {
|
||||
resId = R.drawable.ic_action_folder_stroke;
|
||||
}
|
||||
addPlainMenuItem(resId, typeStr, false);
|
||||
addPlainMenuItem(resId, typeStr, false, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,8 +184,8 @@ public class MapDataMenuController extends MenuController {
|
|||
@Override
|
||||
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
|
||||
if (indexItem != null) {
|
||||
addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getType().getString(getMapActivity()), false);
|
||||
addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getSizeDescription(getMapActivity()), false);
|
||||
addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getType().getString(getMapActivity()), false, false);
|
||||
addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getSizeDescription(getMapActivity()), false, false);
|
||||
}
|
||||
if (!Algorithms.isEmpty(mapObject.getWorldRegion().getParams().getWikiLink())) {
|
||||
String[] items = mapObject.getWorldRegion().getParams().getWikiLink().split(":");
|
||||
|
|
@ -195,11 +195,11 @@ public class MapDataMenuController extends MenuController {
|
|||
} else {
|
||||
url = "https://wikipedia.org/wiki/" + items[0].replace(' ', '_');
|
||||
}
|
||||
addPlainMenuItem(R.drawable.ic_world_globe_dark, url, true);
|
||||
addPlainMenuItem(R.drawable.ic_world_globe_dark, url, false, true);
|
||||
}
|
||||
if (indexItem != null) {
|
||||
DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(getMapActivity());
|
||||
addPlainMenuItem(R.drawable.ic_action_data, indexItem.getRemoteDate(dateFormat), false);
|
||||
addPlainMenuItem(R.drawable.ic_action_data, indexItem.getRemoteDate(dateFormat), false, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ public abstract class PointEditor {
|
|||
public PointEditor(MapActivity mapActivity) {
|
||||
this.app = mapActivity.getMyApplication();
|
||||
this.mapActivity = mapActivity;
|
||||
portraitMode = AndroidUiHelper.isOrientationPortrait(mapActivity);
|
||||
largeDevice = AndroidUiHelper.isXLargeDevice(mapActivity);
|
||||
updateLandscapePortrait();
|
||||
updateNightMode();
|
||||
}
|
||||
|
||||
|
|
@ -42,6 +42,10 @@ public abstract class PointEditor {
|
|||
return !nightMode;
|
||||
}
|
||||
|
||||
public void updateLandscapePortrait() {
|
||||
portraitMode = AndroidUiHelper.isOrientationPortrait(mapActivity);
|
||||
}
|
||||
|
||||
public void updateNightMode() {
|
||||
nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,9 @@ public abstract class PointEditorFragment extends Fragment {
|
|||
|
||||
view = inflater.inflate(R.layout.point_editor_fragment, container, false);
|
||||
|
||||
getEditor().updateLandscapePortrait();
|
||||
getEditor().updateNightMode();
|
||||
|
||||
if (getEditor().isLandscapeLayout()) {
|
||||
AndroidUtils.setBackground(view.getContext(), view, !getEditor().isLight(),
|
||||
R.drawable.bg_left_menu_light, R.drawable.bg_left_menu_dark);
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ public class EditPOIMenuBuilder extends MenuBuilder {
|
|||
if (osmPoint instanceof OsmNotesPoint) {
|
||||
OsmNotesPoint notes = (OsmNotesPoint) osmPoint;
|
||||
|
||||
buildRow(view, R.drawable.ic_action_note_dark, notes.getText(), 0, false, 0);
|
||||
buildRow(view, R.drawable.ic_group, notes.getAuthor(), 0, false, 0);
|
||||
buildRow(view, R.drawable.ic_action_note_dark, notes.getText(), 0, false, 0, false);
|
||||
buildRow(view, R.drawable.ic_group, notes.getAuthor(), 0, false, 0, false);
|
||||
|
||||
} else if (osmPoint instanceof OpenstreetmapPoint) {
|
||||
OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint;
|
||||
|
|
@ -57,7 +57,7 @@ public class EditPOIMenuBuilder extends MenuBuilder {
|
|||
if (resId == 0) {
|
||||
resId = R.drawable.ic_action_folder_stroke;
|
||||
}
|
||||
buildRow(view, resId, poiTranslation, 0, false, 0);
|
||||
buildRow(view, resId, poiTranslation, 0, false, 0, false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -67,12 +67,12 @@ public class EditPOIMenuBuilder extends MenuBuilder {
|
|||
continue;
|
||||
}
|
||||
String text = e.getKey() + "=" + e.getValue();
|
||||
buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, 0);
|
||||
buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, 0, false);
|
||||
}
|
||||
}
|
||||
|
||||
buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app,
|
||||
osmPoint.getLatitude(), osmPoint.getLongitude(), true)
|
||||
.replaceAll("\n", ""), 0, false, 0);
|
||||
.replaceAll("\n", ""), 0, false, 0, false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ public class OsmBugMenuController extends MenuController {
|
|||
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
|
||||
super.addPlainMenuItems(typeStr, pointDescription, latLon);
|
||||
for (String description : bug.getCommentDescriptionList()) {
|
||||
addPlainMenuItem(R.drawable.ic_action_note_dark, description, true);
|
||||
addPlainMenuItem(R.drawable.ic_action_note_dark, description, true, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -333,6 +333,20 @@ public class IncrementalChangesManager {
|
|||
return iul;
|
||||
}
|
||||
|
||||
public long getUpdatesSize(String fileName){
|
||||
RegionUpdateFiles ruf = regions.get(fileName.toLowerCase());
|
||||
long size = 0;
|
||||
for (List<RegionUpdate> regionUpdates : ruf.dayUpdates.values()) {
|
||||
for (RegionUpdate regionUpdate : regionUpdates) {
|
||||
size += regionUpdate.file.length();
|
||||
}
|
||||
}
|
||||
for (RegionUpdate regionUpdate : ruf.monthUpdates.values()) {
|
||||
size += regionUpdate.file.length();
|
||||
}
|
||||
return size;
|
||||
}
|
||||
|
||||
public long getTimestamp(String fileName) {
|
||||
RegionUpdateFiles ruf = regions.get(fileName.toLowerCase());
|
||||
return getTimestamp(ruf);
|
||||
|
|
@ -350,6 +364,4 @@ public class IncrementalChangesManager {
|
|||
}
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue