diff --git a/OsmAnd-telegram/res/values-an/strings.xml b/OsmAnd-telegram/res/values-an/strings.xml index a6b3daec93..271f0790cd 100644 --- a/OsmAnd-telegram/res/values-an/strings.xml +++ b/OsmAnd-telegram/res/values-an/strings.xml @@ -1,2 +1,4 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml index 33680e1089..4715a16091 100644 --- a/OsmAnd-telegram/res/values-nb/strings.xml +++ b/OsmAnd-telegram/res/values-nb/strings.xml @@ -268,4 +268,5 @@ Siste oppdatering fra Telegram: %1$s siden Siste respons: %1$s siden %1$s siden + ERR \ No newline at end of file diff --git a/OsmAnd-telegram/res/values-ru/strings.xml b/OsmAnd-telegram/res/values-ru/strings.xml index c1c2124e85..8a232e948c 100644 --- a/OsmAnd-telegram/res/values-ru/strings.xml +++ b/OsmAnd-telegram/res/values-ru/strings.xml @@ -158,7 +158,7 @@ Политика конфиденциальности Telegram Политика конфиденциальности OsmAnd Получено точек GPX: %1$s - Внешний вид + Вид Показать количество собранных и отправленных точек GPS. Обновите OsmAnd для просмотра данных на карте Обновить diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png deleted file mode 100644 index 01afb085fd..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_compass_widget.png deleted file mode 100644 index af36e36892..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-hdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 150ec6b547..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 15fb01c0b4..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 8901c389b9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png deleted file mode 100644 index c1ba05be3b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_copy.png b/OsmAnd/res/drawable-hdpi/ic_action_copy.png deleted file mode 100644 index c62cd30a9a..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png deleted file mode 100644 index a1a4129763..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gprint_dark.png deleted file mode 100644 index 0a639dc2eb..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png deleted file mode 100644 index 83b5e2dc93..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png deleted file mode 100644 index e7330eb803..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_home_dark.png deleted file mode 100644 index b2b58532b8..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_import.png b/OsmAnd/res/drawable-hdpi/ic_action_import.png deleted file mode 100644 index 1714a7e2bc..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_info_dark.png deleted file mode 100644 index cf6c396f6b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png deleted file mode 100644 index 988e4cf571..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png deleted file mode 100644 index e476eac718..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png deleted file mode 100644 index f0914e4aa9..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png deleted file mode 100644 index 028221e52c..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-hdpi/ic_action_previous_route.png deleted file mode 100644 index cf87b0a6c6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ruler.png b/OsmAnd/res/drawable-hdpi/ic_action_ruler.png deleted file mode 100644 index 947cbef786..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings.png b/OsmAnd/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index 9f462386e1..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_travel.png b/OsmAnd/res/drawable-hdpi/ic_action_travel.png deleted file mode 100644 index 7e5309917d..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png deleted file mode 100644 index eca1da7c4f..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_work.png b/OsmAnd/res/drawable-hdpi/ic_action_work.png deleted file mode 100644 index 372258dc20..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png deleted file mode 100644 index 330da77fbd..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_map.png b/OsmAnd/res/drawable-hdpi/ic_map.png deleted file mode 100644 index 66407962a2..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-hdpi/ic_navigation_drawer.png deleted file mode 100644 index e99ca193e6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-hdpi/ic_plugin_srtm.png deleted file mode 100644 index 170aefa1c5..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png deleted file mode 100644 index 9235ce8668..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_compass_widget.png deleted file mode 100644 index c292db68dd..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-mdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 7b0315f985..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 825ef20d31..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 5a8551d5a4..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png deleted file mode 100644 index 1e329f8110..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_copy.png b/OsmAnd/res/drawable-mdpi/ic_action_copy.png deleted file mode 100644 index 82a96390f7..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png deleted file mode 100644 index 5f04a9bcae..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gprint_dark.png deleted file mode 100644 index ae443c661d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png deleted file mode 100644 index fc0a89d575..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png deleted file mode 100644 index fe04c8513e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_home_dark.png deleted file mode 100644 index 8e187c2263..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_import.png b/OsmAnd/res/drawable-mdpi/ic_action_import.png deleted file mode 100644 index 248d297466..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_info_dark.png deleted file mode 100644 index cdb944551e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png deleted file mode 100644 index 2dab1265c0..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png deleted file mode 100644 index 975cd200b8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png deleted file mode 100644 index 890646f66f..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png deleted file mode 100644 index 274be86f2e..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-mdpi/ic_action_previous_route.png deleted file mode 100644 index 1f2b6e7394..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ruler.png b/OsmAnd/res/drawable-mdpi/ic_action_ruler.png deleted file mode 100644 index 54f82daeed..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings.png b/OsmAnd/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index bb2cc22048..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_travel.png b/OsmAnd/res/drawable-mdpi/ic_action_travel.png deleted file mode 100644 index d7335726be..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png deleted file mode 100644 index 59f63440a8..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_work.png b/OsmAnd/res/drawable-mdpi/ic_action_work.png deleted file mode 100644 index 015800328d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png deleted file mode 100644 index ec2dac1101..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_map.png b/OsmAnd/res/drawable-mdpi/ic_map.png deleted file mode 100644 index 458117c9fe..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-mdpi/ic_navigation_drawer.png deleted file mode 100644 index 80409f3676..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-mdpi/ic_plugin_srtm.png deleted file mode 100644 index ce89e3758b..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png deleted file mode 100644 index 8bfa9f6b72..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget.png deleted file mode 100644 index 0ad0e45980..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index bf9eb8b2d8..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 025303ba1d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 56a568c287..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png deleted file mode 100644 index ad49ad0f0d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_copy.png b/OsmAnd/res/drawable-xhdpi/ic_action_copy.png deleted file mode 100644 index a870b9c4b4..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png deleted file mode 100644 index f378f2faa7..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gprint_dark.png deleted file mode 100644 index 8dc22c65eb..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png deleted file mode 100644 index e7ea375f45..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png deleted file mode 100644 index 44f098aa98..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_home_dark.png deleted file mode 100644 index 1305c63173..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_import.png b/OsmAnd/res/drawable-xhdpi/ic_action_import.png deleted file mode 100644 index 699f1b417c..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_info_dark.png deleted file mode 100644 index fd864c66a0..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png deleted file mode 100644 index 731ac33b2b..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png deleted file mode 100644 index 3219e7bbf1..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png deleted file mode 100644 index 92c3f3358e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png deleted file mode 100644 index cc841eb7be..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-xhdpi/ic_action_previous_route.png deleted file mode 100644 index 71da51f44d..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ruler.png b/OsmAnd/res/drawable-xhdpi/ic_action_ruler.png deleted file mode 100644 index d1a65048ba..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings.png deleted file mode 100644 index 3972159d46..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_travel.png b/OsmAnd/res/drawable-xhdpi/ic_action_travel.png deleted file mode 100644 index 8dd368dd2e..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png deleted file mode 100644 index a3efd50585..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_work.png b/OsmAnd/res/drawable-xhdpi/ic_action_work.png deleted file mode 100644 index 254e193254..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png deleted file mode 100644 index 7699bc55fb..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_map.png b/OsmAnd/res/drawable-xhdpi/ic_map.png deleted file mode 100644 index 67eb37ac50..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-xhdpi/ic_navigation_drawer.png deleted file mode 100644 index c3b6da6636..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-xhdpi/ic_plugin_srtm.png deleted file mode 100644 index a103242a3f..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png deleted file mode 100644 index fbb7f251cc..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_bug_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget.png deleted file mode 100644 index 896382de6d..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 8385db87ff..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_latitude.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_latitude.png deleted file mode 100644 index 57f3050e54..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_latitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_longitude.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_longitude.png deleted file mode 100644 index 06b996b9cd..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_longitude.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png deleted file mode 100644 index c3c416f6d1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_copy.png b/OsmAnd/res/drawable-xxhdpi/ic_action_copy.png deleted file mode 100644 index f6155536f7..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_copy.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_delete_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_delete_dark.png deleted file mode 100644 index 151538d1ba..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_delete_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_dark.png deleted file mode 100644 index 890f19e0cf..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png deleted file mode 100644 index e840eb5ff0..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png deleted file mode 100644 index 37037454f4..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_home_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_home_dark.png deleted file mode 100644 index 0956ccccb5..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_home_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_import.png b/OsmAnd/res/drawable-xxhdpi/ic_action_import.png deleted file mode 100644 index b802cf1ea8..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_import.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_info_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_info_dark.png deleted file mode 100644 index 957fcbe0da..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_info_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png deleted file mode 100644 index 2244702813..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png deleted file mode 100644 index dc6aa21733..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_micro_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png deleted file mode 100644 index 53b09f0cb7..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png deleted file mode 100644 index 0ee6810890..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-xxhdpi/ic_action_previous_route.png deleted file mode 100644 index fca798f46a..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler.png b/OsmAnd/res/drawable-xxhdpi/ic_action_ruler.png deleted file mode 100644 index 9a51090661..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings.png deleted file mode 100644 index 0fac002ad8..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_travel.png b/OsmAnd/res/drawable-xxhdpi/ic_action_travel.png deleted file mode 100644 index db56fd2f91..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_travel.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png deleted file mode 100644 index ba06d4920e..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_video_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_work.png b/OsmAnd/res/drawable-xxhdpi/ic_action_work.png deleted file mode 100644 index 7bea54d8eb..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png deleted file mode 100644 index b6a40f9d15..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_map.png b/OsmAnd/res/drawable-xxhdpi/ic_map.png deleted file mode 100644 index 49079a9e1b..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_map.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer.png b/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer.png deleted file mode 100644 index b007054f4e..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_navigation_drawer.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_plugin_srtm.png b/OsmAnd/res/drawable-xxhdpi/ic_plugin_srtm.png deleted file mode 100644 index 4c98804578..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_plugin_srtm.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget.png deleted file mode 100644 index d007519851..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget_hide.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget_hide.png deleted file mode 100644 index 9367547567..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_compass_widget_hide.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png deleted file mode 100644 index 05dfda08ca..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_gsave_dark.png deleted file mode 100644 index ca8ea70cad..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_gsave_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_previous_route.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_previous_route.png deleted file mode 100644 index aad78c1730..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_previous_route.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_work.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_work.png deleted file mode 100644 index 86aeafcb89..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_work.png and /dev/null differ diff --git a/OsmAnd/res/drawable/ic_action_bug_dark.xml b/OsmAnd/res/drawable/ic_action_bug_dark.xml new file mode 100644 index 0000000000..fe7b8af253 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_bug_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_compass_widget.xml b/OsmAnd/res/drawable/ic_action_compass_widget.xml new file mode 100644 index 0000000000..108cfcdf2b --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_compass_widget.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_compass_widget_hide.xml b/OsmAnd/res/drawable/ic_action_compass_widget_hide.xml new file mode 100644 index 0000000000..0b1eb4b8cb --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_compass_widget_hide.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_coordinates_latitude.xml b/OsmAnd/res/drawable/ic_action_coordinates_latitude.xml new file mode 100644 index 0000000000..a7ee81cb1a --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_coordinates_latitude.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_coordinates_longitude.xml b/OsmAnd/res/drawable/ic_action_coordinates_longitude.xml new file mode 100644 index 0000000000..6c8e01f542 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_coordinates_longitude.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_coordinates_widget.xml b/OsmAnd/res/drawable/ic_action_coordinates_widget.xml new file mode 100644 index 0000000000..4cf5271120 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_coordinates_widget.xml @@ -0,0 +1,16 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_copy.xml b/OsmAnd/res/drawable/ic_action_copy.xml new file mode 100644 index 0000000000..ebb2b35c22 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_copy.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_delete_dark.xml b/OsmAnd/res/drawable/ic_action_delete_dark.xml new file mode 100644 index 0000000000..a05bd21abe --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_delete_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_gprint_dark.xml b/OsmAnd/res/drawable/ic_action_gprint_dark.xml new file mode 100644 index 0000000000..5f70128718 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_gprint_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_gsave_dark.xml b/OsmAnd/res/drawable/ic_action_gsave_dark.xml new file mode 100644 index 0000000000..a25a0996de --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_gsave_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_gshare_dark.xml b/OsmAnd/res/drawable/ic_action_gshare_dark.xml new file mode 100644 index 0000000000..edad7213e2 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_gshare_dark.xml @@ -0,0 +1,15 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_action_home_dark.xml b/OsmAnd/res/drawable/ic_action_home_dark.xml new file mode 100644 index 0000000000..b665594692 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_home_dark.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_action_import.xml b/OsmAnd/res/drawable/ic_action_import.xml new file mode 100644 index 0000000000..8bf929c6b3 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_import.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_info_dark.xml b/OsmAnd/res/drawable/ic_action_info_dark.xml new file mode 100644 index 0000000000..15cb857d72 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_info_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_marker_dark.xml b/OsmAnd/res/drawable/ic_action_marker_dark.xml new file mode 100644 index 0000000000..9dfc2cb852 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_marker_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_micro_dark.xml b/OsmAnd/res/drawable/ic_action_micro_dark.xml new file mode 100644 index 0000000000..e0224a0233 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_micro_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_parking_dark.xml b/OsmAnd/res/drawable/ic_action_parking_dark.xml new file mode 100644 index 0000000000..e0b15af75f --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_parking_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_photo_dark.xml b/OsmAnd/res/drawable/ic_action_photo_dark.xml new file mode 100644 index 0000000000..dac4cd7253 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_photo_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_previous_route.xml b/OsmAnd/res/drawable/ic_action_previous_route.xml new file mode 100644 index 0000000000..f4ecad8fa7 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_previous_route.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/OsmAnd/res/drawable/ic_action_ruler.xml b/OsmAnd/res/drawable/ic_action_ruler.xml new file mode 100644 index 0000000000..a0c4afb370 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_ruler.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_settings.xml b/OsmAnd/res/drawable/ic_action_settings.xml new file mode 100644 index 0000000000..bd93d68f88 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_settings.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_travel.xml b/OsmAnd/res/drawable/ic_action_travel.xml new file mode 100644 index 0000000000..4875093f17 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_travel.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/OsmAnd/res/drawable/ic_action_video_dark.xml b/OsmAnd/res/drawable/ic_action_video_dark.xml new file mode 100644 index 0000000000..8a1561bc17 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_video_dark.xml @@ -0,0 +1,10 @@ + + + diff --git a/OsmAnd/res/drawable/ic_action_work.xml b/OsmAnd/res/drawable/ic_action_work.xml new file mode 100644 index 0000000000..4656d02c65 --- /dev/null +++ b/OsmAnd/res/drawable/ic_action_work.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/OsmAnd/res/drawable/ic_configure_screen_dark.xml b/OsmAnd/res/drawable/ic_configure_screen_dark.xml new file mode 100644 index 0000000000..f3f7b78cac --- /dev/null +++ b/OsmAnd/res/drawable/ic_configure_screen_dark.xml @@ -0,0 +1,13 @@ + + + + diff --git a/OsmAnd/res/drawable/ic_map.xml b/OsmAnd/res/drawable/ic_map.xml new file mode 100644 index 0000000000..48040318f4 --- /dev/null +++ b/OsmAnd/res/drawable/ic_map.xml @@ -0,0 +1,9 @@ + + + diff --git a/OsmAnd/res/drawable/ic_navigation_drawer.xml b/OsmAnd/res/drawable/ic_navigation_drawer.xml new file mode 100644 index 0000000000..34b1b9881f --- /dev/null +++ b/OsmAnd/res/drawable/ic_navigation_drawer.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/OsmAnd/res/drawable/ic_plugin_srtm.xml b/OsmAnd/res/drawable/ic_plugin_srtm.xml new file mode 100644 index 0000000000..9562493d37 --- /dev/null +++ b/OsmAnd/res/drawable/ic_plugin_srtm.xml @@ -0,0 +1,15 @@ + + + + diff --git a/OsmAnd/res/layout/gpx_track_select_dialog.xml b/OsmAnd/res/layout/gpx_track_select_dialog.xml new file mode 100644 index 0000000000..88c1985298 --- /dev/null +++ b/OsmAnd/res/layout/gpx_track_select_dialog.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/gpx_track_select_item.xml b/OsmAnd/res/layout/gpx_track_select_item.xml new file mode 100644 index 0000000000..844b1382f2 --- /dev/null +++ b/OsmAnd/res/layout/gpx_track_select_item.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OsmAnd/res/layout/preference_select_icon_button.xml b/OsmAnd/res/layout/preference_select_icon_button.xml index ac80040512..d92a103c86 100644 --- a/OsmAnd/res/layout/preference_select_icon_button.xml +++ b/OsmAnd/res/layout/preference_select_icon_button.xml @@ -3,31 +3,36 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="6dp"> + android:padding="@dimen/map_button_margin"> - + - + - + - + + + + \ No newline at end of file diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 3e8c98c001..c67ded97ad 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -144,7 +144,7 @@ Accessibilitat Utilitza colors fluorescents per mostrar traces i rutes. S\'està pujant… - Configureu els advertiments de trànsit (límits de velocitat, cues, bandes rugoses, túnels), avisos de radars i informació dels carrils. + Configureu els avisos de trànsit (límits de velocitat, cues, bandes rugoses, túnels), avisos de radars i informació dels carrils. Afegeix un avís a Calendari Fes transparents totes les característiques d\'àrees de sòl al mapa. S\'ha creat el filtre \'%1$s\' @@ -874,7 +874,7 @@ Comença Connector de l\'OsmAnd per a corbes de nivell fora de línia Mesura de distàncies - Encara no teniu definida la localització de la nota. «Usa localització…» per assignar una nota a la localització especificada. + Premeu «Usa localització…» per afegir una nota a la localització. Feu notes d\'àudio/fotografies/vídeo durant un trajecte, mitjançant un botó a la pantalla o directament al menú de localització contextual. Connector de notes d\'àudio peces @@ -915,7 +915,7 @@ Aquest connector proporciona tant corbes de nivell superposades com una capa d\'ombres amb efecte relleu per superposar als mapes de OsmAnd. Corredors, ciclistes, excursionistes i qualsevol interessat en el perfil de relleu del terreny ho agrairan força. (Fixeu-vos que les corbes de nivell i/o els efectes de relleu són baixades independents i complementàries, disponibles un cop s\'hagi activat el connector). \n \nLes dades globals (entre 70 ° nord i 70 ° sud) estan basades en mesures del SRTM (Shuttle Radar Topography Mission) i del ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un instrument de generació d\'imatges a bord de Terra, el satèl·lit insígnia del Sistema d\'Observació de la Terra de la NASA. ASTER és un esforç de col·laboració entre la NASA, el Ministeri d\'Economia i Comerç del Japó (METI) i la fundació Japan Space Systems (J-spacesystems). - Indiqueu quan mostrar mapes de només carreteres: + Trieu quan mostrar mapes de carreteres i prou: Inicia els anuncis automàtics Per a veure la localització seguiu l\'enllaç web %1$s o l\'enllaç Android %2$s L\'obtenció del llistat de versions de l\'OsmAnd ha fallat @@ -2152,12 +2152,12 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Un botó per afegir un PDI al centre de la pantalla. Un botó per activar o desactivar la orientació de veu durant la navegació. Un botó per afegir una posició d\'aparcament al centre de la pantalla. - " s\'ha desat a " + " desat a " Lloc - El nom d\'acció directa indicat ja s\'està utilitzant, s\'ha canviat pel de %1$s per evitar duplicats. + S\'ha canviat el nom d\'acció directa pel de %1$s per evitar duplicats. El nom de l\'acció directa està duplicat - Prement aquest botó d\'acció es mostra o s\'amaga els punts Preferits en el mapa. - Prement aquest botó d\'acció mostreu o amagueu els PDIs en el mapa. + Un commutador per mostrar o amagar els punts Preferits en el mapa. + Un commutador per mostrar o amagar els PDIs en el mapa. Mostra/amaga Preferits Mostra Preferits Amaga Preferits @@ -2171,8 +2171,8 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Deixeu-lo buit per utilitzar l\'adreça o el nom d\'un lloc. Aquest missatge s\'inclou en el camp de comentaris. Missatge - Seleccioneu la categoria on desar-hi el Preferit. - Seleccioneu una categoria opcional. + Categoria on desar-hi el Preferit: + Trieu una categoria opcional. Llista de PDI Afegiu un estil de mapa Ompliu tots els paràmetres @@ -2192,8 +2192,8 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Mostra un diàleg provisional Afegiu una o més categories de PDI per mostrar-les al mapa. Nom de l\'acció - La superposició del mapa s\'ha canviat a \"%s\". - El fons del mapa s\'ha canviat a \"%s\". + S\'ha canviat el mapa superposat a \"%s\". + S\'ha canviat el mapa de fons a \"%s\". Codi de localització obert OLC no vàlid @@ -2201,7 +2201,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Proporcioneu el codi complet OLC complet vàlid Abasta l\'àrea: %1$s x %2$s - Prement aquest botó d\'acció pagineu per la llista que segueix. + Un botó per paginar la llista que segueix. Divisió automàtica de les gravacions un cop aturades Comença un nou segment desprès de 6 min d\'interrupció, una traça nova si es superen les 2 hores o un nou fitxer si encara dura més i ha canviat la data. Mostra isòbates i fondàries puntuals. @@ -2890,9 +2890,9 @@ Abasta l\'àrea: %1$s x %2$s Voleu iniciar OsmAnd\? Guaraní Un botó per canviar entre els modes diürn i nocturn d\'OsmAnd. - Mode Diürn - Mode Nocturn - Canvia mode Diürn/Nocturn + Mode diürn + Mode nocturn + Canvia mode diürn/nocturn Establiu destinació Afegeix punt intermedi Establiu el punt inicial @@ -3416,7 +3416,7 @@ Abasta l\'àrea: %1$s x %2$s El connector ha afegit els perfils Desactiva S\'ha afegit un nou connector - A deserts i altre àrees poc poblades. Mostra més detalls en una escala de visualització. + Per deserts i altre àrees poc poblades. Més detallat. Límit d\'amplada Indica el límit d\'amplada de vehicle permesa en les rutes. Via aèria @@ -3610,4 +3610,9 @@ Abasta l\'àrea: %1$s x %2$s Les pistes es mostren sobre el terreny i amb colors. Pistes Connector d\'OsmAnd adaptat + Substitueix un altre punt per aquest + S\'han fet els canvis al perfil %1$s. + No s\'ha pogut llegir %1$s. + No s\'ha pogut escriure %1$s. + No s\'ha pogut importar %1$s. \ No newline at end of file diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 89e013c03e..911917fda4 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -3294,4 +3294,48 @@ Zobrazená oblast: %1$s x %2$s Nelze přečíst %1$s. Nelze zapsat %1$s. Nelze importovat %1$s. + Stínování svahů + Terén + Stínované svahy používají tmavé odstíny pro vyjádření svahů, vrcholů a nížin. + Svahy jsou barevné vizualizace terénu. + Nastavte minimální a maximální úroveň přiblížení, při které bude vrstva zobrazená. + Pro zobrazení stínování kopců jsou potřeba další mapy. + Pro zobrazení svahů jsou potřeba další mapy. + O svazích si můžete přečíst více na %1$s. + Průhlednost + Úrovně přiblížení + Legenda + Zapněte pro zobrazení stínovaných svahů. O tomto typu map se dozvíte více na našich stránkách + Všechna data z %1$s jsou naimportovaná, můžete použít tlačítka níže k otevření části aplikace pro jejich správu. + Import dokončen + Položky přidány + OsmAnd kontroluje %1$s na duplicity s existujícími položkami v aplikaci. +\n +\nMůže to chvíli trvat. + Importování + Importování dat z %1$s + Nepodařilo se zálohovat profil. + Ukládání nového profilu + Obnovit všechna nastavení profilu\? + Po vytvoření/importování tohoto profilu budou všechna nastavení profilu resetována do původního stavu. + Opravdu chcete vymazat zaznamenané údaje\? + Přepočítat trasu v případě odchýlení + Zvolte vzdálenost, při které bude trasa přepočítána. + Trasa bude přepočítaná pokud vzdálenost od trasy k aktuální poloze je větší než zvolená hodnota. + %1$s z %2$s + Svahy + Zobrazit/skrýt terén + Skrýt terén + Zobrazit terén + Tlačítko pro zobrazení nebo skrytí vrstvy terénu na mapě. + Smazat popis + Přidat popis + Vyberte skupinu + Vyberte tvar + Kruh + Osmiúhelník + Čtverec + Min + Nahradit jiný bod tímto + Lyžařské okruhy \ No newline at end of file diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 76860fd8ec..4f2b3f28cb 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -3586,4 +3586,12 @@ Repræsenterer område: %1$s x %2$s Reliefskygge Alle data fra %1$s er importeret, brug knapperne nedenfor til at åbne den nødvendige del af programmet til at håndtere det. Poster tilføjet - + Ski touring + Snescooter + Brugerdefineret udvidelse + Ændringer anvendt på %1$s profil. + Kunne ikke læse %1$s. + Kunne ikke skrive til %1$s. + Kunne ikke importere %1$s. + Erstat et andet punkt med dette + \ No newline at end of file diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 4673a7ccef..605afd91f5 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -552,7 +552,7 @@ Straßenbahnhaltestelle Reisebüro Tunnel - Wendehammer + Wendestelle Universität Tapezierer Staubsaugergeschäft @@ -604,7 +604,7 @@ Achterbahn Rutschbahn Sommerrodelbahn - Schaukel-Karussell + Kettenkarussell Eisenbahn (Attraktion) Wasserrutsche Turm @@ -740,7 +740,7 @@ Höchstgewicht Betreiber Eingestellt - Aufgelassen + Aufgegeben Maximale Höhe Telefon Internetseite @@ -848,7 +848,7 @@ Schwingtor Barriere Höhendurchfahrtbegrenzung - Ausfalltor + Ausfallstor Drehkreuz Kutschendurchlass Fußgängerübergang @@ -895,7 +895,7 @@ Restmüll Kunststoffverpackungen Zeitungen - Kartons + Kartonagen Pappe Zeitschriften Papierverpackungen @@ -957,10 +957,10 @@ CDs Altöl Blech - Folie + Folien Medikamente - Spanplatte - Gipskartonplatte + Spanplatten + Gipskartonplatten Tierischer Abfall Überwachungsstation ja @@ -1124,7 +1124,7 @@ Mit Abfalleimer ohne Abfalleimer WLAN - Arbeitsplatz + Terminal kabelgebunden Internetzugang: öffentlich Internetzugang: Dienstleistung @@ -1276,7 +1276,7 @@ Spiritualismus Evangelikal Mormonen - Jehovas Zeugen + Zeugen Jehovas Griechisch-katholisch Bulgarisch-orthodox Adventisten @@ -1489,7 +1489,7 @@ Vereinigte Kirche Christi Wissenschaftler Rumänisch-orthodox - Typ: Wappen + Art: Wappen Material: Stahlbeton Material: Beton Material: Mauerwerk @@ -1502,14 +1502,14 @@ Befestigung Siedlung Stadt - Nekropole + Nekropolis Erdarbeiten - Megalithtyp: Menhir - Megalithtyp: Dolmen - Befestigungstyp: Wallburg - Befestigungstyp: Limes - Befestungstyp: Schanze - Befestigungstyp: Ringgraben + Grabtyp: Hinkelstein + Grabtyp: Hünengrab + Befestigungsart: Wallburg + Befestigungsart: Limes + Befestungsart: Schanze + Befestigungsart: Ringgraben Pa (befestigte Siedlung der Maori) Historischer Bauernhof Freimaurerloge @@ -1520,11 +1520,11 @@ Bildhauer Gebäudeart: Kloster Ehemaliges Gefangenenlager - Typ: Konzentrationslager - Typ: Kriegsgefangenenlager - Typ: Arbeitslager - Typ: Nazi - Typ: Gulag + Art: Konzentrationslager + Art: Kriegsgefangenenlager + Art: Arbeitslager + Art: Nazi + Art: Gulag Baden: ja Baden: nein Bootslager @@ -1605,7 +1605,7 @@ Shingon-shū Mahayana-Buddhisten Jersey-Barriere - Nadelwald + Nadeln Küche Wegweiser Wegmarkierung @@ -1896,16 +1896,16 @@ Palme Fahnenstange Öffentlicher Verkehr - Picknickschutz - Wetterschutz + Picknick-Unterstand + Wetter-Unterstand Anbau Gebäude - Grundhütte + Hütte Tierschutz Felsüberhang Sonnenschutz Feldhütte - Unterstandtyp: Zelt + Zelt Unterstandtyp: verlassen Tempelturm Baryt @@ -1914,7 +1914,7 @@ Kunstart: Statue Kunstart: Wandgemälde Kunstart: Architektur - Kunstart: Malen + Kunstart: Bild Kunstart: Stein Kunstart: Büste Kunstart: Installation @@ -2031,28 +2031,28 @@ Ausbildung: Luftfahrt Ausbildung: Frisör Monumentales Objekt - Typ: Ölindustrie - Typ: Internetseite - Typ: Fabrik - Typ: Gasindustrie - Typ: Bauholz - Typ: Raffinerie - Typ: Warenhaus - Typ: Autoabschleppdienst - Typ: Landwirtschaft - Typ: Brauerei - Typ: Ziegelei - Typ: intermodales Frachtterminal - Typ: Sägewerk - Typ: Wasseraufbereitung - Typ: Hafen - Typ: Lagerhaus + Art: Ölindustrie + Art: Bohrstelle + Art: Fabrik + Art: Gasindustrie + Art: Bauholz + Art: Raffinerie + Art: Warenhaus + Art: KFZ Schrotthändler + Art: Landwirtschaft + Art: Brauerei + Art: Ziegelei + Art: intermodales Frachtterminal + Art: Sägewerk + Art: Wasseraufbereitung + Art: Hafen + Art: Lagerhaus Trog Tierbeförderung - Beförderungstyp: Hund - Beförderungstyp: Katze - Beförderungstyp: Hund, Katze - Beförderungstyp: Pferd + Tierpensionstyp: Hund + Tierpensionstyp: Katze + Tierpensionstyp: Hund, Katze + Tierpensionstyp: Pferd Honiggeschäft Technisches Denkmal Campingbüro @@ -2103,7 +2103,7 @@ Burgtyp: Verteidigung Burgtyp: Festung Burgtyp: Palast - Burgtyp: Verteidigung, stattlich + Burgtyp: Verteidigung, Adelssitz Thailändisch Sexuell Massagen @@ -2144,7 +2144,7 @@ Beratungsstelle Anbauprodukt: Lavendel Burgtyp: Kreml - Burgtyp: Römerkastell + Burgtyp: römisches Kastell Burgtyp: Shiro Chinesisch Brennofen @@ -2162,16 +2162,16 @@ Treppenzustand: schlecht Steinhügel Fassadendekoration - Typ: Kriegsgräber - Typ: Hügelgrab - Typ: Felsgrab - Typ: Hypogäum - Typ: Gewölbe - Typ: Kolumbarium - Typ: Mausoleum - Typ: Sarkophag - Typ: Krypta - Typ: Pyramide + Art: Kriegsgräber + Art: Hügelgrab + Art: Felsgrab + Art: Hypogäum + Art: Gewölbe + Art: Kolumbarium + Art: Mausoleum + Art: Sarkophag + Art: Krypta + Art: Pyramide Kultur: römische Antike (753 v. Chr. - 284 n. Chr.) Kultur: Nuraghen (18. Jh. v. Chr. - 2. Jh. n. Chr.) Kultur: Etrusker (12. - 6. Jh. v. Chr.) @@ -2234,12 +2234,12 @@ Historische Epoche: Mittelsteinzeit Historische Epoche: Jungsteinzeit Historische Epoche: Kupfersteinzeit (4. - 3. Jahrtausend v. Chr.) - Typ: Steinkreuz + Art: Steinkreuz Hüttenkreis - Petroglyphe - Megalithtyp: Nuraghe - Megalithtyp: Steinkreis - Megalithtyp: Ganggrab + Felsbild + Grabtyp: prähistorische Turmbauten + Grabtyp: Steinkreis + Grabtyp: Ganggrab Gipfelkreuz: ja Vermittlung: ja Afrikanisches Wiki @@ -2342,7 +2342,7 @@ Naturheilkunde Tiefenpsychologie Verhaltenstherapie - Gebäudetyp: Pyramide + Gebäudeart: Pyramide Fitnesscenter Fitness Billard @@ -2350,7 +2350,7 @@ Mikrowelle: nein Wasserkocher: ja Wasserkocher: nein - Oberfläche + Art: Freifläche Garagen Carports Dojo @@ -2536,7 +2536,7 @@ Funktion im Gesundheitssektor: Pflegefachkraft Funktion im Gesundheitssektor: Sanitäter Funktion im Gesundheitssektor: Arzt - Funktion im Gesundheitssektor: Podologin + Funktion im Gesundheitssektor: Podologe Funktion im Gesundheitssektor: Psychologe Funktion im Gesundheitssektor: Therapeut Funktion im Gesundheitssektor: Assistenzarzt @@ -2775,27 +2775,27 @@ Kraftstoffart (avia) Tankkarten Internet-Zugangsart - Kleidungsart - Schuhart - Feuerhydranttyp + Art + Art + Art Position Wasserquelle Zahlungsart - Art des Fußgängerübergangs + Art Ertastbares Pflaster Bürstenlos Automatisiert - Parkplatztyp + Art Überdacht Fracht - Art des Fahrradparkens + Art Fahrradtransport Heizung Pumpe Bezeichnung - Teleskoptyp - Tierausbildungsart - Botschaftsart + Art + Art + Art Hauptstadt Signalton U-Bahnstation @@ -2822,10 +2822,10 @@ Oberfläche FKK Rollstuhlgerecht - Art des Urlaubsortes + Art Pistenpflege - Recyclingtyp - Unterkunftsart + Art + Art Weihnachten Weihnachtsveranstaltung Weihnachtsmarkt @@ -2843,19 +2843,19 @@ Dienstleistung Selbstbedienung Nach Rezept - Art der archäologischen Fundstätte + Art Bewertung in Sternen Konfession - Informationsart + Art Drive-in Durchfahrschalter Dienstleistung Öffentlicher Bücherschrank - Typ: Telefonzelle - Typ: Lesebox - Typ: Holzgehäuse - Typ: Metallschrank - Typ: Regal + Art: Telefonzelle + Art: Lesebox + Art: Holzgehäuse + Art: Metallschrank + Art: Regal Zelte Waschmaschine Wohnwagen @@ -3034,7 +3034,7 @@ Döner Kebab (Schawarma) Schawarma Speisen - Art der Sozialeinrichtung + Art Apfelweinhaus Baguetterie Pastel @@ -3049,7 +3049,7 @@ Leuchten Lotteriescheine Spielbank - Glücksspielart + Art Lotterie Pachinko Spielautomaten @@ -3065,8 +3065,8 @@ Tierhaltung Tierhaltung: Pferd Tierhaltung: Schaf - Typ: offener Stall - Typ: Paddock + Art: offener Stall + Art: Paddock Bauart: Gitter Anlage: freistehend Bauart: Kuppel @@ -3095,7 +3095,7 @@ Voliere Falknerei Reptilien - Zootyp + Art Vögel Kundendienst Motorradtyp @@ -3115,7 +3115,7 @@ Motorradbekleidung Motorradbekleidung: nein Motorroller - Supersportler + Sport-Motorrad Chopper Gelände Reiseenduro @@ -3518,7 +3518,7 @@ Geldautomat Schuhreparatur Verpackungsfreie Waren - Umspannwerkstyp + Art ja Nur verpackungsfrei Umspannwerk @@ -3749,7 +3749,7 @@ Postbank PostFinance Card Migros Bank - Badtyp + Art Heiße Quelle Onsen Hammam @@ -3772,14 +3772,14 @@ Grab Parkbucht URL - Vulkanart + Art Vulkanstatus Schlacke Schichtvulkan Schild Maar - Caldera - Lavadom + Kessel + Lavakuppel Erde Letzter Ausbruch Erloschen @@ -3787,7 +3787,7 @@ Aktiv Inaktiv Anzahl der Ausbrüche - Gedenk-Geisterfahrrad + Geisterfahrrad Paintball Bergrettung Sicherheitsgeschäft @@ -3797,15 +3797,15 @@ Tauchzentrum SMS Video - Ja - Nein - Ja - Nein + ja + nein + ja + nein Nur wenn Gehen erlaubt ist - Kontrastiert + Kontrastreich Falsch Unterstand - Unterstand Typ + Unterstand-Art Primitiv Wasserstand: teilweise überflutet Wasserstand: überflutet @@ -3819,6 +3819,6 @@ Behinderung Trinkwassernachfüllung: ja Trinkwassernachfüllung: nein - Trinkwassernachfüllnetz + Trinkwasser-Nachfüllnetzwerk Internetzugangsgebühr für Kunden \ No newline at end of file diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index f8a77861ef..89b397f101 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1435,7 +1435,7 @@ Routing-Regeln v1.9 nicht verwenden Neuen Routenalgorithmus aus v1.9 nicht verwenden. Fußgängerübergänge - Parkplatz + Parkbucht TAG ENTFERNEN GPS-Status Nightly-Builds herunterladen. diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index cc7490d03a..1000d41c7b 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -1060,7 +1060,7 @@ Lon %2$s Centrado automático del mapa activado. Opciones específicas de dibujo vectorial Superpuesta / subyacente - Ajustes del repositorio del mapa + Ajustes del repositorio de mapas Ajustes del mapa vectorial ¿Borrar «%1$s»? Suburbio @@ -1143,7 +1143,7 @@ Lon %2$s Pasar a lo largo de la traza completa Mapa vectorial presente para esta ubicación. \n\t -\n\tPara usarlo activa «Menú» → «Configurar mapa» → «Repositorio del mapa…» → «Mapas vectoriales sin conexión». +\n\tPara usarlo activa «Menú» → «Configurar mapa» → «Repositorio de mapas…» → «Mapas vectoriales sin conexión». Salida de indicaciones por voz Elige que altavoz reproducirá indicaciones por voz. Audio de llamada telefónica (para altavoces estéreos con Bluetooth) @@ -1307,7 +1307,7 @@ Lon %2$s Ruta Notas de OSM (en línea) Superposición de PDI… - Repositorio del mapa… + Repositorio de mapas… Capas de mapas Buscar PDI Usa un dispositivo con rueda de desplazamiento para mover el mapa. diff --git a/OsmAnd/res/values-et/phrases.xml b/OsmAnd/res/values-et/phrases.xml index 42528c34d6..43cce7313c 100644 --- a/OsmAnd/res/values-et/phrases.xml +++ b/OsmAnd/res/values-et/phrases.xml @@ -1587,7 +1587,7 @@ Internet: olemas Internet: puudub Internet - tasuline - Internet - tasuta + Tasuta internet Ürituste toimumiskoht Ainult taimetoit Taimetoit @@ -3767,4 +3767,27 @@ Mitteaktiivne Pursete arv Kummitusratas + Veetase: kuival + Veetase: vee all + Veetase: osaliselt vee all + Algeline + Ebaõige + Kontrastne + Ainult kui jalakäijatele lubatud + Tasuline internetipunkt + Ei + Jah + Kioski tüüp + Kiosk + Ei + Jah + Sukeldumiskeskus + Jahibaas + Raja viitenumber + Bowlingukeskus + Turvakauplus + Mägipääste + Värvisõda + Video + SMS \ No newline at end of file diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml index 142c132032..6d2e58c040 100644 --- a/OsmAnd/res/values-et/strings.xml +++ b/OsmAnd/res/values-et/strings.xml @@ -3404,4 +3404,79 @@ Kasuta süsteemi rakendust Kaamera katiku heli Autoriseerimine õnnestus + Ava seaded + Keela ümberarvutus + Määra profiili nimi + Vali imporditavad andmed. + Mõned kirjed on juba olemas + OsmAndis on juba samade nimedega kirjed kui need, mis imporditud. +\n +\nVali toiming. + Imporditud kirjetele lisatakse eesliide + Säilita mõlemad + Asenda kõik + Olemasolevad kirjed asendatakse failis olevate kirjetega + Märgitud %1$s on juba OsmAndis olemas. + Profiilid + Kiirtoimingud + Midagi pole valitud + Huvipunktide tüübid + Ettevalmistus + Rakenduse vaikeväärtus (%s) + Vähim nurk minu asukoha ja teekonna vahel + Minu asukoha ja arvutatud teekonna vahel kuvatakse teekonna ümberarvutuseni täiendav sirglõik + Renderdusfaili import + Nurk + Nurk: %s° + Kohandatud profiil + Maastik + Kõrgusreljeefi kaart tumedate varjunditega nõlvade, tippude ja tasandike kirjeldamiseks. + Nõlv märgib maastikku värvidega. + Määra vähima ja suurima suurenduse kaardikihi kuvamisel. + Kõrgusreljeefi kuvamiseks on vaja täiendavaid kaarte. + Nõlvade kuvamiseks on vaja täiendavaid kaarte. + Nõlvadest saab rohkem lugeda %1$s-s. + Läbipaistvus + Suurendus + Tingmärgid + Luba kõrgusreljeefi või nõlvakaardi kuvamiseks. Nendest kaarditüüpidest saab rohkem lugeda meie kodulehel + Kõrgusreljeef + Kõik andmed %1$s-st imporditud, rakenduse vajaliku osaga töötamiseks võib kasutada nuppe allpool. + Imporditud + Kirjed lisatud + OsmAnd kontrollib %1$s rakenduses korduvate kirjete osas. +\n +\nSelleks võib kuluda aega. + Importimine + Andmete import %1$s-st + Ei saanud profiili varundada. + Uue profiili salvestamine + Kas taastada kõik profiili seaded\? + Kõik profiili seaded lähtestatakse peale selle profiili loomist/importimist algväärtustele. + Kas tõesti kustutada salvestatud andmed\? + Arvutada teekond kõrvalekaldel ümber + Vali eemaldumine alates millest teekond arvutatakse ümber. + Teekonna ümberarvutus, kui kaugus teekonnast praegusesse asukohta on suurem valitud väärtusest. + %1$s %2$s-st + Nõlvad + Kuva/peida maastik + Peida maastik + Kuva maastik + Nupp maastikukihi kuvamiseks või peitmiseks kaardil. + Kustuta kirjeldus + Lisa kirjeldus + Vali grupp + Vali kujund + Ring + Kaheksanurk + Ruut + Min + Asenda sellega mõni teine punkt + Suusasõit + Mootorsaan + Kohandatud OsmAnd pistik + Profiil %1$s muudetud. + Ei saanud lugeda %1$s. + Ei saanud kirjutada %1$s. + Ei saanud importida %1$s. \ No newline at end of file diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index f4537299c5..3b2047ef55 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -3424,7 +3424,7 @@ پروفایل‌هایی که افزونه افزوده افزونهٔ تازه اضافه شد نمایش مسیرهای دوچرخهٔ شبکه‌های گره - %1$s پاک‌سازی شود؟ + ‏%1$s پاک‌سازی شود؟ شبکه‌های گره خاموش پیوند پاره‌ها diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml index 543697755e..3235a1d66f 100644 --- a/OsmAnd/res/values-he/strings.xml +++ b/OsmAnd/res/values-he/strings.xml @@ -3599,4 +3599,7 @@ לא ניתן לקרוא את %1$s. לא ניתן לכתוב את %1$s. לא ניתן לייבא את %1$s. + זה מסנן שחותך מהירויות נמוכות כדי לא להקליט נקודות מתחת למהירות מסוימת. הפעלת המסנן תגרום לכך שהמסלולים ייראו חלקים יותר כשמסתכלים על המפה. + טיולי סקי + %1$s — %2$s — %3$s \ No newline at end of file diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml index 0f8006dfa4..38feecc760 100644 --- a/OsmAnd/res/values-is/strings.xml +++ b/OsmAnd/res/values-is/strings.xml @@ -3624,4 +3624,5 @@ Stendur fyrir svæði: %1$s x %2$s Vélsleðar Sérsniðin OsmAnd-viðbót Átthyrningur + Lágm \ No newline at end of file diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 49b76e35ff..a1b12f098d 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1902,7 +1902,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).Parte della tua donazione sarà inviata agli utenti OSM che sottopongono modifiche alla mappa in quella regione. Impostazioni della sottoscrizione Per favore acquista prima la sottoscrizione a OsmAnd Live - La sottoscrizione abilita gli aggiornamenti orari per tutte le mappe del mondo. Parte degli incassi ritornano alla comunità OSM e sono corrisposti per ogni contributo a OSM. Se ti piacciono OsmAnd e OSM e vuoi sostenerli ed essere sostenuto da questi, questo è il miglior modo per farlo. + La sottoscrizione abilita gli aggiornamenti orari per tutte le mappe del mondo. +\nParte degli incassi ritornano alla comunità OSM e sono corrisposti per ogni contributo a OSM. +\nSe ti piacciono OsmAnd e OSM e vuoi sostenerli ed essere sostenuto da questi, questo è il miglior modo per farlo. Carica anonimamente Mostra la barra di ricerca trasparente Barra superiore @@ -2313,13 +2315,13 @@ Rappresenta l\'area: %1$s x %2$s \n \n Dall\'Afghanistan al Zimbabwe, dall\'Australia agli USA. Argentina, Brasile, Canada, Francia, Germania, Messico, Gran Bretagna, Spagna, … \n - "Contribuisci direttamente a OSM + Contribuisci direttamente a OSM \n • Segnala errori nei dati \n • Contribuisci tracce GPX a OSM direttamente dall\'app \n • Aggiungi PDI e caricali direttamente in OSM (o successivamente se sei offline) \n • Registrazione opzionale del viaggio anche in modalità background (mentre il dispositivo è in modalità sleep) -\n OsmAnd è software open-source attivamente in fase di sviluppo. Chiunque può contribuire all\'applicazione riportando degli errori, migliorando la traduzione o programmando nuove funzionalità. Inoltre il progetto si basa sui contributi finanziari per finanziare la programmazione e il test di nuove funzionalità. -\n " +\n OsmAnd è software open-source attivamente in fase di sviluppo. Chiunque può contribuire all\'applicazione riportando degli errori, migliorando la traduzione o programmando nuove funzionalità. Inoltre il progetto si basa sui contributi finanziari per finanziare la programmazione e il test di nuove funzionalità. +\n OsmAnd è un software open-source attivamente sviluppato. Chiunque può contribuire all\'app segnalando degli errori, migliorando la traduzione o programmando nuove funzionalità. Inoltre il progetto si basa anche sui contributi finanziari per finanziare la programmazione e il test di nuove funzionalità. \n Copertura e qualità della mappa approssimativa: \n • Ovest Europa: **** @@ -3564,10 +3566,10 @@ Rappresenta l\'area: %1$s x %2$s Alcuni oggetti esistono già Seleziona i dati da importare. Importa il file di rappresentazione - Tutti le impostazioni del profilo saranno ripristinate ai valori iniziali dopo l\'importazione/creazione di questo profilo. + Tutti le impostazioni del profilo saranno ripristinate ai valori iniziali dopo la creazione/importazione di questo profilo. Ripristinare tutte le impostazioni del profilo\? Salvataggio del nuovo profilo - Impossibile fare una copia di salvataggio del profilo. + Impossibile creare un backup del profilo. Sei sicuro di voler eliminare i dati registrati\? Importazione dei dati da %1$s Importazione in corso @@ -3575,7 +3577,7 @@ Rappresenta l\'area: %1$s x %2$s Importazione completata Tutti i dati sono stati importati da %1$s, puoi utilizzare i bottoni sottostanti per aprire e gestire le parti dell\' applicazione di cui necessiti. Il percorso verrà ricalcolato quando la distanza tra il percorso e la propria posizione è maggiore del valore selezionato. - Seleziona dopo che distanza effettuare il ricalcolo del percorso. + Seleziona le distanza dopo la quale il percorso verrà ricalcolato. Ricalcola il percorso in caso di deviazione Quadrato Rombo diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index a7d926cf99..521e62848f 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -3475,4 +3475,28 @@ Importerer data fra %1$s Importerer Velg form + Minimumshastighet + Min. nøyaktighet + Merknad + Nettadresse + Opptegningsstil + %1$s/%2$s + Kun vis om natten + Legg til egendefinert kategori + Meny + Åpne innstillinger + Terreng + %1$s av %2$s + Vis/skjul terreng + Skjul terreng + Vis terreng + Slett beskrivelse + Legg til beskrivelse + Velg gruppe + Sirkel + Oktogon + Firkant + Kunne ikke lese %1$s. + Kunne ikke importere %1$s. + Kunne ikke skrive %1$s. \ No newline at end of file diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 66a046a938..3d0e90f46b 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -3659,4 +3659,36 @@ Доступ для трейлеров Тип Статус + Да + Да + Да + Да + Выделенный + Да + Доступ для такси: нет + Доступ для такси: выделенный + Доступ для такси: да + Доступ на лыжах: нет + Доступ на лыжах: да + Доступ для снегохода: нет + Доступ для снегохода: частный + Доступ для туристического автобуса: выделенный + Доступ для туристического автобуса: нет + Доступ для туристического автобуса: да + Доступ для автобуса: нет + Доступ для каравана: нет + Доступ для дома на колесах: нет + Доступ для трейлера: нет + Ледопад + Скалолазание + Тип карты: топоскоп + Плата за парковку + Искусственное покрытие + УКВ-канал + Шаурма + Сухой баррель + Высота просвета (открытая) + Высота просвета (закрытая) + Видео + SMS \ No newline at end of file diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 2fd42ef883..472c5413b5 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -542,7 +542,7 @@ Выберите слой наложения поверх основной карты Карта уже установлена, настройки будут обновлены. Выберите (тайловые) карты для установки или обновления. - Требуется Интернет соединение для данной операции, но оно недоступно. + Для данной операции требуется подключение к интернету, но оно недоступно. Загрузить еще… Минимальный масштаб для использования векторных карт. Минимальный уровень векторных карт @@ -3567,9 +3567,9 @@ Выберите расстояние, после которого маршрут будет пересчитан. Легенда Невозможно разобрать геоссылку \"%s\". - + Для отображения затенения рельефа на карте необходимы дополнительные карты. Мин. - + Отображение затенения рельефа или склонов. Подробнее об этих типах карт вы можете прочитать на нашем сайте. Прозрачность Уровни масштаба Пересчитывать маршрут в случае отклонения @@ -3590,4 +3590,21 @@ Выберите фигуру Круг Восьмиугольник + Сообщение о доступности + Примечание: проверка скорости > 0: большинство модулей GPS сообщают значение скорости только в том случае, если алгоритм определяет, что вы движетесь, и ничего, если вы не перемещаетесь. Следовательно, использование параметра > 0 в этом фильтре в некотором смысле приводит к обнаружению факта перемещения модуля GPS. Но даже если мы не производим данную фильтрацию во время записи, то все равно эта функция используется при анализе GPX для определения скорректированного расстояния, то есть значение, отображаемое в этом поле, является расстоянием, записанным во время движения. + Разделение записи + Укажите веб-адрес со следующими параметрами: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}. + В этом случае будут записываться только точки, измеренные с минимальной точностью (в метрах/футах согласно настройкам устройства). Точность относится к разбросу повторяющихся измерений и не связана непосредственно с точностью, которая определяет, насколько ваши измерения близки к вашему истинному положению. + Рекомендация: попробуйте сначала воспользоваться детектором движения через фильтр минимального смещения (B), что может дать лучшие результаты и вы потеряете меньше данных. Если треки остаются шумными на низких скоростях, попробуйте использовать ненулевые значения. Обратите внимание, что некоторые измерения могут вообще не указывать значения скорости (некоторые сетевые методы), и в этом случае ничего не будет записываться. + Склон выделяется цветовой визуализацией на рельефе местности. + Подробнее о склонах можно прочитать в %1$s. + Затенение рельефа + Затенение рельефа использует темные оттенки для отображения склонов, вершин и низменностей. + Для отображения склонов на карте необходимы дополнительные карты. + Склоны + Заменить другую точку на эту + Изменения применены к профилю %1$s. + Невозможно прочитать %1$s. + Невозможно записать %1$s. + Невозможно импортировать %1$s. \ No newline at end of file diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index d672156ebf..45d1e70ecc 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -158,7 +158,7 @@ A: Pro: Dae: - Predefinidu + Esplora sa mapa Profilu predefinidu Issèbera unu profilu de impreu cun impostatziones personalizadas pro sa mapa e sa navigatzione. Destinatzione %1$s @@ -1239,7 +1239,7 @@ Amenidades prus a curtzu Màchina Bitzicleta - A pede + A pee In tzentru In bassu Inserta sa latitùdine e sa longitùdine in su formadu ischertadu (G - grados, M - minutos, S - segundos) @@ -3580,4 +3580,38 @@ Pro praghere iscrie su còdighe intreu S\'àndala at a torrare a èssere carculada si sa distàntzia dae s\'àndala a sa positzione de su momentu at a èssere prus manna de su valore ischertadu. Ischerta sa distàntzia a pustis de sa cale s\'àndala at a torrare a èssere carculada. Torra a carculare s\'àndala in casu de deviatzione + Mapa de sas umbraduras de sos rilevos chi impreat umbras iscuras pro ammustrare pendèntzias, cùcuros e pranos. + Terrinu + Sa pista benit ammustrada cun colores in su terrinu. + Imposta sos livellos de ismanniamentu mìnimu e màssimu pro ammustrare s\'istratu. + Pro bìdere sas umbraduras de sos rilievos in sa mapa b\'at bisòngiu de mapas additzionales. + Pro bìdere sas pistas in sa mapa b\'at bisòngiu de mapas additzionales. + Podes lèghere àteras informatziones a pitzu de sas pistas in %1$s. + Trasparèntzia + Livellos de ismanniada + Legenda + Abìlita·lu pro ammustrare sas mapas de sas umbraduras de sos rilievos o de sas pistas. Podes lèghere àteras informatziones a pitzu de custas castas de mapas in su situ nostru + Umbraduras de sos rilievos + %1$s de %2$s + Pistas + Ammustra/cua su terrinu + Cua su terrinu + Ammustra su terrinu + Unu butone pro ammustrare o cuare s\'istratu de su terrinu in sa mapa. + Iscantzella sa descritzione + Annanghe una descritzione + Ischerta su grupu + Ischerta sa forma + Tzìrculu + Otàgonu + Cuadradu + Mìn + Remplasa un\'àteru puntu cun custu + Iscì-alpinismu + Motoislita + Estensione de OsmAnd personalizada + Modìficas aplicadas a su profilu %1$s. + Leghidura de %1$s fallida. + Iscritura de %1$s fallida. + Importatzione de %1$s fallida. \ No newline at end of file diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 0f60f18027..5bb067456e 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -3599,4 +3599,9 @@ Zodpovedá oblasti: %1$s x %2$s Lyžiarske okruhy Snežný skúter Vlastný modul pre OsmAnd + Nahradiť iný bod týmto + Zmeny boli použité na profil %1$s. + Nepodarilo sa prečítať %1$s. + Nepodarilo sa zapísať %1$s. + Nepodarilo sa importovať %1$s. \ No newline at end of file diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml index 8aa28377d2..c06f602369 100644 --- a/OsmAnd/res/values/sizes.xml +++ b/OsmAnd/res/values/sizes.xml @@ -356,6 +356,8 @@ 72dp 72dp 42dp + 128dp + 164dp 8dp 12dp diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 6728e3504d..8f3a8a0ebd 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,7 @@ Thx - Hardy --> + Select track file Could not import %1$s. Could not write %1$s. Could not read %1$s. diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml index c3e1eeb4d4..cea274876b 100644 --- a/OsmAnd/res/values/styles.xml +++ b/OsmAnd/res/values/styles.xml @@ -564,7 +564,7 @@ @color/active_color_primary_dark - @@ -768,4 +768,8 @@ ?attr/app_bar_primary_item_color @dimen/dialog_header_text_size + + diff --git a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java index 6031fdacd6..267fc8d177 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/MultimediaNotesFragment.java @@ -136,6 +136,10 @@ public class MultimediaNotesFragment extends BaseSettingsFragment implements Cop // Photo picture size // get supported sizes List psps = parameters.getSupportedPictureSizes(); + if (psps == null) { + cameraPictureSize.setVisible(false); + return; + } // list of megapixels of each resolution List mpix = new ArrayList(); // list of index each resolution in list, returned by getSupportedPictureSizes() @@ -209,6 +213,10 @@ public class MultimediaNotesFragment extends BaseSettingsFragment implements Cop // focus mode settings // show in menu only suppoted modes List sfm = parameters.getSupportedFocusModes(); + if (sfm == null) { + cameraFocusType.setVisible(false); + return; + } List items = new ArrayList(); List itemsValues = new ArrayList(); // filtering known types for translate and set index diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java index a19e9d09cb..815b77108c 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java @@ -21,10 +21,8 @@ import net.osmand.plus.activities.SettingsBaseActivity; import org.apache.commons.logging.Log; import java.io.File; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import static net.osmand.plus.audionotes.AudioVideoNotesPlugin.AUDIO_BITRATE_DEFAULT; import static net.osmand.plus.audionotes.AudioVideoNotesPlugin.AV_CAMERA_FOCUS_AUTO; @@ -78,105 +76,8 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity { R.string.av_use_external_camera_descr)); Parameters parameters = cam.getParameters(); - - // Photo picture size - // get supported sizes - List psps = parameters.getSupportedPictureSizes(); - // list of megapixels of each resolution - List mpix = new ArrayList(); - // list of index each resolution in list, returned by getSupportedPictureSizes() - List picSizesValues = new ArrayList(); - // fill lists for sort - for (int index = 0; index < psps.size(); index++) { - mpix.add((psps.get(index)).width * (psps.get(index)).height); - picSizesValues.add(index); - } - // sort list for max resolution in begining of list - for (int i = 0; i < mpix.size(); i++) { - for (int j = 0; j < mpix.size() - i - 1; j++) { - if (mpix.get(j) < mpix.get(j + 1)) { - // change elements - int tmp = mpix.get(j + 1); - mpix.set(j + 1, mpix.get(j)); - mpix.set(j, tmp); - - tmp = picSizesValues.get(j + 1); - picSizesValues.set(j + 1, picSizesValues.get(j)); - picSizesValues.set(j, tmp); - } - } - } - // set default photo size to max resolution (set index of element with max resolution in List, returned by getSupportedPictureSizes() ) - cameraPictureSizeDefault = picSizesValues.get(0); - log.debug("onCreate() set cameraPictureSizeDefault=" + cameraPictureSizeDefault); - - List itemsPicSizes = new ArrayList(); - String prefix; - for (int index = 0; index < psps.size(); index++) { - float px = (float) ((psps.get(picSizesValues.get(index))).width * (psps.get(picSizesValues.get(index))).height); - if (px > 102400) // 100 K - { - px = px / 1048576; - prefix = "Mpx"; - } else { - px = px / 1024; - prefix = "Kpx"; - } - - itemsPicSizes.add((psps.get(picSizesValues.get(index))).width + - "x" + - (psps.get(picSizesValues.get(index))).height + - " ( " + - String.format("%.2f", px) + - " " + - prefix + - " )"); - } - log.debug("onCreate() set default size: width=" + psps.get(cameraPictureSizeDefault).width + " height=" - + psps.get(cameraPictureSizeDefault).height + " index in ps=" + cameraPictureSizeDefault); - - entries = itemsPicSizes.toArray(new String[itemsPicSizes.size()]); - intValues = picSizesValues.toArray(new Integer[picSizesValues.size()]); - if (entries.length > 0) { - ListPreference camSizes = createListPreference(p.AV_CAMERA_PICTURE_SIZE, entries, intValues, R.string.av_camera_pic_size, - R.string.av_camera_pic_size_descr); - photo.addPreference(camSizes); - } - - // focus mode settings - // show in menu only suppoted modes - List sfm = parameters.getSupportedFocusModes(); - List items = new ArrayList(); - List itemsValues = new ArrayList(); - // filtering known types for translate and set index - for (int index = 0; index < sfm.size(); index++) { - if (sfm.get(index).equals("auto")) { - items.add(getString(R.string.av_camera_focus_auto)); - itemsValues.add(AV_CAMERA_FOCUS_AUTO); - } else if (sfm.get(index).equals("fixed")) { - items.add(getString(R.string.av_camera_focus_hiperfocal)); - itemsValues.add(AV_CAMERA_FOCUS_HIPERFOCAL); - } else if (sfm.get(index).equals("edof")) { - items.add(getString(R.string.av_camera_focus_edof)); - itemsValues.add(AV_CAMERA_FOCUS_EDOF); - } else if (sfm.get(index).equals("infinity")) { - items.add(getString(R.string.av_camera_focus_infinity)); - itemsValues.add(AV_CAMERA_FOCUS_INFINITY); - } else if (sfm.get(index).equals("macro")) { - items.add(getString(R.string.av_camera_focus_macro)); - itemsValues.add(AV_CAMERA_FOCUS_MACRO); - } else if (sfm.get(index).equals("continuous-picture")) { - items.add(getString(R.string.av_camera_focus_continuous)); - itemsValues.add(AV_CAMERA_FOCUS_CONTINUOUS); - } - } - entries = items.toArray(new String[items.size()]); - intValues = itemsValues.toArray(new Integer[itemsValues.size()]); - if (entries.length > 0) { - ListPreference camFocus = createListPreference(p.AV_CAMERA_FOCUS_TYPE, entries, intValues, R.string.av_camera_focus, - R.string.av_camera_focus_descr); - photo.addPreference(camFocus); - } + createCameraPictureSizesPref(p, photo, parameters); + createCameraFocusModesPref(p, photo, parameters); // play sound on success photo photo.addPreference(createCheckBoxPreference(p.AV_PHOTO_PLAY_SOUND, R.string.av_photo_play_sound, @@ -309,6 +210,119 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity { } } + private void createCameraPictureSizesPref(AudioVideoNotesPlugin p, PreferenceCategory photo, Parameters parameters) { + String[] entries; + Integer[] intValues; + // Photo picture size + // get supported sizes + List psps = parameters.getSupportedPictureSizes(); + if (psps == null) { + return; + } + // list of megapixels of each resolution + List mpix = new ArrayList(); + // list of index each resolution in list, returned by getSupportedPictureSizes() + List picSizesValues = new ArrayList(); + // fill lists for sort + for (int index = 0; index < psps.size(); index++) { + mpix.add((psps.get(index)).width * (psps.get(index)).height); + picSizesValues.add(index); + } + // sort list for max resolution in begining of list + for (int i = 0; i < mpix.size(); i++) { + for (int j = 0; j < mpix.size() - i - 1; j++) { + if (mpix.get(j) < mpix.get(j + 1)) { + // change elements + int tmp = mpix.get(j + 1); + mpix.set(j + 1, mpix.get(j)); + mpix.set(j, tmp); + + tmp = picSizesValues.get(j + 1); + picSizesValues.set(j + 1, picSizesValues.get(j)); + picSizesValues.set(j, tmp); + } + } + } + // set default photo size to max resolution (set index of element with max resolution in List, returned by getSupportedPictureSizes() ) + cameraPictureSizeDefault = picSizesValues.get(0); + log.debug("onCreate() set cameraPictureSizeDefault=" + cameraPictureSizeDefault); + + List itemsPicSizes = new ArrayList(); + String prefix; + for (int index = 0; index < psps.size(); index++) { + float px = (float) ((psps.get(picSizesValues.get(index))).width * (psps.get(picSizesValues.get(index))).height); + if (px > 102400) // 100 K + { + px = px / 1048576; + prefix = "Mpx"; + } else { + px = px / 1024; + prefix = "Kpx"; + } + + itemsPicSizes.add((psps.get(picSizesValues.get(index))).width + + "x" + + (psps.get(picSizesValues.get(index))).height + + " ( " + + String.format("%.2f", px) + + " " + + prefix + + " )"); + } + log.debug("onCreate() set default size: width=" + psps.get(cameraPictureSizeDefault).width + " height=" + + psps.get(cameraPictureSizeDefault).height + " index in ps=" + cameraPictureSizeDefault); + + entries = itemsPicSizes.toArray(new String[itemsPicSizes.size()]); + intValues = picSizesValues.toArray(new Integer[picSizesValues.size()]); + if (entries.length > 0) { + ListPreference camSizes = createListPreference(p.AV_CAMERA_PICTURE_SIZE, entries, intValues, R.string.av_camera_pic_size, + R.string.av_camera_pic_size_descr); + photo.addPreference(camSizes); + } + } + + private void createCameraFocusModesPref(AudioVideoNotesPlugin p, PreferenceCategory photo, Parameters parameters) { + String[] entries; + Integer[] intValues; + // focus mode settings + // show in menu only suppoted modes + List sfm = parameters.getSupportedFocusModes(); + if (sfm == null) { + return; + } + List items = new ArrayList(); + List itemsValues = new ArrayList(); + // filtering known types for translate and set index + for (int index = 0; index < sfm.size(); index++) { + if (sfm.get(index).equals("auto")) { + items.add(getString(R.string.av_camera_focus_auto)); + itemsValues.add(AV_CAMERA_FOCUS_AUTO); + } else if (sfm.get(index).equals("fixed")) { + items.add(getString(R.string.av_camera_focus_hiperfocal)); + itemsValues.add(AV_CAMERA_FOCUS_HIPERFOCAL); + } else if (sfm.get(index).equals("edof")) { + items.add(getString(R.string.av_camera_focus_edof)); + itemsValues.add(AV_CAMERA_FOCUS_EDOF); + } else if (sfm.get(index).equals("infinity")) { + items.add(getString(R.string.av_camera_focus_infinity)); + itemsValues.add(AV_CAMERA_FOCUS_INFINITY); + } else if (sfm.get(index).equals("macro")) { + items.add(getString(R.string.av_camera_focus_macro)); + itemsValues.add(AV_CAMERA_FOCUS_MACRO); + } else if (sfm.get(index).equals("continuous-picture")) { + items.add(getString(R.string.av_camera_focus_continuous)); + itemsValues.add(AV_CAMERA_FOCUS_CONTINUOUS); + } + } + entries = items.toArray(new String[items.size()]); + intValues = itemsValues.toArray(new Integer[itemsValues.size()]); + if (entries.length > 0) { + ListPreference camFocus = createListPreference(p.AV_CAMERA_FOCUS_TYPE, entries, intValues, R.string.av_camera_focus, + R.string.av_camera_focus_descr); + photo.addPreference(camFocus); + } + } + protected Camera openCamera() { try { return Camera.open(); diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxTrackAdapter.java b/OsmAnd/src/net/osmand/plus/helpers/GpxTrackAdapter.java new file mode 100644 index 0000000000..5579414293 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxTrackAdapter.java @@ -0,0 +1,159 @@ +package net.osmand.plus.helpers; + +import android.app.Activity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import net.osmand.AndroidUtils; +import net.osmand.GPXUtilities; +import net.osmand.IndexConstants; +import net.osmand.plus.GPXDatabase; +import net.osmand.plus.OsmAndFormatter; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.R; +import net.osmand.plus.UiUtilities; +import net.osmand.util.Algorithms; + +import java.io.File; +import java.text.DateFormat; +import java.util.Date; +import java.util.List; + +public class GpxTrackAdapter extends RecyclerView.Adapter { + + private LayoutInflater themedInflater; + private List gpxInfoList; + private OsmandApplication app; + private boolean showCurrentGpx; + private OnItemClickListener onItemClickListener; + private UiUtilities iconsCache; + + + GpxTrackAdapter(Activity activity, List gpxInfoList, boolean showCurrentGpx, + OnItemClickListener onItemClickListener) { + this.showCurrentGpx = showCurrentGpx; + this.onItemClickListener = onItemClickListener; + app = (OsmandApplication) activity.getApplication(); + boolean nightMode = app.getDaynightHelper().isNightModeForMapControls(); + themedInflater = UiUtilities.getInflater(activity, nightMode); + this.gpxInfoList = gpxInfoList; + iconsCache = app.getUIUtilities(); + } + + @NonNull + @Override + public GpxTrackAdapter.TrackViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = themedInflater.inflate(R.layout.gpx_track_select_item, parent, false); + ImageView distanceIcon = view.findViewById(R.id.distance_icon); + distanceIcon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_distance_16)); + ImageView pointsIcon = view.findViewById(R.id.points_icon); + pointsIcon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_waypoint_16)); + ImageView timeIcon = view.findViewById(R.id.time_icon); + timeIcon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_time_16)); + return new TrackViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull final GpxTrackAdapter.TrackViewHolder holder, final int position) { + boolean currentlyRecordingTrack = (showCurrentGpx && position == 0); + if (currentlyRecordingTrack) { + holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_track_recordable)); + } else { + holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_polygom_dark)); + } + final int adapterPosition = holder.getAdapterPosition(); + GpxUiHelper.GPXInfo info = gpxInfoList.get(adapterPosition); + GPXDatabase.GpxDataItem dataItem = getDataItem(info); + String itemTitle = GpxUiHelper.getGpxTitle(info.getFileName()); + updateGpxInfoView(holder, itemTitle, info, dataItem, currentlyRecordingTrack, app); + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + onItemClickListener.onItemClick(adapterPosition); + } + }); + } + + @Override + public int getItemCount() { + return gpxInfoList.size(); + } + + private void updateGpxInfoView(TrackViewHolder holder, String itemTitle, GpxUiHelper.GPXInfo info, + GPXDatabase.GpxDataItem dataItem, boolean currentlyRecordingTrack, + OsmandApplication app) { + holder.name.setText(itemTitle.replace("/", " • ").trim()); + GPXUtilities.GPXTrackAnalysis analysis = null; + if (currentlyRecordingTrack) { + analysis = app.getSavingTrackHelper().getCurrentTrack().getTrackAnalysis(app); + } else if (dataItem != null) { + analysis = dataItem.getAnalysis(); + } + if (analysis == null) { + holder.readSection.setVisibility(View.GONE); + holder.unknownSection.setVisibility(View.VISIBLE); + String date = ""; + String size = ""; + if (info.getFileSize() >= 0) { + size = AndroidUtils.formatSize(app, info.getFileSize()); + } + DateFormat df = app.getResourceManager().getDateFormat(); + long fd = info.getLastModified(); + if (fd > 0) { + date = (df.format(new Date(fd))); + } + holder.dateAndSize.setText(String.format(app.getString(R.string.ltr_or_rtl_combine_via_bold_point), date, size)); + } else { + holder.readSection.setVisibility(View.VISIBLE); + holder.unknownSection.setVisibility(View.GONE); + holder.pointsCount.setText(String.valueOf(analysis.wptPoints)); + holder.distance.setText(OsmAndFormatter.getFormattedDistance(analysis.totalDistance, app)); + if (analysis.isTimeSpecified()) { + holder.time.setText(Algorithms.formatDuration((int) (analysis.timeSpan / 1000), app.accessibilityEnabled())); + } else { + holder.time.setText(""); + } + } + } + + private GPXDatabase.GpxDataItem getDataItem(GpxUiHelper.GPXInfo info) { + return app.getGpxDbHelper().getItem(new File(app.getAppPath(IndexConstants.GPX_INDEX_DIR), info.getFileName())); + } + + static class TrackViewHolder extends RecyclerView.ViewHolder { + + ImageView icon; + TextView name; + TextView distance; + TextView pointsCount; + TextView time; + LinearLayout readSection; + LinearLayout unknownSection; + TextView dateAndSize; + + TrackViewHolder(View itemView) { + super(itemView); + icon = itemView.findViewById(R.id.icon); + name = itemView.findViewById(R.id.name); + distance = itemView.findViewById(R.id.distance); + pointsCount = itemView.findViewById(R.id.points_count); + time = itemView.findViewById(R.id.time); + readSection = itemView.findViewById(R.id.read_section); + unknownSection = itemView.findViewById(R.id.unknown_section); + dateAndSize = itemView.findViewById(R.id.date_and_size_details); + } + } + + public interface OnItemClickListener { + + void onItemClick(int position); + + } +} diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java index 2b2af7b009..917ee1abc8 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java @@ -15,7 +15,6 @@ import android.net.Uri; import android.os.Build; import android.text.SpannableString; import android.text.style.StyleSpan; -import android.util.TypedValue; import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.View; @@ -38,6 +37,8 @@ import androidx.appcompat.widget.ListPopupWindow; import androidx.appcompat.widget.SwitchCompat; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.github.mikephil.charting.charts.HorizontalBarChart; import com.github.mikephil.charting.charts.LineChart; @@ -355,60 +356,19 @@ public class GpxUiHelper { final List list, final ContextMenuAdapter adapter) { final OsmandApplication app = (OsmandApplication) activity.getApplication(); - final UiUtilities iconsCache = app.getUIUtilities(); - final File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR); - AlertDialog.Builder builder = new AlertDialog.Builder(activity); - final int layout = R.layout.list_menu_item_native_singlechoice; - - final ArrayAdapter listAdapter = new ArrayAdapter(activity, layout, R.id.text1, - adapter.getItemNames()) { - @Override - public View getView(final int position, View convertView, ViewGroup parent) { - // User super class to create the View - View v = convertView; - if (v == null) { - v = activity.getLayoutInflater().inflate(layout, null); - } - final ContextMenuItem item = adapter.getItem(position); - TextView tv = (TextView) v.findViewById(R.id.text1); - Drawable icon; - if (showCurrentGpx && position == 0) { - icon = null; - } else { - icon = iconsCache.getThemedIcon(item.getIcon()); - } - tv.setCompoundDrawablePadding(AndroidUtils.dpToPx(activity, 10f)); - tv.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); - tv.setText(item.getTitle()); - tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); - - return v; - } - }; - - int selectedIndex = 0; - String prevSelectedGpx = app.getSettings().LAST_SELECTED_GPX_TRACK_FOR_NEW_POINT.get(); - if (prevSelectedGpx != null) { - selectedIndex = list.indexOf(prevSelectedGpx); - } - if (selectedIndex == -1) { - selectedIndex = 0; - } - - final int[] selectedPosition = {selectedIndex}; - builder.setSingleChoiceItems(listAdapter, selectedIndex, new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int position) { - selectedPosition[0] = position; - } - }); - builder.setTitle(R.string.select_gpx) - .setPositiveButton(R.string.shared_string_ok, new OnClickListener() { - + boolean nightMode = app.getDaynightHelper().isNightModeForMapControls(); + final View customLayout = UiUtilities.getInflater(activity, nightMode).inflate(R.layout.gpx_track_select_dialog, null); + AlertDialog.Builder builder = new AlertDialog.Builder(UiUtilities.getThemedContext(activity, nightMode)); + builder.setView(customLayout); + final AlertDialog dlg = builder.create(); + View cancelButton = customLayout.findViewById(R.id.dismiss_button); + UiUtilities.setupDialogButton(nightMode, cancelButton, UiUtilities.DialogButtonType.SECONDARY, R.string.shared_string_cancel); + TextView gpxCounter = customLayout.findViewById(R.id.counter); + gpxCounter.setText(String.valueOf(adapter.length())); + GpxTrackAdapter gpxTrackAdapter = new GpxTrackAdapter(activity, list, showCurrentGpx, + new GpxTrackAdapter.OnItemClickListener() { @Override - public void onClick(DialogInterface dialog, int which) { - - int position = selectedPosition[0]; + public void onItemClick(int position) { if (position != -1 && position < list.size()) { if (showCurrentGpx && position == 0) { callbackWithObject.processResult(null); @@ -419,19 +379,27 @@ public class GpxUiHelper { SelectedGpxFile selectedGpxFile = app.getSelectedGpxHelper().getSelectedFileByName(fileName); if (selectedGpxFile != null) { - callbackWithObject.processResult(new GPXFile[]{selectedGpxFile.getGpxFile()}); + callbackWithObject.processResult(new GPXUtilities.GPXFile[]{selectedGpxFile.getGpxFile()}); } else { - loadGPXFileInDifferentThread(activity, callbackWithObject, dir, null, fileName); + File dir = app.getAppPath(IndexConstants.GPX_INDEX_DIR); + GpxUiHelper.loadGPXFileInDifferentThread(activity, callbackWithObject, dir, null, fileName); } } } + dlg.dismiss(); } - }) - .setNegativeButton(R.string.shared_string_cancel, null); - - final AlertDialog dlg = builder.create(); + }); + RecyclerView recyclerView = customLayout.findViewById(R.id.gpx_track_list); + recyclerView.setAdapter(gpxTrackAdapter); + recyclerView.setLayoutManager(new LinearLayoutManager(app, LinearLayoutManager.VERTICAL, false)); dlg.setCanceledOnTouchOutside(false); dlg.show(); + cancelButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dlg.dismiss(); + } + }); try { dlg.getListView().setFastScrollEnabled(true); } catch (Exception e) { @@ -1007,8 +975,8 @@ public class GpxUiHelper { } - private static void loadGPXFileInDifferentThread(final Activity activity, final CallbackWithObject callbackWithObject, - final File dir, final GPXFile currentFile, final String... filename) { + static void loadGPXFileInDifferentThread(final Activity activity, final CallbackWithObject callbackWithObject, + final File dir, final GPXFile currentFile, final String... filename) { final ProgressDialog dlg = ProgressDialog.show(activity, activity.getString(R.string.loading_smth, ""), activity.getString(R.string.loading_data)); new Thread(new Runnable() {