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

Added parking card and updated view of route details

Browse source
This commit is contained in:
Denis 2015-03-10 16:20:30 +02:00
parent 0b741f6f80
commit 11cc8be063
47 changed files with 165 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/res/layout/dash_parking_fragment.xml
View file

@ -30,13 +30,19 @@
<TextView
android:id="@+id/distance"
android:textSize="@dimen/dash_parking_text_size"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:textColor="@color/color_white"
tools:text="@string/app_version"/>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:textColor="@color/color_white"
android:textSize="@dimen/dashProgressTextSize"
tools:text="@string/app_version"/>
</LinearLayout>
<LinearLayout
@ -50,6 +56,8 @@
android:id="@+id/time_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_white"
android:textSize="@dimen/dash_parking_text_size"
tools:text="@string/app_mode_aircraft"/>
<TextView
@ -57,6 +65,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/osmand_parking_time_left"
android:textColor="@color/color_white"
android:textSize="@dimen/dashProgressTextSize"
tools:text="@string/app_version"/>
</LinearLayout>

20
OsmAnd/res/layout/route_details_header.xml Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:orientation="horizontal">
<TextView
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"/>
<ImageButton
android:id="@+id/start_navigation"
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:background="?attr/options_button_background"
android:src="@drawable/ic_action_start_navigation"/>
</LinearLayout>

99
OsmAnd/res/layout/route_info_list_item.xml
View file

@ -1,52 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:minWidth="50dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:orientation="vertical">
<TextView
android:id="@+id/cumulative_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/cumulative_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="@color/color_distance"
tools:text="@string/app_version"/>
<TextView
android:id="@+id/cumulative_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/cumulative_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="@color/color_distance"
tools:text="@string/app_version"/>
</LinearLayout>
<ImageView
android:id="@+id/direction"
android:layout_width="32dp"
android:layout_height="32dp" />
<ImageView
android:id="@+id/direction"
android:layout_marginLeft="@dimen/list_header_padding"
android:layout_marginRight="@dimen/list_header_padding"
android:layout_width="32dp"
android:layout_height="32dp"/>
<LinearLayout
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="50dp"
android:layout_marginRight="@dimen/list_header_padding"
android:orientation="vertical">
<TextView
android:id="@+id/distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="@color/color_distance"
tools:text="@string/app_version"/>
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
<TextView
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""></TextView>
android:textColor="@color/color_distance"
tools:text="@string/app_version"/>
</LinearLayout>
<TextView
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
tools:text="@string/lorem_ipsum"
android:text=""/>
</LinearLayout>

2
OsmAnd/res/values-af/strings.xml
View file

@ -680,7 +680,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Maksimum aanlyn vergroting</string>
<string name="max_level_download_tile_descr">Kies maksimum vergrotingsvlak om af te laai vir aanlyn teëls</string>
<string name="route_general_information">Totale afstand %1$s, reistyd %2$d h %3$d m.</string>
<string name="route_general_information">Totale afstand %1$s,\n reistyd %2$d h %3$d m.</string>
<string name="router_service_descr">Kies \'n aanlyn of aflyn navigasie diens</string>
<string name="router_service">Navigasie diens</string>
<string name="sd_dir_not_accessible">Berg adres op SD kaart is nie toeganklik nie</string>

2
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -1602,7 +1602,7 @@
<string name="search_online_address">Siecіŭny pošuk</string>
<string name="max_level_download_tile">Maksіmaĺnaje pavielіčeńnie onlajn mapaŭ</string>
<string name="max_level_download_tile_descr">Vybierycie maksіmaĺny ŭzrovień pavielіčeńnia dlia zahruzkі onlajn rastravych mapaŭ</string>
<string name="route_general_information">Ahuĺnaja adliehlaść %1$s, čas u darozie %2$d h. %3$d chv.</string>
<string name="route_general_information">Ahuĺnaja adliehlaść %1$s,\n čas u darozie %2$d h. %3$d chv.</string>
<string name="router_service_descr">Abrać siecіŭny cі pazasiecіŭny servіs navіhacyі</string>
<string name="router_service">Servіs navіhacyі</string>
<string name="sd_dir_not_accessible">Katalioh na SD-karcie niedastupny dlia zachoŭvańnia!</string>

4
OsmAnd/res/values-be/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
<string name="auto_zoom_close">Буйней</string>
<string name="auto_zoom_far">Для сярэдняга маштаба</string>
<string name="auto_zoom_farthest">Драбней</string>
@ -1221,7 +1221,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="search_online_address">Сеціўны пошук</string>
<string name="max_level_download_tile">Максімальнае павелічэньне онлайн мапаў</string>
<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэньня для сьцягваньня фрагмэнтаў мапы з Інтэрнэту</string>
<string name="route_general_information">Агульная адлегласьць %1$s, час у дарозе %2$d г. %3$d хв.</string>
<string name="route_general_information">Агульная адлегласьць %1$s,\n час у дарозе %2$d г. %3$d хв.</string>
<string name="router_service_descr">Абраць сеціўны ці пазасеціўны сэрвіс навігацыі</string>
<string name="router_service">Сэрвіс навігацыі</string>
<string name="sd_dir_not_accessible">Каталёг на SD-карце недаступны для захоўваньня!</string>

2
OsmAnd/res/values-bg/strings.xml
View file

@ -1327,7 +1327,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="search_online_address">Търсене онлайн</string>
<string name="max_level_download_tile">Максимален мащаб при онлайн</string>
<string name="max_level_download_tile_descr">Изберете максимален мащаб за сваляне на онлайн картни фрагменти</string>
<string name="route_general_information">Обща дистанция: %1$s, време: %2$d ч. %3$d мин.</string>
<string name="route_general_information">Обща дистанция: %1$s,\n време: %2$d ч. %3$d мин.</string>
<string name="router_service_descr">Изберете онлайн или офлайн услуга за навигация</string>
<string name="router_service">Услуга за навигация</string>
<string name="sd_dir_not_accessible">Папката за запис на SD картата не е достъпна</string>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -896,7 +896,7 @@
<string name="search_osm_nominatim">Cerca una adreça utilitzant OSM Nominatim</string>
<string name="hint_search_online">Cerca en línia: Núm. de la casa, carrer, ciutat</string>
<string name="max_level_download_tile_descr">Seleccioneu el nivell màxim de zoom per baixar les tessel·les dels mapes en línia</string>
<string name="route_general_information">Distància total %1$s, temps de viatge %2$d h %3$d m.</string>
<string name="route_general_information">Distància total %1$s,\n temps de viatge %2$d h %3$d m.</string>
<string name="router_service_descr">Escolliu un servei de navegació en línia o fora de línia</string>
<string name="download_question">Voleu baixar {0} - {1} ?</string>
<string name="download_question_exist">Ja existeixen dades fora de línia per {0} ({1}). Voleu actualitzar-les ({2}) ?</string>

2
OsmAnd/res/values-cs/strings.xml
View file

@ -622,7 +622,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Maximální zvětšení</string>
<string name="max_level_download_tile_descr">Jaké nejvyšší zvětšení mapy stahovat</string>
<string name="route_general_information">Celková vzdálenost %1$s, doba cesty %2$d h %3$d m.</string>
<string name="route_general_information">Celková vzdálenost %1$s,\n doba cesty %2$d h %3$d m.</string>
<string name="router_service_descr">Vyberte navigační službu</string>
<string name="router_service">Navigace</string>
<string name="sd_dir_not_accessible">Úložný datový adresář na SD kartě není dostupný!</string>

2
OsmAnd/res/values-da/strings.xml
View file

@ -1070,7 +1070,7 @@
<string name="osmand_routing_experimental">OsmAnd offline-navigation er en eksperimentel funktion og den virker ikke for afstande på mere end ca. 20 km.
\nNavigationstjenesten skiftes midlertidig til online CloudMade.</string>
<string name="search_offline_address">Offline søgning</string>
<string name="route_general_information">Total afstand %1$s, rejsetid %2$d t %3$d m.</string>
<string name="route_general_information">Total afstand %1$s,\n rejsetid %2$d t %3$d m.</string>
<string name="router_service_descr">Vælg en online eller offline navigationstjeneste</string>
<string name="router_service">Navigationstjeneste</string>
<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgængelig!</string>

2
OsmAnd/res/values-el/strings.xml
View file

@ -841,7 +841,7 @@
<string name="search_online_address">Διαδίκτυο</string>
<string name="max_level_download_tile">Μεγ. online κλίμακα</string>
<string name="max_level_download_tile_descr">Επιλέξτε τη μέγιστη κλίμακα προς λήψη για τα πλακίδια του online χάρτη</string>
<string name="route_general_information">Συνολική απόσταση %1$s, χρόνος ταξιδιού %2$d ω %3$d λ.</string>
<string name="route_general_information">Συνολική απόσταση %1$s,\n χρόνος ταξιδιού %2$d ω %3$d λ.</string>
<string name="router_service_descr">Επιλέξτε μια online ή offline υπηρεσία πλοήγησης</string>
<string name="router_service">Υπηρεσία πλοήγησης</string>
<string name="sd_dir_not_accessible">Η κατάλογος αποθήκευσης δεδομένων στην SD κάρτα δεν είναι προσβάσιμος!</string>

2
OsmAnd/res/values-es/strings.xml
View file

@ -552,7 +552,7 @@
<string name="search_online_address">Búsqueda en línea</string>
<string name="max_level_download_tile">Máx. acercamiento con conexión</string>
<string name="max_level_download_tile_descr">Elige el nivel de acercamiento máximo para descargar teselas de mapas con conexión</string>
<string name="route_general_information">Distancia total %1$s, tiempo de viaje %2$d h %3$d m.</string>
<string name="route_general_information">Distancia total %1$s,\n tiempo de viaje %2$d h %3$d m.</string>
<string name="router_service_descr">Elige un servicio de navegación con o sin conexión</string>
<string name="router_service">Servicio de navegación</string>
<string name="sd_dir_not_accessible">¡No se puede acceder a la carpeta de almacenamiento en la tarjeta SD!</string>

2
OsmAnd/res/values-eu/strings.xml
View file

@ -970,7 +970,7 @@
<string name="search_online_address">Sareko bilaketa</string>
<string name="max_level_download_tile">Sareko zoom maximoa</string>
<string name="max_level_download_tile_descr">Aukeratu sareko tesela mapentzat deskargatzeko zoom maila maximoa</string>
<string name="route_general_information">Guztira distantzia %1$s, bidean denbora %2$d h %3$d m.</string>
<string name="route_general_information">Guztira distantzia %1$s,\n bidean denbora %2$d h %3$d m.</string>
<string name="router_service_descr">Aukeratu sareko edo lineaz kanpoko nabigazio zerbitzu bat</string>
<string name="router_service">Nabigazio zerbitzua</string>
<string name="sd_dir_not_accessible">Ezin da direktorioa SD txartelan gorde</string>

2
OsmAnd/res/values-fi/strings.xml
View file

@ -521,7 +521,7 @@
<string name="use_english_names_descr">Valitse omakieliset tai englanninkieliset nimet</string>
<string name="go_back_to_osmand">Palaa OsmAnd karttaan</string>
<string name="empty_route_calculated">Virhe: Laskettu reitti on tyhjä</string>
<string name="route_general_information">Välimatka %1$s,matka-aika %2$d h %3$d m.</string>
<string name="route_general_information">Välimatka %1$s,\n matka-aika %2$d h %3$d m.</string>
<string name="gps_provider">GPS</string>
<string name="int_seconds">sekuntia</string>
<string name="int_min">min.</string>

2
OsmAnd/res/values-fr/strings.xml
View file

@ -564,7 +564,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Niveau de zoom maximum</string>
<string name="max_level_download_tile_descr">Choisir un niveau de zoom maximum pour le téléchargement</string>
<string name="route_general_information">Distance totale : %1$s, durée estimée : %2$d h %3$d m.</string>
<string name="route_general_information">Distance totale : %1$s,\n durée estimée : %2$d h %3$d m.</string>
<string name="router_service_descr">Sélectionner un service de navigation, hors-ligne ou en ligne</string>
<string name="router_service">Service de navigation</string>
<string name="sd_dir_not_accessible">Le dossier contenant les données sur la carte SD est inaccessible !</string>

2
OsmAnd/res/values-gl/strings.xml
View file

@ -1496,7 +1496,7 @@
<string name="search_online_address">Busca con conexión</string>
<string name="max_level_download_tile">Max. online zoom</string>
<string name="max_level_download_tile_descr">Escoller o nivel de ampliación máximo que descargar para as teselas dos mapas con conexión</string>
<string name="route_general_information">Distancia total %1$s, tempo de viaxe %2$d h %3$d m.</string>
<string name="route_general_information">Distancia total %1$s,\n tempo de viaxe %2$d h %3$d m.</string>
<string name="router_service_descr">Escoller un servizo de navegación con ou sen conexión</string>
<string name="router_service">Navigation service</string>
<string name="sd_dir_not_accessible">O cartafol de almacenamento de datos do cartón SD non é accesíbel!</string>

2
OsmAnd/res/values-hr/strings.xml
View file

@ -406,7 +406,7 @@
<string name="download_question">Preuzmi {0} - {1} ?</string>
<string name="download_question_exist">Offline podaci za {0} već postoje ({1}). Želite li ih ažurirali ({2})?</string>
<string name="search_offline_address">Traži offline</string>
<string name="route_general_information">Ukupna udaljenost %1$s, vrijeme putovanja %2$d i %3$d m.</string>
<string name="route_general_information">Ukupna udaljenost %1$s,\n vrijeme putovanja %2$d i %3$d m.</string>
<string name="search_nothing_found">Nije pronađeno ništa</string>
<string name="searching">Tražim…</string>
<string name="searching_address">Tražim adresu…</string>

2
OsmAnd/res/values-hu/strings.xml
View file

@ -615,7 +615,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Max. online nagyítás</string>
<string name="max_level_download_tile_descr">Maximum nagyítási szint kiválasztása térképcsempék letöltéshez</string>
<string name="route_general_information">Teljes távolság %1$s, utazási idő %2$d ó. %3$d p.</string>
<string name="route_general_information">Teljes távolság %1$s,\n utazási idő %2$d ó. %3$d p.</string>
<string name="router_service_descr">Online vagy offline útvonaltervező szolgáltatás kiválasztása</string>
<string name="router_service">Útvonaltervező</string>
<string name="sd_dir_not_accessible">Az adattárolási könyvtár nem elérhető az SD kártyán!</string>

2
OsmAnd/res/values-it/strings.xml
View file

@ -541,7 +541,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Max zoom online</string>
<string name="max_level_download_tile_descr">Scegli il livello di zoom massimo da scaricare per le mappe online a mattonelle</string>
<string name="route_general_information">Distanza totale = %1$s, durata del viaggio = %2$d h %3$d m.</string>
<string name="route_general_information">Distanza totale = %1$s,\n durata del viaggio = %2$d h %3$d m.</string>
<string name="router_service_descr">Scegli un servizio online oppure offline di navigazione</string>
<string name="router_service">Servizio di navigazione</string>
<string name="sd_dir_not_accessible">La cartella di salvataggio sulla SD card non è accessibile!</string>

2
OsmAnd/res/values-ja/strings.xml
View file

@ -423,7 +423,7 @@ POIの更新は利用できません</string>
<string name="max_level_download_tile">最大オンラインズーム</string>
<string name="max_level_download_tile_descr">オンラインマップタイル用にダウンロードする
最大ズームレベルを選ぶ</string>
<string name="route_general_information">総距離 %1$s,
<string name="route_general_information">総距離 %1$s,\n
移動時間 %2$d 時間 %3$d 分。</string>
<string name="router_service_descr">オンラインまたはオフラインルーティングサービスを選択</string>
<string name="router_service">経路案内サービス</string>

2
OsmAnd/res/values-ka/strings.xml
View file

@ -613,7 +613,7 @@
<string name="search_online_address">ინტერნეტი</string>
<string name="max_level_download_tile">მაქს. მიმდინარე გადიდება</string>
<string name="max_level_download_tile_descr">აირჩიეთ მაქსიმალური გადიდება მიმდინარე რუკების ნაწილის ჩამოტვირთვისას</string>
<string name="route_general_information">ჯამური სიშორე %1$s, მოგზაურობის დრო %2$d სთ %3$d წთ.</string>
<string name="route_general_information">ჯამური სიშორე %1$s,\n მოგზაურობის დრო %2$d სთ %3$d წთ.</string>
<string name="router_service_descr">აირჩიეთ მიმდინარე ან გათიშული ნავიგაციის სერვისი</string>
<string name="router_service">ნავიგაციის სერვისი</string>
<string name="sd_dir_not_accessible">შენახვის დასტა SDCard-ზე მიუწვდომელია</string>

2
OsmAnd/res/values-ko/strings.xml
View file

@ -656,7 +656,7 @@
<string name="search_online_address">온라인 검색</string>
<string name="max_level_download_tile">최대 온라인 줌</string>
<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
<string name="route_general_information">전체거리 %1$s,\n 여행시간 %2$d h %3$d m.</string>
<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
<string name="router_service">운행 서비스</string>
<string name="sd_dir_not_accessible">SD 카드에 있는 데이터 저장 폴더에 접근할 수 없습니다!</string>

2
OsmAnd/res/values-lt/strings.xml
View file

@ -754,7 +754,7 @@
<string name="search_online_address">Internete</string>
<string name="max_level_download_tile">Didžiausias mastelis interneto žemėlapiui</string>
<string name="max_level_download_tile_descr">Pasirinkti didžiausią internetinio žemėlapio mastelį parsiuntimui</string>
<string name="route_general_information">Visas atstumas %1$s, kelionės trukmė %2$d h %3$d m.</string>
<string name="route_general_information">Visas atstumas %1$s,\n kelionės trukmė %2$d h %3$d m.</string>
<string name="router_service_descr">Pasirinkti navigacijos paslaugą internete arba įrenginyje</string>
<string name="router_service">Navigacijos paslauga</string>
<string name="sd_dir_not_accessible">Duomenų išsaugojimo segtuvas SD kortelėje nepasiekiamas!</string>

2
OsmAnd/res/values-lv/strings.xml
View file

@ -613,7 +613,7 @@
<string name="search_online_address">Internets</string>
<string name="max_level_download_tile">Maksimālais tiešsaistes palielinājums</string>
<string name="max_level_download_tile_descr">Izvēlēties maksimālo palielinājuma līmeni, kuru lejupielādēt tiešsaites kartēm</string>
<string name="route_general_information">Kopējā distance %1$s, ceļojuma laiks %2$d h %3$d m.</string>
<string name="route_general_information">Kopējā distance %1$s,\n ceļojuma laiks %2$d h %3$d m.</string>
<string name="router_service_descr">Izvēlieties tiešsaites vai netiešsaites maršrutēšanas pakalpojumu</string>
<string name="router_service">Maršrutēšanas pakalpojums</string>
<string name="sd_dir_not_accessible">Glabātuves mape SD kartē nav pieejama</string>

2
OsmAnd/res/values-mr/strings.xml
View file

@ -237,7 +237,7 @@
<string name="searching_address">पत्ता शोधत आहे…</string>
<string name="search_offline_address">ऑफलाएन शोध</string>
<string name="search_online_address">ऑनलाएन शोध</string>
<string name="route_general_information">एकुण अंतर %1$s, प्रवासाचा वेळ %2$d ता %3$d मि.</string>
<string name="route_general_information">एकुण अंतर %1$s,\n प्रवासाचा वेळ %2$d ता %3$d मि.</string>
<string name="download_question">डाउनलोड {0} - {1} ?</string>
<string name="address">पत्ता</string>
<string name="shared_string_download_successful">डाउनलोड यशस्वी</string>

2
OsmAnd/res/values-nb/strings.xml
View file

@ -486,7 +486,7 @@
<string name="search_online_address">Nettbasert søk</string>
<string name="max_level_download_tile">Maks. nettbasert zoom</string>
<string name="max_level_download_tile_descr">Velg maksimalt zoomnivå å laste ned for nettbaserte kartseksjoner</string>
<string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d m.</string>
<string name="route_general_information">Total distanse %1$s,\n reisetid %2$d t %3$d m.</string>
<string name="router_service_descr">Velg en nettbasert eller offline navigeringstjeneste</string>
<string name="router_service">Navigeringstjeneste</string>
<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgjengelig!</string>

2
OsmAnd/res/values-nl/strings.xml
View file

@ -633,7 +633,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Max. online zoom</string>
<string name="max_level_download_tile_descr">Kies maximum zoomniveau voor het downloaden van online kaartsegmenten</string>
<string name="route_general_information">Totale afstand %1$s, reistijd %2$d u %3$d m.</string>
<string name="route_general_information">Totale afstand %1$s,\n reistijd %2$d u %3$d m.</string>
<string name="router_service_descr">Kies een online of offline routeberekening</string>
<string name="router_service">Routeberekening</string>
<string name="sd_dir_not_accessible">Opslagmap op SD kaart is niet toegankelijk</string>

2
OsmAnd/res/values-pl/strings.xml
View file

@ -466,7 +466,7 @@
<string name="search_online_address">Wyszukiwanie online</string>
<string name="max_level_download_tile">Maks. zoom online</string>
<string name="max_level_download_tile_descr">Wybierz maksymalny poziom przybliżenia mapy dla pobierania kafelków map online</string>
<string name="route_general_information">Całkowity dystans %1$s, czas podróży %2$d h %3$d m.</string>
<string name="route_general_information">Całkowity dystans %1$s,\n czas podróży %2$d h %3$d m.</string>
<string name="router_service_descr">Wybierz usługę nawigacyjną (online lub offline)</string>
<string name="router_service">Usługa nawigacyjna</string>
<string name="sd_dir_not_accessible">Katalog przechowywania danych na karcie SD jest niedostępny!</string>

2
OsmAnd/res/values-pt/strings.xml
View file

@ -231,7 +231,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Nível de zoom máx</string>
<string name="max_level_download_tile_descr">Escolher um nível máximo de zoom para download</string>
<string name="route_general_information">Distância total = %1$s tempo de viagem, = %2$dh %3$dm.</string>
<string name="route_general_information">Distância total = %1$s \n tempo de viagem, = %2$dh %3$dm.</string>
<string name="router_service_descr">Escolha o sistema de navegação</string>
<string name="router_service">Serviço de navegação</string>
<string name="sd_dir_not_accessible">Diretório do cartão SD inacessível</string>

2
OsmAnd/res/values-ro/strings.xml
View file

@ -897,7 +897,7 @@
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Nivel max. zoom online</string>
<string name="max_level_download_tile_descr">Alegeți nivelul maxim de zoom pentru descărcarea de hărți raster online</string>
<string name="route_general_information">Distanța totală %1$s, timp %2$d h %3$d m.</string>
<string name="route_general_information">Distanța totală %1$s,\n timp %2$d h %3$d m.</string>
<string name="router_service_descr">Alegeți un serviciu de rutare online sau offline</string>
<string name="router_service">Serviciu de rutare</string>
<string name="sd_dir_not_accessible">Directorul de pe cardul SD unde se salvează date nu este accesibil!</string>

2
OsmAnd/res/values-ru/strings.xml
View file

@ -660,7 +660,7 @@
<string name="search_online_address">Интернет</string>
<string name="max_level_download_tile">Уровень детализации</string>
<string name="max_level_download_tile_descr">Выберите максимальный уровень для загрузки из Интернета</string>
<string name="route_general_information">Общая протяженность = %1$s, время в пути = %2$d ч. %3$d мин.</string>
<string name="route_general_information">Общая протяженность = %1$s,\n время в пути = %2$d ч. %3$d мин.</string>
<string name="router_service_descr">Выберите онлайн или оффлайн сервис для прокладки маршрута</string>
<string name="router_service">Прокладка маршрута</string>
<string name="sd_dir_not_accessible">Директория хранения данных на SD-карте не доступна!</string>

2
OsmAnd/res/values-sc/strings.xml
View file

@ -1469,7 +1469,7 @@
<string name="search_online_address">Ìnternet</string>
<string name="max_level_download_tile">Max zoom in lìnia</string>
<string name="max_level_download_tile_descr">Issèbera su livellu màssimu da iscarrigare pro sa mapas in lìnia a tasseddos</string>
<string name="route_general_information">Distàntzia totale %1$s, durada de su biàgiu %2$d h %3$d m.</string>
<string name="route_general_information">Distàntzia totale %1$s \n durada de su biàgiu %2$d h %3$d m.</string>
<string name="router_service_descr">Issèbera unu servìtziu in lìnia o sena lìnia de nàvigu</string>
<string name="router_service">Servìtziu de nàvigu</string>
<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s’ischeda SD no est atzessiva!</string>

2
OsmAnd/res/values-sk/strings.xml
View file

@ -730,7 +730,7 @@
<string name="search_online_address">Online hľadanie</string>
<string name="max_level_download_tile">Max. online úroveň priblíženia</string>
<string name="max_level_download_tile_descr">Výber maximálnej úrovne priblíženia na stiahnutie</string>
<string name="route_general_information">Celková vzdialenosť %1$s, čas cestovania %2$d h %3$d m.</string>
<string name="route_general_information">Celková vzdialenosť %1$s \n čas cestovania %2$d h %3$d m.</string>
<string name="router_service_descr">Výber online alebo offline navigačnej služby</string>
<string name="router_service">Navigačná služba</string>
<string name="sd_dir_not_accessible">Priečinok pre uloženie na SD karte nie je prístupný!</string>

2
OsmAnd/res/values-sl/strings.xml
View file

@ -986,7 +986,7 @@
<string name="search_online_address">Iskanje v povezavi</string>
<string name="max_level_download_tile">Maks. povečava za spletne</string>
<string name="max_level_download_tile_descr">Izbira najvišje stopnje povečave za prenos spletnih zemljevidov</string>
<string name="route_general_information">Skupna razdalja %1$s, čas potovanja %2$d u %3$d m.</string>
<string name="route_general_information">Skupna razdalja %1$s \n čas potovanja %2$d u %3$d m.</string>
<string name="router_service_descr">Izbira spletne ali krajevne navigacijske storitve</string>
<string name="sd_dir_not_accessible">Shranjevalnega imenika na SD kartici ni na voljo!</string>
<string name="download_question">Prenesti {0} - {1}?</string>

2
OsmAnd/res/values-sv/strings.xml
View file

@ -806,7 +806,7 @@
<string name="hint_search_online">Online-sökning: Husnummer, gata, stad</string>
<string name="search_offline_address">Offline</string>
<string name="max_level_download_tile_descr">Välj högsta zoomnivå att ladda ner för online-kartbitar</string>
<string name="route_general_information">Total sträcka %1$s, restid %2$d h %3$d m.</string>
<string name="route_general_information">Total sträcka %1$s \n restid %2$d h %3$d m.</string>
<string name="router_service_descr">Välj en online- eller offline-navigeringstjänst</string>
<string name="router_service">Navigeringstjänst</string>
<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet är inte tillgänglig!</string>

2
OsmAnd/res/values-tr/strings.xml
View file

@ -1063,7 +1063,7 @@
<string name="search_nothing_found">Sonuç bulunamadı</string>
<string name="hint_search_online">Ev numarası, sokak, şehir</string>
<string name="search_offline_address">Çevrimdışı arama</string>
<string name="route_general_information">Toplam mesafe %1$s, seyahat süresi %2$d s %3$d d.</string>
<string name="route_general_information">Toplam mesafe %1$s \n seyahat süresi %2$d s %3$d d.</string>
<string name="router_service_descr">Çevrimiçi veya çevrimdışı gezinti hizmeti seçin</string>
<string name="sd_dir_not_accessible">SD karttaki kayıt dizini ulaşılabilir değil</string>
<string name="download_question">{0} - {1} indir ?</string>

4
OsmAnd/res/values-uk/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
\n\t* Більш точні маршрути (трохи повільніше)
\n\t* Розумний і швидкий перерахунок маршруту
\n\t* Вказання напрямку руху по смугам
@ -679,7 +679,7 @@
<string name="search_online_address">Інтернет</string>
<string name="max_level_download_tile">Макс. рівень деталізації</string>
<string name="max_level_download_tile_descr">Веберіть максимальний рівень деталізації для завантаження з Інтернету</string>
<string name="route_general_information">Загальна відстань %1$s, Час в дорозі %2$d г %3$d хв.</string>
<string name="route_general_information">Загальна відстань %1$s \n Час в дорозі %2$d г %3$d хв.</string>
<string name="router_service_descr">Виберіть сервіс для прокладання маршруту</string>
<string name="router_service">Прокладання маршруту</string>
<string name="sd_dir_not_accessible">Тека даних на SD-карті не доступна!</string>

2
OsmAnd/res/values-vi/strings.xml
View file

@ -451,7 +451,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
<string name="search_online_address">Internet</string>
<string name="max_level_download_tile">Online zoom lớn nhất</string>
<string name="max_level_download_tile_descr">Chọn tỉ lệ Zoom lớn nhất để tải về bản đồ tile online</string>
<string name="route_general_information">Tổng khoảng cách %1$s, thời gian đi %2$d h %3$d m.</string>
<string name="route_general_information">Tổng khoảng cách %1$s \n thời gian đi %2$d h %3$d m.</string>
<string name="router_service_descr">Chọn dịch vụ tìm đường Online hoặc Offline</string>
<string name="router_service">Dịch vụ tìm đường</string>
<string name="sd_dir_not_accessible">Không truy xuất được thư mục trên thẻ nhớ!</string>

2
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -826,7 +826,7 @@
<string name="search_offline_address">离线搜索</string>
<string name="search_online_address">在线搜索</string>
<string name="max_level_download_tile">最大在线显示级别</string>
<string name="route_general_information">总距离 %1$s，旅行时间 %2$d 小时 %3$d 分钟。</string>
<string name="route_general_information">总距离 %1$s \n 旅行时间 %2$d 小时 %3$d 分钟。</string>
<string name="router_service_descr">选择一个在线或离线导航服务</string>
<string name="router_service">导航服务</string>
<string name="sd_dir_not_accessible">SD卡上的保存目录无法访问</string>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -784,7 +784,7 @@
<string name="search_online_address">線上查尋</string>
<string name="max_level_download_tile">線上最大縮放比</string>
<string name="max_level_download_tile_descr">選擇線上下載地圖圖磚最大縮放級別</string>
<string name="route_general_information">總距離 %1$s、行駛時間 %2$d 小時 %3$d 分。</string>
<string name="route_general_information">總距離 %1$s \n 行駛時間 %2$d 小時 %3$d 分。</string>
<string name="router_service_descr">選擇線上或離線的導航服務</string>
<string name="router_service">導航服務</string>
<string name="sd_dir_not_accessible">在 SD 卡上的存儲資料夾無法存取！</string>

3
OsmAnd/res/values/sizes.xml
View file

@ -47,10 +47,10 @@
<dimen name="dashboard_map_bottom_padding">90dp</dimen>
<dimen name="dashboard_parking_left_margin">16dp</dimen>
<dimen name="dashboard_parking_icon_size">48dp</dimen>
<dimen name="map_button_size">40dp</dimen>
<dimen name="map_button_margin">8dp</dimen>
<!-- TextSizes -->
<dimen name="list_header_text_size">14sp</dimen>
<dimen name="showAllButtonTextSize">12sp</dimen>
@ -60,4 +60,5 @@
<dimen name="dashFavDescTextSize">14sp</dimen>
<dimen name="dashProgressTextSize">14sp</dimen>
<dimen name="dashParkingTextSize">24sp</dimen>
<dimen name="dash_parking_text_size">22sp</dimen>
</resources>

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

@ -1935,7 +1935,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="search_online_address">Online search</string>
<string name="max_level_download_tile">Max. online zoom</string>
<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
<string name="route_general_information">Total distance %1$s \n travelling time %2$d h %3$d m.</string>
<string name="router_service_descr">Choose an online or offline navigation service</string>
<string name="router_service">Navigation service</string>
<string name="sd_dir_not_accessible">The data storage folder on the SD card is not accessible!</string>

3
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -428,6 +428,9 @@ public class MapActivity extends AccessibleActivity {
}
}
}
if (intent.getStringExtra(ShowRouteInfoActivity.START_NAVIGATION) != null) {
mapLayers.getMapControlsLayer().startNavigation();
}
}
View progress = mapLayers.getMapInfoLayer().getProgressBar();

16
OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java
View file

@ -23,6 +23,7 @@ import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.osmedit.LocalOpenstreetmapActivity;
import net.osmand.plus.routing.RouteDirectionInfo;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.TurnPathHelper;
@ -49,14 +50,25 @@ public class ShowRouteInfoActivity extends OsmandListActivity {
private TextView header;
private DisplayMetrics dm;
public static final String START_NAVIGATION = "START_NAVIGATION";
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setContentView(R.layout.default_list_view);
ListView lv = (ListView) findViewById(android.R.id.list);
header = new TextView(this);
View headerView = getLayoutInflater().inflate(R.layout.route_details_header, null);
header = (TextView) headerView.findViewById(R.id.header);
helper = ((OsmandApplication)getApplication()).getRoutingHelper();
lv.addHeaderView(header);
headerView.findViewById(R.id.start_navigation).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent i = new Intent(ShowRouteInfoActivity.this, MapActivity.class);
i.putExtra(START_NAVIGATION, START_NAVIGATION);
startActivity(i);
}
});
lv.addHeaderView(headerView);
dm = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(dm);

6
OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
View file

@ -73,8 +73,12 @@ public class DashParkingFragment extends DashLocationFragment {
mainView.setVisibility(View.VISIBLE);
}
LatLon loc = getDefaultLocation();
LatLon position = plugin.getParkingPosition();
int dist = (int) (MapUtils.getDistance(position.getLatitude(), position.getLongitude(),
loc.getLatitude(), loc.getLongitude()));
String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication());
((TextView) mainView.findViewById(R.id.distance)).setText(distance);
boolean limited = plugin.getParkingType();
String parking_name = limited ?

7
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -125,6 +125,13 @@ public class MapControlsLayer extends OsmandMapLayer {
initTransparencyBar(view, parent);
}
public void startNavigation() {
if (mapNavigationControl == null) {
return;
}
mapNavigationControl.startNavigation();
}
private <T extends MapControls> T init(final T c, FrameLayout parent, int gravity) {
c.setGravity(gravity);

8
OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java
View file

@ -77,8 +77,7 @@ public class MapNavigateControl extends MapControls {
}
private void startNavigation() {
public void startNavigation() {
stopCounter();
OsmandApplication app = mapActivity.getMyApplication();
RoutingHelper routingHelper = app.getRoutingHelper();
@ -86,8 +85,7 @@ public class MapNavigateControl extends MapControls {
routingHelper.setRoutePlanningMode(false);
mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
} else {
OsmandApplication ctx = mapActivity.getMyApplication();
if(!ctx.getTargetPointsHelper().checkPointToNavigateShort()) {
if(!app.getTargetPointsHelper().checkPointToNavigateShort()) {
ri.showDialog();
} else {
mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
@ -100,7 +98,7 @@ public class MapNavigateControl extends MapControls {
}
}
}
@Override
public void showControls(final FrameLayout parent) {
navigateButton = addButton(parent, R.string.get_directions, R.drawable.map_btn_navigate);