Merge branch 'master' of ssh://github.com/osmandapp/Osmand
This commit is contained in:
Alexey Pelykh
commit
61fb17bc76
33 changed files with 349 additions and 190 deletions
|
|
@ -5,11 +5,4 @@
|
|||
android:id="@+id/main_scroll"
|
||||
android:background="@color/dashboard_background" >
|
||||
|
||||
<fragment
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
|
||||
android:layout_marginTop="@dimen/dashCardMargin"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout android:id="@+id/header"
|
||||
<LinearLayout android:id="@+id/header_layout"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="@dimen/dashHeaderHeight">
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
android:background="@drawable/dashboard_button"
|
||||
android:layout_height="@dimen/dashListItemHeight">
|
||||
<View android:layout_width="match_parent"
|
||||
android:id="@+id/divider"
|
||||
android:background="@color/dashboard_divider"
|
||||
android:layout_height="1dp"/>
|
||||
<LinearLayout android:orientation="horizontal"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
android:layout_marginTop="0dp"
|
||||
android:autoLink="web"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="18sp"></TextView>
|
||||
android:textSize="18sp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
|
|
|
|||
|
|
@ -22,6 +22,23 @@
|
|||
android:selectAllOnFocus="true" />
|
||||
</TableRow>
|
||||
|
||||
<TableRow>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/osmo_group_description" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/descr"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:completionThreshold="1"
|
||||
android:inputType="textCapWords"
|
||||
android:paddingLeft="3dp"
|
||||
android:selectAllOnFocus="true" />
|
||||
</TableRow>
|
||||
|
||||
<TableRow>
|
||||
|
||||
<TextView
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
android:paddingTop="4dp"
|
||||
android:paddingBottom="4dp"
|
||||
android:paddingRight="8dp"
|
||||
android:paddingLeft="8dp">
|
||||
android:paddingLeft="12dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
style="@style/ListText.Small"></TextView>
|
||||
style="@style/ListText.Small"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/local_index_size"
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
android:gravity="right"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/ListText.Small"></TextView>
|
||||
style="@style/ListText.Small"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
|
|
@ -47,6 +47,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="25"
|
||||
style="@style/ListText.Small"></TextView>
|
||||
style="@style/ListText.Small"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
<string name="search_position_current_location_found">Posició (trobada)</string>
|
||||
<string name="search_position_address">Adreça…</string>
|
||||
<string name="search_position_undefined">Indefinida</string>
|
||||
<string name="search_position_fixed">Fixada</string>
|
||||
<string name="search_position_fixed">Posició fixada</string>
|
||||
<string name="search_position_current_location">Posició actual…</string>
|
||||
<string name="context_menu_item_search">Cerca prop d\'aquí</string>
|
||||
<string name="save_route_dialog_title">Desa la ruta com una traça GPX</string>
|
||||
|
|
@ -294,7 +294,7 @@
|
|||
<string name="old_poi_file_should_be_deleted">El fitxer de dades de PDI «%1$s» és redundant i serà suprimit.</string>
|
||||
<string name="search_position_favorites">Preferits…</string>
|
||||
<string name="search_position_map_view">Darrera visualització del mapa</string>
|
||||
<string name="select_search_position">Cerca a prop:</string>
|
||||
<string name="select_search_position">Cerca prop de:</string>
|
||||
<string name="menu_save_directions">Desa les indicacions</string>
|
||||
<string name="local_index_upload_gpx_description">Pengeu els fitxers GPX a la comunitat d\'OSM. Es faran servir per millorar els mapes.</string>
|
||||
<string name="local_index_items_uploaded">%1$d de %2$d ítem(s) s\'han penjat amb èxit.</string>
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@
|
|||
<string name="search_position_fixed">" "</string>
|
||||
<string name="search_position_current_location">Aktuel position…</string>
|
||||
<string name="search_position_map_view">Seneste kortvisning</string>
|
||||
<string name="select_search_position">Oprindelse:</string>
|
||||
<string name="select_search_position">Udgangspunkt:</string>
|
||||
<string name="context_menu_item_search">Søg i nærheden</string>
|
||||
<string name="save_route_dialog_title">Gem rute som GPX-spor</string>
|
||||
<string name="route_successfully_saved_at">Rute gemt som \'%1$s\'.</string>
|
||||
|
|
|
|||
|
|
@ -1737,7 +1737,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
|
|||
<string name="lang_sw">Swahili</string>
|
||||
<string name="lang_he">Hebreo</string>
|
||||
<string name="forward">Siguiente</string>
|
||||
<string name="home">Casa</string>
|
||||
<string name="home">Inicio</string>
|
||||
<string name="live_monitoring_m_descr">Enviar seguimiento a un servicio web específico si la grabación GPX está habilitada.</string>
|
||||
<string name="live_monitoring_m">Seguimiento en línea (requiere GPX)</string>
|
||||
<string name="live_monitoring_start">Iniciar seguimiento en línea</string>
|
||||
|
|
@ -1849,7 +1849,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
|
|||
<string name="advanced_settings">Avanzado</string>
|
||||
<string name="osmo_use_https_descr">Usar conexión segura con el servidor</string>
|
||||
<string name="osmo_use_https">Usar HTTPS</string>
|
||||
<string name="home_button">Casa</string>
|
||||
<string name="home_button">Inicio</string>
|
||||
<string name="map_update">Hay actualizaciones disponibles para %1$s mapa(s)</string>
|
||||
<string name="search_for">Buscar</string>
|
||||
<string name="show_map">MOSTRAR MAPA</string>
|
||||
|
|
@ -1879,11 +1879,11 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
|
|||
<string name="routing_attr_no_new_routing_description">No usar reglas de ruteo introducidas en v.1.9</string>
|
||||
<string name="rendering_value_germanRoadAtlas_name">Atlas de carreteras alemanas</string>
|
||||
<string name="traffic_warning_railways">Cruce de ferrocarril</string>
|
||||
<string name="traffic_warning_pedestrian">Paso peatonal</string>
|
||||
<string name="traffic_warning_pedestrian">Paso de peatones</string>
|
||||
<string name="show_railway_warnings">Mostrar cruces de ferrocarril</string>
|
||||
<string name="show_pedestrian_warnings">Mostrar pasos peatonales</string>
|
||||
<string name="rendering_value_americanRoadAtlas_name">Atlas de carreteras norte-americanas</string>
|
||||
<string name="show_pedestrian_warnings">Mostrar pasos de peatones</string>
|
||||
<string name="rendering_value_americanRoadAtlas_name">Atlas americano de carreteras</string>
|
||||
<string name="navigate_point_easting">Al este</string>
|
||||
<string name="navigate_point_northing">Al norte</string>
|
||||
<string name="speak_pedestrian">Anunciar pasos peatonales</string>
|
||||
<string name="speak_pedestrian">Anunciar pasos de peatones</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -146,10 +146,10 @@
|
|||
<string name="search_position_address">Adresse…</string>
|
||||
<string name="search_position_favorites">Favoris…</string>
|
||||
<string name="search_position_undefined">Non défini</string>
|
||||
<string name="search_position_fixed">Fixé</string>
|
||||
<string name="search_position_fixed"/>
|
||||
<string name="search_position_current_location">Position actuelle…</string>
|
||||
<string name="search_position_map_view">Dernière vue</string>
|
||||
<string name="select_search_position">Recherche autour de :</string>
|
||||
<string name="select_search_position">Origine :</string>
|
||||
<string name="context_menu_item_search">Rechercher autour de ce point</string>
|
||||
<string name="tip_recent_changes_0_6_7_t">Changement pour 0.6.7 :
|
||||
\n\t- Gestionnaire de données hors-ligne (téléchargement, suppression, sauvegarde des données hors-ligne directement dans OsmAnd)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -237,7 +237,7 @@
|
|||
<string name="search_position_current_location">현재 위치…</string>
|
||||
<string name="search_position_map_view">마지막 지도 보기</string>
|
||||
|
||||
<string name="select_search_position">주변 검색 :</string>
|
||||
<string name="select_search_position">기원 :</string>
|
||||
<string name="context_menu_item_search">가까운 주변 검색</string>
|
||||
<string name="tip_recent_changes_0_6_7_t">"0.6.7 버전에 대한 변경사항들 :
|
||||
\n\t- 오프라인 데이터 관리 (OsmAnd 에서 직접 오프라인 데이터 다운로드, 삭제, 활성화 / 비활성화)
|
||||
|
|
@ -404,7 +404,7 @@
|
|||
|
||||
|
||||
<string name="tip_navigation">운행</string>
|
||||
<string name="tip_navigation_t">"운행시작을 하기 전에 목적지를 선택하여야 합니다. 그런 다음 맵 상에서 \'메뉴\' -> \'운행시작\' 을 누르고 내비게이션 종류를 선택합니다.
|
||||
<string name="tip_navigation_t">"운행을 시작하기 전에 목적지를 선택하여야 합니다. 그런 다음 맵 상에서 \'메뉴\' -> \'운행시작\' 을 누르고 내비게이션 종류를 선택합니다.
|
||||
\n\n목적지는 지도에 도착지 플래그 마커로 표시되고 OsmAnd는 주황색 삼각형으로 목적지까지의 거리와 목적지까지의 방향을 표시합니다.
|
||||
\n\n당신이 \"운행시작\"을 선택 할 수 있습니다. 이는 OsmAnd가 당신을 라이브 - 가이드 (활성화 된 경우) 음성 안내를 제공 할 것을 의미합니다, 어떤 라이브 guideance 또는 조정없이 정적 경로의 결과로, \'경로 표시\'를 선택할 수 있습니다.
|
||||
\n\n현재 위치가 아닌 다른 위치에서 선택한 목적지로 경로를 표시하려면 지도에 시작 지점을 선택하고 \'출발지 운행시작\'을 누릅니다.
|
||||
|
|
@ -708,7 +708,7 @@
|
|||
<string name="follow">운행 시작</string>
|
||||
<string name="recalculate_route_to_your_location">전송 모드 :</string>
|
||||
<string name="mark_final_location_first">먼저 목적지를 선택하세요</string>
|
||||
<string name="get_directions">안내시작</string>
|
||||
<string name="get_directions">운행시작</string>
|
||||
<string name="show_gps_status">GPS 정보</string>
|
||||
<string name="opening_hours">오프닝 시간</string>
|
||||
<string name="opening_changeset">변경사항 여는중…</string>
|
||||
|
|
|
|||
|
|
@ -338,10 +338,10 @@
|
|||
<string name="search_position_address">Adresas…</string>
|
||||
<string name="search_position_favorites">Įsimintos…</string>
|
||||
<string name="search_position_undefined">Nenurodyta</string>
|
||||
<string name="search_position_fixed">Fiksuota</string>
|
||||
<string name="search_position_fixed"/>
|
||||
<string name="search_position_current_location">Esama vieta…</string>
|
||||
<string name="search_position_map_view">Paskutinė žiūrėta žemėlapio vieta</string>
|
||||
<string name="select_search_position">Ieškoti šalia :</string>
|
||||
<string name="select_search_position">Kilmė:</string>
|
||||
<string name="context_menu_item_search">Ieškoti netoliese nuo čia</string>
|
||||
<string name="tip_recent_changes_0_6_7_t">Pakeitimai 0.6.7 versijoje :
|
||||
\n\t- Parsiųstų duomenų valdymas (parsiųsti, ištrinti, aktyvuoti / deaktyvuoti parsiųstus duomenis tiesiogiai OsmAnd programoje)
|
||||
|
|
@ -580,7 +580,7 @@
|
|||
<string name="select_build_to_install">Įdiegimui pasirinkite vieną iš OsmAnd versijų</string>
|
||||
<string name="contribution_activity">Specialūs veiksmai tobulinamai versijai</string>
|
||||
<string name="gps_status_app_not_found">GPS statuso programa neįdiegta. Ieškoti Parduotuvėje?</string>
|
||||
<string name="voice_is_not_available_msg">Balso nurodymai neprieinami. Eikite į nustatymus, išsirinkite pageidaujamą kalbos paketą ir jį parsisiųskite.</string>
|
||||
<string name="voice_is_not_available_msg">Balso nurodymai neprieinami. Eikite į Nustatymus→Bendra→Balso pranešiai, išsirinkite arba parsisiųskite pageidaujamą kalbos paketą .</string>
|
||||
<string name="voice_is_not_available_title">Balso nurodymai nepasirinkti</string>
|
||||
<string name="daynight_mode_day">Diena</string>
|
||||
<string name="daynight_mode_night">Naktis</string>
|
||||
|
|
@ -1876,8 +1876,10 @@
|
|||
<string name="routing_attr_no_new_routing_description">Nenaudoti 1.9 versijos maršrutizavimo</string>
|
||||
<string name="dash_download_msg_none">Ar norite atsisiųsti bet kurį žemėlapį naudojimui be interneto?</string>
|
||||
<string name="dismiss">Nesiųsti</string>
|
||||
<string name="traffic_warning_railways">Geležinkeliai</string>
|
||||
<string name="traffic_warning_railways">Geležinkelio pervaža</string>
|
||||
<string name="traffic_waring_pedestrian">Pėstieji</string>
|
||||
<string name="show_railway_warnings">Rodyti geležinkelių pervažas</string>
|
||||
<string name="show_pedestrian_warnings">Rodyti pėsčiųjų perėjas</string>
|
||||
</resources>
|
||||
<string name="speak_pedestrian">Pranešti apie perėjas</string>
|
||||
<string name="traffic_warning_pedestrian">Pėčiųjų perėja</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -914,7 +914,7 @@
|
|||
<string name="route_kl">Links aanhouden en volg</string>
|
||||
<string name="route_kr">Rechts aanhouden en volg</string>
|
||||
<string name="rendering_attr_noPolygons_description">Maak alle oppervlaktes op de kaart transparant</string>
|
||||
<string name="rendering_attr_noPolygons_name">Geen vlakken</string>
|
||||
<string name="rendering_attr_noPolygons_name">Verberg vlakken</string>
|
||||
<string name="rendering_attr_appMode_name">Weergave-modus</string>
|
||||
<string name="rendering_attr_appMode_description">Kaartoptimalisatie voor dit gebruiksprofiel</string>
|
||||
<string name="rendering_attr_contourLines_description">Toon vanaf schaal (hoogtekaart moet aanwezig zijn):</string>
|
||||
|
|
@ -2028,7 +2028,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="rendering_attr_transportStops_name">OV-haltes</string>
|
||||
<string name="voices">Gesproken aanwijzingen</string>
|
||||
<string name="dash_download_msg_none">Kaarten downloaden naar het toestel?</string>
|
||||
<string name="dash_download_msg">U hebt %1$s kaarten gedownload</string>
|
||||
<string name="dash_download_msg">Je hebt %1$s kaarten gedownload</string>
|
||||
<string name="dash_download_new_one">Download een nieuwe kaart</string>
|
||||
<string name="dash_download_manage">Beheer</string>
|
||||
<string name="rendering_attr_roadStyle_name">Weergave van wegen</string>
|
||||
|
|
@ -2038,9 +2038,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="rendering_value_americanRoadAtlas_name">Amerikaanse wegenkaart</string>
|
||||
<string name="routing_attr_no_new_routing_name">Gebruik routeberekening v1.9 niet</string>
|
||||
<string name="routing_attr_no_new_routing_description">Gebruik routeberekening v1.9 niet</string>
|
||||
<string name="traffic_warning_railways">Spoorweg</string>
|
||||
<string name="traffic_warning_pedestrian">Voetgangers</string>
|
||||
<string name="show_railway_warnings">Waarschuw voor spoorwegovergangen</string>
|
||||
<string name="show_pedestrian_warnings">Waarschuw voor oversteekplaatsen</string>
|
||||
<string name="traffic_warning_railways">Spoorweg overgang</string>
|
||||
<string name="traffic_warning_pedestrian">Voetgangers oversteekplaats</string>
|
||||
<string name="show_railway_warnings">Toon spoorwegovergangen</string>
|
||||
<string name="show_pedestrian_warnings">Toon voetgangers oversteekplaatsen</string>
|
||||
<string name="speak_pedestrian">Meld oversteekplaatsen</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<string name="poi_pet_shop">Zoologiczny</string>
|
||||
<string name="poi_radiotechnics_shop">Art. RTV</string>
|
||||
<string name="poi_second_hand">Rzeczy \"z drugiej ręki\"</string>
|
||||
<string name="poi_ship_chandler">Żeglarski</string>
|
||||
<string name="poi_ship_chandler">Armator</string>
|
||||
<string name="poi_sports_shop">Sportowy</string>
|
||||
<string name="poi_stationery_shop">Papierniczy</string>
|
||||
<string name="poi_tableware_shop">Zastawy stołowe</string>
|
||||
|
|
@ -135,13 +135,13 @@
|
|||
<string name="poi_public_transport_platform">Przystanek transportu miejskiego</string>
|
||||
<string name="poi_public_transport_platform_bus">Przystanek autobusowy</string>
|
||||
<string name="poi_public_transport_platform_trolleybus">Przystanek trolejbusowy</string>
|
||||
<string name="poi_bus_stop">Przystanek autobusowy (nieczynny)</string>
|
||||
<string name="poi_bus_stop">Przystanek autobusowy (przestarzałe)</string>
|
||||
<string name="poi_public_transport_platform_tram">Przystanek tramwajowy</string>
|
||||
<string name="poi_tram_stop">Przystanek tramwajowy (nieczynny)</string>
|
||||
<string name="poi_tram_stop">Przystanek tramwajowy (przestarzałe)</string>
|
||||
<string name="poi_public_transport_station">Dworzec transportu miejskiego</string>
|
||||
<string name="poi_bus_station">Przystanek autobusowy (nieczynny)</string>
|
||||
<string name="poi_railway_station">Przystanek kolejowy (nieczynny)</string>
|
||||
<string name="poi_railway_platform">Peron kolejowy (nieczynny)</string>
|
||||
<string name="poi_bus_station">Dworzec autobusowy (przestarzałe)</string>
|
||||
<string name="poi_railway_station">Stacja kolejowa (przestarzałe)</string>
|
||||
<string name="poi_railway_platform">Peron kolejowy (przestarzałe)</string>
|
||||
<string name="poi_subway_entrance">Metro - wejście</string>
|
||||
<string name="poi_subway_station">Stacja metra</string>
|
||||
<string name="poi_taxi">Postój TAXI</string>
|
||||
|
|
@ -179,7 +179,7 @@
|
|||
<string name="poi_emergency_access_point">Pogotowie</string>
|
||||
|
||||
<string name="poi_railway_halt">Dworzec kolejowy (nieaktualne)</string>
|
||||
<string name="poi_turning_circle">Punkt zawracania</string>
|
||||
<string name="poi_turning_circle">Miejsce do zawracania</string>
|
||||
<string name="poi_motorway_junction">Zjazd z autostrady</string>
|
||||
|
||||
<string name="poi_water_well">Fontanna</string>
|
||||
|
|
@ -188,4 +188,14 @@
|
|||
<string name="poi_boatyard">Stocznia</string>
|
||||
<string name="poi_wastewater_plant">Oczyszczalnia ścieków</string>
|
||||
<string name="poi_water_tower">Wieża ciśnień</string>
|
||||
<string name="poi_dam">Tama</string>
|
||||
<string name="poi_water_mill">Młyn wodny</string>
|
||||
|
||||
<string name="poi_power_substation">Podstacja</string>
|
||||
<string name="poi_power_transformer">Transformator</string>
|
||||
<string name="poi_post_office">Urząd pocztowy</string>
|
||||
<string name="poi_post_box">Skrzynka pocztowa</string>
|
||||
<string name="poi_telephone">Telefon</string>
|
||||
<string name="poi_waste_basket">Kosz na śmieci</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -543,7 +543,7 @@
|
|||
<string name="save_current_track_descr">Zapisz bieżący ślad na karcie SD</string>
|
||||
<string name="save_current_track">Zapisz bieżący ślad</string>
|
||||
<string name="save_track_interval_descr">Wybierz czas pomiędzy sprawdzaniem pozycji przy nagrywaniu ścieżek podczas nawigacji</string>
|
||||
<string name="save_track_interval">Czas pomiędzy sprawdzaniem pozycji podczas nawigacji</string>
|
||||
<string name="save_track_interval">Częstotliwość zapisywania podczas nawigacji</string>
|
||||
|
||||
<string name="save_track_to_gpx_descrp">Ślady zostaną zapisane do katalogu ścieżek podczas nawigacji</string>
|
||||
<string name="save_track_to_gpx">Zapisuj ślad do pliku GPX podczas nawigacji</string>
|
||||
|
|
@ -1883,7 +1883,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="record_plugin_name">Nagrywaj swoje wycieczki</string>
|
||||
<string name="int_hour">godz.</string>
|
||||
<string name="duration">Czas trwania</string>
|
||||
<string name="distance">Dystans</string>
|
||||
<string name="distance">Odległość</string>
|
||||
<string name="index_tours">Wycieczki</string>
|
||||
<string name="flat_list_waypoints">Wszystkie</string>
|
||||
<string name="waypoints">Punkty trasy</string>
|
||||
|
|
@ -1896,8 +1896,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="save_track_interval_globally">Częstotliwość zapisywania</string>
|
||||
<string name="record_plugin_description">Zapisz swoje ścieżki jednym guzikiem na ekranie mapy. Pokazuj ustawienia nagrywania twoich wycieczek do pliku GPX lub używając serwisu internetowego.</string>
|
||||
<string name="confirm_every_run">Zawsze pytaj</string>
|
||||
<string name="save_global_track_interval_descr">Wybierz interwał rejestrowania dla nagrywania ścieżki (włączonego poprzez widżet nagrywania GPX na mapie)</string>
|
||||
<string name="save_global_track_interval">Ogólny interwał rejestrowania</string>
|
||||
<string name="save_global_track_interval_descr">Wybierz częstotliwość rejestrowania dla nagrywania ścieżki (włączonego poprzez widżet nagrywania GPX na mapie)</string>
|
||||
<string name="save_global_track_interval">Ogólna częstotliwość zapisywania</string>
|
||||
<string name="traffic_warning_speed_limit">Ograniczenie prędkości</string>
|
||||
<string name="traffic_warning_border_control">Kontrola graniczna</string>
|
||||
<string name="traffic_warning_payment">Punkt poboru opłat</string>
|
||||
|
|
@ -1913,8 +1913,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="use_native_render">Użyj renderowania natywnego</string>
|
||||
<string name="use_native_render_descr">Użyj kodu renderowania C++ zamiast Java</string>
|
||||
<string name="speed_limit_exceed">Tolerancja ograniczenia prędkości</string>
|
||||
<string name="speed_limit_exceed_message">Wybierz margines tolerancji ograniczenia prędkości, powyżej której otrzymasz ostrzeżenie głosowe.</string>
|
||||
<string name="fav_point_emoticons_message">Nazwa ulubionego punktu została zmodyfikowany na %1$s, aby prawidłowo ułatwić zapisywanie do pliku ciągu z emotikonem.</string>
|
||||
<string name="speed_limit_exceed_message">Wybierz margines tolerancji ograniczenia prędkości, powyżej którego otrzymasz ostrzeżenie głosowe.</string>
|
||||
<string name="fav_point_emoticons_message">Nazwa ulubionego punktu została zmieniona na %1$s, aby prawidłowo ułatwić zapisywanie do pliku ciągu z emotikonem.</string>
|
||||
<string name="print_route">Drukuj trasę</string>
|
||||
<string name="osmo_device_not_found">Nie znaleziono urządzenia</string>
|
||||
<string name="osmo_no_connection_msg">Serwis OsMo jest niedostępny:\n- sprawdź połączenie internetowe;\n- sprawdź ustawienia;\n- sprawdź Twitter: https://twitter.com/OsMomobi</string>
|
||||
|
|
@ -1932,9 +1932,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="layers_category_show">Pokaż</string>
|
||||
<string name="configure_map">Skonfiguruj mapę</string>
|
||||
<string name="search_radius_proximity">W odległości</string>
|
||||
<string name="wake_on_voice">Włączyć ekran</string>
|
||||
<string name="wake_on_voice">Włącz ekran</string>
|
||||
<string name="wake_on_voice_descr">Włącz ekran urządzenia podczas zbliżania się do skrętu</string>
|
||||
<string name="select_impassable_road">Wybierz mapę</string>
|
||||
<string name="select_impassable_road">Zaznacz na mapie</string>
|
||||
<string name="impassable_road">Unikaj dróg…</string>
|
||||
<string name="rendering_attr_tramTrainRoutes_name">Trasy tramwajowe i kolejowe</string>
|
||||
<string name="tip_recent_changes_1_9_t">"Zmiany w 1.9: * Aktualizacja stylów mapy z renderowaniem warstw nawierzchni drogi, transportu i symboli turystycznych * Wyszukiwanie punktów POI wzdłuż trasy * Zaznaczanie nieprzejezdnej drogi dla danego przejazdu * Ułatwienia pobrania i aktualizacji mapy * Otrzymywanie powiadomień wizualnych i audio podczas zbliżania się do punktu * Drukuj informacje o trasie i manewrach * Wsparcie dla asystenta pasa ruchu * Wsparcie Android Wear * Dużo zmian UI * Oddzielne powiększenie rozmiaru dla tekstu na mapie * Specjalne powiadomienia dźwiękowe w przypadku zjechania z trasy * Funkcjonalności logowania do Osmo * Poprawienie niezgodności wersji OsMo "</string>
|
||||
|
|
@ -1947,10 +1947,10 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="lock_screen_request_explanation">%1$s potrzebuje uprawnień do wyłączenia ekranu dla funkcji oszczędzania energii.</string>
|
||||
<string name="wake_on_voice_never">Nigdy</string>
|
||||
<string name="osmo_use_https_descr">Użyj bezpiecznego połączenia z serwerem</string>
|
||||
<string name="osmo_use_https">Użyj https</string>
|
||||
<string name="osmo_use_https">Użyj HTTPS</string>
|
||||
<string name="advanced_settings">Zaawansowane</string>
|
||||
<string name="home_button">Strona startowa</string>
|
||||
<string name="map_update">Aktualizacje dla %1$s map</string>
|
||||
<string name="map_update">Dostępne aktualizacje dla %1$s map</string>
|
||||
<string name="search_for">Wyszukaj</string>
|
||||
<string name="show_map">POKAŻ MAPĘ</string>
|
||||
<string name="show_all">POKAŻ WSZYSTKIE</string>
|
||||
|
|
@ -1958,13 +1958,13 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="dismiss">Odrzuć</string>
|
||||
<string name="everything_up_to_date">Wszystkie pliki aktualne</string>
|
||||
<string name="use_opengl_render">Użyj renderowania OpenGL</string>
|
||||
<string name="use_opengl_render_descr">"Użyj sprzętowego renderowania OpenGL (może nie działać na niektórych urządzeniach)"</string>
|
||||
<string name="use_opengl_render_descr">Użyj sprzętowego renderowania OpenGL (może nie działać na niektórych urządzeniach)</string>
|
||||
<string name="error_avoid_specific_road">Nie znaleziono objazdu</string>
|
||||
<string name="dash_download_msg_none">Czy chcesz pobrać mapy offline?</string>
|
||||
<string name="dash_download_msg">Pobrałeś %1$s map</string>
|
||||
<string name="dash_download_new_one">Pobierz nową mapę</string>
|
||||
<string name="dash_download_manage">Zarządzaj</string>
|
||||
<string name="map_locale">Język Mapy</string>
|
||||
<string name="map_locale">Język mapy</string>
|
||||
<string name="navigate_point_zone">Strefa</string>
|
||||
<string name="download_tab_downloads">Pobrane</string>
|
||||
<string name="download_tab_updates">Aktualizacje</string>
|
||||
|
|
@ -1979,7 +1979,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="rendering_attr_transportStops_name">Przystanki transportu miejskiego</string>
|
||||
<string name="navigate_point_easting">Linia współrzędnych x\"</string>
|
||||
<string name="download_tab_local">W urządzeniu</string>
|
||||
<string name="no_internet_connection">Pobieranie niemożliwe. Sprawdź połączenie sieciowe.</string>
|
||||
<string name="no_internet_connection">Pobieranie niemożliwe. Sprawdź połączenie z Internetem.</string>
|
||||
<string name="voices">Wskazówki głosowe</string>
|
||||
<string name="traffic_warning_railways">Przejazd kolejowy</string>
|
||||
<string name="traffic_warning_pedestrian">Przejście dla pieszych</string>
|
||||
|
|
|
|||
|
|
@ -595,7 +595,7 @@
|
|||
|
||||
<string name="poi_military_airfield">Военный аэродром</string>
|
||||
<string name="poi_military_bunker">Военный бункер</string>
|
||||
<string name="poi_military_barracks">Бараки</string>
|
||||
<string name="poi_military_barracks">Казармы</string>
|
||||
<string name="poi_military_danger_area">Опасная зона</string>
|
||||
<string name="poi_military_range">Военное стрельбище</string>
|
||||
<string name="poi_military_naval_base">Военно-морская база</string>
|
||||
|
|
|
|||
|
|
@ -1146,7 +1146,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
|
|||
<string name="map_version_changed_info">In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s\'aplicu a s\'ùritma versione.</string>
|
||||
<string name="local_index_mi_rename">Torra a numenare</string>
|
||||
<string name="search_position_undefined">Non dessinidu</string>
|
||||
<string name="search_position_fixed">Fissadu</string>
|
||||
<string name="search_position_fixed"></string>
|
||||
<string name="search_position_current_location">Positzione currente…</string>
|
||||
<string name="search_position_map_view">Ùrtima bisura mapa</string>
|
||||
<string name="local_index_mi_upload_gpx">Imbia ad OSM</string>
|
||||
|
|
|
|||
|
|
@ -321,10 +321,10 @@
|
|||
<string name="search_position_address">Adresa…</string>
|
||||
<string name="search_position_favorites">Obľúbené miesta…</string>
|
||||
<string name="search_position_undefined">Neurčené</string>
|
||||
<string name="search_position_fixed">Súradnice</string>
|
||||
<string name="search_position_fixed"/>
|
||||
<string name="search_position_current_location">Aktuálne umiestnenie…</string>
|
||||
<string name="search_position_map_view">Posledné mapové zobrazenie</string>
|
||||
<string name="select_search_position">Hľadať v okolí:</string>
|
||||
<string name="select_search_position">Východzí bod:</string>
|
||||
<string name="context_menu_item_search">Hľadať</string>
|
||||
<string name="tip_recent_changes_0_6_7_t">"Novinky vo verzii 0.6.7 :
|
||||
\n\t- Manažér offline údajov (sťahovanie, mazanie a záloha offline dát priamo v OsmAnde)
|
||||
|
|
|
|||
|
|
@ -429,10 +429,10 @@
|
|||
<string name="search_position_address">Adress …</string>
|
||||
<string name="search_position_favorites">Favoriter …</string>
|
||||
<string name="search_position_undefined">Odefinierad</string>
|
||||
<string name="search_position_fixed">Fast</string>
|
||||
<string name="search_position_fixed"/>
|
||||
<string name="search_position_current_location">Nuvarande position …</string>
|
||||
<string name="search_position_map_view">Senaste kartvyn</string>
|
||||
<string name="select_search_position">Sök nära:</string>
|
||||
<string name="select_search_position">Ursprung:</string>
|
||||
<string name="context_menu_item_search">Sök i närheten</string>
|
||||
<string name="save_route_dialog_title">Spara rutt som GPX-spår</string>
|
||||
<string name="route_successfully_saved_at">Rutten sparades som \'%1$s\'.</string>
|
||||
|
|
|
|||
|
|
@ -169,13 +169,13 @@
|
|||
<string name="targets">Destinations</string>
|
||||
<string name="announce_gpx_waypoints">Announce GPX waypoints</string>
|
||||
<string name="download_additional_maps">Download missing maps %1$s (%2$d MB)?</string>
|
||||
<string name="more">More...</string>
|
||||
<string name="more">More…</string>
|
||||
<string name="rendering_value_browse_map_name">Browse map</string>
|
||||
<string name="rendering_value_car_name">Car</string>
|
||||
<string name="rendering_value_bicycle_name">Bicycle</string>
|
||||
<string name="rendering_value_pedestrian_name">Pedestrian</string>
|
||||
<string name="rendering_attr_coloredBuildings_name">Color-code buildings by type</string>
|
||||
<string name="osmo_invite">Invite...</string>
|
||||
<string name="osmo_invite">Invite…</string>
|
||||
<string name="osmo_leave_confirmation_msg">Do you want to leave group %1$s?</string>
|
||||
<string name="osmo_specify_tracker_id">Please specify id</string>
|
||||
<string name="continue_navigation">Continue Navigation</string>
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
<string name="save_as_favorites_points">Save as group of favorites</string>
|
||||
<string name="select_destination_and_intermediate_points">Select waypoints</string>
|
||||
<string name="layer_amenity_label">Point labels</string>
|
||||
<string name="loading_smth">Loading %1$s …</string>
|
||||
<string name="loading_smth">Loading %1$s…</string>
|
||||
<string name="map_widget_plain_time">Current time</string>
|
||||
<string name="gpx_wpt">Waypoint</string>
|
||||
<string name="selected_gpx_info_show">\n\nPress and hold to see on map</string>
|
||||
|
|
@ -339,7 +339,7 @@
|
|||
<string name="osmo_tracker_id_descr">Click to view or share tracker id.
|
||||
Using tracker id connected devices will be able to monitor all movements of this device! To disconnect select Regenerate option.</string>
|
||||
<string name="osmo_session_token">Session token: %1$s</string>
|
||||
<string name="osmo_auth_pending">Waiting for authorization...</string>
|
||||
<string name="osmo_auth_pending">Waiting for authorization…</string>
|
||||
<string name="osmo_locations_sent">Locations sent %1$d (in buffer %2$d) </string>
|
||||
<string name="osmo_conn_successfull">Connection established: %1$s </string>
|
||||
<string name="osmo_io_error">OsMo connection problem: </string>
|
||||
|
|
@ -431,10 +431,10 @@
|
|||
<string name="gpx_option_calculate_first_last_segment">Calculate OsmAnd route for first and last route segment</string>
|
||||
<string name="use_displayed_track_for_navigation">Do you want to use displayed track for navigation?</string>
|
||||
<string name="keep_and_add_destination_point">Add as destination point</string>
|
||||
<string name="select_gpx">Select GPX …</string>
|
||||
<string name="select_gpx">Select GPX…</string>
|
||||
<string name="route_descr_select_destination">Select Destination</string>
|
||||
<string name="route_descr_select_on_map">Select on map …</string>
|
||||
<string name="route_descr_favorite">Favorite …</string>
|
||||
<string name="route_descr_select_on_map">Select on map…</string>
|
||||
<string name="route_descr_favorite">Favorite…</string>
|
||||
<string name="route_preferences">Route preferences</string>
|
||||
<string name="route_info">Route information</string>
|
||||
<string name="routing_attr_prefer_motorway_name">Prefer motorways</string>
|
||||
|
|
@ -454,7 +454,7 @@
|
|||
<string name="android_19_location_disabled">Since Android version 4.4 (KitKat) you cannot download and update maps to the previous storage folder (%s). Do you want to change to the permitted storage location and copy all OsmAnd files there?
|
||||
\n Note 1: Your old files will remain untouched (but can be deleted manually).
|
||||
\n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
|
||||
<string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination...</string>
|
||||
<string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination…</string>
|
||||
<string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)</string>
|
||||
<string name="copying_osmand_files">Copying OsmAnd data files</string>
|
||||
<string name="calculate_osmand_route_gpx">Calculate OsmAnd offline route</string>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import android.content.Context;
|
|||
public class FavouritePoint implements Serializable, LocationPoint {
|
||||
private static final long serialVersionUID = 729654300829771466L;
|
||||
private String name;
|
||||
private String description;
|
||||
private String category = "";
|
||||
private double latitude;
|
||||
private double longitude;
|
||||
|
|
@ -75,6 +76,14 @@ public class FavouritePoint implements Serializable, LocationPoint {
|
|||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription () {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
|
|
|||
|
|
@ -344,6 +344,7 @@ public class FavouritesDbHelper {
|
|||
pt.setColor(p.getColor());
|
||||
}
|
||||
pt.name = p.getName();
|
||||
pt.desc = p.getDescription();
|
||||
if (p.getCategory().length() > 0)
|
||||
pt.category = p.getCategory();
|
||||
gpx.points.add(pt);
|
||||
|
|
@ -432,6 +433,7 @@ public class FavouritesDbHelper {
|
|||
name = p.name.substring(0, c);
|
||||
}
|
||||
FavouritePoint fp = new FavouritePoint(p.lat, p.lon, name, categoryName);
|
||||
fp.setDescription(p.desc);
|
||||
fp.setColor(p.getColor(0));
|
||||
fp.setVisible(!p.getExtensionsToRead().containsKey(HIDDEN));
|
||||
points.put(getKey(fp), fp);
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ public class OsmandApplication extends Application {
|
|||
public void onTerminate() {
|
||||
super.onTerminate();
|
||||
if (routingHelper != null) {
|
||||
routingHelper.getVoiceRouter().onApplicationTerminate(this);
|
||||
routingHelper.getVoiceRouter().onApplicationTerminate();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -951,6 +951,7 @@ public class MapActivityActions implements DialogProvider {
|
|||
if(getMyApplication().getLocationProvider().getLocationSimulation().isRouteAnimating()) {
|
||||
getMyApplication().getLocationProvider().getLocationSimulation().startStopRouteAnimation(mapActivity);
|
||||
}
|
||||
routingHelper.getVoiceRouter().interruptRouteCommands();
|
||||
routingHelper.clearCurrentRoute(null, new ArrayList<LatLon>());
|
||||
routingHelper.setRoutePlanningMode(false);
|
||||
settings.APPLICATION_MODE.set(settings.DEFAULT_APPLICATION_MODE.get());
|
||||
|
|
|
|||
|
|
@ -1019,8 +1019,10 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
|
|||
recordings.unregisterObject(r.lat, r.lon, r);
|
||||
recordingByFileName.remove(r.file.getName());
|
||||
Algorithms.removeAllFiles(r.file);
|
||||
activity.getMapLayers().getContextMenuLayer().setLocation(null, "");
|
||||
activity.getMapView().refreshMap();
|
||||
if (activity != null) {
|
||||
activity.getMapLayers().getContextMenuLayer().setLocation(null, "");
|
||||
activity.getMapView().refreshMap();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,22 +1,45 @@
|
|||
package net.osmand.plus.dashboard;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.os.Bundle;
|
||||
import android.view.ContextMenu;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListAdapter;
|
||||
import com.actionbarsherlock.app.ActionBar;
|
||||
import com.actionbarsherlock.app.SherlockFragmentActivity;
|
||||
import com.actionbarsherlock.app.SherlockListActivity;
|
||||
import com.actionbarsherlock.internal.widget.IcsAdapterView;
|
||||
import com.actionbarsherlock.view.MenuItem;
|
||||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MainMenuActivity;
|
||||
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Denis on 23.12.2014.
|
||||
*/
|
||||
public class DashAudioVideoNotesActivity extends SherlockFragmentActivity {
|
||||
public class DashAudioVideoNotesActivity extends SherlockListActivity {
|
||||
AudioVideoNotesPlugin plugin;
|
||||
List<AudioVideoNotesPlugin.Recording> items;
|
||||
NotesAdapter listAdapter;
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
setContentView(R.layout.audio_video_notes_all);
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.editing_poi_filter);
|
||||
|
||||
plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
|
||||
|
||||
ColorDrawable color = new ColorDrawable(getResources().getColor(R.color.actionbar_color));
|
||||
ActionBar actionBar = getSupportActionBar();
|
||||
|
|
@ -24,6 +47,53 @@ public class DashAudioVideoNotesActivity extends SherlockFragmentActivity {
|
|||
actionBar.setBackgroundDrawable(color);
|
||||
actionBar.setIcon(android.R.color.transparent);
|
||||
actionBar.setHomeButtonEnabled(true);
|
||||
actionBar.setDisplayHomeAsUpEnabled(true);
|
||||
getListView().setBackgroundColor(getResources().getColor(R.color.dashboard_background));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
items = new ArrayList<AudioVideoNotesPlugin.Recording>(plugin.getAllRecordings());
|
||||
listAdapter = new NotesAdapter(items);
|
||||
setListAdapter(listAdapter);
|
||||
}
|
||||
|
||||
private void showContextMenu(final AudioVideoNotesPlugin.Recording recording){
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
final ContextMenuAdapter adapter = new ContextMenuAdapter(this);
|
||||
ContextMenuAdapter.OnContextMenuClick listener = new ContextMenuAdapter.OnContextMenuClick() {
|
||||
@Override
|
||||
public boolean onContextMenuClick(final ArrayAdapter<?> adapter, int resId, int pos, boolean isChecked) {
|
||||
if (resId == R.string.local_index_mi_delete) {
|
||||
AlertDialog.Builder confirm = new AlertDialog.Builder(DashAudioVideoNotesActivity.this);
|
||||
confirm.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
plugin.deleteRecording(recording);
|
||||
items.remove(recording);
|
||||
listAdapter.notifyDataSetChanged();
|
||||
}
|
||||
});
|
||||
confirm.setNegativeButton(R.string.default_buttons_no, null);
|
||||
confirm.setMessage(getString(R.string.delete_confirmation_msg, recording.file.getName()));
|
||||
confirm.show();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
adapter.item(R.string.local_index_mi_delete).listen(listener).position(0).reg();
|
||||
|
||||
builder.setItems(adapter.getItemNames(), new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
ContextMenuAdapter.OnContextMenuClick clk = adapter.getClickAdapter(which);
|
||||
if (clk != null){
|
||||
clk.onContextMenuClick(null, adapter.getElementId(which), which, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
builder.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -35,4 +105,32 @@ public class DashAudioVideoNotesActivity extends SherlockFragmentActivity {
|
|||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
class NotesAdapter extends ArrayAdapter<AudioVideoNotesPlugin.Recording> {
|
||||
NotesAdapter(List<AudioVideoNotesPlugin.Recording> recordingList) {
|
||||
super(DashAudioVideoNotesActivity.this, R.layout.dash_note_item, recordingList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(final int position, View convertView, ViewGroup parent) {
|
||||
LayoutInflater inflater = getLayoutInflater();
|
||||
View row = convertView;
|
||||
if (row == null){
|
||||
row = inflater.inflate(R.layout.dash_note_item, parent, false);
|
||||
row.findViewById(R.id.divider).setVisibility(View.GONE);
|
||||
}
|
||||
final AudioVideoNotesPlugin.Recording recording = getItem(position);
|
||||
DashAudioVideoNotesFragment.getNoteView(recording, row, DashAudioVideoNotesActivity.this, plugin);
|
||||
row.setOnLongClickListener(new View.OnLongClickListener() {
|
||||
@Override
|
||||
public boolean onLongClick(View v) {
|
||||
showContextMenu(recording);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
return row;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package net.osmand.plus.dashboard;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
|
|
@ -28,32 +29,25 @@ import java.util.List;
|
|||
*/
|
||||
public class DashAudioVideoNotesFragment extends DashBaseFragment {
|
||||
AudioVideoNotesPlugin plugin;
|
||||
boolean allNotes;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
|
||||
|
||||
View view = getActivity().getLayoutInflater().inflate(R.layout.dash_audio_video_notes_plugin, container, false);
|
||||
allNotes = getActivity() instanceof DashAudioVideoNotesActivity;
|
||||
if (allNotes) {
|
||||
view.findViewById(R.id.header).setVisibility(View.GONE);
|
||||
} else {
|
||||
Typeface typeface = FontCache.getRobotoMedium(getActivity());
|
||||
((TextView) view.findViewById(R.id.notes_text)).setTypeface(typeface);
|
||||
((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);
|
||||
|
||||
(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
Activity activity = getActivity();
|
||||
final Intent favorites = new Intent(activity, DashAudioVideoNotesActivity.class);
|
||||
favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
activity.startActivity(favorites);
|
||||
}
|
||||
});
|
||||
}
|
||||
Typeface typeface = FontCache.getRobotoMedium(getActivity());
|
||||
((TextView) view.findViewById(R.id.notes_text)).setTypeface(typeface);
|
||||
((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);
|
||||
|
||||
(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
Activity activity = getActivity();
|
||||
final Intent favorites = new Intent(activity, DashAudioVideoNotesActivity.class);
|
||||
favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
activity.startActivity(favorites);
|
||||
}
|
||||
});
|
||||
return view;
|
||||
}
|
||||
|
||||
|
|
@ -78,21 +72,21 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
|
|||
}
|
||||
|
||||
if (plugin == null){
|
||||
(mainView.findViewById(R.id.main_notes)).setVisibility(View.GONE);
|
||||
mainView.setVisibility(View.GONE);
|
||||
return;
|
||||
}
|
||||
|
||||
List<AudioVideoNotesPlugin.Recording> notes = new ArrayList<AudioVideoNotesPlugin.Recording>(plugin.getAllRecordings());
|
||||
if (notes.size() == 0){
|
||||
(mainView.findViewById(R.id.main_notes)).setVisibility(View.GONE);
|
||||
mainView.setVisibility(View.GONE);
|
||||
return;
|
||||
} else {
|
||||
(mainView.findViewById(R.id.main_notes)).setVisibility(View.VISIBLE);
|
||||
mainView.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
LinearLayout notesLayout = (LinearLayout) mainView.findViewById(R.id.notes);
|
||||
notesLayout.removeAllViews();
|
||||
if (notes.size() > 3 && !allNotes){
|
||||
if (notes.size() > 3){
|
||||
while (notes.size() != 3){
|
||||
notes.remove(3);
|
||||
}
|
||||
|
|
@ -102,23 +96,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
|
|||
LayoutInflater inflater = getActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.dash_note_item, null, false);
|
||||
|
||||
if (recording.name != null){
|
||||
((TextView) view.findViewById(R.id.name)).setText(recording.name);
|
||||
((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(getActivity()));
|
||||
} else {
|
||||
((TextView) view.findViewById(R.id.name)).setText(recording.getDescription(getActivity()));
|
||||
view.findViewById(R.id.descr).setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
ImageView icon = (ImageView) view.findViewById(R.id.icon);
|
||||
if (recording.isAudio()){
|
||||
icon.setImageResource(R.drawable.ic_type_audio);
|
||||
} else if (recording.isVideo()){
|
||||
icon.setImageResource(R.drawable.ic_type_video);
|
||||
} else {
|
||||
icon.setImageResource(R.drawable.ic_type_img);
|
||||
}
|
||||
|
||||
getNoteView(recording, view, getActivity(), plugin);
|
||||
view.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
|
@ -128,20 +106,35 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
|
|||
MapActivity.launchMapActivityMoveToTop(getActivity());
|
||||
}
|
||||
});
|
||||
view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
plugin.playRecording(getActivity(), recording);
|
||||
}
|
||||
});
|
||||
|
||||
//int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
|
||||
|
||||
//LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
|
||||
//view.setLayoutParams(lp);
|
||||
notesLayout.addView(view);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static void getNoteView(final AudioVideoNotesPlugin.Recording recording, View view,
|
||||
final Context ctx, final AudioVideoNotesPlugin plugin) {
|
||||
if (recording.name != null){
|
||||
((TextView) view.findViewById(R.id.name)).setText(recording.name);
|
||||
((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx));
|
||||
} else {
|
||||
((TextView) view.findViewById(R.id.name)).setText(recording.getDescription(ctx));
|
||||
view.findViewById(R.id.descr).setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
ImageView icon = (ImageView) view.findViewById(R.id.icon);
|
||||
if (recording.isAudio()){
|
||||
icon.setImageResource(R.drawable.ic_type_audio);
|
||||
} else if (recording.isVideo()){
|
||||
icon.setImageResource(R.drawable.ic_type_video);
|
||||
} else {
|
||||
icon.setImageResource(R.drawable.ic_type_img);
|
||||
}
|
||||
|
||||
view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
plugin.playRecording(ctx, recording);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
package net.osmand.plus.dashboard;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Bitmap;
|
||||
import android.os.AsyncTask;
|
||||
import android.view.*;
|
||||
import android.widget.ImageView;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.RotatedTileBox;
|
||||
import net.osmand.map.MapTileDownloader.DownloadRequest;
|
||||
import net.osmand.map.MapTileDownloader.IMapDownloaderCallback;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MainMenuActivity;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.helpers.FontCache;
|
||||
import net.osmand.plus.render.MapRenderRepositories;
|
||||
import net.osmand.plus.render.MapVectorLayer;
|
||||
import net.osmand.plus.resources.ResourceManager;
|
||||
import net.osmand.plus.views.MapTextLayer;
|
||||
|
|
@ -17,9 +22,6 @@ import net.osmand.plus.views.OsmandMapTileView;
|
|||
import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
|
@ -27,7 +29,7 @@ import android.widget.TextView;
|
|||
/**
|
||||
* Created by Denis on 24.11.2014.
|
||||
*/
|
||||
public class DashMapFragment extends DashBaseFragment implements IMapDownloaderCallback {
|
||||
public class DashMapFragment extends DashBaseFragment implements IMapDownloaderCallback {
|
||||
|
||||
public static final String TAG = "DASH_MAP_FRAGMENT";
|
||||
|
||||
|
|
@ -36,7 +38,7 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
super.onDestroy();
|
||||
getMyApplication().getResourceManager().getMapTileDownloader().removeDownloaderCallback(this);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
|
@ -46,7 +48,7 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
protected void startMapActivity() {
|
||||
MapActivity.launchMapActivityMoveToTop(getActivity());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
View view = getActivity().getLayoutInflater().inflate(R.layout.dash_map_fragment, container, false);
|
||||
|
|
@ -60,7 +62,7 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
startMapActivity();
|
||||
}
|
||||
|
||||
|
||||
|
||||
});
|
||||
view.findViewById(R.id.map_image).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
|
|
@ -68,7 +70,6 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
startMapActivity();
|
||||
}
|
||||
});
|
||||
setMapImage(view);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
|
@ -79,7 +80,7 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
}
|
||||
Bitmap image = getMyApplication().getResourceManager().getRenderer().getBitmap();
|
||||
ImageView map = (ImageView) view.findViewById(R.id.map_image);
|
||||
if (image != null){
|
||||
if (image != null) {
|
||||
map.setImageBitmap(image);
|
||||
}
|
||||
}
|
||||
|
|
@ -88,15 +89,16 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
setMapImage(getView());
|
||||
|
||||
if (!getMyApplication().isApplicationInitializing()) {
|
||||
updateMapImage();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
view.findViewById(R.id.map_image).setVisibility(View.GONE);
|
||||
if(getMyApplication().isApplicationInitializing()) {
|
||||
if (getMyApplication().isApplicationInitializing()) {
|
||||
getMyApplication().checkApplicationIsBeingInitialized(getActivity(), (TextView) view.findViewById(R.id.ProgressMessage),
|
||||
(ProgressBar) view.findViewById(R.id.ProgressBar), new Runnable() {
|
||||
@Override
|
||||
|
|
@ -110,9 +112,10 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
}
|
||||
|
||||
private void applicationInitialized(View view) {
|
||||
updateMapImage();
|
||||
view.findViewById(R.id.loading).setVisibility(View.GONE);
|
||||
MainMenuActivity dashboardActivity =((MainMenuActivity)getSherlockActivity());
|
||||
if (dashboardActivity != null){
|
||||
MainMenuActivity dashboardActivity = ((MainMenuActivity) getSherlockActivity());
|
||||
if (dashboardActivity != null) {
|
||||
dashboardActivity.updateDownloads();
|
||||
view.findViewById(R.id.map_image).setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
|
@ -120,10 +123,27 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloader
|
|||
|
||||
@Override
|
||||
public void tileDownloaded(DownloadRequest request) {
|
||||
if(request != null && !request.error && request.fileToSave != null){
|
||||
if (request != null && !request.error && request.fileToSave != null) {
|
||||
ResourceManager mgr = getMyApplication().getResourceManager();
|
||||
mgr.tileDownloaded(request);
|
||||
setMapImage(getView());
|
||||
}
|
||||
setMapImage(getView());
|
||||
}
|
||||
|
||||
private void updateMapImage() {
|
||||
MapRenderRepositories repositories = getMyApplication().getResourceManager().getRenderer();
|
||||
LatLon lm = getMyApplication().getSettings().getLastKnownMapLocation();
|
||||
int zm = getMyApplication().getSettings().getLastKnownMapZoom();
|
||||
|
||||
WindowManager wm = (WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE);
|
||||
Display display = wm.getDefaultDisplay();
|
||||
int height = (int) getActivity().getResources().getDimension(R.dimen.dashMapHeight);
|
||||
int width = display.getWidth();
|
||||
|
||||
RotatedTileBox rotatedTileBox = new RotatedTileBox.RotatedTileBoxBuilder().
|
||||
setZoom(zm).setLocation(lm.getLatitude(), lm.getLongitude()).
|
||||
setPixelDimensions(width, height).build();
|
||||
repositories.loadMap(rotatedTileBox,
|
||||
getMyApplication().getResourceManager().getMapTileDownloader().getDownloaderCallbacks());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ public class FavoriteDialogs {
|
|||
final FavouritesDbHelper helper = ((OsmandApplication) activity.getApplication()).getFavorites();
|
||||
builder.setView(v);
|
||||
final EditText editText = (EditText) v.findViewById(R.id.Name);
|
||||
final EditText description = (EditText) v.findViewById(R.id.descr);
|
||||
final AutoCompleteTextView cat = (AutoCompleteTextView) v.findViewById(R.id.Category);
|
||||
List<FavoriteGroup> gs = helper.getFavoriteGroups();
|
||||
String[] list = new String[gs.size()];
|
||||
|
|
@ -208,6 +209,7 @@ public class FavoriteDialogs {
|
|||
final FavouritesDbHelper helper = app.getFavorites();
|
||||
app.getSettings().LAST_FAV_CATEGORY_ENTERED.set(categoryStr);
|
||||
point.setName(editText.getText().toString().trim());
|
||||
point.setDescription(description.getText().toString().trim());
|
||||
point.setCategory(categoryStr);
|
||||
boolean added = helper.addFavourite(point);
|
||||
if (added) {
|
||||
|
|
|
|||
|
|
@ -484,7 +484,17 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
|
|||
if (type == WaypointHelper.POI && btn.isChecked()){
|
||||
running[0] = position;
|
||||
thisAdapter.notifyDataSetInvalidated();
|
||||
selectPoi(running, thisAdapter, type, true, ctx);
|
||||
MapActivity map = (MapActivity) ctx;
|
||||
final PoiFilter[] selected = new PoiFilter[1];
|
||||
AlertDialog dlg = map.getMapLayers().selectPOIFilterLayer(map.getMapView(), selected);
|
||||
dlg.setOnDismissListener(new OnDismissListener() {
|
||||
@Override
|
||||
public void onDismiss(DialogInterface dialog) {
|
||||
if (selected != null) {
|
||||
enableType(running, thisAdapter, type, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -493,7 +503,8 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
|
|||
|
||||
private void selectPoi(final int[] running, final ArrayAdapter<Object> listAdapter, final int type,
|
||||
final boolean enable, Activity ctx) {
|
||||
if (ctx instanceof MapActivity && !PoiFilter.CUSTOM_FILTER_ID.equals(app.getSettings().getPoiFilterForMap())) {
|
||||
if (ctx instanceof MapActivity &&
|
||||
!PoiFilter.CUSTOM_FILTER_ID.equals(app.getSettings().getPoiFilterForMap())) {
|
||||
MapActivity map = (MapActivity) ctx;
|
||||
final PoiFilter[] selected = new PoiFilter[1];
|
||||
AlertDialog dlg = map.getMapLayers().selectPOIFilterLayer(map.getMapView(), selected);
|
||||
|
|
|
|||
|
|
@ -793,7 +793,7 @@ public class VoiceRouter {
|
|||
// }
|
||||
//}
|
||||
|
||||
public void onApplicationTerminate(Context ctx) {
|
||||
public void onApplicationTerminate() {
|
||||
if (player != null) {
|
||||
player.clear();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,7 +165,10 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.
|
|||
public String getObjectDescription(Object o) {
|
||||
Class<? extends LocationPoint> fcl = getFavoriteClass();
|
||||
if(o!= null && fcl.isInstance(o)) {
|
||||
return getObjName() + " : " + ((LocationPoint)o).getName(view.getContext()); //$NON-NLS-1$
|
||||
String desciption = ((FavouritePoint)o).getDescription() != null ?
|
||||
" " + ((FavouritePoint)o).getDescription() : "";
|
||||
return getObjName() + ": " + ((LocationPoint)o).getName(view.getContext())
|
||||
+ desciption; //$NON-NLS-1$
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue