Merge branch 'master' of github.com:osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2015-04-10 00:56:47 +02:00
commit f776137fc5
19 changed files with 213 additions and 40 deletions

View file

@ -734,4 +734,40 @@
<string name="poi_valley">Даліна</string>
<string name="poi_wood">Лес</string>
<string name="poi_landuse">Землекарыстаньне</string>
<string name="poi_fuel_diesel_yes">Дызэль</string>
<string name="poi_fuel_gtl_diesel_yes">GTL-дызэль</string>
<string name="poi_fuel_hgv_diesel_yes">HGV-дызэль</string>
<string name="poi_fuel_biodiesel_yes">Біядызэль</string>
<string name="poi_fuel_lpg_yes">Звадкаваны газ</string>
<string name="poi_fuel_octane_80_yes">Актан 80</string>
<string name="poi_fuel_octane_91_yes">Актан 91</string>
<string name="poi_fuel_octane_92_yes">Актан 92</string>
<string name="poi_fuel_octane_95_yes">Актан 95</string>
<string name="poi_fuel_octane_98_yes">Актан 98</string>
<string name="poi_fuel_octane_100_yes">Актан 100</string>
<string name="poi_fuel_cng_yes">Сьціснуты прыродны газ</string>
<string name="poi_fuel_1_25_yes">Паліва 1:25</string>
<string name="poi_fuel_1_50_yes">Паліва 1:50</string>
<string name="poi_fuel_ethanol_yes">Этаноль</string>
<string name="poi_fuel_methanol_yes">Мэтаноль</string>
<string name="poi_fuel_svo_yes">Алейнае паліва</string>
<string name="poi_fuel_e10_yes">E10</string>
<string name="poi_fuel_e20_yes">E20</string>
<string name="poi_fuel_e85_yes">E85</string>
<string name="poi_fuel_biogas_yes">E85</string>
<string name="poi_fuel_LH2_yes">Вадкі вадарод</string>
<string name="poi_fuel_electricity_yes">Электрычнасьць</string>
<string name="poi_farmyard">Падворак</string>
<string name="poi_meadow">Луг</string>
<string name="poi_recreation_ground">Пляцоўка для адпачынку</string>
<string name="poi_village_green">Трава</string>
<string name="poi_industrial">Прамысловая зона</string>
<string name="poi_residential">Жылы раён</string>
<string name="poi_landuse_railway">Чыгуначная паласа</string>
<string name="poi_junction">Перакрыжаваньне</string>
</resources>

View file

@ -1947,4 +1947,5 @@
<string name="shared_string_show_description">Паказаць апісаньне</string>
<string name="shared_string_search">Пошук</string>
<string name="shared_string_places">Месцы</string>
<string name="rendering_attr_OSMMapperAssistant_name">Памагаты картографа OSM</string>
</resources>

View file

@ -1919,4 +1919,6 @@ s často kladenými otázkami.</string>
<string name="shared_string_show_description">Zobrazit popis</string>
<string name="shared_string_do_not_use">Nepoužívat</string>
<string name="shared_string_address">Adresa</string>
<string name="shared_string_places">Místa</string>
<string name="shared_string_search">Hledat</string>
</resources>

View file

@ -753,4 +753,38 @@
<string name="poi_valley">Dal</string>
<string name="poi_water">Vand</string>
<string name="poi_wood">Træ</string>
<string name="poi_landuse">Arealanvendelse</string>
<string name="poi_fuel_diesel_yes">Diesel</string>
<string name="poi_fuel_gtl_diesel_yes">GTL diesel</string>
<string name="poi_fuel_hgv_diesel_yes">HGV diesel</string>
<string name="poi_fuel_biodiesel_yes">Bio-diesel</string>
<string name="poi_fuel_lpg_yes">LPG</string>
<string name="poi_fuel_octane_80_yes">Oktan 80</string>
<string name="poi_fuel_octane_91_yes">Oktan 91</string>
<string name="poi_fuel_octane_92_yes">Oktan 92</string>
<string name="poi_fuel_octane_95_yes">Oktan 95</string>
<string name="poi_fuel_octane_98_yes">Oktan 98</string>
<string name="poi_fuel_octane_100_yes">Oktan 100</string>
<string name="poi_fuel_cng_yes">CNG</string>
<string name="poi_fuel_1_25_yes">1:25 benzin</string>
<string name="poi_fuel_1_50_yes">1:50 benzin</string>
<string name="poi_fuel_ethanol_yes">Ethanol</string>
<string name="poi_fuel_methanol_yes">Methanol</string>
<string name="poi_fuel_svo_yes">SVO</string>
<string name="poi_fuel_e10_yes">E10</string>
<string name="poi_fuel_e20_yes">E20</string>
<string name="poi_fuel_e85_yes">E85</string>
<string name="poi_fuel_biogas_yes">E85</string>
<string name="poi_fuel_LH2_yes">Flydende brint</string>
<string name="poi_fuel_electricity_yes">Elektricitet</string>
<string name="poi_industrial">Industriområde</string>
<string name="poi_farmyard">Gårdsplads</string>
<string name="poi_meadow">Eng</string>
<string name="poi_landuse_railway">Jernbaneområde</string>
<string name="poi_residential">Boligområde</string>
<string name="poi_recreation_ground">Rekreativtområde</string>
<string name="poi_village_green">Forte</string>
</resources>

View file

@ -1993,4 +1993,5 @@
<string name="shared_string_show_description">Vis beskrivelse</string>
<string name="shared_string_search">Søg</string>
<string name="shared_string_places">Steder</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM kortlægger assistent</string>
</resources>

View file

@ -717,4 +717,24 @@
<string name="poi_water">Eau</string>
<string name="poi_wood">Bois</string>
<string name="poi_allotments">Lotissement</string>
<string name="poi_fuel_octane_80_yes">Octane 80</string>
<string name="poi_fuel_octane_91_yes">Octane 91</string>
<string name="poi_fuel_octane_92_yes">Octane 92</string>
<string name="poi_fuel_octane_95_yes">Octane 95</string>
<string name="poi_fuel_octane_98_yes">Octane 98</string>
<string name="poi_fuel_octane_100_yes">Octane 100</string>
<string name="poi_fuel_ethanol_yes">Éthanol</string>
<string name="poi_fuel_methanol_yes">Méthanol</string>
<string name="poi_fuel_e85_yes">E85</string>
<string name="poi_fuel_biogas_yes">E85</string>
<string name="poi_fuel_e20_yes">E20</string>
<string name="poi_fuel_LH2_yes">Hydrogène liquide</string>
<string name="poi_fuel_electricity_yes">Électricité</string>
<string name="poi_fuel_e10_yes">E10</string>
<string name="poi_farmyard">Cour de ferme</string>
<string name="poi_meadow">Prairie</string>
<string name="poi_recreation_ground">Terrain de jeu</string>
<string name="poi_industrial">Zone industrielle</string>
<string name="poi_residential">Zone résidentielle</string>
</resources>

View file

@ -165,7 +165,7 @@
<string name="init_native_library">Natív renderelő inicializálása…</string>
<string name="choose_auto_follow_route">Automatikus követés ideje</string>
<string name="choose_auto_follow_route_descr">Válaszd ki, mennyi idő múlva ugorjon vissza a térkép a pozíciódhoz</string>
<string name="auto_follow_route_never">Soha (a vezetés manuális indításához kattints a kék nyílra)</string>
<string name="auto_follow_route_never">Soha (a vezetés kézi indításához koppintson az „Indításra”)</string>
<string name="auto_follow_route_navigation">Követés csak navigáció közben</string>
<string name="auto_follow_route_navigation_descr">Csak navigáció közben követi automatikusan a pozíciódat a térkép.</string>
<string name="auto_follow_location_enabled">Automatikus követés.</string>
@ -1285,7 +1285,7 @@
<string name="av_camera_focus_continuous">A kamera folyamatosan próbál fókuszálni</string>
<string name="av_photo_play_sound">Hangjelzés elsütéskor</string>
<string name="av_photo_play_sound_descr">Válassz, hogy szeretnél-e hangjelzést fénykép készítésekor</string>
<string name="driving_region_descr">Válassz vezetési területet: USA, Európa, UK, Ázsia, stb.</string>
<string name="driving_region_descr">Vezetési területet kiválasztása: USA, Európa, UK, Ázsia és egyebek</string>
<string name="driving_region">Vezetési terület</string>
<string name="driving_region_japan">Japán</string>
<string name="driving_region_us">USA</string>
@ -1606,7 +1606,7 @@
<string name="shared_string_share">Megosztás</string>
<string name="share_fav_subject">OsmAndból megosztott kedvencek</string>
<string name="no_index_file_to_download">Nem találhatók letöltések, ellenőrizd az internetkapcsolatot.</string>
<string name="no_index_file_to_download">Nem találhatók letöltések, ellenőrizze az internetkapcsolatát.</string>
<string name="none_selected_gpx">Nincs GPX fájl kiválasztva. A kiválasztáshoz nyomj hosszan egy nyomvonalra.</string>
<string name="local_index_select_gpx_file">Kiválasztás megjelenítésre</string>
@ -1823,7 +1823,7 @@
<string name="shared_string_my_location">Pozícióm</string>
<string name="osm_editing_manage">Kezelés</string>
<string name="navigation_over_track">Indítasz navigációt a nyomvonal mentén?</string>
<string name="navigation_over_track">Elindítja a navigációt a nyomvonal mentén?</string>
<string name="avoid_roads_msg">Elkerülendő utcák kiválasztásával megváltoztathatod a tervezett útvonalat</string>
<string name="enable_proxy_title">HTTP proxy engedélyezése</string>
<string name="enable_proxy_descr">HTTP proxy beállítása minden hálózati kéréshez</string>
@ -1877,12 +1877,12 @@
<string name="action_modify">Módosítás művelet</string>
<string name="action_delete">Törlés művelet</string>
<string name="osm_edits">OSM szerkesztések</string>
<string name="osmand_parking_hour">ó</string><string name="osmand_parking_minute">perc</string><string name="osmand_parking_time_left">Bal</string> <string name="confirmation_to_clear_history">A teljes előzményt törölni szeretné?</string>
<string name="delay_to_start_navigation_descr">Navigáció automatikus indítása egy megadott idő után</string>
<string name="osmand_parking_hour">ó</string><string name="osmand_parking_minute">perc</string><string name="osmand_parking_time_left">bal</string> <string name="confirmation_to_clear_history">Szeretné törölni az előzményeket?</string>
<string name="delay_to_start_navigation_descr">A hátralévő várakozási idő megadása az útvonaltervezés képernyőn</string>
<string name="delay_to_start_navigation">Útvonaltervezés kihagyása</string>
<string name="shared_string_go">Indítás</string>
<string name="parking_place_limited">A parkolóhely időkorlátos</string>
<string name="parking_place_limited">A parkolási idő korlátozott</string>
<string name="your_edits">Az Ön szerkesztései</string>
<string name="waypoint_visit_after">Megtekintés ez után:</string>
<string name="simulate_your_location">Pozíció szimulálása</string>
@ -1903,17 +1903,23 @@
<string name="shared_string_release">Megjelent</string>
<string name="days_behind">napos</string>
<string name="welmode_download_maps">Térképek letöltése</string>
<string name="confirm_usage_speed_cameras">"Néhány országban (pl. Németország, Franciaország, Olaszország) tilos a traffipax figyelmeztetés használata! Az OsmAnd nem vállal felelősséget a helyi szabályok megsértéséért. Kérlek kattints az Igen gombra, ha jogosult vagy a funkció használatára. "</string>
<string name="confirm_usage_speed_cameras">Néhány országban (Németország, Franciaország, Olaszország és még néhány) tilos a traffipax figyelmeztetés használata! Az OsmAnd nem vállal felelősséget a helyi szabályok megsértéséért. Kérem kattintson az Igen gombra, ha jogosult a funkció használatára.</string>
<string name="welcome_select_region">Válaszd ki a régiódat</string>
<string name="welcome_text">Az OsmAnd lehetővé teszi a térképek és a navigáció offline használatát!</string>
<string name="welcome_text">Az OsmAnd lehetővé teszi a térképek és a navigáció offline használatát az egész világon!</string>
<string name="current_route">Jelenlegi útvonal</string>
<string name="osmo_grop_name_length_alert">A csoportnév legalább 3 karakter hosszú kell legyen!</string>
<string name="osmo_grop_name_length_alert">A csoportnévnek legalább 3 karakter hosszúnak kell lennie!</string>
<string name="local_osm_changes_upload_all_confirm">%1$d módosítást fogsz feltölteni OSM-re. Biztos vagy benne?</string>
<string name="osmand_parking_overdue">lejár</string>
<string name="waypoint_visit_before">Megtekintés ez előtt:</string>
<string name="agps_info">A-GPS információk</string>
<string name="agps_data_last_downloaded">Legutóbb letöltött A-GPS adatok: %1$s</string>
<string name="welcome_header">Üdvözöljük</string>
<string name="osm_changes_added_to_local_edits">Az OSM változások hozzáadva a helyi változásokhoz</string>
<string name="osm_changes_added_to_local_edits">Az OSM változások hozzáadva a helyi változáscsomaghoz</string>
<string name="mark_to_delete">Megjelölés törlésre</string>
<string name="shared_string_places">Helyek</string>
<string name="shared_string_search">Keresés</string>
<string name="shared_string_show_description">Leírás megjelenítése</string>
<string name="shared_string_message">Üzenet</string>
<string name="shared_string_do_not_use">Ne használja</string>
<string name="shared_string_address">Cím</string>
</resources>

View file

@ -332,7 +332,7 @@
\n\nVelg enten \'Start navigering\', som betyr at OsmAnd gir veiledning og taleinstruksjoner (hvis aktivert) etc. Eller velg \'Vis rute\', som resulterer i en statisk rute uten veiledning eller justeringer mens du beveger deg.
\n\nFor å vise en rute til det valgte reisemålet fra ethvert punkt annet enn din gjeldende posisjon, velg startpunktet på kartet og trykk \'Anvisninger fra\'.
\n\nHvis du bruker \'Anvisninger fra\' sammen med \'Start navigering\', vil OsmAnd skifte til din faktiske posisjon så snart den er funnet (slik at dette kan brukes til å hurtig-starte ruting før posisjonen er funnet), mens \'Anvisninger fra\' i kombinasjon med \'Vis rute\' bare viser deg ruten fra ethvert vilkårlig punkt du hadde valgt uten påfølgende oppdateringer. "</string>
<string name="tip_search">Søk</string>
<string name="tip_search">Søker</string>
<string name="tip_search_t">"Du kan søke etter steder direkte på kartet via \'Bruk posisjon\' → \'Søk nær her\', eller ved å kalle søkeskjermen via \'Meny\' → \'Søk\'.
\n\nSøkeskjermen gir maler for søk
\n\t* etter adresse
@ -1281,4 +1281,7 @@
<string name="shared_string_do_not_use">Ikke bruk</string>
<string name="shared_string_address">Adresse</string>
<string name="delay_navigation_start">Start trinnvis veiledning automatisk</string>
<string name="shared_string_places">Steder</string>
<string name="shared_string_search">Søk</string>
<string name="shared_string_show_description">Vis beskrivelse</string>
</resources>

View file

@ -338,7 +338,7 @@
<string name="poi_attraction_big_wheel">Diabelski młyn</string>
<string name="poi_attraction_carousel">Karuzela</string>
<string name="poi_attraction_maze">Labirynt</string>
<string name="poi_attraction_roller_coaster">Roller coaster</string>
<string name="poi_attraction_roller_coaster">Kolejka górska</string>
<string name="poi_attraction_water_slide">Zjeżdżalnia wodna</string>
<string name="poi_hotel">Hotel</string>
@ -486,4 +486,27 @@
<string name="poi_bmx">BMX</string>
<string name="poi_boules">Bule</string>
<string name="poi_battlefield">Miejsce bitwy</string>
<string name="poi_shop_food">Sklep spożywczy</string>
<string name="poi_road_obstacle">Przeszkoda drogowa</string>
<string name="poi_filling_station">Stacja benzynowa</string>
<string name="poi_personal_transport">Transport własny</string>
<string name="poi_public_transport">Transport publiczny</string>
<string name="poi_air_transport">Transport lotniczy</string>
<string name="poi_water_transport">Transport wodny</string>
<string name="poi_bicycle_transport">Transport rowerowy</string>
<string name="poi_water_supply">Wodociąg</string>
<string name="poi_power">Energia</string>
<string name="poi_communication">Komunikacja</string>
<string name="poi_trash_disposal">Utylizacja śmieci</string>
<string name="poi_office">Biuro</string>
<string name="poi_sightseeing">Zwiedzanie</string>
<string name="poi_internet_access">Dostęp do Internetu</string>
<string name="poi_farm">Sklep rolniczy</string>
<string name="poi_military_nuclear_explosion_site">Miejsce eksplozji jądrowej</string>
<string name="poi_military_naval_base">Wojskowa baza morska</string>
<string name="poi_military_danger_area">Strefa zagrożenia</string>
<string name="poi_military_landuse">Strefa wojskowa</string>
<string name="poi_accomodation">Noclegi</string>
<string name="poi_club">Klub</string>
<string name="poi_cafe_and_restaurant">Kawiarnia i restauracja</string>
</resources>

View file

@ -2088,4 +2088,6 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="shared_string_do_not_use">Nie używaj</string>
<string name="shared_string_address">Adres</string>
<string name="shared_string_show_description">Pokaż opis</string>
<string name="shared_string_places">Miejsca</string>
<string name="shared_string_search">Szukaj</string>
</resources>

View file

@ -1661,7 +1661,7 @@
<string name="osmo_auth_error">Ошибка авторизации OsMo : %1$s.↵\n Это может быть временно недоступный сервис или срок вашей регистрации истек.↵\n Желаете продолжить с новой регистрацией?</string>
<string name="osmo_not_signed_in">Не удалось войти в OsMo</string>
<string name="osmo_gpx_track_downloaded">OsMo трек %1$s загружен.</string>
<string name="no_index_file_to_download">Загрузок не найдено. Проверьте подключение к Интернет.</string>
<string name="no_index_file_to_download">Загрузок не найдено, проверьте подключение к Интернет.</string>
<string name="osmo_expire_group">Истекает</string>
<string name="osmo_gpx_points_downloaded">Точки OsMo %1$s загружены.</string>
<string name="osmo_session_not_available">Сессия недоступна, пожалуйста проверьте, что \"отправка местоположения\" включена.</string>
@ -1954,4 +1954,6 @@
<string name="shared_string_address">Адрес</string>
<string name="rendering_attr_pisteRoutes_name">Горнолыжные склоны</string>
<string name="shared_string_show_description">Показать описание</string>
<string name="shared_string_places">Места</string>
<string name="shared_string_search">Поиск</string>
</resources>

View file

@ -1938,4 +1938,6 @@
<string name="shared_string_do_not_use">No impreare</string>
<string name="shared_string_address">Indiritzu</string>
<string name="shared_string_show_description">Ammustra descritzione</string>
<string name="shared_string_places">Logos</string>
<string name="shared_string_search">Chirca</string>
</resources>

View file

@ -1855,4 +1855,6 @@
<string name="shared_string_address">Adress</string>
<string name="shared_string_show_description">Visa beskrivning</string>
<string name="shared_string_search">Sök</string>
<string name="shared_string_places">Platser</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM kartassistent</string>
</resources>

View file

@ -1964,4 +1964,5 @@
<string name="shared_string_address">地址</string>
<string name="shared_string_show_description">顯示記述</string>
<string name="shared_string_search">搜尋</string>
<string name="shared_string_places">地點</string>
</resources>

View file

@ -19,6 +19,7 @@
<string name="poi_power">Power</string>
<string name="poi_communication">Communication</string>
<string name="poi_trash_disposal">Trash disposal</string>
<string name="poi_landuse">Landuse</string>
<string name="poi_education">Education</string>
<string name="poi_administrative">Administrative</string>
<string name="poi_healthcare">Healthcare</string>
@ -170,6 +171,29 @@
<string name="poi_vehicle_inspection">Vehicle inspection</string>
<string name="poi_car_wash">Car wash</string>
<string name="poi_fuel">Gas station</string>
<string name="poi_fuel_diesel_yes">Diesel</string>
<string name="poi_fuel_gtl_diesel_yes">GTL diesel</string>
<string name="poi_fuel_hgv_diesel_yes">HGV diesel</string>
<string name="poi_fuel_biodiesel_yes">Bio diesel</string>
<string name="poi_fuel_lpg_yes">LPG</string>
<string name="poi_fuel_octane_80_yes">Octane 80</string>
<string name="poi_fuel_octane_91_yes">Octane 91</string>
<string name="poi_fuel_octane_92_yes">Octane 92</string>
<string name="poi_fuel_octane_95_yes">Octane 95</string>
<string name="poi_fuel_octane_98_yes">Octane 98</string>
<string name="poi_fuel_octane_100_yes">Octane 100</string>
<string name="poi_fuel_cng_yes">CNG</string>
<string name="poi_fuel_1_25_yes">1:25 fuel</string>
<string name="poi_fuel_1_50_yes">1:50 fuel</string>
<string name="poi_fuel_ethanol_yes">Ethanol</string>
<string name="poi_fuel_methanol_yes">Methanol</string>
<string name="poi_fuel_svo_yes">SVO</string>
<string name="poi_fuel_e10_yes">E10</string>
<string name="poi_fuel_e20_yes">E20</string>
<string name="poi_fuel_e85_yes">E85</string>
<string name="poi_fuel_biogas_yes">E85</string>
<string name="poi_fuel_LH2_yes">Liquid hydrogen</string>
<string name="poi_fuel_electricity_yes">Electricity</string>
<string name="poi_charging_station">Charging station</string>
<string name="poi_vehicle_ramp">Vehicle ramp</string>
<string name="poi_compressed_air">Compressed air</string>
@ -227,6 +251,7 @@
<string name="poi_speed_camera">Speed camera</string>
<string name="poi_turning_circle">Turning circle</string>
<string name="poi_motorway_junction">Motorway junction</string>
<string name="poi_junction">Junction</string>
<string name="poi_rest_area">Rest area</string>
<string name="poi_water_well">Water well</string>
@ -257,11 +282,15 @@
<string name="poi_waste_disposal">Waste disposal</string>
<string name="poi_waste_basket">Waste basket</string>
<string name="poi_industrial">Industrial area</string>
<string name="poi_quarry">Quarry</string>
<string name="poi_vineyard">Vineyard</string>
<string name="poi_orchard">Orchard</string>
<string name="poi_allotments">Allotments</string>
<string name="poi_forest">Human maintained forest</string>
<string name="poi_farmyard">Farmyard</string>
<string name="poi_meadow">Meadow</string>
<string name="poi_landuse_railway">Railroad area</string>
<string name="poi_canal">Canal</string>
<string name="poi_pier">Pier</string>
@ -316,6 +345,7 @@
<string name="poi_locality">Locality</string>
<string name="poi_place_allotments">Allotments</string>
<string name="poi_place_farm">Farm</string>
<string name="poi_residential">Residential area</string>
<string name="poi_pharmacy">Pharmacy</string>
<string name="poi_hospital">Hospital</string>
@ -562,6 +592,8 @@
<string name="poi_swimming_pool">Swimming pool</string>
<string name="poi_water_park">Water park</string>
<string name="poi_park">Park</string>
<string name="poi_recreation_ground">Recreation ground</string>
<string name="poi_village_green">Village green</string>
<string name="poi_cafe">Cafe</string>
<string name="poi_biergarten">Biergarten</string>

View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="rendering_attr_OSMMapperAssistant_name">OSM mapper assistant</string>
<string name="agps_info">A-GPS info</string>
<string name="shared_string_manage">Manage</string>
<string name="shared_string_edit">Edit</string>

View file

@ -277,7 +277,9 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
String typeName = historyEntry.getName().getTypeName();
if (typeName != null && !typeName.isEmpty()) {
row.findViewById(R.id.type_name_icon).setVisibility(View.VISIBLE);
ImageView group = (ImageView)row.findViewById(R.id.type_name_icon);
group.setVisibility(View.VISIBLE);
group.setImageDrawable(ic.getContentIcon(R.drawable.ic_small_group));
((TextView) row.findViewById(R.id.type_name)).setText(typeName);
} else {
row.findViewById(R.id.type_name_icon).setVisibility(View.GONE);

View file

@ -1,35 +1,31 @@
package net.osmand.plus.dashboard;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.dialogs.DirectionsDialogs;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.util.MapUtils;
import android.app.Activity;
import android.content.Intent;
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.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.dialogs.DirectionsDialogs;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.util.MapUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/**
* Created by Denis
* on 24.11.2014.
@ -96,10 +92,12 @@ public class DashFavoritesFragment extends DashLocationFragment {
direction.setVisibility(View.VISIBLE);
label.setVisibility(View.VISIBLE);
view.findViewById(R.id.divider).setVisibility(View.VISIBLE);
ImageView groupImage = (ImageView)view.findViewById(R.id.group_image);
if (point.getCategory().length() > 0) {
((TextView) view.findViewById(R.id.group_name)).setText(point.getCategory());
groupImage.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_small_group));
} else {
view.findViewById(R.id.group_image).setVisibility(View.GONE);
groupImage.setVisibility(View.GONE);
}
((ImageView) view.findViewById(R.id.favourite_icon)).setImageDrawable(FavoriteImageDrawable.getOrCreate(
@ -111,6 +109,7 @@ public class DashFavoritesFragment extends DashLocationFragment {
name.setText(point.getName());
name.setTypeface(Typeface.DEFAULT, point.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
view.findViewById(R.id.navigate_to).setVisibility(View.VISIBLE);
((ImageView) view.findViewById(R.id.navigate_to)).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_gdirections_dark));
view.findViewById(R.id.navigate_to).setOnClickListener(new View.OnClickListener() {
@Override

View file

@ -227,10 +227,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
((TextView) v.findViewById(R.id.points_count)).setText(sth.getPoints() + "");
((TextView) v.findViewById(R.id.distance))
.setText(OsmAndFormatter.getFormattedDistance(sth.getDistance(), app));
v.findViewById(R.id.points_count).setVisibility(View.VISIBLE);
v.findViewById(R.id.points_icon).setVisibility(View.VISIBLE);
v.findViewById(R.id.distance).setVisibility(View.VISIBLE);
v.findViewById(R.id.distance_icon).setVisibility(View.VISIBLE);
ImageView distance = (ImageView) v.findViewById(R.id.distance_icon);
distance.setVisibility(View.VISIBLE);
distance.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_distance));
ImageView pointsCount = (ImageView) v.findViewById(R.id.points_icon);
pointsCount.setVisibility(View.VISIBLE);
pointsCount.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_point));
}
@Override