diff --git a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml index ed3f0e5956..31032dc8b4 100644 --- a/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml +++ b/OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml @@ -1,7 +1,7 @@ - + - + - + - + \ No newline at end of file diff --git a/OsmAnd/res/drawable-sw600dp/first_splash_screen_free_dev.xml b/OsmAnd/res/drawable-sw600dp/first_splash_screen_free_dev.xml index 20d4cde2ea..aae2c9955e 100644 --- a/OsmAnd/res/drawable-sw600dp/first_splash_screen_free_dev.xml +++ b/OsmAnd/res/drawable-sw600dp/first_splash_screen_free_dev.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable-sw600dp/first_splash_screen_plus.xml b/OsmAnd/res/drawable-sw600dp/first_splash_screen_plus.xml index 20d4cde2ea..aae2c9955e 100644 --- a/OsmAnd/res/drawable-sw600dp/first_splash_screen_plus.xml +++ b/OsmAnd/res/drawable-sw600dp/first_splash_screen_plus.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/first_splash_screen_free.xml b/OsmAnd/res/drawable/first_splash_screen_free.xml index b3d6f99388..4a413970b5 100644 --- a/OsmAnd/res/drawable/first_splash_screen_free.xml +++ b/OsmAnd/res/drawable/first_splash_screen_free.xml @@ -1,7 +1,7 @@ - + - + - + diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml index 2ba0589479..7ba6d5ffe6 100644 --- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml +++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml @@ -43,6 +43,7 @@ android:ellipsize="end" android:maxLines="2" style="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Some description" /> diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml index ae1255e374..34e329d8a3 100644 --- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml +++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml @@ -44,6 +44,7 @@ android:ellipsize="end" android:maxLines="2" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Some description"/> diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml index 7f54956e23..82d4698be8 100644 --- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml +++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml @@ -44,6 +44,7 @@ android:ellipsize="end" android:maxLines="2" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Some description"/> diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_switch_and_additional_button_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_switch_and_additional_button_56dp.xml index 006824b159..ceb6326c35 100644 --- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_switch_and_additional_button_56dp.xml +++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_switch_and_additional_button_56dp.xml @@ -49,6 +49,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="2" + android:textColor="@null" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" tools:text="Some description" /> diff --git a/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml b/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml index 2e00611e3d..da5f1dff61 100644 --- a/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml +++ b/OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml @@ -1,60 +1,66 @@ - - - - - - + android:orientation="vertical"> - + - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/bottom_sheet_plan_route_start.xml b/OsmAnd/res/layout/bottom_sheet_plan_route_start.xml index 84900e29d2..a4aa9f312e 100644 --- a/OsmAnd/res/layout/bottom_sheet_plan_route_start.xml +++ b/OsmAnd/res/layout/bottom_sheet_plan_route_start.xml @@ -1,41 +1,47 @@ - + android:orientation="vertical"> - + android:orientation="horizontal" + android:paddingStart="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingTop="@dimen/bottom_sheet_title_padding_top" + android:paddingEnd="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom"> + + + + + + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml index f2854b4a77..9e142ae938 100644 --- a/OsmAnd/res/layout/fragment_edit_poi.xml +++ b/OsmAnd/res/layout/fragment_edit_poi.xml @@ -43,26 +43,32 @@ android:layout_height="wrap_content" app:layout_scrollFlags="scroll"> - - - + - + android:layout_marginStart="24dp" + android:layout_marginLeft="24dp" + android:importantForAutofill="noExcludeDescendants" + app:endIcon="@drawable/ic_action_arrow_drop_down" + app:labelText="@string/poi_dialog_poi_type" + app:panelBackgroundColor="@color/color_transparent" + app:primaryColor="@color/color_white" + app:secondaryColor="@color/white_50_transparent"> - - + - + + + + + + + + + - - diff --git a/OsmAnd/res/layout/fragment_map_markers_groups.xml b/OsmAnd/res/layout/fragment_map_markers_groups.xml index 82d9cea70f..f02d69f7fb 100644 --- a/OsmAnd/res/layout/fragment_map_markers_groups.xml +++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml @@ -22,6 +22,7 @@ android:layout_height="wrap_content" app:srcCompat="@drawable/ic_action_plus" app:backgroundTint="?attr/active_color_basic" + app:tint="?attr/app_bar_primary_item_color" app:fabSize="normal" app:useCompatPadding="true"/> diff --git a/OsmAnd/res/layout/gpx_description_card.xml b/OsmAnd/res/layout/gpx_description_card.xml index 88d7c651fa..e60e525bb0 100644 --- a/OsmAnd/res/layout/gpx_description_card.xml +++ b/OsmAnd/res/layout/gpx_description_card.xml @@ -24,6 +24,7 @@ android:ellipsize="end" android:maxLines="5" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard." android:layout_marginStart="@dimen/content_padding" android:layout_marginEnd="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/gpx_item_list_header.xml b/OsmAnd/res/layout/gpx_item_list_header.xml index 251eda21b6..715dd7789e 100644 --- a/OsmAnd/res/layout/gpx_item_list_header.xml +++ b/OsmAnd/res/layout/gpx_item_list_header.xml @@ -64,19 +64,21 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1.8" - android:minHeight="48dp" + android:minHeight="@dimen/card_row_min_height" android:paddingLeft="@dimen/content_padding" - android:paddingTop="@dimen/content_padding_half" - android:paddingBottom="@dimen/content_padding_half" + android:paddingStart="@dimen/content_padding" + android:paddingRight="0dp" + android:paddingEnd="0dp" android:orientation="horizontal" - android:gravity="center_vertical" - android:paddingStart="@dimen/content_padding"> + android:gravity="center_vertical"> @@ -119,14 +121,16 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1.6" - android:minHeight="48dp" + android:minHeight="@dimen/card_row_min_height" android:paddingLeft="@dimen/content_padding" + android:paddingStart="@dimen/content_padding" + android:paddingRight="0dp" + android:paddingEnd="0dp" android:paddingTop="@dimen/content_padding_half" android:paddingBottom="@dimen/content_padding_half" android:background="?attr/selectableItemBackground" android:orientation="horizontal" - android:gravity="center_vertical" - android:paddingStart="@dimen/content_padding"> + android:gravity="center_vertical"> diff --git a/OsmAnd/res/layout/markers_group_view_holder.xml b/OsmAnd/res/layout/markers_group_view_holder.xml index 800dc74bc0..1c9179ba6d 100644 --- a/OsmAnd/res/layout/markers_group_view_holder.xml +++ b/OsmAnd/res/layout/markers_group_view_holder.xml @@ -44,6 +44,7 @@ android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" android:visibility="gone" tools:text="Some description" tools:visibility="visible"/> diff --git a/OsmAnd/res/layout/plan_route_gpx.xml b/OsmAnd/res/layout/plan_route_gpx.xml index 5e68cdfa44..2429273922 100644 --- a/OsmAnd/res/layout/plan_route_gpx.xml +++ b/OsmAnd/res/layout/plan_route_gpx.xml @@ -46,7 +46,8 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="2" - android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" /> + android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" /> diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml index e20eabf662..e39a1dbf44 100644 --- a/OsmAnd/res/layout/point_editor_fragment_new.xml +++ b/OsmAnd/res/layout/point_editor_fragment_new.xml @@ -519,6 +519,7 @@ android:lines="1" android:text="@string/replace_point_descr" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="@string/replace_point_descr" /> diff --git a/OsmAnd/res/layout/preference_dropdown_list.xml b/OsmAnd/res/layout/preference_dropdown_list.xml index ec62e1232d..6f247664fa 100644 --- a/OsmAnd/res/layout/preference_dropdown_list.xml +++ b/OsmAnd/res/layout/preference_dropdown_list.xml @@ -22,9 +22,11 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical|end" android:paddingRight="@dimen/content_padding" + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="0dp" + android:paddingStart="0dp" app:srcCompat="@drawable/ic_action_arrow_drop_down" - android:tint="@color/settings_divider" - android:paddingEnd="@dimen/content_padding" /> + android:tint="@color/settings_divider" /> diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml index 73db37f093..33a93fc70e 100644 --- a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml +++ b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml @@ -66,6 +66,7 @@ android:ellipsize="end" android:maxLines="2" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Some description" /> diff --git a/OsmAnd/res/layout/quick_action_list.xml b/OsmAnd/res/layout/quick_action_list.xml index 7b042aa261..9d8b797ae1 100644 --- a/OsmAnd/res/layout/quick_action_list.xml +++ b/OsmAnd/res/layout/quick_action_list.xml @@ -31,6 +31,7 @@ android:layout_alignParentBottom="true" android:layout_margin="@dimen/content_padding" android:contentDescription="@string/quick_action_new_action" + app:tint="?attr/app_bar_primary_item_color" app:backgroundTint="?attr/color_dialog_buttons" app:srcCompat="@drawable/ic_action_plus" /> diff --git a/OsmAnd/res/layout/wikivoyage_article_card.xml b/OsmAnd/res/layout/wikivoyage_article_card.xml index b7b266f138..cd44a13933 100644 --- a/OsmAnd/res/layout/wikivoyage_article_card.xml +++ b/OsmAnd/res/layout/wikivoyage_article_card.xml @@ -54,6 +54,7 @@ android:ellipsize="end" android:maxLines="3" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard."/> @@ -84,6 +85,7 @@ android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="England • United Kingdom" android:layout_marginStart="@dimen/content_padding" android:layout_marginEnd="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/wikivoyage_search_list_item.xml b/OsmAnd/res/layout/wikivoyage_search_list_item.xml index 1f78ca6221..14c6c79729 100644 --- a/OsmAnd/res/layout/wikivoyage_search_list_item.xml +++ b/OsmAnd/res/layout/wikivoyage_search_list_item.xml @@ -61,6 +61,7 @@ android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextAppearance.ContextMenuSubtitle" + android:textColor="@null" tools:text="Amstellend North Holland"/> diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index 5ce66d6222..ffa1df255e 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -983,16 +983,13 @@ حسب اتجاه الحركة الشمال في الأعلى حسب البوصلة - بدء التسجيل إشارة توقف إيقاف التتبع على الإنترنت - إيقاف موقف مواقف صوت المسار الجار تسجيله تسجيل المسار - اختر الفاصل الزمني لتسجيل المسار العام (مفعل عن طريق أداة تسجيل GPX على الخريطة). اختر الفاصل الزمني لتسجيل المسار أثناء الملاحة صوت مسج التوجيه @@ -1412,7 +1409,6 @@ وسع فرز وضع الخريطة - %s مسار محدد رقيقة متوسط لم تضف علامات على الخريطة @@ -1867,7 +1863,6 @@ لغة السيبيونو لديك بيانات ويكيبيديا منزلة قديمة غير متوافقة. هل تريد أرشفتها؟ منع التسجيل في الخلفية - إيقاف تسجيل المسار عند إغلاق التطبيق من نافذة التطبيقات المستخدمة مؤخراً. (إشعار أوسماند سيختفي من شريط الإشعارات) استيراد إلى أوسماند حذف تعديل OSM معطل diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml index 85f0de6448..5b1f9888a0 100644 --- a/OsmAnd/res/values-az/strings.xml +++ b/OsmAnd/res/values-az/strings.xml @@ -70,7 +70,6 @@ Quraşdırılmayıb Sırala Xəritə rejimi - %s GPX faylı seçildi Orta Qalın Yuxarı daşı @@ -834,8 +833,6 @@ Açıqlama daxil et. Genişlət Yuxarı get - GPX qeydiyyatını başlat - GPX qeydiyyatını dayandır Yeni seqment başlat Binalar Qeyri-nəqliyyat magistrallar diff --git a/OsmAnd/res/values-b+be+Latn/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml index 8958acc8d0..c227708242 100644 --- a/OsmAnd/res/values-b+be+Latn/strings.xml +++ b/OsmAnd/res/values-b+be+Latn/strings.xml @@ -89,7 +89,6 @@ Spynіć fonavy režym GPS? Spynіć Pytacca zaŭsiody - Abiarycie interval zapisu sliedu (ukliučajecca vidžetam zapisu GPX na mapie). Ahulny іntervał zapіsu Іntervał abudžeńnia GPS Uklučyć fonavy režym GPS @@ -136,8 +135,6 @@ Adsočvańnie praz Іnternet (patrabujecca GPX) Pačać adsočvańnie praz Іnternet Spynіć adsočvańnie praz Іnternet - Pačać zapіs GPX - Spynіć zapіs GPX Pačać novy adrezak Budynkі Nie aŭtamabіlnyja darohі @@ -1434,7 +1431,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB). Pierajścі ŭvierch Sartavać Režym mapy - Abrana %s GPX fajłaŭ Tonkі Siarednі Toŭsty @@ -1696,7 +1692,6 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB). Ściahnuć dadatkovyja źviestki Vikipedyi (%1$s MB) ? Služba miescaznachodžańnia nie ŭkliučanaja. Ukliučyć jaje? Praduchіlić aŭtanomny zapіs - Zapіs GPX prypynіcca, kali prahrama budzie zabіta (praz nadaŭnіja prahramy). (Apaviaščeńnie ŭ vobłaścі padkazak Android pra fonavy režym OsmAnd źnіknie.) Іmpartavać u OsmAnd Čytać artykuł całkam (anłajn) Vіkіpedyja diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml index 4c8081133b..eba9ae37de 100644 --- a/OsmAnd/res/values-b+hsb/strings.xml +++ b/OsmAnd/res/values-b+hsb/strings.xml @@ -1479,8 +1479,6 @@ Informacije wo čarje Awtodróhi preferować Awtodróhi preferować - GPX-nahrawanje započeć - GPX-nahrawanje zastajić Najdalši jako prěni Najbliši jako prěni Šěrinu a dołhotu zapodać diff --git a/OsmAnd/res/values-b+kab/strings.xml b/OsmAnd/res/values-b+kab/strings.xml index 24096e8c9a..9023496916 100644 --- a/OsmAnd/res/values-b+kab/strings.xml +++ b/OsmAnd/res/values-b+kab/strings.xml @@ -1245,7 +1245,6 @@ marker Azen Asawen - %S n ifuyla ifernen. Takarḍa Aseklu (Tabdart d tilemt) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index b7187b04b0..aa18d65b20 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1248,7 +1248,6 @@ Iнтэрвал абуджэння GPS Суахілі Іўрыт - Працягнуць запіс GPX Пачаць новы адрэзак Персідская Спыніць фонавы рэжым GPS? @@ -1258,7 +1257,6 @@ Наперад Панэль кіравання Пакінуць - Прыпыніць запіс GPX Пачаць адсочванне праз Інтэрнэт Спыніць адсочванне праз Інтэрнэт Адсочванне праз Інтэрнэт (патрабуецца GPX) @@ -1305,7 +1303,6 @@ Інтэрвал запісу Запіс месцазнаходжання ў GPX-файл можа быць уключаны або выключаны з дапамогай кнопкі запісу GPX мапе. Пытацца заўсёды - Вызначце інтэрвал запісу следу (уключаецца праз віджэт запісу GPX на мапе). Агульны інтэрвал запісу Абмежаванне хуткасці Памежны кантроль @@ -1592,7 +1589,6 @@ Сапраўды хочаце выдаліць %1$d нататак\? Імпартаваць у OsmAnd Прадухіліць аўтаномны запіс - Запіс GPX прыпыніцца, калі праграма будзе забітая (праз надаўнія праграмы). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.) Служба вызначэння месцазнаходжання выключаная. Уключыць яе\? Даныя Вікіпедыі састарэлі і больш непрыдатныя. Заархіваваць іх\? Спампаваць дадатковыя даныя Вікіпедыі (%1$s МБ)\? @@ -1960,7 +1956,6 @@ Сярэдні Тоўсты Рэжым мапы - Абрана %s GPX-файлаў Дадаць усе пункты як адзнакі мапы\? Дадаць да адзнак мапы Калі ласка, дадайце адзнакі праз экран мапы diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml index 53c0ff4242..f5c84b1d29 100644 --- a/OsmAnd/res/values-bg/strings.xml +++ b/OsmAnd/res/values-bg/strings.xml @@ -1092,8 +1092,6 @@ Иврит Напред Табло за управление - Старт на записа в GPX - Край на GPX записа Започни нов сегмент Скрий сградите Скрий пътищата, които не са за автомобили @@ -1195,7 +1193,6 @@ Номер Да премести ли OsmAnd своите файлове на новото място\? Общи настройки - Изберете интервал при запис на изминат път (достъпен чрез добавката за запис в GPX) Интервал за запис Търси Покажи всички @@ -1389,7 +1386,6 @@ Покажи подробни данни Услугата за местоположение е изключена. Включване\? Предотвратяване на самостоятелно записване - Спира на пауза записа на GPX, когато приложението е затворено (от последни приложения). (Иконата на OsmAnd изчезва от лентата за уведомяване на Андроид.) Импортиране към OsmAnd Прочетете пълната статия (онлайн) Сигурни ли сте, че искате да изтриете %1$d бележки\? diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index df334f59ba..2aec4790c2 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -879,7 +879,6 @@ Mapes estàndards No mostris els límits administratius regionals (nivells 5 a 9). Límit de velocitat - GPX Cerca progressiva de municipis Executeu l\'aplicació en mode segur (usant Android més lent que el codi nadiu). Elimina el destí @@ -1279,8 +1278,6 @@ Registre de traça en línia (cal GPX) Inicia un registre de traça en línia Atura el registre de traça en línia - Inicia el registre GPX - Atura el registre GPX Inicia un segment nou Persa Mantén @@ -1332,7 +1329,6 @@ L\'enregistrament de la posició en un fitxer GPX es pot activar o desactivar amb el giny d\'enregistrament GPX al mapa. Interval d\'enregistrament Es demana confirmació - Indiqueu l\'interval d\'enregistrament general de les traces (s\'activa mitjançant el giny de gravació de GPX del mapa). Interval d\'enregistrament general Velocitat màxima Control de fronteres @@ -1570,7 +1566,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Viquipèdia El servei de posicionament està aturat. El voleu activar\? Evita la gravació en procés de fons - L\'enregistrament en format GPX s\'aturarà quan ho faci OsmAnd (via les aplicacions recents). (La indicació de procés de fons de l\'OsmAnd desapareixerà de la barra de notificacions d\'Android) Importa a l\'OsmAnd Esteu segur que voleu esborrar %1$d notes\? Teniu dades de Viquipèdia antigues i incompatibles. Les voleu desar? @@ -1945,7 +1940,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Divisió d\'enregistrament Utilitza divisió d\'enregistrament Mode mapa - "Seleccionats %s arxius GPX" Color per defecte Trieu la categoria Introduïu el nom diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 67e25b09c8..43c43f51fb 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -860,7 +860,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).Rychlostní omezení Hranice oblastí Potlačit zobrazení správních hranic (administrativní úrovně 5-9). - GPX Vrstevnice Ostatní mapy Modul zvukové/video poznámky @@ -1241,8 +1240,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).On-line sledování (vyžaduje GPX) Spustit on-line sledování Zastavit on-line sledování - Pokračovat v GPX logování - Pozastavit GPX logování Začít nový segment Cesty, které nejsou pro vozidla Budovy při přiblížení 15 @@ -1297,7 +1294,6 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).Blízké body zájmu POI Záznam do GPX souboru může být zapnut nebo vypnut pomocí widgetu Záznam trasy na mapové obrazovce. Vždy se zeptat - Vybrat interval ukládání pro globální záznam trasy (aktivovaný přes widget Záznam trasy na mapové obrazovce). Globální interval záznamu Rychlostní limit Hraniční kontrola @@ -1565,7 +1561,6 @@ Délka %2$s Stáhnout dodatečná Wikipedia data (%1$s MB) \? Služba zjištění polohy není zapnuta. Aktivovat\? Zabránit samostatnému logování - Pozastaví záznam GPX trasy pokud je aplikace ukončena (přes nedávné aplikace). (OsmAnd indikátor zmizí ze stavového řádku Androidu.) Okamžité aktualizace Nejsou dostupné žádné aktualizace Nebezpečí @@ -1932,7 +1927,6 @@ Délka %2$s Navigovat nahoru Setřídit Režim mapy - %s vybraných GPX souborů Tenké Střední Tučné diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 403b7637de..9f75e0ed79 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -126,7 +126,6 @@ På anmodning\? Brug systemprogram til foto. Brug kamera - GPX Lat %1$.3f, Lon %2$.3f Mellemliggende destination %1$s Hold position på vejen under navigation. @@ -1221,8 +1220,6 @@ Online sporing (GPX nødvendig) Start online sporing Stop online sporing - Start GPX-logning - Stop GPX-logning Start nyt segment Persisk Foretrukket sprog for etiketter på kortet (hvis ikke tilgængelig bruges engelske eller lokale navne). @@ -1274,7 +1271,6 @@ Logningsinterval Generel positionsslogning til en GPX-fil kan slås til eller fra med GPX-logning udvidelsen på kortet. Spørg altid - Angiv logningsinterval for den almindelige optagelse af spor (aktiveres via \'GPX-logning\' på hovedskærmen). Generelt logningsinterval Hastighedsgrænse Grænsekontrol @@ -1565,7 +1561,6 @@ Importer til OsmAnd Slet %1$d noter. Bekræft? Forhindre uafhængig logning - Hvis markeret vil GPX-logning blive stoppet, når programmet afsluttes (via seneste programmer). OsmAnd-baggrundsmeddelse forsvinder fra meddelelseslinjen. Placeringtjenesten er slukket. Slå det til\? Der er gamle inkompatible Wikipedia data. Skal de arkiveres? Hent yderligere data fra Wikipedia (%1$s MB)? @@ -1938,7 +1933,6 @@ Tynd Mellem Fed - %s GPX-filer valgt Korttilstand Standardfarve Vælg kategori diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 73354f351f..5b758e0777 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -12,7 +12,6 @@ Weltweite Karten Standortservice ist deaktiviert. Einschalten\? Eigenständige Streckenaufzeichnung unterbinden - Die GPX-Aufzeichnung wird angehalten, wenn OsmAnd beendet wird (über „zuletzt verwendete Apps“). (Die Hintergrunddienst-Anzeige verschwindet aus der Android-Benachrichtigungsleiste.) In OsmAnd importieren Häufig gestellte Fragen, neueste Änderungen und anderes. Zielführung beginnen nach … @@ -29,7 +28,6 @@ Favoriten in der Nähe Nahegelegene POI Immer fragen - Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (via Schaltfläche \'GPX\' auf dem Kartenbildschirm). Intervall für generelle Aufzeichnung GPS-Hintergrunddienst aktivieren GPS-Hintergrunddienst beenden? @@ -1013,7 +1011,6 @@ Entfernungsmessung Streckenaufzeichnung Konfiguration der Streckenaufzeichnung. - GPX Audio-Notizen Machen Sie während einer Reise Audio-, Foto- und Video-Notizen, indem Sie entweder eine Karten-Schaltfläche oder ein Standort-Kontextmenü verwenden. Audio-/Video-Notizen @@ -1321,8 +1318,6 @@ \nTrack %2$s Trennungsintervall Track-Segmente: %1$s - GPX-Aufzeichnung fortsetzen - GPX-Aufzeichnung anhalten Neues Segment starten Wegpunkt Sichtbarkeit @@ -1940,7 +1935,6 @@ Mittel Fett Kartenmodus - %s GPX-Dateien ausgewählt Standardfarbe Kategorie auswählen Namen eingeben diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 437746e35a..d97fabeee7 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -855,7 +855,6 @@ Δεν βρέθηκαν κτήρια. Πλ %1$.3f μήκ %2$.3f Όριο ταχύτητας - GPX Όρια Περιορισμός εμφάνισης διοικητικών ορίων (επίπεδα διαχειριστή 5-9). Άλλοι χάρτες @@ -1221,8 +1220,6 @@ Αυτοκίνητο Ποδήλατο Πεζοπόρος - Συνέχιση καταγραφής GPX - Παύση καταγραφής GPX Έναρξη νέου τμήματος Όλα Προειδοποιήσεις κυκλοφορίας @@ -1518,7 +1515,6 @@ Εισαγωγή ονόματος Εισαγωγή κατηγορίας Εισαγωγή περιγραφής. - %s GPX αρχεία επιλέχτηκαν Λεπτή Μέτρια Παχιά @@ -2251,7 +2247,6 @@ Καμπίλε Βερβερικά Αποτροπή αυτόνομης καταγραφής - Θα παύσει την καταγραφή GPX όταν η εφαρμογή τερματιστεί (μέσω πρόσφατων εφαρμογών). (Η ένδειξη παρασκηνίου OsmAnd εξαφανίζεται από τη γραμμή ειδοποιήσεων του Android.) Βικιπαίδεια Χρώμα ανάλογα με τη σχέση του δικτύου Χρώμα ανάλογα με τα σύμβολα πεζοπορίας OSMC @@ -2323,7 +2318,6 @@ Το αγαπημενο μετονομάστηκε σε \'%1$s\' για να προφυλάξει την συμβολοσειρά που περιέχει emoticons σε αρχείο. Ορίστηκε διπλογραφή ονόματος Αγαπημένου Χαλάρωση κυκλοφορίας - Ορίστε τα χρονικά διαστήματα καταγραφής για τη γενική εγγραφή ιχνών (ενεργό μέσω του γραφικού στοιχείου καταγραφής GPX στον χάρτη). Καταγραφή ίχνους κατ΄ απαίτηση Διαμόρφωση μεσολαβητή HTTP για όλες τις αιτήσεις δικτύου. Προσδιορίστε τον υπολογιστή μεσολάβησης (π.χ. 127.0.0.1). diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml index 93172e04ae..20acb30170 100644 --- a/OsmAnd/res/values-eo/strings.xml +++ b/OsmAnd/res/values-eo/strings.xml @@ -304,7 +304,6 @@ Ĉu elŝuti aldonajn Vikipediajn datumojn (%1$s MB)\? Pozici-trova servo estas malaktiva. Ĉu aktivigi ĝin? Preventi de aŭtomata protokolado - Paŭzigi GPX-protokoladon je halto de la aplikaĵo (per lastaj aplikaĵoj). (Fona piktogramo de OsmAnd malaperas de Androida sciiga breto.) Legi tutan artikolon (enrete) Montri detalojn Forigi OSM-redaktojn @@ -589,7 +588,6 @@ Ĉesigi Demandi ĉiam Ĝenerala registrada intervalo - Elekti intervalon de registrado por ĝenerala registrado de kurso (aktivigita per la GPX-registrada fenestraĵo sur la mapo). GPS-a vekintervalo Aktivigi GPS-an fonan reĝimon Registri spuron laŭpete @@ -629,9 +627,7 @@ Enreta spur-registrado (GPX bezonata) Sendi datumojn de spuroj al difinita retservo, se GPX-registrado estas aktiva. Ekigi enretan kurs-registradon - Pluigi GPX-registradon Ĉesigi enretan kurs-registradon - Paŭzigi GPX-registradon Ekigi novan segmenton Konstruaĵoj Vojoj ne por aŭtoj @@ -777,7 +773,6 @@ Supren Ordigi Map-reĝimo - %s GPX-dosieroj elektitaj Maldika Meza Dika @@ -1008,7 +1003,6 @@ Limoj Ne montri regionajn limojn (administraciaj niveloj 5–9). Rapidlimo - GPX Neniu konstruaĵo trovita. Serĉi urbon tajpante komencajn literojn Serĉi pli vilaĝojn/poŝtkodojn diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 65d69e2127..e26a6fbdd8 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -443,7 +443,6 @@ Define el tamaño del texto en el mapa. El servicio de OsmAnd, aún está funcionando en modo reposo. ¿Quieres pararlo también? ¿Parar modo reposo del GPS? - Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación GPX sobre el mapa). Intervalo de registro general Intervalo de activación del GPS Registro de trazas bajo demanda @@ -469,8 +468,6 @@ Seguimiento en línea (requiere GPX) Iniciar seguimiento en línea Parar seguimiento en línea - Reanudar grabación GPX - Pausar grabación GPX Vías no aptas para vehículos Bosques y matorrales No se encontraron descargas, comprueba tu conexión a Internet. @@ -692,7 +689,6 @@ Fronteras Ocultar fronteras regionales (niveles administrativos 5–9). Límite de velocidad - GPX No se encontraron edificios. Buscar ciudades incrementalmente Buscar más pueblos o códigos postales @@ -1559,7 +1555,6 @@ Importar a OsmAnd ¿Borrar %1$d nota(s)? Prevenir grabación independiente - La grabación GPX se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.) Servicio de ubicación desactivado. ¿Quieres activarlo? Tienes datos de Wikipedia viejos e incompatibles. ¿Archivarlos? ¿Descargar datos adicionales de Wikipedia (%1$s MB)? @@ -1933,7 +1928,6 @@ Mediano Grueso Modo del mapa - %s archivos GPX elegidos Color predefinido Elegir categoría Ingresar nombre diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml index e8e2070077..24462a5ca5 100644 --- a/OsmAnd/res/values-es-rUS/strings.xml +++ b/OsmAnd/res/values-es-rUS/strings.xml @@ -443,7 +443,6 @@ Define el tamaño del texto en el mapa. El servicio de OsmAnd, aún está funcionando en modo reposo. ¿Quieres pararlo también? ¿Parar modo reposo del GPS? - Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación GPX sobre el mapa). Intervalo de registro general Intervalo de activación del GPS Registro de trazas bajo demanda @@ -469,8 +468,6 @@ Seguimiento en línea (requiere GPX) Iniciar seguimiento en línea Parar seguimiento en línea - Reanudar grabación GPX - Pausar grabación GPX Vías no aptas para vehículos Bosques y matorrales No se encontraron descargas, comprueba tu conexión a Internet. @@ -692,7 +689,6 @@ Fronteras Ocultar fronteras regionales (niveles administrativos 5–9). Límite de velocidad - GPX No se encontraron edificios. Buscar ciudades incrementalmente Buscar más pueblos o códigos postales @@ -1559,7 +1555,6 @@ Importar a OsmAnd ¿Borrar %1$d nota(s)? Prevenir grabación independiente - La grabación GPX se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.) Servicio de ubicación desactivado. ¿Quieres activarlo? Tienes datos de Wikipedia viejos e incompatibles. ¿Archivarlos? ¿Descargar datos adicionales de Wikipedia (%1$s MB)? @@ -1933,7 +1928,6 @@ Mediano Grueso Modo del mapa - %s archivos GPX elegidos Color predefinido Elegir categoría Ingresar nombre diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index bf7548fed4..1b04d0d33a 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -880,7 +880,6 @@ No se encontraron edificios. Buscar más pueblos/códigos postales Límite de velocidad - GPX Fronteras Ocultar fronteras regionales (niveles administrativos 5–9). piezas @@ -1270,8 +1269,6 @@ Seguimiento en línea (requiere GPX) Iniciar seguimiento en línea Parar seguimiento en línea - Continuar grabación GPX - Detener grabación GPX Iniciar nuevo segmento Persa Albanés @@ -1317,7 +1314,6 @@ Intervalo de registro Registra la ubicación en un archivo GPX, pudiendo des/activarlo usando el widget de grabación GPX en el mapa. Preguntar siempre - Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación GPX sobre el mapa). Intervalo de registro general Límite de velocidad Control fronterizo @@ -1559,7 +1555,6 @@ Wikipedia Servicio de ubicación desactivado. ¿Quieres activarlo? Prevenir grabación independiente - La grabación GPX se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.) Claro Oscuro Piamontés @@ -1929,7 +1924,6 @@ No se encontraron puntos de referencia El nombre del archivo contiene caracteres ilegales Modo del mapa - %s archivos GPX elegidos Fino Medio Grueso diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml index 75ac52b1b4..5cbc7fc257 100644 --- a/OsmAnd/res/values-et/strings.xml +++ b/OsmAnd/res/values-et/strings.xml @@ -135,7 +135,6 @@ Navigeeri üles Sorteeri Kaardi režiim - %s GPX faili valitud Õhuke Keskmine Rasvane @@ -1128,7 +1127,6 @@ Laadida täiendavaid andmeid Vikipeediast (%1$s MB)\? Asukohateenus on välja lülitatud. Lülitada sisse\? Väldi iseseisvat logimist - Peatab GPX logimise rakenduse jõuga sulgemise korral (hiljutiste rakenduste kaudu). (OsmAndi taustnäit kaob Androidi teavitusribalt.) OsmAnd import Loe kogu artiklit (veebis) Vikipeedia @@ -1300,7 +1298,6 @@ Peata GPS taustarežiim\? Peatu Küsi alati - Määra üldise teekonna salvestamise logimise ajavahemik (lubatud kaardil GPX logimise lisa abil). Üldine logimisintervall GPS äratuse ajavahemik Luba GPS taustarežiim @@ -1346,8 +1343,6 @@ Veebis jälgimine (GPX kohustuslik) Alusta veebis jälgimist Peata veebis jälgimine - Alusta GPX logimist - Peata GPX logimine Alusta uut lõiku Hooned Liiklusvahenditele mitte mõeldud tee @@ -1652,7 +1647,6 @@ Kuva rajad vastavalt OSMC radadele. Piirid Kiiruspiirang - GPX Hooneid ei leidu. Otsi linna kasvavalt Otsi veel külasid/postiindekseid diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index 1c475f4fa7..bd2cfbcd31 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -180,7 +180,6 @@ Mugak "Ez erakutsi eskualde mailako mugak (5-9 administrazio mailak)." Abiadura muga - GPX Ez da eraikinik aurkitu. Bilatu herria progresiboki Bilatu herri/posta-kode gehiago @@ -1102,8 +1101,6 @@ Hebreera Aurrera Kontrol panela - Jarraitu GPXa grabatzen - Pausatu GPX grabaketa Hasi segmentu berria Eraikinak Ez-ibilgailu bideak @@ -1300,7 +1297,6 @@ Lorratza %2$s Zabaldu Ordenatu Maparen argitasun-modua - %s GPX fitxategi hautatuta Aplikazioak orain kanpo biltegian idazteko baimena du, baina horretarako aplikazioa eskuz berrabiarazi behar da. Izen publikoa Ez bistaratu nire izena txostenetan @@ -1521,7 +1517,6 @@ Lorratza %2$s Lorratzaren segmentuak Lorratzaren puntuak Hasi nabigazioa lorratzari jarraituz? - Zehaztu lorratzen grabatze orokorrerako erregistratze maiztasun bat (Mapan GPX erregistratze trepetaren bidez gaitzen da). Eskaerapeko lorratz erregistroa Aurretik zehaztu GPX fitxategia luze sakatuz. Azpi-lorratzak: %1$s @@ -1708,7 +1703,6 @@ Lorratza %2$s Estoniera Asturiera Eragotzi bigarren planoko egunkaria - GPX erregistroa geldiaraziko du aplikazioa hiltzean (azken aplikazioak pantailaren bidez). (OsmAnd bigarren planoan dabilela adierazten duen ikonoa Android jakinarazpen barratik desagertuko da) OSMC bidezidor kirol sinboloen araberako koloreztatzea Eraman OsmAnd-en datu fitxategiak xede berrira \? Erabiltzaile anitzeko biltegiratzea diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 8c268a77e6..14fd623bee 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -774,7 +774,6 @@ \n \nاَستِر یک ابزار تصویربرداری است که بر روی ماهوارهٔ Terra نصب است و تِرا ماهوار‌ه‌ای فوق‌پیشرفته برای سامانهٔ دیده‌بانی زمینِ ناساست. \nاَستِر محصول تلاش مشترک ناسا، وزارت اقتصاد، صنعت و تجارت ژاپن و سامانه‌های فضایی ژاپن است. - GPX همهٔ عوارض زمین را روی نقشه ناپدید کنید. چندضلعی‌ها حالت رندرگیری @@ -1299,8 +1298,6 @@ ردیابی آنلاین (GPX لازم است) شروع ردیابی آنلاین توقف ردیابی آنلاین - ازسرگیری ضبط GPX - نگه‌داشتن ضبط GPX ساختمان‌ها شروع بخش جدید راه‌های غیرموتوری @@ -1314,7 +1311,6 @@ کیفیت راه سطح راه مسیرهای دوچرخه - بازهٔ زمانی برای ضبط رد را انتخاب کنید (که از طریق ابزار ضبط GPX روی نقشه فعال می‌شود). بازهٔ زمانی ثبت (سراسری) می‌توانید با استفاده از ابزارک ضبط GPX روی نقشه، ردنگاری در فایل GPX را خاموش یا روشن کنید. بازهٔ زمانی ثبت @@ -1616,7 +1612,6 @@ نقشه را جابه‌جا کنید تا موقعیت نشانه عوض شود مرتب‌سازی - %s فایل GPX انتخاب شده است برای اطلاع‌رسانی دربارهٔ مشارکت‌های شما. آیا {0} فایل را دانلود می‌کنید؟ \n {3} مگابایت برای ذخیره‌سازی موقت و {1} مگابایت برای ذخیره‌سازی دائمی لازم دارید. (از {2} مگابایت) @@ -2024,7 +2019,6 @@ گالیسیایی موقعیت‌یاب خاموش است. روشن شود؟ جلوگیری از ثبت خوداتکا - هنگامی که برنامه را از طریق برنامه‌های اخیر ببندید ثبت اطلاعات GPX موقتاً متوقف می‌شود. (نشانگر اجرای پس‌زمینه از نوار اعلان حذف می‌شود.) درون‌برد به OsmAnd مقالهٔ کامل را بخوانید (آنلاین) ویکی‌پدیا diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index 7659f1d3ce..734015792a 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -911,7 +911,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist Navigointi ylös Lajittele Karttatila - %s GPX-tiedostoa valittu Hieno Ohut Keskipaksu @@ -1373,8 +1372,6 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist Online seuranta (GPX pakollinen) Aloita online seuranta Lopeta online seuranta - Aloita GPX kirjaus - Lopeta GPX kirjaus Aloita uusi segmentti Tie ei-kulkuneuvoille Teksti diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index bd331e4ce1..80eb185f16 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1250,8 +1250,6 @@ Suivi en ligne (GPX requis) Démarrer le suivi en ligne Arrêter le suivi en ligne - Continuer l\'enregistrement GPX - Interrompre l\'enregistrement GPX Débuter un nouveau segment Bâtiments Voies non adaptées aux véhicules @@ -1309,7 +1307,6 @@ L\'enregistrement des positions dans un fichier GPX peut être activé ou désactivé depuis le gadget sur la carte. Intervalle d\'enregistrement Toujours demander - Indiquez l\'intervalle d\'enregistrement des traces (activé via le gadget d\'enregistrement GPX sur la carte). Intervalle d\'enregistrement par défaut Limite de vitesse Poste frontière @@ -1549,7 +1546,6 @@ Importer dans OsmAnd Êtes-vous certain(e) de vouloir supprimer %1$d notes \? Le service de localisation est arrêté. Souhaitez-vous l’activer ? - Met en pause l\'enregistrement de la trace GPX lors de l\'arrêt d\'OsmAnd (via les applications récentes) et supprime l\'icône OsmAnd de la barre de notification Android. Interdire la journalisation autonome Télécharger des données Wikipédia supplémentaires (%1$s Mo) ? Malaisien @@ -1921,7 +1917,6 @@ Fin Moyen Épais - %s fichiers GPX sélectionnés Mode Carte Couleur par défaut Sélectionnez une catégorie diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml index 2b9984299a..283c4ba01c 100644 --- a/OsmAnd/res/values-gl/strings.xml +++ b/OsmAnd/res/values-gl/strings.xml @@ -20,7 +20,6 @@ Deter o modo de segundo plano do GPS? Deter Preguntar sempre - Especifica o intre de rexistro para a gravación xeral de pistas (activar mediante o trebello da gravación GPX no mapa). Intre de rexistro xeral Intre de activación do GPS Activar o modo de segundo plano do GPS @@ -69,8 +68,6 @@ Seguimento con conexión (requírese GPX) Iniciar o seguimento con conexión Deter o seguemento con conexión - Retomar a gravación de GPX - Deter a gravación de GPX Comezar un segmento novo Edificios Estradas que non sexan para vehículos @@ -1615,7 +1612,6 @@ Lon %2$s Localizacións Bordo groso Navaho - Detén o rexistro de GPX cando se pecha a aplicación (mediante a lapela de aplicacións recentes). (A indicación do OsmAnd desaparece da barra das notificacións do Android.) Información de A-GPS Datos A-GPS baixados: %1$s Indicar o tempo de espera durante o que ficar na pantalla de planificación das rutas. @@ -1985,7 +1981,6 @@ Lon %2$s Listaxe despregada Listaxe baleira Listaxe en árbore - %s ficheiros GPX seleccionados Descargas ilimitadas dos mapas, actualizacións e plugin da Wikipedia. Camiño con aforro no combustíbel Empregar o camiño con aforro no combustíbel (normalmente máis curto). diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml index 835aa5da61..68954c5771 100644 --- a/OsmAnd/res/values-hr/strings.xml +++ b/OsmAnd/res/values-hr/strings.xml @@ -994,8 +994,6 @@ Preuzeti karte koje nedostaju %1$s (%2$d MB)? Započnite online praćenje Zaustavi online praćenje - Započni GPX bilježenje položaja - Zaustavi GPX bilježenje položaja Sakrij zgrade Sakrij tekst Sakrij šume i šikare diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index aa47bd6ab5..63bca90179 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1249,8 +1249,6 @@ Online útvonalrögzítés (GPX szükséges) Online útvonalrögzítés indítása Online útvonalrögzítés megállítása - GPX naplózás folytatása - GPX naplózás szüneteltetése Új szakasz kezdése Épületek Gyalogutak @@ -1305,7 +1303,6 @@ Időtartam Távolság Mindig kérdezzen rá - Adja meg az általános nyomvonalrögzítéshez használandó naplózási időközt (a térképen lévő GPX-naplózó widgettel engedélyezve). Általános naplózási időköz A GPX-fájlba történő általános pozíciónaplózás be- és kikapcsolható a térképen lévő GPX-naplózó widgettel. Rögzítési időköz @@ -1552,7 +1549,6 @@ Biztosan törölni szeretne %1$d jegyzetet\? Önálló naplózás megakadályozása A helymeghatározó szolgáltatás ki van kapcsolva. Bekapcsolja\? - Szüneteltetni fogja a GPX-naplózást, ha az alkalmazást kilőtték (a legutóbbi alkalmazásokon keresztül). (Az OsmAnd háttérben futás jelzője eltűnik az Android értesítési sávjáról.) volapük thai telugu @@ -1937,7 +1933,6 @@ Navigáció fel Rendezés Térképmód - %s GPX-fájl kijelölve Vékony Közepes Vastag diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml index 73b22752e7..59530ef151 100644 --- a/OsmAnd/res/values-hy/strings.xml +++ b/OsmAnd/res/values-hy/strings.xml @@ -495,7 +495,6 @@ Անցնել վերև Դասակարգել Քարտեզի ռեժիմը - %s GPX Ֆայլ(եր) ընտրված են Ճշգրիտ Բարակ Միջին @@ -790,7 +789,6 @@ Ներբեռնել լրացուցիչ Վիքիպեդիայի տվյալները (%1$s MB)? Կոորդինատները հայտնաբերման ծառայությունը միացված չէ: Միացնել? Դադարեցնել ինքնավար գրանցումը - Հավելվածը փակելուց հետո (ուրիշ հավելվածը միջոցով), GPX-ի գրանցումը կդադարեցվի: (Ֆոնային պատկերակը անհետանում է Android ծանուցման բարից:) Ներմուծել OsmAnd Կարդալ ամբողջական հոդվածը (առցանց) Վիքիփեդիա @@ -1094,7 +1092,6 @@ Դադարեցնել GPS-ի աշխատանքը ֆոնային ռեժիմում? Դադարեցնել Միշտ հարցնել - Ընտրեք ժամանակի ընդմիջումը տրեկի գրանցման համար (ներառյալ GPX գրանցումը վիջեթի միջոցով քարտեզի վրա)։ Ընդհանուր ժամանակի ընդմիջումը GPS-ի զարթմատ ժամանակի ընդմիջումը Միացնել GPS ֆոնի ռեժիմը @@ -1146,8 +1143,6 @@ Առցանց հետևում(tracking) (GPX պահանջվում է) Սկսեք առցանց հետևելուն(tracking) Դադարեցնել առցանց հետևելուն(tracking) - Շարունակել GPX գրանցումը - Դադարեցնել GPX-ի գրանցումը Սկսել նոր սեգմենտ Շենքեր Ոչ ավտոճանապարհներ diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml index 501e0dbbb9..69996dc5e0 100644 --- a/OsmAnd/res/values-id/strings.xml +++ b/OsmAnd/res/values-id/strings.xml @@ -555,7 +555,6 @@ Tipis Medium Tebal - %s berkas GPX dipilih Mode peta Warna bawaan Pilih kategori diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml index 77ef80be4f..980accd122 100644 --- a/OsmAnd/res/values-is/strings.xml +++ b/OsmAnd/res/values-is/strings.xml @@ -740,7 +740,6 @@ Samfallinn listi Útliðaður listi Kortahamur - %s GPX-skrár valdar Hætta leiðsögn Forðast veg Fjöldi viðtakenda @@ -1467,8 +1466,6 @@ Nálægur merkisstaður Almennt millibil skráninga Millibil skráninga - Halda áfram með GPX-skráningu - Setja GPX-skráningu í bið Vegalengd: %1$s (%2$s punktar) Upptaka mistókst Myndavél er ekki tiltæk @@ -2508,7 +2505,6 @@ \n• Þjöppuð ónettengd vektorkort, uppfærð einu sinni í mánuði \n \n• Val á milli heildargagna svæðis eða einungis vegakerfis (dæmi: öll gögn fyrir Japan eru 700 MB en 200 MB fyrir vegakerfið eingöngu) - Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum fyrir GPX-skráningu á kortinu). Opnar á morgun klukkan Virkja hreyfingu við hliðrun staðsetningar minnar á meðan leiðsögn stendur. Núna hefur forritið heimild til að skrifa í ytri gagnageymslur, en það þarf að endurræsa forritið handvirkt til að geta nýtt sér það. @@ -2538,7 +2534,6 @@ Þessi áskrift virkjar uppfærslur á klukkustundar fresti fyrir öll kort um allan heim. \n Hluti innkomunnar fer til OSM-samfélagsins og er greitt fyrir hvert framlag til OSM. \n Ef þér líkar við OsmAnd og OSM og vilt styðja við verkefnið og fá stuðning frá þeim, þá er þetta kjörin leið. - Mun setja GPX-skráningu í bið þegar forritið er drepið (slökkt á því í gegnum nýleg forrit skjáinn - bakgrunnsvísir OsmAnd hverfur þar með úr tilkynningastiku Android-kerfisins.) Nafni eftirlætisins hefur verið breytt í %1$s til að auðvelda rétta vistun strengsins ásamt tjáningartáknum yfir í skrá. Hægt er að kveikja og slökkva á almennri skráningu staðsetninga í GPX-skrá með viðmótshlutanum fyrir GPX-skráningu á kortaskjánum. Síðan í Android útgáfu 4.4 (KitKat) er gamla geymslumappan (%s) úrelt. Á að afrita allar OsmAnd-skrár í nýja möppu\? diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 5bf286959f..c16467db70 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1208,8 +1208,6 @@ Tracciamento online (GPX richiesto) Avvia il tracciamento online Ferma il tracciamento online - Riprendi la registrazione GPX - Metti in pausa la registrazione GPX Inizia un nuovo segmento Persiano Ebraico @@ -1260,7 +1258,6 @@ Intervallo registrazione Percorsi bus, filobus, servizi navetta Chiedi sempre - Specifica l\'intervallo di tempo per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa). Intervallo predefinito di registrazione Limite di velocità Casello @@ -1544,7 +1541,6 @@ Scaricare i dati aggiuntivi di Wikipedia (%1$s MB)\? Il servizio di localizzazione è spento. Vuoi accenderlo\? Previeni il login remoto - Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android Importa in OsmAnd Leggi l\'articolo intero (online) Wikipedia @@ -1922,7 +1918,6 @@ Medio Grosso Modalità mappa - %s file GPX selezionati Colore preimpostato Scegli la categoria Inserisci il nome diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml index 62eca33659..c990b008ad 100644 --- a/OsmAnd/res/values-iw/strings.xml +++ b/OsmAnd/res/values-iw/strings.xml @@ -1552,8 +1552,6 @@ מעקב מקוון (נדרש GPX) הפעלת מעקב מקוון עצירת מעקב מקוון - חידוש רישום GPX - השהיית רישום GPX התחלת מקטע חדש בניינים דרכים מהירות שלא מיועדות למכוניות @@ -2073,7 +2071,6 @@ ניווט למעלה מיון מצב מפה - נבחרו %s קובצי GPX נא להוסיף סמני מפה דרך המפה לא נמצאו נקודות דרך דק׳ @@ -2635,9 +2632,7 @@ \n \nניתן לשתף נתיבים מוקלטים עם חבריך או להשתמש בהם כתרומה ל־OSM. אתלטים יכולים להשתמש במסלולים מוקלטים כדי לעקוב אחר האימונים שלהם. ניתן לבצע ניתוח מסלול בסיסי ישירות ב־OsmAnd, כמו זמני הקפה, מהירות ממוצעת וכו׳, כמו כן, ניתן לנתח את המסלולים בשלב מאוחר יותר על ידי כלי ניתוח מיוחדים מגורמי צד־שלישי. צפייה - נא לציין מרווח בין הקלטות כלליות של מסלול (מופעל דרך וידג׳ט ה־GPX על המפה). נתיבים קרובים בטווח של עד - רישום ה־GPX יושהה כאשר היישומון ייסגר (דרך היישומונים האחרונים). (התראות הרקע של OsmAnd תיעלמנה מסרגל ההודעות של Android.) פעולת יצירה פעולת שינוי פעולת מחיקה diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 47b683fe32..caf630ec62 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -1151,8 +1151,6 @@ POIの更新は利用できません オンライン追跡に関する設定(GPXが必要) オンライントラッキング開始 オンライントラッキング停止 - GPX記録の再開 - GPS記録の一時停止 建物 自動車以外の専用道路 文字列 @@ -1330,7 +1328,6 @@ POIの更新は利用できません GPXファイルへ記録される位置情報全般は、マップ画面上のGPXログウィジェットを使用してONとOFFを切り替えることが可能です。 記録間隔 常に尋ねる - 旅程ログ全般の記録間隔を選択します(マップ上のGPXログウィジェットで有効化) ログの記録間隔 制限速度 国境検問所 @@ -1611,7 +1608,6 @@ POIの更新は利用できません Wikipediaの追加データ(%1$s MB)をダウンロードしますか？ 位置取得機能(現在地、GPS、位置情報サービス等)がオフになっています。オンにしますか？ スタンドアロン動作時のログ記録を停止 - タスクリストからアプリが停止された場合、GPX記録を一時停止します(OsmAndバックグラウンド動作表示が、Androidの通知エリアに表示されなくなります) デフォルト(13) デフォルト (半透明シアン) OsmAndにインポート @@ -1969,7 +1965,6 @@ POIの更新は利用できません 展開 並べ替え 昼夜モード切替 - %s個のGPXファイルが選択済み 細線 中 太線 diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index e1e4664e09..a6ab88ce93 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -1196,8 +1196,6 @@ 온라인 트래킹 (GPX 파일 필요) 온라인 트래킹 시작 온라인 트래킹 중지 - GPX 로깅 시작 - GPX 로깅 중지 새로운 세그먼트 시작 페르시아어 알바니아어 @@ -1241,7 +1239,6 @@ GPX 파일에 기록하는 일반적인 위치는 지도 화면에 GPX 로깅 위젯을 사용하여 켜거나 끌 수 있습니다 로깅 간격 항상 요청 - 일반 트랙 레코딩에 대한 로깅 간격을 선택합니다 (지도에 GPX 로깅 위젯을 통해 사용 가능) 일반 로깅 간격 속도 제한 국경 통제 @@ -1513,7 +1510,6 @@ 긴 여행인 경우 경로 다시 계산 위치 서비스는 사용할 수 없습니다. 위치 서비스를 켜시겠습니까? 단독 로깅 방지 - 앱이 죽을 때 GPX 로깅은 일시 중지 합니다. (OsmAnd 절전 모드 표시는 안드로이드 알림 표시줄에서 사라집니다.) OsmAnd로 가져오기 전체 기사 읽기 (온라인) 위키백과 @@ -1703,7 +1699,6 @@ - diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 3d1dcde185..36989898e7 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1224,8 +1224,6 @@ Tam prireiks {1} MB pastoviam saugojimui. Sekimas internete (reikalingas GPX) Pradėti sekimą internete Stabdyti sekimą internete - Pradėti GPX įrašymą - Stabdyti GPX įrašymą Pradėti naują segmentą Persų Albanų @@ -1271,7 +1269,6 @@ Tam prireiks {1} MB pastoviam saugojimui. \n \nĮrašytais maršrutais galima pasidalinti su draugais arba pridėti kaip kontribuciją OSM. Sportininkai gali naudoti įrašytus maršrutus norėdami stebėti savo treniruotes. Elementarią analizę, tokią kaip ratų laikai, vidutinis greitis, ir t.t., galima atlikti tiesiai OsmAnd bei, be abejo, vėliau išanalizuoti su trečių šalių progamine įranga. Visada klausti - Pasirinkite bendrojo maršruto įrašymo intervalą (įjungiama per GPX valdiklį žemėlapio rodinyje). Bendras įrašymo intervalas Greičio ribojimas Pasienio kontrolė @@ -1509,7 +1506,6 @@ Ilguma %2$s Ištrinti OSM taisymus Ketinate ištrinti %1$d pastabas. Ar tikrai to norite? Vikipedija - Bus pristabdytas GPX įrašymas, jei programa bus išjungta (per Pastarosios programos). (OsmAnd Miego foninio režimo piktograma dings iš Android pranešimų juostos.) Ar norite atsisiųsti papildomų Wikipedia duomenų (%1$s MB)? Jūsų turimi Wikipedia duomenys yra pasenę. Gal norite juos suarchyvuoti? Šviesi @@ -1896,7 +1892,6 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka. Žemėlapis yra susietas su vietos pozicija Vykti aukštyn Žemėlapio režimas - Pasirinkti %s GPX failai Prašome pridėti žemėlapio žymeklius per žemėlapį Jokių krypčių taškų nerasta Dabar programa gebės rašyti į išorinę atmintį. Būtinas rankinis programos paleidimas iš naujo. diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml index 8aff25adb4..95f040be10 100644 --- a/OsmAnd/res/values-lv/strings.xml +++ b/OsmAnd/res/values-lv/strings.xml @@ -1232,8 +1232,6 @@ Sekošana tīklā (no GPX ieraksta) Sākt sekošanu tīklā Pārtraukt sekošanu tīklā - Sākt GPX ierakstu - Pārtraukt GPX ierakstu Sākt jaunu segmentu Ēkas Neizbraucamie ceļi @@ -1415,7 +1413,6 @@ Attālumā līdz Vai izslēgt GPS darbību fonā? Izslēgt - Izvēlieties intervālu treka ierakstam (ieslēgt caur GPX ieraksta logrīku kartē) Ierakstīšanas intervāls Atļaut gps darboties fonā Treka ieraksta logošana pēc pieprasījuma @@ -1475,7 +1472,6 @@ Lejupielādēti novecojuši vikipēdijas dati. Vai arhivēt tos? Vai lejupielādēt papildus vikipēdijas datus (%1$s MB) ? GPS ir izslēgts. Vai ieslēgt to tagad? - GPX ieraksts tiks nopauzēts, ja aplikāciju nobeidzēs (caur nesenajiem appiem). (OsmAnd fona servisa indikācija pazudīs no Android piezīmju joslas.) Importēt OsmAndā Lasīt visu rakstu (onlainā) Vikipēdija @@ -1855,7 +1851,6 @@ failu(s)? \n \nŠo karti var atkārtoti deaktivizēt šeit vai galvenajā izvēlē - kartes attēlošana. " Apgaismojums - %s GPX faili atzīmēti Tievi Viduvēji Trekni diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml index 36973fdaa9..6dc1df8051 100644 --- a/OsmAnd/res/values-ml/strings.xml +++ b/OsmAnd/res/values-ml/strings.xml @@ -205,7 +205,6 @@ ദിശ ശബ്ദസൂചിക "ദിശ ഹാപ്ടിക് ഫീഡ്ബാക്ക്" മാപ് രീതി - "%s ജിപിഎക്സ് ഫയലുകള്‍ തിരഞ്ഞെടുത്തിരിക്കുന്നു " "വഴിത്തിരിവുകളൊന്നും കണ്ടെത്താനായില്ല " ഓ എസ് എം എഡിറ്ററുഡെ റാങ്കിങ്ങ് മാസവരി. @@ -272,8 +271,6 @@ മ. നിലനിര്‍ത്തുക "ഹീബ്രൂ ഭാക്ഷ " - "ജിപിഎക്സ് റിക്കോഡിങ്ങ് തുടങ്ങുക " - "ജിപിഎക്സ് റിക്കോഡിങ്ങ് നിര്‍ത്തുക " പാതയുടെ പ്രതലം കാണിക്കുക "ദൂരക്രമത്തിലടുക്കുക " %1$s... വന്ന് കൊണ്ടിരിക്കുന്നു… @@ -946,7 +943,6 @@ പ്രാരംഭ സ്ഥലം ലക്ഷ്യസ്ഥാനവും തിരിച്ചിടുക "നിങ്ങളുടെ സ്ഥാനം സിമുലേറ്റ് ചെയ്യുന്നത് നിര്‍ത്തുക" "പരിഷ്കരണങ്ങള്‍ " - "ആപ്പിനെ (അടുത്തകാലത്തുള്ള അപ്പുകള്‍ -ആന്ഡ്രോയിഡ് വഴി)നിര്‍ത്തിയാല്‍ ജി പി എക്സ് റിക്കോഡിങ്ങ് നിര്‍ത്തും. (ഓഎസ്എംആന്ഡിന്റെ ബാക്ക്ഗ്രൗണ്ട് സൂചിക ആന്ഡ്രോയിഡില്‍ നോട്ടിഫിക്കേഷന്‍ പലകയില്‍ നിന്നും അപ്രത്യ്ക്ഷമാകും" പുതിയ ലക്ഷ്യത്തിലേക്കുള്ള OsmAnd ഡാറ്റാ ഫയലുകൾ നീക്കണോ\? ഒന്നിലധികം ഉപഭോക്താക്കളുടെ സംഭരണസ്ഥലം അവസാനം ഡൗണ്‍ലോഡ് ചെയ്തത്: %1$s @@ -2081,7 +2077,6 @@ സ്പീഡ് ലിമിറ്റ് ടോളറൻസ് മാർജിൻ തിരഞ്ഞെടുക്കുക, അതിന് മുകളിൽ നിങ്ങൾക്ക് ഒരു വോയ്സ് മുന്നറിയിപ്പ് ലഭിക്കും. സ്ട്രിംഗ് ഇമോട്ടിക്കോണുകൾ ഒരു ഫയലിലേക്ക് ശരിയായി സംരക്ഷിക്കുന്നതിന് പേര് %1$s എന്നതിലേക്ക് പരിഷ്ക്കരിച്ചു. പ്രിന്റ് റൂട്ട് - " ട്രാക്ക് റെക്കോർഡിംഗിന് പൊതുവായ ലോഗിംഗ് ഇടവേള തിരഞ്ഞെടുക്കുക (മാപ്പിലെ ജിപിഎക്സ് ലോഗിംഗ് വിഡ്ജറ്റ് വഴി പ്രവർത്തനക്ഷമമാക്കിയത്)." "ജിപിഎക്സ് ഫയലിലേക്കു് സ്ഥാനം ലോഗ്ഗിങ് ചെയ്യുന്നത്, ഭൂപടത്തിൽ ജിപിഎക്സ് ലോഗിങ് വിഡ്ജെറ്റ് ഉപയോഗിച്ചു് ഓണാക്കുന്നതാണു്." ഇപ്പോൾ നിലവിലുള്ള ട്രാക്ക് ജിപിഎക്സ് ഫയൽ ആയി സംരക്ഷിക്കുക. നാവിഗേഷൻ സമയത്ത് ട്രാക്ക് ഓട്ടോമാറ്റിക്കായി റെക്കോർഡ് ചെയ്യുക diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index e798cd75a3..aa1ff19745 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -1478,7 +1478,6 @@ Utvid Sorter Kartmodus - %s GPX-filer valgt Følg oss OsmAnd Live-navigering Reisemål er ikke angitt @@ -1660,7 +1659,6 @@ Mellomtjenervert Angi din mellomtjeners vertsnavn (f.eks. 127.0.0.1). Mellomtjener-port - Ta en pause i GPX-logging Start nytt segment Ingen nedlastinger funnet, sjekk din internettforbindelse. Underspor: %1$s @@ -1787,14 +1785,12 @@ Nordverdi Østverdi Favorittnavn endret til \"%1$s\" for å muliggjøre lagring av streng med uttrykksikoner til en fil. - Angi loggingsintervall for det generelle sporingsopptaket (påskrudd via miniprogrammet for GPX-logging på kartet). Sporingslogging på etterspørsel Angi din mellomtjeners portnummer (f.eks. 8118). Send sporingsdata til en angitt nettjeneste hvis GPX-logging er påslått. Nettbasert sporing (GPX kreves) Start nettbasert sporing Stopp nettbasert sporing - Fortsett GPX-logging Fant ikke noe. Hvis du ikke finner din region, kan du lage den selv (se https://osmand.net). Ingen GPX-filer valgt. Velg en ved lang-trykking. Oppdelingsintervall @@ -2436,7 +2432,6 @@ Åpner i morgen Vinter og ski Turvisning - Vil sette GPX-logging i pausemodus når programmet avsluttes (via nylig brukte apper). (OsmAnds bakgrunnsindikasjon forsvinner fra Android-varslingslinjen.) For lange distanser: Legg til mellomliggende reisemål hvis denne lange ruten ikke er beregnet innen 10 minutter. Optimalisert rekkefølge av mellomliggende reisemål underveis til målet. Sted å assosiere med notatet er ikke definert ennå. \"Bruk posisjon…\" for å tilordne et notat til det angitte stedet. diff --git a/OsmAnd/res/values-night/colors.xml b/OsmAnd/res/values-night/colors.xml new file mode 100644 index 0000000000..86193d0cc0 --- /dev/null +++ b/OsmAnd/res/values-night/colors.xml @@ -0,0 +1,4 @@ + + + @color/map_background_color_dark + \ No newline at end of file diff --git a/OsmAnd/res/values-night/styles.xml b/OsmAnd/res/values-night/styles.xml new file mode 100644 index 0000000000..aa6decf779 --- /dev/null +++ b/OsmAnd/res/values-night/styles.xml @@ -0,0 +1,4 @@ + + + - - - - diff --git a/OsmAnd/src/net/osmand/FileUtils.java b/OsmAnd/src/net/osmand/FileUtils.java index 4620a38403..661bf81f75 100644 --- a/OsmAnd/src/net/osmand/FileUtils.java +++ b/OsmAnd/src/net/osmand/FileUtils.java @@ -10,6 +10,8 @@ import android.widget.Toast; import androidx.appcompat.app.AlertDialog; +import net.osmand.plus.GpxSelectionHelper; +import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.SQLiteTileSource; @@ -128,7 +130,13 @@ public class FileUtils { dest.getParentFile().mkdirs(); } if (source.renameTo(dest)) { + GpxSelectionHelper helper = ctx.getSelectedGpxHelper(); + SelectedGpxFile selected = helper.getSelectedFileByPath(source.getAbsolutePath()); ctx.getGpxDbHelper().rename(source, dest); + if (selected != null && selected.getGpxFile() != null) { + selected.getGpxFile().path = dest.getAbsolutePath(); + helper.updateSelectedGpxFile(selected); + } if (callback != null) { callback.renamedTo(dest); } diff --git a/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java b/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java index 147c4b80cc..b5265a89ce 100644 --- a/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java +++ b/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java @@ -78,7 +78,12 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment { RelativeLayout view = new RelativeLayout(activity); view.setOnClickListener(null); - view.setBackgroundColor(getResources().getColor(R.color.map_background_color_light)); + int backgroundColorId = R.color.map_background_color_light; + if (app.getSettings().isSupportSystemDefaultTheme() + && !app.getSettings().isLightSystemDefaultTheme()) { + backgroundColorId = R.color.map_background_color_dark; + } + view.setBackgroundColor(getResources().getColor(backgroundColorId)); ImageView logo = new ImageView(getContext()); logo.setId(LOGO_ID); diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 10d52563d1..43c3a17f09 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -760,23 +760,23 @@ public class OsmandApplication extends MultiDexApplication { } public void applyTheme(Context c) { - int t = R.style.OsmandDarkTheme; + int themeResId; boolean doNotUseAnimations = osmandSettings.DO_NOT_USE_ANIMATIONS.get(); - if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) { + if (!osmandSettings.isLightContent()) { if (doNotUseAnimations) { - t = R.style.OsmandDarkTheme_NoAnimation; + themeResId = R.style.OsmandDarkTheme_NoAnimation; } else { - t = R.style.OsmandDarkTheme; + themeResId = R.style.OsmandDarkTheme; } - } else if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) { + } else { if (doNotUseAnimations) { - t = R.style.OsmandLightTheme_NoAnimation; + themeResId = R.style.OsmandLightTheme_NoAnimation; } else { - t = R.style.OsmandLightTheme; + themeResId = R.style.OsmandLightTheme; } } setLanguage(c); - c.setTheme(t); + c.setTheme(themeResId); } public IBRouterService getBRouterService() { diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java index df340fe7b4..02ed96daba 100644 --- a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java @@ -33,12 +33,9 @@ public abstract class ActionBarPreferenceActivity extends AppCompatPreferenceAct protected void onCreate(final Bundle savedInstanceState) { //settings needed it's own theme because of check boxes not styled properly OsmandSettings settings = ((OsmandApplication) getApplication()).getSettings(); - int t = R.style.OsmandLightTheme_NoActionbar_Preferences; - if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) { - t = R.style.OsmandDarkTheme_NoActionbar_Preferences; - } else if (settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) { - t = R.style.OsmandLightTheme_NoActionbar_Preferences; - } + int t = settings.isLightContent() + ? R.style.OsmandLightTheme_NoActionbar_Preferences + : R.style.OsmandDarkTheme_NoActionbar_Preferences; setTheme(t); super.onCreate(savedInstanceState); boolean lightTheme = settings.isLightContent(); diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java index 82bcc813b1..b6a03fa1cd 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java @@ -83,7 +83,7 @@ public class FavoritesSearchFragment extends DialogFragment { super.onCreate(savedInstanceState); app = getMyApplication(); accessibilityAssistant = new AccessibilityAssistant(getActivity()); - boolean isLightTheme = app.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + boolean isLightTheme = app.getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java index 37504315f1..2187e801a2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java @@ -23,14 +23,15 @@ import androidx.appcompat.app.AlertDialog.Builder; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; -import net.osmand.plus.settings.backend.ApplicationMode; +import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; -import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; -import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import net.osmand.plus.R; import net.osmand.plus.profiles.AppProfileArrayAdapter; import net.osmand.plus.profiles.ProfileDataObject; +import net.osmand.plus.settings.backend.ApplicationMode; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; +import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference; import org.apache.commons.logging.Log; @@ -287,8 +288,9 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity public ListPreference createTimeListPreference(OsmandPreference b, int[] seconds, int[] minutes, int coeff, int title, int summary) { return createTimeListPreference(b, seconds, minutes, coeff, null, title, summary); } - public ListPreference createTimeListPreference(OsmandPreference b, int[] seconds, int[] minutes, int coeff, CommonPreference disable, int title, - int summary) { + + public ListPreference createTimeListPreference(OsmandPreference b, int[] seconds, int[] minutes, + int coeff, CommonPreference disable, int title, int summary) { int minutesLength = minutes == null ? 0 : minutes.length; int secondsLength = seconds == null ? 0 : seconds.length; Integer[] ints = new Integer[secondsLength + minutesLength]; @@ -299,19 +301,19 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity intDescriptions[k] = seconds[i] + " " + getString(R.string.int_seconds); //$NON-NLS-1$ k++; } + OsmandApplication app = getMyApplication(); for (int i = 0; i < minutesLength; i++) { ints[k] = (minutes[i] * 60) * coeff; - intDescriptions[k] = minutes[i] + " " + getString(R.string.int_min); //$NON-NLS-1$ + intDescriptions[k] = OsmAndFormatter.getFormattedDuration(minutes[i] * 60, app); k++; } ListPreference lp = createListPreference(b, intDescriptions, ints, title, summary); - if(disable != null) { + if (disable != null) { registerDisablePreference(b, getString(R.string.confirm_every_run), disable); } return lp; } - @Override public boolean onOptionsItemSelected(MenuItem item) { int itemId = item.getItemId(); diff --git a/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java index 664c2a8afe..57928eac50 100644 --- a/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java @@ -66,6 +66,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment { private View view; private OnLayoutChangeListener containerLayoutListener; private View topShadow; + private ViewGroup topView; private View bottomScrollView; private LinearLayout cardsContainer; private FrameLayout bottomContainer; @@ -167,6 +168,11 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment { return mainView; } + @Nullable + public ViewGroup getTopView() { + return topView; + } + public boolean isNightMode() { return nightMode; } @@ -290,7 +296,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment { final int touchSlop = vc.getScaledTouchSlop(); if (getTopViewId() != 0) { - View topView = view.findViewById(getTopViewId()); + topView = view.findViewById(getTopViewId()); AndroidUtils.setBackground(app, topView, nightMode, R.color.card_and_list_background_light, R.color.card_and_list_background_dark); } if (!portrait) { diff --git a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java index fc1a917058..42a036599c 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java @@ -16,7 +16,6 @@ import androidx.fragment.app.DialogFragment; import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import org.apache.commons.logging.Log; @@ -44,8 +43,7 @@ public class HelpArticleDialogFragment extends DialogFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - boolean isLightTheme = (getOsmandApplication()) - .getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + boolean isLightTheme = (getOsmandApplication()).getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java index 99f5e9b642..2fb12e2ea4 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java @@ -561,7 +561,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement ActionBar actionBar = getDownloadActivity().getSupportActionBar(); //hide action bar from downloadindexfragment actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); - int iconColorResId = getMyApplication().getSettings().isLightContent() ? R.color.active_buttons_and_links_text_light : R.color.active_buttons_and_links_text_dark; + boolean nightMode = !getMyApplication().getSettings().isLightContent(); + UiUtilities iconsCache = getMyApplication().getUIUtilities(); + int iconColorResId = nightMode ? + R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light; optionsMenuAdapter = new ContextMenuAdapter(requireMyApplication()); ItemClickListener listener = new ContextMenuAdapter.ItemClickListener() { @Override @@ -600,7 +603,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement ContextMenuItem contextMenuItem = optionsMenuAdapter.getItem(j); if (j + 1 >= max && optionsMenuAdapter.length() > max) { if (split == null) { - Drawable icOverflowMenu = getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_overflow_menu_white); + Drawable icOverflowMenu = iconsCache.getIcon(R.drawable.ic_overflow_menu_white, iconColorResId); split = menu.addSubMenu(0, 1, j + 1, R.string.shared_string_more_actions); split.setIcon(icOverflowMenu); split.getItem(); diff --git a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java index afb24f06e5..ac9a87b32e 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java @@ -40,7 +40,6 @@ import net.osmand.data.Amenity; import net.osmand.map.OsmandRegions; import net.osmand.map.WorldRegion; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.download.CityItem; import net.osmand.plus.download.DownloadActivity; @@ -87,7 +86,7 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - boolean isLightTheme = getMyApplication().getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + boolean isLightTheme = getMyApplication().getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java index 45c57ed935..e84f7cbfc4 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java @@ -33,7 +33,6 @@ import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarkersSortByDef; import net.osmand.plus.MapMarkersHelper.OnGroupSyncedListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; @@ -79,7 +78,7 @@ public class MapMarkersDialogFragment extends DialogFragment implements OnGroupS public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); OsmandApplication app = getMyApplication(); - lightTheme = app.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + lightTheme = app.getSettings().isLightContent(); int themeId = lightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java index 7c19d0db33..4217faf1c9 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java @@ -61,6 +61,11 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment return R.layout.fragment_gpx_approximation_bottom_sheet_dialog; } + @Override + public int getTopViewId() { + return R.id.gpx_approximation_top_shadow_all; + } + @Override public int getHeaderViewHeight() { return menuTitleHeight; @@ -259,9 +264,11 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment ViewGroup cardsContainer = getCardsContainer(); cardsContainer.removeAllViews(); - SliderCard sliderCard = new SliderCard(mapActivity, distanceThreshold); - sliderCard.setListener(this); - cardsContainer.addView(sliderCard.build(mapActivity)); + if (getTopView() != null) { + SliderCard sliderCard = new SliderCard(mapActivity, distanceThreshold); + sliderCard.setListener(this); + getTopView().addView(sliderCard.build(mapActivity)); + } ProfileCard profileCard = new ProfileCard(mapActivity, snapToRoadAppMode); profileCard.setListener(this); diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java index d4f538faba..32b469db06 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java @@ -191,6 +191,10 @@ public class MeasurementEditingContext { return gpxData != null && gpxData.getGpxFile() != null && gpxData.getGpxFile().hasRtePt(); } + public boolean hasSavedRoute() { + return gpxData != null && gpxData.getGpxFile() != null && gpxData.getGpxFile().hasRoute(); + } + public CalculationMode getCalculationMode() { return calculationMode; } @@ -321,6 +325,7 @@ public class MeasurementEditingContext { public void clearSegments() { clearBeforeSegments(); clearAfterSegments(); + clearSnappedToRoadPoints(); } public void clearBeforeSegments() { @@ -378,6 +383,16 @@ public class MeasurementEditingContext { } private void recreateCacheForSnap(TrkSegment cache, TrkSegment original, boolean calculateIfNeeded) { + boolean hasDefaultModeOnly = true; + if (original.points.size() > 1) { + for (int i = 0; i < original.points.size(); i++) { + String profileType = original.points.get(i).getProfileType(); + if (profileType != null && !profileType.equals(DEFAULT_APP_MODE.getStringKey())) { + hasDefaultModeOnly = false; + break; + } + } + } if (original.points.size() > 1) { for (int i = 0; i < original.points.size() - 1; i++) { Pair pair = new Pair<>(original.points.get(i), original.points.get(i + 1)); @@ -386,7 +401,7 @@ public class MeasurementEditingContext { if (pts != null) { cache.points.addAll(pts); } else { - if (calculateIfNeeded) { + if (calculateIfNeeded && !hasDefaultModeOnly) { scheduleRouteCalculateIfNotEmpty(); } cache.points.addAll(Arrays.asList(pair.first, pair.second)); @@ -450,7 +465,7 @@ public class MeasurementEditingContext { } } - public void setPoints(GpxRouteApproximation gpxApproximation) { + public void setPoints(GpxRouteApproximation gpxApproximation, ApplicationMode mode) { if (gpxApproximation == null || Algorithms.isEmpty(gpxApproximation.finalPoints) || Algorithms.isEmpty(gpxApproximation.result)) { return; } @@ -463,12 +478,14 @@ public class MeasurementEditingContext { WptPt p1 = new WptPt(); p1.lat = rp1.loc.getLatitude(); p1.lon = rp1.loc.getLongitude(); + p1.setProfileType(mode.getStringKey()); if (i == 0) { routePoints.add(p1); } WptPt p2 = new WptPt(); p2.lat = rp2.loc.getLatitude(); p2.lon = rp2.loc.getLongitude(); + p2.setProfileType(mode.getStringKey()); routePoints.add(p2); Pair pair = new Pair<>(p1, p2); List points = new ArrayList<>(); @@ -579,10 +596,10 @@ public class MeasurementEditingContext { @Override public void updateProgress(int progress) { - int pairs = calculatedPairs + pointsToCalculateSize; + int pairs = pointsToCalculateSize; if (pairs != 0) { - int pairProgress = 100 / pairs; - progress = calculatedPairs * pairProgress + progress / pairs; + float pairProgress = 100f / pairs; + progress = (int)(calculatedPairs * pairProgress + (float) progress / pairs); } progressListener.updateProgress(progress); } @@ -616,6 +633,7 @@ public class MeasurementEditingContext { pts.add(pt); } calculatedPairs++; + params.calculationProgressCallback.updateProgress(0); List originalRoute = route.getOriginalRoute(); if (Algorithms.isEmpty(originalRoute)) { originalRoute = Collections.singletonList(routePlannerFrontEnd.generateStraightLineSegment( @@ -640,6 +658,24 @@ public class MeasurementEditingContext { return params; } + public List getDistinctRoutePoints() { + List res = new ArrayList<>(); + List points = new ArrayList<>(before.points); + points.addAll(after.points); + int size = points.size(); + for (int i = 0; i < size - 1; i++) { + Pair pair = new Pair<>(points.get(i), points.get(i + 1)); + RoadSegmentData data = this.roadSegmentData.get(pair); + if (data != null) { + res.addAll(data.points); + if (i < size - 2) { + res.remove(res.size() - 1); + } + } + } + return res; + } + @Nullable public GPXFile exportRouteAsGpx(@NonNull String gpxName) { if (application == null || before.points.isEmpty() || !hasRoute()) { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index f8b7b6ffd0..610f20f053 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -425,7 +425,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route if (editingCtx.isNewData() && planRouteMode) { StartPlanRouteBottomSheet.showInstance(mapActivity.getSupportFragmentManager(), createStartPlanRouteListener()); - } else if (!editingCtx.isNewData() && !editingCtx.hasRoutePoints() && !editingCtx.hasRoute()) { + } else if (!editingCtx.isNewData() && !editingCtx.hasRoutePoints() && !editingCtx.hasRoute() && editingCtx.getPointsCount() > 1) { SnapTrackWarningBottomSheet.showInstance(mapActivity.getSupportFragmentManager(), this); } } @@ -468,13 +468,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route displaySegmentPoints(); } } -/* - if (saved == null) { - saved = gpxData != null - && (gpxData.getActionType() == ActionType.ADD_ROUTE_POINTS - || gpxData.getActionType() == ActionType.EDIT_SEGMENT); - } -*/ } } @@ -574,7 +567,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route toolBarController.setTitle(getString(R.string.route_between_points)); mapActivity.refreshMap(); - if (editingCtx.isNewData() || editingCtx.hasRoutePoints() || editingCtx.hasRoute()) { + if (editingCtx.isNewData() || editingCtx.hasRoutePoints() || editingCtx.hasRoute() || editingCtx.getPointsCount() < 2) { RouteBetweenPointsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(), this, editingCtx.getCalculationMode(), editingCtx.getAppMode()); @@ -590,7 +583,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route if (editingCtx.getPointsCount() > 0) { GpxData gpxData = editingCtx.getGpxData(); if (editingCtx.isNewData()) { - saveAsGpx(SaveType.ROUTE_POINT); + saveAsGpx(SaveType.ROUTE_POINT, close); } else if (isInEditMode() && gpxData.getActionType() == ActionType.EDIT_SEGMENT) { openSaveAsNewTrackMenu(mapActivity); } else { @@ -795,6 +788,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route if (measurementLayer != null) { editingCtx.getCommandManager().execute(new ChangeRouteModeCommand(measurementLayer, mode, calculationMode)); updateUndoRedoButton(false, redoBtn); + updateUndoRedoButton(true, undoBtn); disable(upDownBtn); updateSnapToRoadControls(); updateDistancePointsText(); @@ -1317,7 +1311,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route } } - private void saveAsGpx(final SaveType saveType) { + private void saveAsGpx(final SaveType saveType, final boolean close) { MapActivity mapActivity = getMapActivity(); if (mapActivity != null) { final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR); @@ -1356,7 +1350,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route fout = new File(dir, fileName); } } - saveNewGpx(dir, fileName, showOnMapToggle.isChecked(), saveType, false); + saveNewGpx(dir, fileName, showOnMapToggle.isChecked(), saveType, close); } }) .setNegativeButton(R.string.shared_string_cancel, null); @@ -1437,6 +1431,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route private ProgressDialog progressDialog; private File toSave; + private GPXFile savedGpxFile; @Override protected void onPreExecute() { @@ -1466,8 +1461,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route if (measurementLayer != null) { if (saveType == SaveType.LINE) { TrkSegment segment = new TrkSegment(); - segment.points.addAll(before.points); - segment.points.addAll(after.points); + if (editingCtx.hasRoute()) { + segment.points.addAll(editingCtx.getDistinctRoutePoints()); + } else { + segment.points.addAll(before.points); + segment.points.addAll(after.points); + } Track track = new Track(); track.name = trackName; track.segments.add(segment); @@ -1484,6 +1483,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route } Exception res = GPXUtilities.writeGpxFile(toSave, gpx); gpx.path = toSave.getAbsolutePath(); + savedGpxFile = gpx; if (showOnMap) { app.getSelectedGpxHelper().selectGpxFile(gpx, true, false); } @@ -1496,8 +1496,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route if (planRouteMode) { if (saveType == SaveType.LINE) { TrkSegment segment = new TrkSegment(); - segment.points.addAll(before.points); - segment.points.addAll(after.points); + if (editingCtx.hasRoute()) { + segment.points.addAll(editingCtx.getDistinctRoutePoints()); + } else { + segment.points.addAll(before.points); + segment.points.addAll(after.points); + } Track track = new Track(); track.name = trackName; track.segments.add(segment); @@ -1550,6 +1554,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route } } Exception res = GPXUtilities.writeGpxFile(toSave, gpx); + savedGpxFile = gpx; if (showOnMap) { SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, true, false); if (sf != null) { @@ -1578,6 +1583,13 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route mapActivity.refreshMap(); if (warning == null) { editingCtx.setChangesSaved(); + if (editingCtx.isNewData() && savedGpxFile != null) { + QuadRect rect = savedGpxFile.getRect(); + TrkSegment segment = savedGpxFile.getNonEmptyTrkSegment(); + GpxData gpxData = new GpxData(savedGpxFile, rect, ActionType.EDIT_SEGMENT, segment); + editingCtx.setGpxData(gpxData); + updateToolbar(); + } if (isInEditMode()) { dismiss(mapActivity); } else { @@ -1590,8 +1602,13 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route @Override public void onClick(View view) { MapActivity mapActivity = mapActivityRef.get(); - if (mapActivity != null && AndroidUtils.isActivityNotDestroyed(mapActivity)) { - FileUtils.renameFile(mapActivity, toSave, null); + if (AndroidUtils.isActivityNotDestroyed(mapActivity)) { + FileUtils.renameFile(mapActivity, toSave, new FileUtils.RenameCallback() { + @Override + public void renamedTo(File file) { + + } + }); } } }); @@ -1668,7 +1685,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route } } if (!editMode && editingCtx.getPointsCount() > 1) { - toolBarController.setTitle(fileName); + toolBarController.setTitle(fileName.replace('_', ' ')); toolBarController.setDescription(actionStr); } else { toolBarController.setTitle(actionStr); diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java index 7b2b259e3a..268696bb5f 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java @@ -12,6 +12,7 @@ import net.osmand.GPXUtilities.WptPt; import net.osmand.Location; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; +import net.osmand.data.QuadRect; import net.osmand.data.RotatedTileBox; import net.osmand.plus.R; import net.osmand.plus.settings.backend.ApplicationMode; @@ -178,6 +179,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL new Renderable.StandardTrack(new ArrayList<>(after.points), 17.2). drawSegment(view.getZoom(), lineAttrs.paint, canvas, tb); + drawPoints(canvas, tb); } } @@ -185,6 +187,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) { if (inMeasurementMode) { lineAttrs.updatePaints(view.getApplication(), settings, tb); + drawBeforeAfterPath(canvas, tb); if (editingCtx.getSelectedPointPosition() == -1) { drawCenterIcon(canvas, tb, settings.isNightMode()); @@ -203,90 +206,115 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL } } - TrkSegment before = editingCtx.getBeforeTrkSegmentLine(); - TrkSegment after = editingCtx.getAfterTrkSegmentLine(); - - canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); - - if (before.points.size() > 0 || after.points.size() > 0) { - path.reset(); - tx.clear(); - ty.clear(); - - if (before.points.size() > 0) { - WptPt pt = before.points.get(before.points.size() - 1); - float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); - float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); - tx.add(locX); - ty.add(locY); - tx.add((float) tb.getCenterPixelX()); - ty.add((float) tb.getCenterPixelY()); - } - if (after.points.size() > 0) { - if (before.points.size() == 0) { - tx.add((float) tb.getCenterPixelX()); - ty.add((float) tb.getCenterPixelY()); - } - WptPt pt = after.points.get(0); - float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); - float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); - tx.add(locX); - ty.add(locY); - } - - GeometryWay.calculatePath(tb, tx, ty, path); - canvas.drawPath(path, lineAttrs.paint); + List beforePoints = editingCtx.getBeforePoints(); + List afterPoints = editingCtx.getAfterPoints(); + if (beforePoints.size() > 0) { + drawPointIcon(canvas, tb, beforePoints.get(beforePoints.size() - 1)); } - - List points = new ArrayList<>(); - points.addAll(editingCtx.getBeforePoints()); - points.addAll(editingCtx.getAfterPoints()); - overlapped = false; - int drawn = 0; - for (int i = 0; i < points.size(); i++) { - WptPt pt = points.get(i); - float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); - float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); - if (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) { - drawn++; - if (drawn > POINTS_TO_DRAW) { - overlapped = true; - break; - } - } - } - if (overlapped) { - WptPt pt = points.get(0); - float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); - float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); - if (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) { - canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); - } - pt = points.get(points.size() - 1); - locX = tb.getPixXFromLatLon(pt.lat, pt.lon); - locY = tb.getPixYFromLatLon(pt.lat, pt.lon); - if (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) { - canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); - - } - } else { - for (int i = 0; i < points.size(); i++) { - WptPt pt = points.get(i); - float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); - float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); - if (locX >= 0 && locX <= tb.getPixWidth() && locY >= 0 && locY <= tb.getPixHeight()) { - canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); - } - } + if (afterPoints.size() > 0) { + drawPointIcon(canvas, tb, afterPoints.get(0)); } if (editingCtx.getSelectedPointPosition() != -1) { + canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); int locX = tb.getCenterPixelX(); int locY = tb.getCenterPixelY(); canvas.drawBitmap(applyingPointIcon, locX - marginApplyingPointIconX, locY - marginApplyingPointIconY, bitmapPaint); + canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); + } + } + } + + private boolean isInTileBox(RotatedTileBox tb, WptPt point) { + QuadRect latLonBounds = tb.getLatLonBounds(); + return point.getLatitude() >= latLonBounds.bottom && point.getLatitude() <= latLonBounds.top + && point.getLongitude() >= latLonBounds.left && point.getLongitude() <= latLonBounds.right; + } + + private void drawPoints(Canvas canvas, RotatedTileBox tb) { + canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); + + WptPt lastBeforePoint = null; + List points = new ArrayList<>(editingCtx.getBeforePoints()); + if (points.size() > 0) { + lastBeforePoint = points.get(points.size() - 1); + } + WptPt firstAfterPoint = null; + List afterPoints = editingCtx.getAfterPoints(); + if (afterPoints.size() > 0) { + firstAfterPoint = afterPoints.get(0); + } + points.addAll(afterPoints); + overlapped = false; + int drawn = 0; + for (int i = 0; i < points.size(); i++) { + WptPt pt = points.get(i); + if (tb.containsLatLon(pt.lat, pt.lon)) { + drawn++; + if (drawn > POINTS_TO_DRAW) { + overlapped = true; + break; + } + } + } + if (overlapped) { + WptPt pt = points.get(0); + if (pt != lastBeforePoint && pt != firstAfterPoint && isInTileBox(tb, pt)) { + float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); + float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); + canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); + } + pt = points.get(points.size() - 1); + if (pt != lastBeforePoint && pt != firstAfterPoint && isInTileBox(tb, pt)) { + float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); + float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); + canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); + } + } else { + for (int i = 0; i < points.size(); i++) { + WptPt pt = points.get(i); + if (pt != lastBeforePoint && pt != firstAfterPoint && isInTileBox(tb, pt)) { + float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); + float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); + canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); + } + } + } + + canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); + } + + private void drawBeforeAfterPath(Canvas canvas, RotatedTileBox tb) { + TrkSegment before = editingCtx.getBeforeTrkSegmentLine(); + TrkSegment after = editingCtx.getAfterTrkSegmentLine(); + if (before.points.size() > 0 || after.points.size() > 0) { + path.reset(); + tx.clear(); + ty.clear(); + + if (before.points.size() > 0) { + WptPt pt = before.points.get(before.points.size() - 1); + float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); + float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); + tx.add(locX); + ty.add(locY); + tx.add((float) tb.getCenterPixelX()); + ty.add((float) tb.getCenterPixelY()); + } + if (after.points.size() > 0) { + if (before.points.size() == 0) { + tx.add((float) tb.getCenterPixelX()); + ty.add((float) tb.getCenterPixelY()); + } + WptPt pt = after.points.get(0); + float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); + float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); + tx.add(locX); + ty.add(locY); } - canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); + GeometryWay.calculatePath(tb, tx, ty, path); + canvas.drawPath(path, lineAttrs.paint); } } @@ -298,6 +326,16 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); } + private void drawPointIcon(Canvas canvas, RotatedTileBox tb, WptPt pt) { + canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); + float locX = tb.getPixXFromLatLon(pt.lat, pt.lon); + float locY = tb.getPixYFromLatLon(pt.lat, pt.lon); + if (tb.containsPoint(locX, locY, 0)) { + canvas.drawBitmap(pointIcon, locX - marginPointIconX, locY - marginPointIconY, bitmapPaint); + } + canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY()); + } + public WptPt addCenterPoint() { RotatedTileBox tb = view.getCurrentRotatedTileBox(); LatLon l = tb.getCenterLatLon(); diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/ProfileCard.java b/OsmAnd/src/net/osmand/plus/measurementtool/ProfileCard.java index 27245d92f4..98d180e48f 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/ProfileCard.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/ProfileCard.java @@ -15,6 +15,7 @@ import net.osmand.plus.routepreparationmenu.cards.BaseCard; import net.osmand.plus.settings.backend.ApplicationMode; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public class ProfileCard extends BaseCard { @@ -34,9 +35,15 @@ public class ProfileCard extends BaseCard { @Override protected void updateContent() { - final List modes = new ArrayList<>(ApplicationMode.values(app)); modes.remove(ApplicationMode.DEFAULT); + Iterator iterator = modes.iterator(); + while (iterator.hasNext()) { + ApplicationMode mode = iterator.next(); + if ("public_transport".equals(mode.getRoutingProfile())) { + iterator.remove(); + } + } for (int i = 0; i < modes.size(); i++) { ApplicationMode mode = modes.get(i); LinearLayout container = view.findViewById(R.id.content_container); diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java index a6348963ca..29f1294a42 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java @@ -34,7 +34,8 @@ import org.apache.commons.logging.Log; import java.util.ArrayList; import java.util.List; -import static net.osmand.plus.UiUtilities.CustomRadioButtonType.*; +import static net.osmand.plus.UiUtilities.CustomRadioButtonType.LEFT; +import static net.osmand.plus.UiUtilities.CustomRadioButtonType.RIGHT; import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.NEXT_SEGMENT; import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.WHOLE_TRACK; import static net.osmand.plus.measurementtool.MeasurementEditingContext.DEFAULT_APP_MODE; @@ -120,8 +121,10 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial for (int i = 0; i < modes.size(); i++) { ApplicationMode mode = modes.get(i); - icon = app.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)); - addProfileView(navigationType, onClickListener, i, icon, mode.toHumanString(), mode.equals(appMode)); + if (!"public_transport".equals(mode.getRoutingProfile())) { + icon = app.getUIUtilities().getIcon(mode.getIconRes(), mode.getIconColorInfo().getColor(nightMode)); + addProfileView(navigationType, onClickListener, i, icon, mode.toHumanString(), mode.equals(appMode)); + } } segmentBtn.setOnClickListener(new View.OnClickListener() { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java index ef99bd3758..f9a79c96b6 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java @@ -66,6 +66,6 @@ public class ApplyGpxApproximationCommand extends MeasurementModeCommand { public void applyApproximation() { getEditingCtx().setAppMode(mode); getEditingCtx().clearSegments(); - getEditingCtx().setPoints(approximation); + getEditingCtx().setPoints(approximation, mode); } } diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index aa69457806..94987d1c8a 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -43,9 +43,9 @@ import net.osmand.plus.dashboard.tools.DashFragmentData; import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.fragments.BaseSettingsFragment; -import net.osmand.plus.views.layers.MapInfoLayer; import net.osmand.plus.views.OsmandMapLayer.DrawSettings; import net.osmand.plus.views.OsmandMapTileView; +import net.osmand.plus.views.layers.MapInfoLayer; import net.osmand.plus.views.mapwidgets.widgets.TextInfoWidget; import net.osmand.util.Algorithms; @@ -164,7 +164,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { public static final int[] SECONDS = new int[] {0, 1, 2, 3, 5, 10, 15, 20, 30, 60, 90}; public static final int[] MINUTES = new int[] {2, 3, 5}; - public static final int[] MAX_INTERVAL_TO_SEND_MINUTES = new int[] {1, 2, 5, 10, 15, 20, 30, 60}; + public static final int[] MAX_INTERVAL_TO_SEND_MINUTES = new int[] {1, 2, 5, 10, 15, 20, 30, 60, 90, 2 * 60, 3 * 60, 4 * 60, 6 * 60, 12 * 60, 24 * 60}; @Override diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java index 00e7910271..6e862b5d4b 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java @@ -1486,16 +1486,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement new View.OnClickListener() { @Override public void onClick(View v) { - final SelectedGpxFile selectedGpxFile = selectedGpxHelper.getSelectedFileByPath(gpxInfo.file.getPath()); FileUtils.renameFile(getActivity(), gpxInfo.file, new RenameCallback() { @Override public void renamedTo(File file) { asyncLoader = new LoadGpxTask(); asyncLoader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, getActivity()); - if (selectedGpxFile != null && selectedGpxFile.getGpxFile() != null) { - selectedGpxFile.getGpxFile().path = file.getPath(); - selectedGpxHelper.updateSelectedGpxFile(selectedGpxFile); - } } }); } diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java index c7b3d0ba18..5115e7f63e 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java @@ -38,7 +38,6 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.TrackActivity; @@ -83,7 +82,7 @@ public class SplitSegmentDialogFragment extends DialogFragment { TrackActivity trackActivity = requireTrackActivity(); app = trackActivity.getMyApplication(); ic = app.getUIUtilities(); - boolean isLightTheme = app.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + boolean isLightTheme = app.getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java index ace09d8c3d..7c0edb7168 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java @@ -19,7 +19,6 @@ import android.util.TypedValue; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; @@ -27,7 +26,6 @@ import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.AutoCompleteTextView; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; @@ -40,6 +38,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.AppCompatImageButton; import androidx.appcompat.widget.Toolbar; import androidx.core.view.ViewCompat; import androidx.fragment.app.DialogFragment; @@ -50,7 +49,6 @@ import androidx.fragment.app.FragmentTransaction; import androidx.viewpager.widget.ViewPager; import com.google.android.material.tabs.TabLayout; -import com.google.android.material.textfield.TextInputLayout; import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; @@ -75,6 +73,7 @@ import net.osmand.plus.osmedit.OsmPoint.Action; import net.osmand.plus.osmedit.dialogs.PoiSubTypeDialogFragment; import net.osmand.plus.osmedit.dialogs.PoiTypeDialogFragment; import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.widgets.OsmandTextFieldBoxes; import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; @@ -89,6 +88,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import studio.carbonylgroup.textfieldboxes.ExtendedEditText; + public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { public static final String TAG = EditPoiDialogFragment.class.getSimpleName(); private static final Log LOG = PlatformUtil.getLog(EditPoiDialogFragment.class); @@ -111,11 +112,11 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { private EditPoiData editPoiData; private EditPoiViewPager viewPager; - private AutoCompleteTextView poiTypeEditText; + private ExtendedEditText poiTypeEditText; private OnSaveButtonClickListener onSaveButtonClickListener; private OpenstreetmapUtil mOpenstreetmapUtil; - private TextInputLayout poiTypeTextInputLayout; + private OsmandTextFieldBoxes poiTypeTextInputLayout; private View view; public static final int AMENITY_TEXT_LENGTH= 255; @@ -139,7 +140,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { view = inflater.inflate(R.layout.fragment_edit_poi, container, false); - boolean isLightTheme = getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + boolean isLightTheme = getSettings().isLightContent(); if (savedInstanceState != null) { @SuppressWarnings("unchecked") @@ -250,7 +251,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { } }); - EditText poiNameEditText = (EditText) view.findViewById(R.id.poiNameEditText); + ExtendedEditText poiNameEditText = (ExtendedEditText) view.findViewById(R.id.poiNameEditText); AndroidUtils.setTextHorizontalGravity(poiNameEditText, Gravity.START); poiNameEditText.addTextChangedListener(new TextWatcher() { @Override @@ -276,8 +277,8 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { poiNameEditText.setText(editPoiData.getTag(OSMSettings.OSMTagKey.NAME.getValue())); poiNameEditText.requestFocus(); AndroidUtils.showSoftKeyboard(getActivity(), poiNameEditText); - poiTypeTextInputLayout = (TextInputLayout) view.findViewById(R.id.poiTypeTextInputLayout); - poiTypeEditText = (AutoCompleteTextView) view.findViewById(R.id.poiTypeEditText); + poiTypeTextInputLayout = (OsmandTextFieldBoxes) view.findViewById(R.id.poiTypeTextInputLayout); + poiTypeEditText = (ExtendedEditText) view.findViewById(R.id.poiTypeEditText); AndroidUtils.setTextHorizontalGravity(poiTypeEditText, Gravity.START); poiTypeEditText.setText(editPoiData.getPoiTypeString()); poiTypeEditText.addTextChangedListener(new TextWatcher() { @@ -296,7 +297,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { if (!getMyApplication().isApplicationInitializing()) { PoiCategory category = editPoiData.getPoiCategory(); if (category != null) { - poiTypeTextInputLayout.setHint(category.getTranslation()); + poiTypeTextInputLayout.setLabelText(category.getTranslation()); } } } @@ -304,45 +305,24 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { }); poiNameEditText.setOnEditorActionListener(mOnEditorActionListener); poiTypeEditText.setOnEditorActionListener(mOnEditorActionListener); - poiTypeEditText.setOnTouchListener(new View.OnTouchListener() { + + AppCompatImageButton expandButton = poiTypeTextInputLayout.getEndIconImageButton(); + expandButton.setColorFilter(R.color.gpx_chart_red); + expandButton.setOnClickListener(new View.OnClickListener() { @Override - public boolean onTouch(final View v, MotionEvent event) { - Context ctx = getContext(); - if (ctx == null) { - return false; - } - boolean isLayoutRtl = AndroidUtils.isLayoutRtl(getContext()); - final EditText editText = (EditText) v; - if (event.getAction() == MotionEvent.ACTION_UP) { - final int DRAWABLE_END = 2; - int expandBtnWidth = AndroidUtils.getCompoundDrawables(editText)[DRAWABLE_END].getBounds().width(); - - boolean expandButtonPressed = false; - if (isLayoutRtl) { - expandButtonPressed = event.getX() <= (editText.getLeft() + expandBtnWidth - + editText.getPaddingLeft()); - } else { - expandButtonPressed = event.getX() >= (editText.getRight() - expandBtnWidth - - editText.getPaddingRight()); - } - - if (expandButtonPressed) { - PoiCategory category = editPoiData.getPoiCategory(); - if (category != null) { - PoiSubTypeDialogFragment dialogFragment = - PoiSubTypeDialogFragment.createInstance(category); - dialogFragment.setOnItemSelectListener(new PoiSubTypeDialogFragment.OnItemSelectListener() { - @Override - public void select(String category) { - setSubCategory(category); - } - }); - dialogFragment.show(getChildFragmentManager(), "PoiSubTypeDialogFragment"); + public void onClick(View v) { + PoiCategory category = editPoiData.getPoiCategory(); + if (category != null) { + PoiSubTypeDialogFragment dialogFragment = + PoiSubTypeDialogFragment.createInstance(category); + dialogFragment.setOnItemSelectListener(new PoiSubTypeDialogFragment.OnItemSelectListener() { + @Override + public void select(String category) { + setSubCategory(category); } - return true; - } + }); + dialogFragment.show(getChildFragmentManager(), "PoiSubTypeDialogFragment"); } - return false; } }); diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java index 0f7f812f48..65f1bab915 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java @@ -477,8 +477,8 @@ public class MapRouteInfoMenuFragment extends ContextMenuFragment { AndroidUtils.setBackground(ctx, getCardsContainer(), isNightMode(), R.color.activity_background_light, R.color.activity_background_dark); - if (getTopViewId() != 0) { - View topView = view.findViewById(getTopViewId()); + if (getTopView() != null) { + View topView = getTopView(); AndroidUtils.setBackground(ctx, topView, isNightMode(), R.color.card_and_list_background_light, R.color.card_and_list_background_dark); } diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 9a29bd355d..57becfe9a6 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -1263,13 +1263,12 @@ public class RoutingHelper { public void run() { RouteCalculationProgress calculationProgress = params.calculationProgress; if (isRouteBeingCalculated()) { - float pr = calculationProgress.getLinearProgress(); - progressRoute.updateProgress((int) pr); Thread t = currentRunningJob; if(t instanceof RouteRecalculationThread && ((RouteRecalculationThread) t).params != params) { // different calculation started return; } else { + progressRoute.updateProgress((int) calculationProgress.getLinearProgress()); if (calculationProgress.requestPrivateAccessRouting) { progressRoute.requestPrivateAccessRouting(); } diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java index 613d7be98f..902f4bea4b 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchCoordinatesFragment.java @@ -44,7 +44,6 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.UpdateLocationViewCache; @@ -119,7 +118,7 @@ public class QuickSearchCoordinatesFragment extends DialogFragment implements Os @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - isLightTheme = getMyApplication().getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + isLightTheme = getMyApplication().getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java index 4b0f54a25e..e211569f4c 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java @@ -47,7 +47,6 @@ import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.poi.PoiFiltersHelper; import net.osmand.plus.poi.PoiUIFilter; import net.osmand.plus.render.RenderingIcons; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.search.SearchUICore; import net.osmand.search.SearchUICore.SearchResultCollection; import net.osmand.search.core.ObjectType; @@ -112,7 +111,7 @@ public class QuickSearchCustomPoiFragment extends DialogFragment implements OnFi app = getMyApplication(); uiUtilities = app.getUIUtilities(); searchUICore = app.getSearchUICore().getCore(); - this.nightMode = app.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME; + this.nightMode = !app.getSettings().isLightContent(); setStyle(STYLE_NO_FRAME, nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme); poiCategoryList = app.getPoiTypes().getCategories(false); Collections.sort(poiCategoryList, new Comparator() { diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java index 5be1d95cee..6b306003d0 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java @@ -236,7 +236,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC nightMode = !app.getSettings().isLightContent(); navigationInfo = new NavigationInfo(app); accessibilityAssistant = new AccessibilityAssistant(getActivity()); - boolean isLightTheme = app.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + boolean isLightTheme = app.getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java index d932d50557..4edc8fa0d1 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchPoiFilterFragment.java @@ -38,7 +38,6 @@ import net.osmand.osm.PoiCategory; import net.osmand.osm.PoiFilter; import net.osmand.osm.PoiType; import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.dialogs.DirectionsDialogs; @@ -97,7 +96,7 @@ public class QuickSearchPoiFilterFragment extends DialogFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - isLightTheme = getMyApplication().getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME; + isLightTheme = getMyApplication().getSettings().isLightContent(); int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme; setStyle(STYLE_NO_FRAME, themeId); } diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java index d6cdc2c813..4afce65383 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java @@ -3895,6 +3895,7 @@ public class OsmandSettings { public static final int OSMAND_DARK_THEME = 0; public static final int OSMAND_LIGHT_THEME = 1; + public static final int SYSTEM_DEFAULT_THEME = 2; public static final int NO_EXTERNAL_DEVICE = 0; public static final int GENERIC_EXTERNAL_DEVICE = 1; @@ -3908,7 +3909,16 @@ public class OsmandSettings { new IntPreference("FAVORITES_TAB", 0).makeGlobal().cache(); public final CommonPreference OSMAND_THEME = - new IntPreference("osmand_theme", OSMAND_LIGHT_THEME).makeProfile().cache(); + new IntPreference("osmand_theme", OSMAND_LIGHT_THEME) { + @Override + public void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException { + Integer theme = parseString(json.getString(getId())); + if (theme == SYSTEM_DEFAULT_THEME && !isSupportSystemDefaultTheme()) { + theme = OSMAND_LIGHT_THEME; + } + setModeValue(appMode, theme); + } + }.makeProfile().cache(); public final OsmandPreference OPEN_ONLY_HEADER_STATE_ROUTE_CALCULATED = new BooleanPreference("open_only_header_route_calculated", false).makeProfile(); @@ -3917,15 +3927,35 @@ public class OsmandSettings { return isLightContent(); } - public boolean isLightContent() { return isLightContentForMode(APPLICATION_MODE.get()); } public boolean isLightContentForMode(ApplicationMode mode) { + if (isSupportSystemDefaultTheme() && OSMAND_THEME.getModeValue(mode) == SYSTEM_DEFAULT_THEME) { + return isLightSystemDefaultTheme(); + } return OSMAND_THEME.getModeValue(mode) != OSMAND_DARK_THEME; } + public boolean isLightSystemDefaultTheme() { + Configuration config = ctx.getResources().getConfiguration(); + int systemNightModeState = config.uiMode & Configuration.UI_MODE_NIGHT_MASK; + return systemNightModeState != Configuration.UI_MODE_NIGHT_YES; + } + + public boolean isSystemDefaultThemeUsed() { + return isSystemDefaultThemeUsedForMode(APPLICATION_MODE.get()); + } + + public boolean isSystemDefaultThemeUsedForMode(ApplicationMode mode) { + return isSupportSystemDefaultTheme() && OSMAND_THEME.getModeValue(mode) == SYSTEM_DEFAULT_THEME; + } + + public boolean isSupportSystemDefaultTheme() { + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q; + } + public final CommonPreference FLUORESCENT_OVERLAYS = new BooleanPreference("fluorescent_overlays", false).makeGlobal().cache(); diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java index 80488797ec..e870fed149 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java @@ -95,14 +95,37 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme }; private void setupAppThemePref() { - final ListPreferenceEx appTheme = (ListPreferenceEx) findPreference(settings.OSMAND_THEME.getId()); - appTheme.setEntries(new String[] {getString(R.string.dark_theme), getString(R.string.light_theme)}); - appTheme.setEntryValues(new Integer[] {OsmandSettings.OSMAND_DARK_THEME, OsmandSettings.OSMAND_LIGHT_THEME}); + final ListPreferenceEx appTheme = + (ListPreferenceEx) findPreference(settings.OSMAND_THEME.getId()); + + ArrayList entries = new ArrayList<>(); + entries.add(getString(R.string.dark_theme)); + entries.add(getString(R.string.light_theme)); + + ArrayList values = new ArrayList<>(); + values.add(OsmandSettings.OSMAND_DARK_THEME); + values.add(OsmandSettings.OSMAND_LIGHT_THEME); + + if (settings.isSupportSystemDefaultTheme()) { + entries.add(getString(R.string.system_default_theme)); + values.add(OsmandSettings.SYSTEM_DEFAULT_THEME); + } + + String[] entriesStrings = new String[entries.size()]; + appTheme.setEntries(entries.toArray(entriesStrings)); + appTheme.setEntryValues(values.toArray()); appTheme.setIcon(getOsmandThemeIcon()); } private Drawable getOsmandThemeIcon() { - return getActiveIcon(settings.isLightContent() ? R.drawable.ic_action_sun : R.drawable.ic_action_moon); + int iconId; + ApplicationMode mode = getSelectedAppMode(); + if (settings.isSystemDefaultThemeUsedForMode(mode)) { + iconId = R.drawable.ic_action_android; + } else { + iconId = settings.isLightContent() ? R.drawable.ic_action_sun : R.drawable.ic_action_moon; + } + return getActiveIcon(iconId); } private void setupRotateMapPref() { diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java index 282fb204e3..e664953662 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/LiveMonitoringFragment.java @@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat; import androidx.preference.Preference; import net.osmand.AndroidUtils; +import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; @@ -128,10 +129,10 @@ public class LiveMonitoringFragment extends BaseSettingsFragment { for (int i = 0; i < MAX_INTERVAL_TO_SEND_MINUTES.length; i++) { int minute = MAX_INTERVAL_TO_SEND_MINUTES[i]; entryValues[i] = (minute * 60) * 1000; - entries[i] = minute + " " + getString(R.string.int_min); + entries[i] = OsmAndFormatter.getFormattedDuration(minute * 60, app); } - ListPreferenceEx liveMonitoringBuffer = (ListPreferenceEx) findPreference(settings.LIVE_MONITORING_MAX_INTERVAL_TO_SEND.getId()); + ListPreferenceEx liveMonitoringBuffer = findPreference(settings.LIVE_MONITORING_MAX_INTERVAL_TO_SEND.getId()); liveMonitoringBuffer.setEntries(entries); liveMonitoringBuffer.setEntryValues(entryValues); liveMonitoringBuffer.setIcon(getPersistentPrefIcon(R.drawable.ic_action_time_span));