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

Merge pull request #11109 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2021-03-10 19:55:18 +01:00 committed by GitHub
commit 215a7f5569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 646 additions and 511 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/res/values-be/phrases.xml
View file

@ -123,7 +123,7 @@
<string name="poi_vehicle_inspection">Пункт тэхагляду</string> <string name="poi_vehicle_inspection">Пункт тэхагляду</string>
<string name="poi_car_wash">Аўтамыйка</string> <string name="poi_car_wash">Аўтамыйка</string>
<string name="poi_fuel">Запраўка;АЗС;Аўтазаправачная станцыя</string> <string name="poi_fuel">Запраўка;АЗС;Аўтазаправачная станцыя</string>
<string name="poi_electricity_combined_charging">Станцыя сілкавання</string> <string name="poi_electricity_combined_charging">Станцыя зарадкі; Станцыя зарадкі для электрамабіля; Станцыя зарадкі для электрамабіляў; Кропка электрычнай зарадкі; Кропка зарадкі; Электронная зарадная станцыя; Абсталяванне для электрамабіляў</string>
<string name="poi_vehicle_ramp">Рамонтная эстакада/яма</string> <string name="poi_vehicle_ramp">Рамонтная эстакада/яма</string>
<string name="poi_compressed_air">Кампрэсар для падпампоўкі шын</string> <string name="poi_compressed_air">Кампрэсар для падпампоўкі шын</string>
<string name="poi_parking">Паркоўка</string> <string name="poi_parking">Паркоўка</string>
@ -3604,7 +3604,7 @@
<string name="poi_vehicle_military">Доступ для транспартных сродкаў: для вайскоўцаў</string> <string name="poi_vehicle_military">Доступ для транспартных сродкаў: для вайскоўцаў</string>
<string name="poi_vehicle_delivery">Доступ для транспартных сродкаў: кур’еры / дастаўка</string> <string name="poi_vehicle_delivery">Доступ для транспартных сродкаў: кур’еры / дастаўка</string>
<string name="poi_vehicle_forestry">Доступ для транспартных сродкаў: лясная гаспадарка</string> <string name="poi_vehicle_forestry">Доступ для транспартных сродкаў: лясная гаспадарка</string>
<string name="poi_motorcar_yes">Доступ для аўтамабіляў:</string> <string name="poi_motorcar_yes">Доступ для аўтамабіляў: так</string>
<string name="poi_motorcar_private">Доступ для аўтамабіляў: прыватны</string> <string name="poi_motorcar_private">Доступ для аўтамабіляў: прыватны</string>
<string name="poi_motorcar_no">Доступ для аўтамабіляў: няма</string> <string name="poi_motorcar_no">Доступ для аўтамабіляў: няма</string>
<string name="poi_motorcar_destination">Доступ для аўтамабіляў: пункт прызначэння</string> <string name="poi_motorcar_destination">Доступ для аўтамабіляў: пункт прызначэння</string>
@ -3804,7 +3804,7 @@
<string name="poi_tactile_paving_primitive">Прымітыўнае</string> <string name="poi_tactile_paving_primitive">Прымітыўнае</string>
<string name="poi_tactile_paving_contrasted">Кантраснае</string> <string name="poi_tactile_paving_contrasted">Кантраснае</string>
<string name="poi_traffic_signals_sound_locate">Толькі калі дазволеная хада</string> <string name="poi_traffic_signals_sound_locate">Толькі калі дазволеная хада</string>
<string name="poi_internet_access_fee_customers">Доступ да сеціва</string> <string name="poi_internet_access_fee_customers">Доступ да сеціва: кліенты</string>
<string name="poi_video_no">Не</string> <string name="poi_video_no">Не</string>
<string name="poi_video_yes">Так</string> <string name="poi_video_yes">Так</string>
<string name="poi_booth">Тып стэнда</string> <string name="poi_booth">Тып стэнда</string>
@ -3823,11 +3823,22 @@
<string name="poi_recycling_small_electrical_appliances">Маленькія электрапрыборы</string> <string name="poi_recycling_small_electrical_appliances">Маленькія электрапрыборы</string>
<string name="poi_beehive">Вулей</string> <string name="poi_beehive">Вулей</string>
<string name="poi_nuts">Крама арэхаў</string> <string name="poi_nuts">Крама арэхаў</string>
<string name="poi_fuel_lng"/> <string name="poi_fuel_lng">ЗПГ</string>
<string name="poi_diplomatic_services_citizen_services_filter">Паслугі для грамадзян</string> <string name="poi_diplomatic_services_citizen_services_filter">Паслугі для грамадзян</string>
<string name="poi_diplomatic_services_immigrant_visas_filter">Іміграцыйныя візы</string> <string name="poi_diplomatic_services_immigrant_visas_filter">Іміграцыйныя візы</string>
<string name="poi_diplomatic_services_non_immigrant_visas_filter">Неіміграцыйныя візы</string> <string name="poi_diplomatic_services_non_immigrant_visas_filter">Неіміграцыйныя візы</string>
<string name="poi_liaison_filter">Сувязь</string> <string name="poi_liaison_filter">Сувязь</string>
<string name="poi_consulate_filter">Консульства</string> <string name="poi_consulate_filter">Консульства</string>
<string name="poi_embassy_filter">Амбасада</string> <string name="poi_embassy_filter">Амбасада</string>
<string name="poi_embassy_high_commission">Вярхоўны камісарыят</string>
<string name="poi_embassy_delegation">Дэлегацыя</string>
<string name="poi_embassy_branch_embassy">Аддзяленне</string>
<string name="poi_embassy_yes">На чале з амбасадарам</string>
<string name="poi_diplomatic_liaison">Сувязь</string>
<string name="poi_diplomatic_embassy">Амбасада</string>
<string name="poi_radar_tower">Радыёлакацыйная вежа</string>
<string name="poi_parking_layby">Прыдарожная стаянка</string>
<string name="poi_parking_sheds">Навесы</string>
<string name="poi_parking_rooftop">Дах</string>
<string name="poi_gpx_point">Пункт GPX</string>
</resources> </resources>

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

@ -598,7 +598,7 @@
<string name="map_version_changed_info">Спампаваць новую версію праграмы, каб мець магчымасць выкарыстоўваць новыя файлы мапаў.</string> <string name="map_version_changed_info">Спампаваць новую версію праграмы, каб мець магчымасць выкарыстоўваць новыя файлы мапаў.</string>
<string name="poi_filter_nominatim">Сеціўны Nominatim</string> <string name="poi_filter_nominatim">Сеціўны Nominatim</string>
<string name="search_position_current_location_search">Вызначэнне становішча…</string> <string name="search_position_current_location_search">Вызначэнне становішча…</string>
<string name="search_position_current_location_found">Маё становішча (знойдзена)</string> <string name="search_position_current_location_found">Маё месцазнаходжанне (знойдзена)</string>
<string name="search_position_address">Адрас…</string> <string name="search_position_address">Адрас…</string>
<string name="search_position_favorites">Улюбёныя мясціны…</string> <string name="search_position_favorites">Улюбёныя мясціны…</string>
<string name="shared_string_undefined">Нявызначана</string> <string name="shared_string_undefined">Нявызначана</string>
@ -2547,7 +2547,7 @@
<string name="hide_passed">Схаваць пройдзеныя</string> <string name="hide_passed">Схаваць пройдзеныя</string>
<string name="use_location">Выкарыстоўваць становішча</string> <string name="use_location">Выкарыстоўваць становішча</string>
<string name="add_location_as_first_point_descr">Дадаць ваша становішча як пункт адпраўлення пры планаванні маршруту.</string> <string name="add_location_as_first_point_descr">Дадаць ваша становішча як пункт адпраўлення пры планаванні маршруту.</string>
<string name="my_location">Маё становішча</string> <string name="my_location">Маё месцазнаходжанне</string>
<string name="shared_string_finish">Фініш</string> <string name="shared_string_finish">Фініш</string>
<string name="plan_route">Планаваць маршрут</string> <string name="plan_route">Планаваць маршрут</string>
<string name="shared_string_sort">Упарадкаваць</string> <string name="shared_string_sort">Упарадкаваць</string>
@ -3954,15 +3954,15 @@
<string name="plan_route_split_after">Падзяліць пасля</string> <string name="plan_route_split_after">Падзяліць пасля</string>
<string name="plan_route_add_new_segment">Дадаць новы сегмент</string> <string name="plan_route_add_new_segment">Дадаць новы сегмент</string>
<string name="profile_type_user_string">Профіль карыстальніка</string> <string name="profile_type_user_string">Профіль карыстальніка</string>
<string name="release_3_9">"• Дададзена магчымасць экспарту і імпарту ўсіх даных, уключаючы налады, рэсурсы, мае месцы. <string name="release_3_9">• Дададзена магчымасць экспарту і імпарту ўсіх даных, уключаючы налады, рэсурсы і мясціны.
\n \n
\n • Планаванне маршруту: графікі для сегментаў трэка з маршрутам, дададзена магчымасць ствараць і рэдагаваць некалькі сегментаў трэка. \n • Планаванне маршруту: графікі для сегментаў следу з маршрутам, дададзена магчымасць ствараць і рэдагаваць некалькі сегментаў следу.
\n \n
\n • Дададзены OAuth метад аўтэнтыфікацыі для OpenStreetMap, палепшаны інтэрфейс дыялогаў OSM. \n • Дададзены метад аўтэнтыфікацыі для OpenStreetMap OAuth, палепшаны інтэрфейс дыялогаў OSM.
\n \n
\n • Падтрымка карыстальніцкіх колераў для абранага і маршрутных пунктаў трэка. \n • Падтрымка адвольных колераў для ўлюбёных мясцін і пунктаў следу.
\n \n
\n"</string> \n</string>
<string name="reverse_all_points">Вярнуць назад усе пункты</string> <string name="reverse_all_points">Вярнуць назад усе пункты</string>
<string name="profile_by_default_description">Выберыце профіль, які будзе выкарыстоўвацца падчас запуску прыкладання.</string> <string name="profile_by_default_description">Выберыце профіль, які будзе выкарыстоўвацца падчас запуску прыкладання.</string>
<string name="shared_string_last_used">Апошні раз выкарыстоўвалася</string> <string name="shared_string_last_used">Апошні раз выкарыстоўвалася</string>
@ -3994,10 +3994,10 @@
<string name="select_folder_descr">Выберыце папку або стварыце новую</string> <string name="select_folder_descr">Выберыце папку або стварыце новую</string>
<string name="shared_string_empty">Пуста</string> <string name="shared_string_empty">Пуста</string>
<string name="analyze_by_intervals">Аналіз паводле інтэрвалаў</string> <string name="analyze_by_intervals">Аналіз паводле інтэрвалаў</string>
<string name="upload_to_openstreetmap">Выгрузіць на OpenStreetMap</string> <string name="upload_to_openstreetmap">Адправіць на OpenStreetMap</string>
<string name="edit_track">Змяніць трэк</string> <string name="edit_track">Змяніць след</string>
<string name="rename_track">Перайменаваць трэк</string> <string name="rename_track">Змяніць назву следу</string>
<string name="change_folder">Змяніць папку</string> <string name="change_folder">Змяніць каталог</string>
<string name="shared_string_sec">сек.</string> <string name="shared_string_sec">сек.</string>
<string name="announcement_time_passing">Пры праходжанні</string> <string name="announcement_time_passing">Пры праходжанні</string>
<string name="announcement_time_approach">Набліжэнне</string> <string name="announcement_time_approach">Набліжэнне</string>
@ -4009,48 +4009,48 @@
<string name="announcement_time_intervals">Інтэрвалы часу і адлегласці</string> <string name="announcement_time_intervals">Інтэрвалы часу і адлегласці</string>
<string name="profile_type_osmand_string">Профіль OsmAnd</string> <string name="profile_type_osmand_string">Профіль OsmAnd</string>
<string name="announcement_time_title">Час абвяшчэння</string> <string name="announcement_time_title">Час абвяшчэння</string>
<string name="announcement_time_descr">Час розных галасавых падказак залежыць ад тыпу запыту, бягучай хуткасці навігацыі і хуткасці навігацыі па змаўчанні.</string> <string name="announcement_time_descr">Час вываду розных галасавых падказак залежыць ад тыпу падказкі, бягучай хуткасці навігацыі і прадвызначанай хуткасці навігацыі.</string>
<string name="start_recording">Пачаць запіс</string> <string name="start_recording">Пачаць запіс</string>
<string name="show_track_on_map">Паказаць трэк на мапе</string> <string name="show_track_on_map">Паказаць след на мапе</string>
<string name="routing_engine_vehicle_type_wheelchair">Інвалідны вазок</string> <string name="routing_engine_vehicle_type_wheelchair">Інвалідны вазок</string>
<string name="routing_engine_vehicle_type_hiking">Пешы турызм</string> <string name="routing_engine_vehicle_type_hiking">Пешы турызм</string>
<string name="routing_engine_vehicle_type_walking">Хадзьба</string> <string name="routing_engine_vehicle_type_walking">Хада</string>
<string name="routing_engine_vehicle_type_cycling_electric">Электраровар</string> <string name="routing_engine_vehicle_type_cycling_electric">Электрычны ровар</string>
<string name="routing_engine_vehicle_type_cycling_mountain">Горны ровар</string> <string name="routing_engine_vehicle_type_cycling_mountain">Горны ровар</string>
<string name="routing_engine_vehicle_type_cycling_road">Дарожны ровар</string> <string name="routing_engine_vehicle_type_cycling_road">Дарожны ровар</string>
<string name="routing_engine_vehicle_type_cycling_regular">Звычайны ровар</string> <string name="routing_engine_vehicle_type_cycling_regular">Звычайны ровар</string>
<string name="routing_engine_vehicle_type_hgv">Грузавік</string> <string name="routing_engine_vehicle_type_hgv">Грузавік</string>
<string name="routing_engine_vehicle_type_small_truck">Малы грузавік</string> <string name="routing_engine_vehicle_type_small_truck">Малы грузавік</string>
<string name="routing_engine_vehicle_type_truck">Грузавік</string> <string name="routing_engine_vehicle_type_truck">Грузавік</string>
<string name="routing_engine_vehicle_type_scooter">Скутэр</string> <string name="routing_engine_vehicle_type_scooter">Скутар</string>
<string name="routing_engine_vehicle_type_racingbike">Гоначны ровар</string> <string name="routing_engine_vehicle_type_racingbike">Гоначны ровар</string>
<string name="routing_engine_vehicle_type_mtb">Горны ровар</string> <string name="routing_engine_vehicle_type_mtb">Горны ровар</string>
<string name="message_server_error">Памылка сервера: %1$s</string> <string name="message_server_error">Памылка сервера: %1$s</string>
<string name="message_name_is_already_exists">Назва ўжо існуе</string> <string name="message_name_is_already_exists">Назва ўжо існуе</string>
<string name="delete_online_routing_engine">Выдаліць анлайн-маршрутызатар\?</string> <string name="delete_online_routing_engine">Выдаліць сеціўную сістэму маршрутызацыі\?</string>
<string name="context_menu_read_full">Чытаць цалкам</string> <string name="context_menu_read_full">Чытаць цалкам</string>
<string name="context_menu_edit_descr">Змяніць апісанне</string> <string name="context_menu_edit_descr">Змяніць апісанне</string>
<string name="delete_waypoints">Выдаліць маршрутныя пункты</string> <string name="delete_waypoints">Выдаліць пункты шляху</string>
<string name="copy_to_map_markers">Капіраваць да пазнак мапы</string> <string name="copy_to_map_markers">Скапіяваць у адзнакі</string>
<string name="copy_to_map_favorites">Капіраваць да абранага</string> <string name="copy_to_map_favorites">Скапіяваць ва ўлюбёныя</string>
<string name="upload_photo">Выгрузка</string> <string name="upload_photo">Адпраўленне</string>
<string name="upload_photo_completed">Выгрузка завершана</string> <string name="upload_photo_completed">Паспяхова адпраўлена</string>
<string name="uploading_count">Выгрузка %1$d з %2$d</string> <string name="uploading_count">Адпраўленне %1$d з %2$d</string>
<string name="uploaded_count">Выгружана %1$d з %2$d</string> <string name="uploaded_count">Адпраўлена %1$d з %2$d</string>
<string name="toast_select_edits_for_upload">Выберыце змены для выгрузкі</string> <string name="toast_select_edits_for_upload">Абярыце змены для адпраўлення</string>
<string name="hillshade_slope_contour_lines">Рэльеф мясцовасці / Схілы / Гарызанталі</string> <string name="hillshade_slope_contour_lines">Рэльеф мясцовасці / Схілы / Контурныя лініі</string>
<string name="open_place_reviews_plugin_description">OpenPlaceReviews — гэта грамадскі праект пра месцы агульнага карыстання, такія як, рэстараны, гатэлі, музеі, пункты шляху. Ён збірае ўсе агульнадаступныя даныя пра іх, такія як, выявы, водгукі, спасылкі на іншыя сістэмы, спасылкі OpenStreetMap, Вікіпедыя. <string name="open_place_reviews_plugin_description">OpenPlaceReviews — гэта грамадскі праект пра месцы агульнага карыстання, такія як рэстараны, гатэлі, музеі, пункты шляху. Ён збірае ўсе агульнадаступныя даныя пра іх, такія як, выявы, водгукі, спасылкі на іншыя сістэмы, спасылкі OpenStreetMap, Вікіпедыя.
\n \n
\nУсе даныя OpenPlaceReview з\'яўляюцца адкрытымі і даступны тут: http://openplacereviews.org/data. \nУсе даныя OpenPlaceReview адкрытыя і даступныя тут: http://openplacereviews.org/data.
\n \n
\nВы можаце прачытаць больш па адрасу: http://openplacereviews.org</string> \nВы можаце прачытаць больш па адрасе: http://openplacereviews.org</string>
<string name="open_place_reviews">OpenPlaceReviews</string> <string name="open_place_reviews">OpenPlaceReviews</string>
<string name="opr_use_dev_url">Выкарыстаць test.openplacereviews.org</string> <string name="opr_use_dev_url">Выкарыстаць test.openplacereviews.org</string>
<string name="login_open_place_reviews">Увайсці ў OpenPlaceReviews</string> <string name="login_open_place_reviews">Увайсці ў OpenPlaceReviews</string>
<string name="activity_type_water_name">Вада</string> <string name="activity_type_water_name">Вада</string>
<string name="activity_type_winter_name">Зіма</string> <string name="activity_type_winter_name">Зіма</string>
<string name="activity_type_snowmobile_name">Снегаход</string> <string name="activity_type_snowmobile_name">Снегаход</string>
<string name="activity_type_riding_name">Язда</string> <string name="activity_type_riding_name">Верхавая язда</string>
<string name="activity_type_racing_name">Гонка</string> <string name="activity_type_racing_name">Гонка</string>
<string name="activity_type_mountainbike_name">Горны ровар</string> <string name="activity_type_mountainbike_name">Горны ровар</string>
<string name="activity_type_cycling_name">Язда на ровары</string> <string name="activity_type_cycling_name">Язда на ровары</string>

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

@ -3564,7 +3564,7 @@
<string name="turn_screen_on_navigation_instructions_descr">Hver navigationsinstruktion tænder skærmen.</string> <string name="turn_screen_on_navigation_instructions_descr">Hver navigationsinstruktion tænder skærmen.</string>
<string name="turn_screen_on_navigation_instructions">Navigationsinstruktioner</string> <string name="turn_screen_on_navigation_instructions">Navigationsinstruktioner</string>
<string name="turn_screen_on_power_button">Tænd/sluk-knap</string> <string name="turn_screen_on_power_button">Tænd/sluk-knap</string>
<string name="turn_screen_on_proximity_sensor">Nærhedssensor</string> <string name="turn_screen_on_proximity_sensor">Nærhedsføler</string>
<string name="keep_screen_on">Hold skærmen tændt</string> <string name="keep_screen_on">Hold skærmen tændt</string>
<string name="keep_screen_off">Hold skærmen slukket</string> <string name="keep_screen_off">Hold skærmen slukket</string>
<string name="pseudo_mercator_projection">Pseudo-Mercatorprojektion</string> <string name="pseudo_mercator_projection">Pseudo-Mercatorprojektion</string>
@ -3763,4 +3763,28 @@
<string name="plan_route_split_before">Opdel før</string> <string name="plan_route_split_before">Opdel før</string>
<string name="plan_route_split_after">Opdel efter</string> <string name="plan_route_split_after">Opdel efter</string>
<string name="plan_route_add_new_segment">Tilføj et nyt segment</string> <string name="plan_route_add_new_segment">Tilføj et nyt segment</string>
<string name="start_recording">Start optagelse</string>
<string name="routing_engine_vehicle_type_wheelchair">Kørestol</string>
<string name="routing_engine_vehicle_type_walking">Gå</string>
<string name="routing_engine_vehicle_type_small_truck">Varevogn</string>
<string name="routing_engine_vehicle_type_hgv">Tung gods transport</string>
<string name="routing_engine_vehicle_type_cycling_electric">Elektrisk cykling</string>
<string name="routing_engine_vehicle_type_cycling_mountain">Bjerg cykling</string>
<string name="routing_engine_vehicle_type_cycling_regular">Normal cykling</string>
<string name="routing_engine_vehicle_type_racingbike">Racercykel</string>
<string name="routing_engine_vehicle_type_truck">Lastbil</string>
<string name="message_server_error">Server fejl: %1$s</string>
<string name="context_menu_edit_descr">Redigere beskrivelse</string>
<string name="upload_photo_completed">Send afsluttet</string>
<string name="uploading_count">Sender %1$d af %2$d</string>
<string name="uploaded_count">Sendt %1$d af %2$d</string>
<string name="upload_photo">Sender</string>
<string name="opr_use_dev_url">Brug test.openplacereviews.org</string>
<string name="activity_type_winter_name">Vinter</string>
<string name="activity_type_riding_name">Ride</string>
<string name="activity_type_cycling_name">Cykle</string>
<string name="activity_type_running_name">Løbe</string>
<string name="activity_type_walking_name">Gå</string>
<string name="activity_type_motorbike_name">Motorcykel</string>
<string name="activity_type_car_name">Bil</string>
</resources> </resources>

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

@ -2976,7 +2976,7 @@
<string name="profile_alert_need_save_title">Änderungen speichern</string> <string name="profile_alert_need_save_title">Änderungen speichern</string>
<string name="profile_alert_need_save_msg">Änderungen am Profil zuerst speichern</string> <string name="profile_alert_need_save_msg">Änderungen am Profil zuerst speichern</string>
<string name="profile_alert_delete_title">Profil löschen</string> <string name="profile_alert_delete_title">Profil löschen</string>
<string name="profile_alert_delete_msg">Möchten Sie das Profil „%s“ wirklich löschen\?</string> <string name="profile_alert_delete_msg">Möchten Sie das Profil „%s“ wirklich löschen</string>
<string name="select_base_profile_dialog_title">Wählen Sie zunächst ein Profil aus</string> <string name="select_base_profile_dialog_title">Wählen Sie zunächst ein Profil aus</string>
<string name="select_base_profile_dialog_message">Bauen Sie ein eigenes Anwendungsprofil auf einem der Standardprofile der App auf. Dieses bestimmt die Grundeinstellungen wie Voreinstellungen zur Sichtbarkeit von Widgets und die Einheiten für Geschwindigkeit und Entfernungen. Dies sind die App-Standardprofile zusammen mit Beispielen für eigene Anwendungsprofile, die erweitert werden können:</string> <string name="select_base_profile_dialog_message">Bauen Sie ein eigenes Anwendungsprofil auf einem der Standardprofile der App auf. Dieses bestimmt die Grundeinstellungen wie Voreinstellungen zur Sichtbarkeit von Widgets und die Einheiten für Geschwindigkeit und Entfernungen. Dies sind die App-Standardprofile zusammen mit Beispielen für eigene Anwendungsprofile, die erweitert werden können:</string>
<string name="select_nav_profile_dialog_title">Navigationsart auswählen</string> <string name="select_nav_profile_dialog_title">Navigationsart auswählen</string>

4
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -316,8 +316,8 @@
<string name="poi_office_administrative">Oficina administrativa</string> <string name="poi_office_administrative">Oficina administrativa</string>
<string name="poi_customs">Aduana</string> <string name="poi_customs">Aduana</string>
<string name="poi_city">Ciudad</string> <string name="poi_city">Ciudad</string>
<string name="poi_town">Pueblo</string> <string name="poi_town">Ciudad pequeña</string>
<string name="poi_village">Pueblito;Villa</string> <string name="poi_village">Pueblo;Villa</string>
<string name="poi_hamlet">Aldea</string> <string name="poi_hamlet">Aldea</string>
<string name="poi_isolated_dwelling">Vivienda aislada</string> <string name="poi_isolated_dwelling">Vivienda aislada</string>
<string name="poi_suburb">Barrio;Suburbio</string> <string name="poi_suburb">Barrio;Suburbio</string>

20
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -380,7 +380,7 @@
<string name="error_avoid_specific_road">No se ha encontrado un desvío</string> <string name="error_avoid_specific_road">No se ha encontrado un desvío</string>
<string name="map_update">Actualización disponible para %1$s mapa(s)</string> <string name="map_update">Actualización disponible para %1$s mapa(s)</string>
<string name="wake_on_voice">Encender pantalla</string> <string name="wake_on_voice">Encender pantalla</string>
<string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en línea (llamados teselas o ráster) que desees, desde teselas predefinidas de OSM (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas del tiempo, mapas del clima, mapas geológicos, capas de sombreado, etc. <string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en línea (llamados teselas o ráster) que desees, desde teselas predefinidas de OSM (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas meteorológicos, mapas del clima, mapas geológicos, capas de sombreado, etc.
\n \n
\nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible. \nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible.
\n \n
@ -418,7 +418,7 @@
<string name="osmand_parking_plugin_description">Registra dónde se ha estacionado el automóvil, incluyendo cuánto tiempo queda. <string name="osmand_parking_plugin_description">Registra dónde se ha estacionado el automóvil, incluyendo cuánto tiempo queda.
\n Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú principal y en un widget sobre el mapa. Se puede añadir una alarma de recordatorio al calendario de Android.</string> \n Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú principal y en un widget sobre el mapa. Se puede añadir una alarma de recordatorio al calendario de Android.</string>
<string name="osmand_distance_planning_plugin_description">Crea caminos pulsando el mapa, usando o modificando archivos GPX existentes, para planificar un viaje y medir la distancia entre puntos. El resultado puede guardarse como un archivo GPX y usarse luego para la orientación.</string> <string name="osmand_distance_planning_plugin_description">Crea caminos pulsando el mapa, usando o modificando archivos GPX existentes, para planificar un viaje y medir la distancia entre puntos. El resultado puede guardarse como un archivo GPX y usarse luego para la orientación.</string>
<string name="osmand_accessibility_description">Activa las funciones de accesibilidad del dispositivo, directamente en OsmAnd. Facilita por ejemplo, el ajuste de la velocidad de la voz para voces de texto a voz, la configuración de navegación D-pad, usando la rueda de desplazamiento para el control del zoom, o la retroalimentación de texto a voz, por ejemplo, para anunciar la ubicación automáticamente.</string> <string name="osmand_accessibility_description">Activa las funciones de accesibilidad del dispositivo, directamente en OsmAnd. Facilita por ejemplo, el ajuste de la velocidad de la voz para voces de texto a voz, la configuración de navegación del pad direccional, usando la rueda de desplazamiento para el control del zoom, o la retroalimentación de texto a voz, por ejemplo, para anunciar la ubicación automáticamente.</string>
<string name="osm_editing_plugin_description">Haz contribuciones en OSM, como el crear o modificar objetos PDI, abrir o comentar notas de OSM y contribuir con archivos de trazas GPX grabados en OsmAnd, proporcionando tu nombre de usuario y contraseña. OpenStreetMap.org es un proyecto de mapeo de dominio público, global, libre e impulsado por la comunidad.</string> <string name="osm_editing_plugin_description">Haz contribuciones en OSM, como el crear o modificar objetos PDI, abrir o comentar notas de OSM y contribuir con archivos de trazas GPX grabados en OsmAnd, proporcionando tu nombre de usuario y contraseña. OpenStreetMap.org es un proyecto de mapeo de dominio público, global, libre e impulsado por la comunidad.</string>
<string name="osmand_development_plugin_description">Ajusta las funciones de desarrollo y depuración, como la simulación de navegación, el rendimiento del renderizado o las indicaciones por voz. Destinado para desarrolladores, no es necesario para el normal uso de la aplicación.</string> <string name="osmand_development_plugin_description">Ajusta las funciones de desarrollo y depuración, como la simulación de navegación, el rendimiento del renderizado o las indicaciones por voz. Destinado para desarrolladores, no es necesario para el normal uso de la aplicación.</string>
<string name="world_ski_missing">Descargar el mapa especial sin conexión para mostrar las instalaciones de esquí.</string> <string name="world_ski_missing">Descargar el mapa especial sin conexión para mostrar las instalaciones de esquí.</string>
@ -1056,8 +1056,8 @@
<string name="delete_confirmation_msg">¿Borrar «%1$s»?</string> <string name="delete_confirmation_msg">¿Borrar «%1$s»?</string>
<string name="city_type_suburb">Suburbio</string> <string name="city_type_suburb">Suburbio</string>
<string name="city_type_hamlet">Aldea</string> <string name="city_type_hamlet">Aldea</string>
<string name="city_type_village">Villa</string> <string name="city_type_village">Pueblo</string>
<string name="city_type_town">Pueblo</string> <string name="city_type_town">Ciudad pequeña</string>
<string name="city_type_city">Ciudad</string> <string name="city_type_city">Ciudad</string>
<string name="animate_route_off">Parar simulación</string> <string name="animate_route_off">Parar simulación</string>
<string name="animate_route">Iniciar simulación</string> <string name="animate_route">Iniciar simulación</string>
@ -1662,7 +1662,7 @@
<string name="shared_string_navigation">Navegación</string> <string name="shared_string_navigation">Navegación</string>
<string name="osmand_running_in_background">Ejecutar en modo reposo</string> <string name="osmand_running_in_background">Ejecutar en modo reposo</string>
<string name="favourites_edit_dialog_title">Información del favorito</string> <string name="favourites_edit_dialog_title">Información del favorito</string>
<string name="favourites_context_menu_add">Añadir a Favoritos</string> <string name="favourites_context_menu_add">Añadir favorito</string>
<string name="roads">Caminos</string> <string name="roads">Caminos</string>
<string name="default_speed_system_descr">Define la unidad de velocidad.</string> <string name="default_speed_system_descr">Define la unidad de velocidad.</string>
<string name="default_speed_system">Unidad de velocidad</string> <string name="default_speed_system">Unidad de velocidad</string>
@ -2668,7 +2668,7 @@
<string name="shared_string_wikivoyage">Wikiviajes</string> <string name="shared_string_wikivoyage">Wikiviajes</string>
<string name="index_item_world_wikivoyage">Artículos de Wikiviajes en todo el mundo</string> <string name="index_item_world_wikivoyage">Artículos de Wikiviajes en todo el mundo</string>
<string name="online_webpage_warning">La página sólo está disponible en línea. ¿Abrirla en el navegador web?</string> <string name="online_webpage_warning">La página sólo está disponible en línea. ¿Abrirla en el navegador web?</string>
<string name="images_cache">Caché de imágenes</string> <string name="images_cache">Almacén de imágenes</string>
<string name="delete_search_history">Borrar historial de búsquedas</string> <string name="delete_search_history">Borrar historial de búsquedas</string>
<string name="show_images">Mostrar imágenes</string> <string name="show_images">Mostrar imágenes</string>
<string name="shared_string_dont">No</string> <string name="shared_string_dont">No</string>
@ -3303,7 +3303,7 @@
<string name="select_color">Elegir el color</string> <string name="select_color">Elegir el color</string>
<string name="edit_profiles_descr">Los perfiles predefinidos de OsmAnd no se pueden borrar, sino desactivar (en la pantalla anterior) u ordenarse en la parte inferior.</string> <string name="edit_profiles_descr">Los perfiles predefinidos de OsmAnd no se pueden borrar, sino desactivar (en la pantalla anterior) u ordenarse en la parte inferior.</string>
<string name="edit_profiles">Editar perfiles</string> <string name="edit_profiles">Editar perfiles</string>
<string name="select_nav_profile_dialog_message">El «Tipo de navegación» rige la forma en que se calculan las rutas.</string> <string name="select_nav_profile_dialog_message">El «Tipo de navegación» determina cómo se calculan las rutas.</string>
<string name="profile_appearance">Aspecto del perfil</string> <string name="profile_appearance">Aspecto del perfil</string>
<string name="choose_icon_color_name">Icono, color y nombre</string> <string name="choose_icon_color_name">Icono, color y nombre</string>
<string name="reorder_profiles">Editar la lista de perfiles</string> <string name="reorder_profiles">Editar la lista de perfiles</string>
@ -3543,7 +3543,7 @@
<string name="lang_ky">Kirguís</string> <string name="lang_ky">Kirguís</string>
<string name="lang_kk">Kazajo</string> <string name="lang_kk">Kazajo</string>
<string name="lang_jv">Javanés</string> <string name="lang_jv">Javanés</string>
<string name="lang_gu">Gujarati</string> <string name="lang_gu">Gujaratí</string>
<string name="lang_cv">Chuvash</string> <string name="lang_cv">Chuvash</string>
<string name="lang_ce">Checheno</string> <string name="lang_ce">Checheno</string>
<string name="lang_bar">Bávaro</string> <string name="lang_bar">Bávaro</string>
@ -3570,7 +3570,7 @@
<string name="map_markers_item">Marcadores del mapa</string> <string name="map_markers_item">Marcadores del mapa</string>
<string name="favorites_item">Favoritos</string> <string name="favorites_item">Favoritos</string>
<string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string> <string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
<string name="osmand_purchases_item">Compras de OsmAnd</string> <string name="osmand_purchases_item">Compras en OsmAnd</string>
<string name="legend_item_description">La guía para la simbología de un mapa.</string> <string name="legend_item_description">La guía para la simbología de un mapa.</string>
<string name="navigation_profiles_item">Perfiles de navegación</string> <string name="navigation_profiles_item">Perfiles de navegación</string>
<string name="release_3_7">• Nuevos mapas sin conexión de las pendientes <string name="release_3_7">• Nuevos mapas sin conexión de las pendientes
@ -3894,7 +3894,7 @@
<string name="select_picture">Elegir imagen</string> <string name="select_picture">Elegir imagen</string>
<string name="lang_de_casual">Alemán (casual)</string> <string name="lang_de_casual">Alemán (casual)</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="app_mode_light_aircraft">Avión ligero</string> <string name="app_mode_light_aircraft">Aeronave ligera</string>
<string name="plan_route_join_segments">Unir segmentos</string> <string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_split_before">Dividir antes</string> <string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir después</string> <string name="plan_route_split_after">Dividir después</string>

10
OsmAnd/res/values-es/phrases.xml
View file

@ -3881,4 +3881,14 @@
<string name="poi_diplomatic_embassy">Embajada</string> <string name="poi_diplomatic_embassy">Embajada</string>
<string name="poi_consulate_filter">Consulado</string> <string name="poi_consulate_filter">Consulado</string>
<string name="poi_embassy_filter">Embajada</string> <string name="poi_embassy_filter">Embajada</string>
<string name="poi_mobile_library">Biblioteca móvil (parada)</string>
<string name="poi_summit_register_no">Registro de cumbre: no</string>
<string name="poi_summit_register_yes">Registro de cumbre: sí</string>
<string name="poi_piste_status_closed">Estado de la pista: cerrada</string>
<string name="poi_piste_status_open">Estado de la pista: abierta</string>
<string name="poi_patrolled_no">Patrullado: no</string>
<string name="poi_patrolled_yes">Patrullado: sí</string>
<string name="poi_gladed_yes">Arbolado: sí</string>
<string name="poi_piste_name">Nombre de la pista</string>
<string name="poi_piste_ski_jump">Salto con esquís</string>
</resources> </resources>

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

File diff suppressed because it is too large Load diff

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

@ -3932,4 +3932,25 @@
<string name="edit_track">Editar trilho</string> <string name="edit_track">Editar trilho</string>
<string name="rename_track">Renomear trilho</string> <string name="rename_track">Renomear trilho</string>
<string name="change_folder">Mudar pasta</string> <string name="change_folder">Mudar pasta</string>
<string name="hillshade_slope_contour_lines">Sombras de relevo / Pistas / Curvas de nível</string>
<string name="open_place_reviews_plugin_description">OpenPlaceReviews é um projeto comunitário sobre lugares públicos como restaurantes, hotéis, museus, pontos de passagem. Recolhe toda a informação pública sobre eles, como fotos, resenhas, ligações para outros sistemas OpenStreetMap, Wikipedia.
\n
\nTodos os dados OpenPlaceReview estão abertos e disponíveis para todos: http://openplacereviews.org/data.
\n
\nPode ler mais em: http://openplacereviews.org</string>
<string name="open_place_reviews">OpenPlaceReviews</string>
<string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
<string name="login_open_place_reviews">Fazer login no OpenPlaceReviews</string>
<string name="activity_type_water_name">Água</string>
<string name="activity_type_winter_name">Inverno</string>
<string name="activity_type_snowmobile_name">Moto de neve</string>
<string name="activity_type_riding_name">Equitação</string>
<string name="activity_type_racing_name">Corrida</string>
<string name="activity_type_mountainbike_name">Mountainbike</string>
<string name="activity_type_cycling_name">Ciclismo</string>
<string name="activity_type_running_name">A correr</string>
<string name="activity_type_walking_name">Caminhando</string>
<string name="activity_type_offroad_name">Fora da estrada</string>
<string name="activity_type_motorbike_name">Motocicleta</string>
<string name="activity_type_car_name">Carro</string>
</resources> </resources>

1
OsmAnd/res/values-ru/phrases.xml
View file

@ -3885,4 +3885,5 @@
<string name="poi_patrolled_yes">Патрулируется: да</string> <string name="poi_patrolled_yes">Патрулируется: да</string>
<string name="poi_piste_name">Название трассы</string> <string name="poi_piste_name">Название трассы</string>
<string name="poi_piste_ski_jump">Лыжный трамплин</string> <string name="poi_piste_ski_jump">Лыжный трамплин</string>
<string name="poi_gladed_yes">По лесу: да</string>
</resources> </resources>

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

@ -3990,4 +3990,13 @@
<string name="activity_type_water_name">Вода</string> <string name="activity_type_water_name">Вода</string>
<string name="activity_type_winter_name">Зима</string> <string name="activity_type_winter_name">Зима</string>
<string name="activity_type_riding_name">Верховая езда</string> <string name="activity_type_riding_name">Верховая езда</string>
<string name="reverse_all_points">Инвертировать все точки</string>
<string name="routing_attr_allow_streams_description">Разрешить ручьи и стоки</string>
<string name="routing_attr_allow_streams_name">Разрешить ручьи и стоки</string>
<string name="open_place_reviews_plugin_description">OpenPlaceReviews - это управляемый сообществом проект об общественных местах, таких как рестораны, отели, музеи, путевые точки. Он собирает всю общедоступную информацию о них, такую как фотографии, обзоры, ссылки на другие системы, ссылки OpenStreetMap, Wikipedia.
\n
\nВсе данные OpenPlaceReview открыты и доступны всем: http://openplacereviews.org/data.
\n
\nВы можете узнать больше на: http://openplacereviews.org</string>
<string name="activity_type_racing_name">Гонки</string>
</resources> </resources>

9
OsmAnd/src/net/osmand/plus/ContextMenuItem.java
View file

@ -9,6 +9,7 @@ import androidx.annotation.LayoutRes;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import net.osmand.plus.ContextMenuAdapter.OnItemDeleteAction; import net.osmand.plus.ContextMenuAdapter.OnItemDeleteAction;
public class ContextMenuItem { public class ContextMenuItem {
@ -164,7 +165,9 @@ public class ContextMenuItem {
return description; return description;
} }
public OnItemDeleteAction getItemDeleteAction() { return itemDeleteAction; } public OnItemDeleteAction getItemDeleteAction() {
return itemDeleteAction;
}
public ContextMenuAdapter.ItemClickListener getItemClickListener() { public ContextMenuAdapter.ItemClickListener getItemClickListener() {
return itemClickListener; return itemClickListener;
@ -207,9 +210,7 @@ public class ContextMenuItem {
} }
public void setColor(Context context, @ColorRes int colorRes) { public void setColor(Context context, @ColorRes int colorRes) {
if (colorRes != INVALID_ID) { color = colorRes != INVALID_ID ? ContextCompat.getColor(context, colorRes) : null;
this.color = ContextCompat.getColor(context, colorRes);
}
} }
public void setSelected(boolean selected) { public void setSelected(boolean selected) {

11
OsmAnd/src/net/osmand/plus/activities/PluginsFragment.java
View file

@ -4,8 +4,8 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -22,7 +22,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
@ -225,7 +224,11 @@ public class PluginsFragment extends BaseOsmAndFragment implements PluginStateLi
pluginDescription.setText(plugin.getDescription()); pluginDescription.setText(plugin.getDescription());
int color = AndroidUtils.getColorFromAttr(context, R.attr.list_background_color); int color = AndroidUtils.getColorFromAttr(context, R.attr.list_background_color);
pluginLogo.setImageDrawable(UiUtilities.tintDrawable(plugin.getLogoResource(), color)); Drawable pluginIcon = plugin.getLogoResource();
if (pluginIcon.getConstantState() != null) {
pluginIcon = pluginIcon.getConstantState().newDrawable().mutate();
}
pluginLogo.setImageDrawable(UiUtilities.tintDrawable(pluginIcon, color));
pluginLogo.setOnClickListener(new View.OnClickListener() { pluginLogo.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -249,7 +252,7 @@ public class PluginsFragment extends BaseOsmAndFragment implements PluginStateLi
if (active) { if (active) {
pluginLogo.setBackgroundResource(nightMode ? R.drawable.bg_plugin_logo_enabled_dark : R.drawable.bg_plugin_logo_enabled_light); pluginLogo.setBackgroundResource(nightMode ? R.drawable.bg_plugin_logo_enabled_dark : R.drawable.bg_plugin_logo_enabled_light);
} else { } else {
TypedArray attributes = context.getTheme().obtainStyledAttributes(new int[] {R.attr.bg_plugin_logo_disabled}); TypedArray attributes = context.getTheme().obtainStyledAttributes(new int[]{R.attr.bg_plugin_logo_disabled});
pluginLogo.setBackgroundDrawable(attributes.getDrawable(0)); pluginLogo.setBackgroundDrawable(attributes.getDrawable(0));
attributes.recycle(); attributes.recycle();
} }

14
OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
View file

@ -3,6 +3,7 @@ package net.osmand.plus.dialogs;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableString; import android.text.SpannableString;
import android.view.View; import android.view.View;
@ -11,12 +12,11 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.plus.profiles.ProfileDataUtils;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -34,6 +34,8 @@ import net.osmand.plus.download.DownloadValidationManager;
import net.osmand.plus.download.IndexItem; import net.osmand.plus.download.IndexItem;
import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.FontCache; import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.profiles.ProfileDataUtils;
import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.widgets.style.CustomTypefaceSpan; import net.osmand.plus.widgets.style.CustomTypefaceSpan;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -87,11 +89,17 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
Typeface typeface = FontCache.getRobotoMedium(getContext()); Typeface typeface = FontCache.getRobotoMedium(getContext());
SpannableString pluginTitleSpan = new SpannableString(plugin.getName()); SpannableString pluginTitleSpan = new SpannableString(plugin.getName());
pluginTitleSpan.setSpan(new CustomTypefaceSpan(typeface), 0, pluginTitleSpan.length(), 0); pluginTitleSpan.setSpan(new CustomTypefaceSpan(typeface), 0, pluginTitleSpan.length(), 0);
Drawable pluginIcon = plugin.getLogoResource();
if (pluginIcon.getConstantState() != null) {
pluginIcon = pluginIcon.getConstantState().newDrawable().mutate();
}
pluginIcon = UiUtilities.tintDrawable(pluginIcon, ContextCompat.getColor(
context, nightMode ? R.color.icon_color_default_light : R.color.icon_color_default_dark));
BaseBottomSheetItem pluginTitle = new SimpleBottomSheetItem.Builder() BaseBottomSheetItem pluginTitle = new SimpleBottomSheetItem.Builder()
.setTitle(pluginTitleSpan) .setTitle(pluginTitleSpan)
.setTitleColorId(nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light) .setTitleColorId(nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light)
.setIcon(plugin.getLogoResource()) .setIcon(pluginIcon)
.setLayoutId(R.layout.bottom_sheet_item_simple_56dp) .setLayoutId(R.layout.bottom_sheet_item_simple_56dp)
.create(); .create();
items.add(pluginTitle); items.add(pluginTitle);

69
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
View file

@ -1,9 +1,7 @@
package net.osmand.plus.mapcontextmenu.other; package net.osmand.plus.mapcontextmenu.other;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.PointF;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.Pair; import android.util.Pair;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -20,7 +18,6 @@ import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData; import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet; import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
import com.github.mikephil.charting.listener.BarLineChartTouchListener;
import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture; import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture;
import com.github.mikephil.charting.listener.OnChartGestureListener; import com.github.mikephil.charting.listener.OnChartGestureListener;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener; import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
@ -611,39 +608,39 @@ public class TrackDetailsMenu {
} }
}); });
final float minDragTriggerDist = AndroidUtils.dpToPx(app, 3); // final float minDragTriggerDist = AndroidUtils.dpToPx(app, 3);
chart.setOnTouchListener(new BarLineChartTouchListener(chart, chart.getViewPortHandler().getMatrixTouch(), 3f) { // chart.setOnTouchListener(new BarLineChartTouchListener(chart, chart.getViewPortHandler().getMatrixTouch(), 3f) {
private PointF touchStartPoint = new PointF(); // private PointF touchStartPoint = new PointF();
//
@SuppressLint("ClickableViewAccessibility") // @SuppressLint("ClickableViewAccessibility")
@Override // @Override
public boolean onTouch(View v, MotionEvent event) { // public boolean onTouch(View v, MotionEvent event) {
switch (event.getAction() & MotionEvent.ACTION_MASK) { // switch (event.getAction() & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: // case MotionEvent.ACTION_DOWN:
saveTouchStart(event); // saveTouchStart(event);
break; // break;
case MotionEvent.ACTION_POINTER_DOWN: // case MotionEvent.ACTION_POINTER_DOWN:
if (event.getPointerCount() >= 2) { // if (event.getPointerCount() >= 2) {
saveTouchStart(event); // saveTouchStart(event);
} // }
break; // break;
case MotionEvent.ACTION_MOVE: // case MotionEvent.ACTION_MOVE:
if (mTouchMode == NONE && mChart.hasNoDragOffset()) { // if (mTouchMode == NONE && mChart.hasNoDragOffset()) {
float touchDistance = distance(event.getX(), touchStartPoint.x, event.getY(), touchStartPoint.y); // float touchDistance = distance(event.getX(), touchStartPoint.x, event.getY(), touchStartPoint.y);
if (Math.abs(touchDistance) > minDragTriggerDist) { // if (Math.abs(touchDistance) > minDragTriggerDist) {
mTouchMode = DRAG; // mTouchMode = DRAG;
} // }
} // }
break; // break;
} // }
return super.onTouch(v, event); // return super.onTouch(v, event);
} // }
//
private void saveTouchStart(MotionEvent event) { // private void saveTouchStart(MotionEvent event) {
touchStartPoint.x = event.getX(); // touchStartPoint.x = event.getX();
touchStartPoint.y = event.getY(); // touchStartPoint.y = event.getY();
} // }
}); // });
chart.setOnChartGestureListener(new OnChartGestureListener() { chart.setOnChartGestureListener(new OnChartGestureListener() {
boolean hasTranslated = false; boolean hasTranslated = false;
float highlightDrawX = -1; float highlightDrawX = -1;