From 2cc16653a1b997ec565bde797acbb3ac496febe9 Mon Sep 17 00:00:00 2001 From: max-klaus Date: Wed, 13 May 2020 14:34:36 +0300 Subject: [PATCH] Introduce vector drawables support for pre 21 --- ...ve.xml => btn_bg_border_inactive_dark.xml} | 2 +- .../drawable/btn_bg_border_inactive_light.xml | 10 +++++ OsmAnd/res/drawable/extension_stub.xml | 14 ------- .../res/layout/add_gpx_point_bottom_sheet.xml | 3 +- .../res/layout/along_the_route_point_item.xml | 7 ++-- .../res/layout/ask_map_download_fragment.xml | 3 +- ...ttom_sheet_item_btn_with_icon_and_text.xml | 2 +- OsmAnd/res/layout/card_bottom_divider.xml | 3 +- OsmAnd/res/layout/card_top_divider.xml | 3 +- OsmAnd/res/layout/change_fav_color.xml | 5 ++- OsmAnd/res/layout/change_order_item.xml | 5 ++- .../res/layout/context_menu_card_dialog.xml | 7 ++-- OsmAnd/res/layout/context_menu_top_shadow.xml | 3 +- OsmAnd/res/layout/crash_title.xml | 2 +- OsmAnd/res/layout/current_gpx_item.xml | 8 ++-- OsmAnd/res/layout/dash_error_fragment.xml | 3 +- OsmAnd/res/layout/dash_gpx_track_item.xml | 17 ++++---- OsmAnd/res/layout/dash_navigation.xml | 7 ++-- OsmAnd/res/layout/dash_parking_fragment.xml | 3 +- OsmAnd/res/layout/dash_simulate_item.xml | 5 ++- .../res/layout/dash_storage_type_fragment.xml | 4 +- OsmAnd/res/layout/dashboard_toolbar.xml | 14 +++---- OsmAnd/res/layout/data_storage_list_item.xml | 4 +- .../layout/data_storage_memory_used_item.xml | 2 +- .../res/layout/dest_reached_menu_fragment.xml | 5 ++- OsmAnd/res/layout/dislike_title.xml | 2 +- .../layout/download_detailed_map_widget.xml | 2 +- .../layout/expandable_list_item_category.xml | 4 +- OsmAnd/res/layout/favorites_list_item.xml | 9 +++-- OsmAnd/res/layout/favourite_list_item.xml | 3 +- .../layout/first_usage_welcome_fragment.xml | 2 +- .../layout/first_usage_wizard_fragment.xml | 14 +++---- .../fragment_data_storage_place_dialog.xml | 11 +++--- .../fragment_direction_indication_dialog.xml | 4 +- OsmAnd/res/layout/fragment_edit_poi.xml | 4 +- .../res/layout/fragment_import_complete.xml | 4 +- .../layout/fragment_map_markers_groups.xml | 2 +- .../res/layout/fragment_mapillary_filters.xml | 4 +- .../res/layout/fragment_measurement_tool.xml | 2 +- .../fragment_plan_route_half_screen.xml | 5 ++- OsmAnd/res/layout/fragment_reports.xml | 18 ++++----- OsmAnd/res/layout/fragment_search_list.xml | 5 ++- .../res/layout/fragment_show_all_routes.xml | 18 ++++----- OsmAnd/res/layout/fragment_simple_list.xml | 2 +- OsmAnd/res/layout/fragment_terrain.xml | 8 ++-- ...ment_wikivoyage_show_images_first_time.xml | 4 +- .../res/layout/global_preference_toolbar.xml | 2 +- ...global_preferences_toolbar_with_switch.xml | 2 +- OsmAnd/res/layout/go_to_map_fragment.xml | 3 +- OsmAnd/res/layout/gpx_item_altitude.xml | 10 ++--- OsmAnd/res/layout/gpx_item_general.xml | 10 ++--- OsmAnd/res/layout/gpx_item_list_header.xml | 6 +-- OsmAnd/res/layout/gpx_item_speed.xml | 10 ++--- OsmAnd/res/layout/gpx_route_card.xml | 4 +- OsmAnd/res/layout/gpx_track_item.xml | 17 ++++---- OsmAnd/res/layout/gpx_track_select_item.xml | 11 +++--- OsmAnd/res/layout/history_card_item.xml | 3 +- OsmAnd/res/layout/home_work_card.xml | 7 ++-- .../res/layout/layers_list_activity_item.xml | 3 +- OsmAnd/res/layout/list_item_move_header.xml | 4 +- OsmAnd/res/layout/list_shadow_footer.xml | 3 +- OsmAnd/res/layout/list_shadow_header.xml | 3 +- OsmAnd/res/layout/live_updates_header.xml | 4 +- OsmAnd/res/layout/local_index_list_item.xml | 5 ++- .../local_index_live_updates_list_item.xml | 5 ++- .../main_menu_drawer_btn_switch_profile.xml | 2 +- OsmAnd/res/layout/make_better_title.xml | 2 +- .../res/layout/map_context_menu_fragment.xml | 6 +-- OsmAnd/res/layout/map_hud_bottom.xml | 2 +- OsmAnd/res/layout/map_hud_top.xml | 16 ++++---- OsmAnd/res/layout/map_hud_widget.xml | 5 ++- OsmAnd/res/layout/map_marker_item.xml | 11 +++--- OsmAnd/res/layout/map_marker_item_new.xml | 5 ++- .../layout/map_marker_selection_fragment.xml | 2 +- OsmAnd/res/layout/mapillary_first_dialog.xml | 3 +- .../res/layout/mapillary_install_dialog.xml | 3 +- .../layout/mapillary_static_image_view.xml | 5 ++- OsmAnd/res/layout/menu_obj_list_item.xml | 3 +- .../res/layout/move_marker_bottom_sheet.xml | 3 +- OsmAnd/res/layout/my_places_fabs.xml | 8 ++-- OsmAnd/res/layout/note.xml | 7 ++-- OsmAnd/res/layout/note_list_item.xml | 7 ++-- OsmAnd/res/layout/open_time_list_item.xml | 5 ++- OsmAnd/res/layout/order_poi_list_item.xml | 2 +- OsmAnd/res/layout/osm_edit_list_item.xml | 5 ++- .../res/layout/osm_live_banner_list_item.xml | 3 +- .../osmlive_cancelled_dialog_fragment.xml | 4 +- OsmAnd/res/layout/plan_route_gpx.xml | 3 +- OsmAnd/res/layout/plan_route_info.xml | 12 +++--- OsmAnd/res/layout/plugin.xml | 35 ++++++++++++----- OsmAnd/res/layout/plugins_list_item.xml | 2 +- OsmAnd/res/layout/poi_filter_list_item.xml | 4 +- OsmAnd/res/layout/point_editor_fragment.xml | 6 +-- .../res/layout/point_editor_fragment_new.xml | 8 ++-- .../layout/point_editor_group_select_item.xml | 2 +- OsmAnd/res/layout/preference_activity.xml | 6 +-- .../res/layout/preference_dropdown_list.xml | 2 +- OsmAnd/res/layout/prev_route_card.xml | 7 ++-- .../layout/profile_data_list_item_group.xml | 3 +- OsmAnd/res/layout/profile_edit_list_item.xml | 2 +- OsmAnd/res/layout/profile_list_item.xml | 3 +- .../res/layout/profile_preference_toolbar.xml | 2 +- .../layout/profile_preference_toolbar_big.xml | 4 +- .../profile_preference_toolbar_with_icon.xml | 2 +- ...profile_preference_toolbar_with_switch.xml | 2 +- .../purchase_dialog_card_button_active_ex.xml | 4 +- .../layout/purchase_dialog_card_header.xml | 3 +- .../res/layout/purchase_dialog_card_row.xml | 4 +- .../purchase_dialog_card_selected_row.xml | 4 +- .../res/layout/purchase_dialog_fragment.xml | 2 +- OsmAnd/res/layout/quick_action_add_bug.xml | 7 ++-- .../layout/quick_action_add_dialog_item.xml | 5 ++- .../res/layout/quick_action_add_favorite.xml | 11 +++--- OsmAnd/res/layout/quick_action_add_gpx.xml | 11 +++--- .../layout/quick_action_add_poi_layout.xml | 16 ++++---- .../quick_action_create_edit_dialog.xml | 8 ++-- .../quick_action_deletable_list_item.xml | 5 ++- OsmAnd/res/layout/quick_action_list.xml | 4 +- OsmAnd/res/layout/quick_action_list_item.xml | 7 ++-- .../res/layout/quick_action_show_hide_poi.xml | 2 +- .../quick_action_start_stop_navigation.xml | 7 ++-- .../layout/quick_action_switchable_action.xml | 6 +-- .../layout/quick_action_switchable_item.xml | 7 ++-- OsmAnd/res/layout/quick_action_with_text.xml | 3 +- OsmAnd/res/layout/rate_us_title.xml | 2 +- .../recording_note_fragment_fullscreen.xml | 7 ++-- OsmAnd/res/layout/route_info_header.xml | 12 +++--- OsmAnd/res/layout/route_info_statistic.xml | 4 +- OsmAnd/res/layout/route_option_btn.xml | 2 +- OsmAnd/res/layout/route_ped_info.xml | 2 +- OsmAnd/res/layout/route_waypoint_item.xml | 9 +++-- .../res/layout/route_waypoints_fragment.xml | 2 +- OsmAnd/res/layout/search_advanced_coords.xml | 22 +++++------ OsmAnd/res/layout/search_custom_list_item.xml | 2 +- OsmAnd/res/layout/search_custom_poi.xml | 2 +- OsmAnd/res/layout/search_dialog_fragment.xml | 10 ++--- .../res/layout/search_history_list_item.xml | 9 +++-- OsmAnd/res/layout/search_list_item.xml | 5 ++- OsmAnd/res/layout/search_more_list_item.xml | 6 +-- OsmAnd/res/layout/search_poi_filter.xml | 4 +- OsmAnd/res/layout/search_text_layout.xml | 3 +- OsmAnd/res/layout/searchpoi.xml | 5 ++- OsmAnd/res/layout/searchpoi_list.xml | 5 ++- OsmAnd/res/layout/searchpoifolder_list.xml | 5 ++- .../layout/select_gpx_appearance_title.xml | 2 +- OsmAnd/res/layout/select_voice_first.xml | 5 ++- OsmAnd/res/layout/split_segments_layout.xml | 2 +- OsmAnd/res/layout/subscribe_email_header.xml | 2 +- OsmAnd/res/layout/subscription_fragment.xml | 12 +++--- OsmAnd/res/layout/switch_select_list_item.xml | 3 +- OsmAnd/res/layout/time_from_to_layout.xml | 3 +- OsmAnd/res/layout/track_content.xml | 2 +- OsmAnd/res/layout/track_details.xml | 9 +++-- OsmAnd/res/layout/transport_route_card.xml | 2 +- OsmAnd/res/layout/waypoint_header.xml | 2 +- OsmAnd/res/layout/waypoint_reached.xml | 11 +++--- .../layout/wikivoyage_start_editing_card.xml | 2 +- OsmAnd/res/layout/wpt_list_item.xml | 4 +- OsmAnd/res/layout/xmas_dialog.xml | 3 +- OsmAnd/res/values/attrs.xml | 1 + OsmAnd/res/values/styles.xml | 2 + OsmAnd/src/net/osmand/AndroidUtils.java | 20 ++++------ .../osmand/SecondSplashScreenFragment.java | 23 ++++++----- OsmAnd/src/net/osmand/plus/UiUtilities.java | 11 +++--- .../activities/FavoritesSearchFragment.java | 3 +- .../activities/FavoritesTreeFragment.java | 5 ++- .../plus/activities/PluginActivity.java | 4 ++ .../osmand/plus/dashboard/DashboardOnMap.java | 11 +++--- .../net/osmand/plus/helpers/ColorDialogs.java | 11 ++++-- .../osmand/plus/helpers/DiscountHelper.java | 3 +- .../osmand/plus/helpers/WaypointHelper.java | 30 +++++++------- .../MapContextMenuFragment.java | 6 +-- .../plus/mapcontextmenu/MenuController.java | 3 +- .../ImpassibleRoadsMenuController.java | 3 +- .../controllers/MyLocationMenuController.java | 3 +- .../editors/PointEditorFragmentNew.java | 27 ++++++------- .../editors/SelectCategoryDialogFragment.java | 11 ++++-- .../other/MapMultiSelectionMenuFragment.java | 3 +- .../CoordinateInputDialogFragment.java | 15 ++++--- .../adapters/MapMarkersActiveAdapter.java | 5 ++- .../adapters/MapMarkersGroupsAdapter.java | 5 ++- .../adapters/MapMarkersHistoryAdapter.java | 3 +- .../adapters/MapMarkersListAdapter.java | 3 +- .../plus/myplaces/FavoritesActivity.java | 13 ++++--- .../TrackActivityFragmentAdapter.java | 5 ++- .../plus/myplaces/TrackBitmapDrawer.java | 3 +- .../plus/notifications/ErrorNotification.java | 2 +- .../plus/notifications/GpxNotification.java | 14 +++---- .../notifications/NavigationNotification.java | 8 ++-- .../osmand/plus/render/RenderingIcons.java | 20 ++++++++-- .../MapRouteInfoMenu.java | 3 +- .../ShowAlongTheRouteBottomSheet.java | 3 +- .../settings/ProfileAppearanceFragment.java | 39 +++++++++++-------- .../osmand/plus/views/ContextMenuLayer.java | 3 +- .../src/net/osmand/plus/views/GPXLayer.java | 3 +- .../osmand/plus/views/MapControlsLayer.java | 6 +-- .../plus/views/MapQuickActionLayer.java | 3 +- .../osmand/plus/views/PointLocationLayer.java | 13 +++++-- .../src/net/osmand/plus/views/RouteLayer.java | 5 ++- .../mapwidgets/MapInfoWidgetsFactory.java | 3 +- .../WikivoyageArticleContentsFragment.java | 3 +- .../WikivoyageArticleNavigationFragment.java | 3 +- .../travelcards/TravelDownloadUpdateCard.java | 3 +- .../search/SearchRecyclerViewAdapter.java | 3 +- .../src/net/osmand/AndroidUtils.java | 7 ++-- 205 files changed, 710 insertions(+), 558 deletions(-) rename OsmAnd/res/drawable/{btn_bg_border_inactive.xml => btn_bg_border_inactive_dark.xml} (74%) create mode 100644 OsmAnd/res/drawable/btn_bg_border_inactive_light.xml delete mode 100644 OsmAnd/res/drawable/extension_stub.xml diff --git a/OsmAnd/res/drawable/btn_bg_border_inactive.xml b/OsmAnd/res/drawable/btn_bg_border_inactive_dark.xml similarity index 74% rename from OsmAnd/res/drawable/btn_bg_border_inactive.xml rename to OsmAnd/res/drawable/btn_bg_border_inactive_dark.xml index dcf60ef7ed..c50d0597c2 100644 --- a/OsmAnd/res/drawable/btn_bg_border_inactive.xml +++ b/OsmAnd/res/drawable/btn_bg_border_inactive_dark.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_bg_border_inactive_light.xml b/OsmAnd/res/drawable/btn_bg_border_inactive_light.xml new file mode 100644 index 0000000000..e1d67c7345 --- /dev/null +++ b/OsmAnd/res/drawable/btn_bg_border_inactive_light.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/extension_stub.xml b/OsmAnd/res/drawable/extension_stub.xml deleted file mode 100644 index 00571fbcd3..0000000000 --- a/OsmAnd/res/drawable/extension_stub.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml index 40603fc059..1b995263b4 100644 --- a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml +++ b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_photo_dark"/> @@ -102,7 +103,7 @@ android:contentDescription="@string/shared_string_delete" android:focusable="false" android:scaleType="center" - android:src="@drawable/ic_action_remove_dark" /> + osmand:srcCompat="@drawable/ic_action_remove_dark" /> @@ -113,4 +114,4 @@ android:layout_marginTop="@dimen/content_padding_half" android:background="?attr/divider_color_basic" /> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/ask_map_download_fragment.xml b/OsmAnd/res/layout/ask_map_download_fragment.xml index a016d8547b..4d89639549 100644 --- a/OsmAnd/res/layout/ask_map_download_fragment.xml +++ b/OsmAnd/res/layout/ask_map_download_fragment.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_remove_dark"/> diff --git a/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml b/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml index 64e41e6502..531df2b54b 100644 --- a/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml +++ b/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml @@ -17,7 +17,7 @@ android:layout_marginRight="@dimen/content_padding" android:tint="?attr/active_color_basic" tools:visibility="visible" - android:src="@drawable/ic_action_plus" + osmand:srcCompat="@drawable/ic_action_plus" android:layout_marginEnd="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/card_bottom_divider.xml b/OsmAnd/res/layout/card_bottom_divider.xml index 8cfc595755..ff9ffe9ff9 100644 --- a/OsmAnd/res/layout/card_bottom_divider.xml +++ b/OsmAnd/res/layout/card_bottom_divider.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/bg_shadow_list_bottom"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/card_top_divider.xml b/OsmAnd/res/layout/card_top_divider.xml index b2036ad492..3392af74fa 100644 --- a/OsmAnd/res/layout/card_top_divider.xml +++ b/OsmAnd/res/layout/card_top_divider.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/bg_shadow_list_top"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/change_fav_color.xml b/OsmAnd/res/layout/change_fav_color.xml index 1ced3dbb18..5eb64adde7 100644 --- a/OsmAnd/res/layout/change_fav_color.xml +++ b/OsmAnd/res/layout/change_fav_color.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_appearance" /> + osmand:srcCompat="@drawable/ic_action_circle" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/change_order_item.xml b/OsmAnd/res/layout/change_order_item.xml index 28bc6596aa..24be06973e 100644 --- a/OsmAnd/res/layout/change_order_item.xml +++ b/OsmAnd/res/layout/change_order_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_remove_dark"/> @@ -89,4 +90,4 @@ android:foreground="@drawable/bg_contextmenu_shadow" android:foregroundGravity="top|fill_horizontal"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/context_menu_top_shadow.xml b/OsmAnd/res/layout/context_menu_top_shadow.xml index b500a81cf4..b0879cb66a 100644 --- a/OsmAnd/res/layout/context_menu_top_shadow.xml +++ b/OsmAnd/res/layout/context_menu_top_shadow.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/bg_shadow_onmap" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/crash_title.xml b/OsmAnd/res/layout/crash_title.xml index 908a5596a2..2511296737 100644 --- a/OsmAnd/res/layout/crash_title.xml +++ b/OsmAnd/res/layout/crash_title.xml @@ -37,6 +37,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/content_padding_small" - android:src="@drawable/img_crash" /> + osmand:srcCompat="@drawable/img_crash" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/current_gpx_item.xml b/OsmAnd/res/layout/current_gpx_item.xml index f67b85825b..0fdda466e4 100644 --- a/OsmAnd/res/layout/current_gpx_item.xml +++ b/OsmAnd/res/layout/current_gpx_item.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginTop="@dimen/content_padding_small" - android:src="@drawable/monitoring_rec_big" + osmand:srcCompat="@drawable/monitoring_rec_big" android:visibility="visible" android:layout_marginStart="@dimen/list_content_padding" /> @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/gpx_small_icon_margin" - android:src="@drawable/ic_small_distance" + osmand:srcCompat="@drawable/ic_small_distance" android:layout_marginEnd="@dimen/gpx_small_icon_margin" /> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_error_fragment.xml b/OsmAnd/res/layout/dash_error_fragment.xml index df3874320b..d36eebe377 100644 --- a/OsmAnd/res/layout/dash_error_fragment.xml +++ b/OsmAnd/res/layout/dash_error_fragment.xml @@ -1,5 +1,6 @@ diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml index 10d35005a0..478f0a671e 100644 --- a/OsmAnd/res/layout/dash_gpx_track_item.xml +++ b/OsmAnd/res/layout/dash_gpx_track_item.xml @@ -1,5 +1,6 @@ @@ -80,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/gpx_small_icon_margin" - android:src="@drawable/ic_small_distance" + osmand:srcCompat="@drawable/ic_small_distance" android:layout_marginEnd="@dimen/gpx_small_icon_margin" /> @@ -172,7 +173,7 @@ android:layout_width="@dimen/list_item_height" android:layout_height="@dimen/list_item_height" android:background="?attr/dashboard_button" - android:src="@drawable/ic_action_rec_stop" + osmand:srcCompat="@drawable/ic_action_rec_stop" android:visibility="gone"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_navigation.xml b/OsmAnd/res/layout/dash_navigation.xml index 59a4b5161d..3762a8bbc5 100644 --- a/OsmAnd/res/layout/dash_navigation.xml +++ b/OsmAnd/res/layout/dash_navigation.xml @@ -1,5 +1,6 @@ @@ -49,7 +50,7 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="@dimen/dashFavIconMargin" android:background="?attr/dashboard_button" - android:src="@drawable/ic_play_dark" + osmand:srcCompat="@drawable/ic_play_dark" android:layout_marginStart="@dimen/dashFavIconMargin" /> + osmand:srcCompat="@drawable/ic_action_remove_dark" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml index c5c39a166c..71ee96dd92 100644 --- a/OsmAnd/res/layout/dash_parking_fragment.xml +++ b/OsmAnd/res/layout/dash_parking_fragment.xml @@ -1,5 +1,6 @@ @@ -58,7 +59,7 @@ android:layout_height="@dimen/list_item_height" android:layout_gravity="center_vertical" android:background="?attr/dashboard_button" - android:src="@drawable/ic_action_rec_stop" + osmand:srcCompat="@drawable/ic_action_rec_stop" tools:visibility="visible" /> diff --git a/OsmAnd/res/layout/dash_storage_type_fragment.xml b/OsmAnd/res/layout/dash_storage_type_fragment.xml index 7dd12f1bf0..6e55a07031 100644 --- a/OsmAnd/res/layout/dash_storage_type_fragment.xml +++ b/OsmAnd/res/layout/dash_storage_type_fragment.xml @@ -69,7 +69,7 @@ android:layout_gravity="center_vertical" android:background="?attr/dashboard_button" android:scaleType="center" - android:src="@drawable/ic_action_edit_dark"/> + osmand:srcCompat="@drawable/ic_action_edit_dark"/> @@ -135,4 +135,4 @@ osmand:typeface="@string/font_roboto_medium"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/dashboard_toolbar.xml b/OsmAnd/res/layout/dashboard_toolbar.xml index 077f46b456..36bab84985 100644 --- a/OsmAnd/res/layout/dashboard_toolbar.xml +++ b/OsmAnd/res/layout/dashboard_toolbar.xml @@ -34,7 +34,7 @@ android:layout_height="match_parent" android:background="@drawable/dashboard_button_light" android:scaleType="fitCenter" - android:src="@drawable/ic_arrow_back" + app:srcCompat="@drawable/ic_arrow_back" tools:visibility="visible"/> + app:srcCompat="@drawable/ic_configure_screen_dark"/> + app:srcCompat="@drawable/ic_action_done"/> + app:srcCompat="@drawable/ic_sort_waypoint_dark"/> diff --git a/OsmAnd/res/layout/data_storage_list_item.xml b/OsmAnd/res/layout/data_storage_list_item.xml index a6f02ba53d..b5c2fcf224 100644 --- a/OsmAnd/res/layout/data_storage_list_item.xml +++ b/OsmAnd/res/layout/data_storage_list_item.xml @@ -26,7 +26,7 @@ android:layout_marginLeft="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding" android:layout_gravity="center" - android:src="@drawable/mm_storage_tank" + osmand:srcCompat="@drawable/mm_storage_tank" tools:tint="?attr/default_icon_color" android:layout_marginEnd="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding" /> @@ -86,7 +86,7 @@ android:layout_marginRight="@dimen/content_padding" android:layout_gravity="center" android:visibility="invisible" - android:src="@drawable/mm_storage_tank" + osmand:srcCompat="@drawable/mm_storage_tank" android:layout_marginEnd="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/data_storage_memory_used_item.xml b/OsmAnd/res/layout/data_storage_memory_used_item.xml index 04b22e2e1a..0edf24f056 100644 --- a/OsmAnd/res/layout/data_storage_memory_used_item.xml +++ b/OsmAnd/res/layout/data_storage_memory_used_item.xml @@ -18,7 +18,7 @@ android:layout_gravity="center" android:layout_marginLeft="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding" - android:src="@drawable/mm_storage_tank" + osmand:srcCompat="@drawable/mm_storage_tank" android:tint="?attr/default_icon_color" tools:tint="?attr/default_icon_color" android:layout_marginEnd="@dimen/content_padding" diff --git a/OsmAnd/res/layout/dest_reached_menu_fragment.xml b/OsmAnd/res/layout/dest_reached_menu_fragment.xml index 58b2d54387..109b62585f 100644 --- a/OsmAnd/res/layout/dest_reached_menu_fragment.xml +++ b/OsmAnd/res/layout/dest_reached_menu_fragment.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/list_destination"/> @@ -71,7 +72,7 @@ android:layout_height="48dp" android:layout_gravity="top" style="@style/Widget.AppCompat.Button.Borderless" - android:src="@drawable/ic_action_remove_dark"/> + osmand:srcCompat="@drawable/ic_action_remove_dark"/> diff --git a/OsmAnd/res/layout/dislike_title.xml b/OsmAnd/res/layout/dislike_title.xml index 80b20bc859..42cc06b642 100644 --- a/OsmAnd/res/layout/dislike_title.xml +++ b/OsmAnd/res/layout/dislike_title.xml @@ -37,6 +37,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/content_padding_small" - android:src="@drawable/img_get_feedback" /> + osmand:srcCompat="@drawable/img_get_feedback" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/download_detailed_map_widget.xml b/OsmAnd/res/layout/download_detailed_map_widget.xml index ac0b78fab4..339d378193 100644 --- a/OsmAnd/res/layout/download_detailed_map_widget.xml +++ b/OsmAnd/res/layout/download_detailed_map_widget.xml @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/card_content_padding_large" - android:src="@drawable/img_download" + osmand:srcCompat="@drawable/img_download" android:layout_marginStart="@dimen/card_content_padding_large" /> diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml index f1699c775a..eacde936c2 100644 --- a/OsmAnd/res/layout/expandable_list_item_category.xml +++ b/OsmAnd/res/layout/expandable_list_item_category.xml @@ -64,7 +64,7 @@ android:background="?attr/dashboard_button" android:focusable="false" android:scaleType="center" - android:src="@drawable/ic_overflow_menu_white" + osmand:srcCompat="@drawable/ic_overflow_menu_white" android:visibility="gone" tools:visiblity="visible" android:layout_marginEnd="4dp" /> @@ -80,4 +80,4 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml index 6283d1ddf9..dbeab2b71d 100644 --- a/OsmAnd/res/layout/favorites_list_item.xml +++ b/OsmAnd/res/layout/favorites_list_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_direction_arrow" /> + osmand:srcCompat="@drawable/ic_small_group" /> diff --git a/OsmAnd/res/layout/favourite_list_item.xml b/OsmAnd/res/layout/favourite_list_item.xml index a7c073ec5e..30b66aae0c 100644 --- a/OsmAnd/res/layout/favourite_list_item.xml +++ b/OsmAnd/res/layout/favourite_list_item.xml @@ -1,4 +1,5 @@ + osmand:srcCompat="@drawable/map_favorite" /> + osmand:srcCompat="@drawable/osmand_logo"/> @@ -638,7 +638,7 @@ android:layout_width="44dp" android:layout_height="44dp" android:contentDescription="@string/shared_string_cancel" - android:src="@drawable/ic_action_close" + osmand:srcCompat="@drawable/ic_action_close" android:tint="@color/icon_color_default_light"/> diff --git a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml index ae0a0f0e09..a15bd4b214 100644 --- a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml +++ b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml @@ -1,4 +1,5 @@ @@ -91,7 +92,7 @@ android:layout_height="56dp" android:paddingRight="@dimen/content_padding" android:scaleType="center" - android:src="@drawable/ic_action_phone" + osmand:srcCompat="@drawable/ic_action_phone" tools:background="@color/color_warning" android:paddingEnd="@dimen/content_padding" /> @@ -143,7 +144,7 @@ android:layout_height="56dp" android:paddingRight="@dimen/content_padding" android:scaleType="center" - android:src="@drawable/ic_action_phone" + osmand:srcCompat="@drawable/ic_action_phone" tools:background="@color/color_warning" android:paddingEnd="@dimen/content_padding" /> @@ -192,7 +193,7 @@ android:layout_height="56dp" android:paddingRight="@dimen/content_padding" android:scaleType="center" - android:src="@drawable/ic_sdcard" + osmand:srcCompat="@drawable/ic_sdcard" tools:background="@color/color_warning" android:paddingEnd="@dimen/content_padding" /> @@ -228,4 +229,4 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml index 878774dda9..44500852c6 100644 --- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml +++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml @@ -553,9 +553,9 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:scaleType="fitXY" - android:src="@drawable/bg_shadow_list_bottom" + app:srcCompat="@drawable/bg_shadow_list_bottom" android:visibility="gone"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml index 764a99cc6f..30d2261406 100644 --- a/OsmAnd/res/layout/fragment_edit_poi.xml +++ b/OsmAnd/res/layout/fragment_edit_poi.xml @@ -78,7 +78,7 @@ android:layout_height="@dimen/context_menu_buttons_bottom_height" android:layout_gravity="bottom" android:background="@null" - android:src="@drawable/ic_action_label"/> + app:srcCompat="@drawable/ic_action_label"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_import_complete.xml b/OsmAnd/res/layout/fragment_import_complete.xml index f45e7faf74..84ce23e040 100644 --- a/OsmAnd/res/layout/fragment_import_complete.xml +++ b/OsmAnd/res/layout/fragment_import_complete.xml @@ -127,9 +127,9 @@ android:id="@+id/shadowView" android:layout_width="match_parent" android:layout_height="@dimen/abp__shadow_height" - android:src="@drawable/preference_activity_action_bar_shadow" + osmand:srcCompat="@drawable/preference_activity_action_bar_shadow" tools:ignore="ContentDescription" /> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_map_markers_groups.xml b/OsmAnd/res/layout/fragment_map_markers_groups.xml index bd2f125853..82d9cea70f 100644 --- a/OsmAnd/res/layout/fragment_map_markers_groups.xml +++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml @@ -20,7 +20,7 @@ android:layout_gravity="bottom|end" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_action_plus" + app:srcCompat="@drawable/ic_action_plus" app:backgroundTint="?attr/active_color_basic" app:fabSize="normal" app:useCompatPadding="true"/> diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml index dc36a64bf1..185109e39d 100644 --- a/OsmAnd/res/layout/fragment_mapillary_filters.xml +++ b/OsmAnd/res/layout/fragment_mapillary_filters.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" - android:src="@drawable/bg_shadow_onmap" /> + osmand:srcCompat="@drawable/bg_shadow_onmap" /> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml index dfdcb95550..e232f81c1e 100644 --- a/OsmAnd/res/layout/fragment_measurement_tool.xml +++ b/OsmAnd/res/layout/fragment_measurement_tool.xml @@ -155,7 +155,7 @@ android:layout_gravity="bottom" android:alpha="0.5" android:scaleType="fitXY" - android:src="@drawable/bg_shadow_onmap"/> + osmand:srcCompat="@drawable/bg_shadow_onmap"/> + osmand:srcCompat="@drawable/bg_shadow_onmap"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_reports.xml b/OsmAnd/res/layout/fragment_reports.xml index 03371c2c17..da5e342cef 100644 --- a/OsmAnd/res/layout/fragment_reports.xml +++ b/OsmAnd/res/layout/fragment_reports.xml @@ -32,7 +32,7 @@ android:layout_width="56dp" android:layout_height="56dp" android:scaleType="center" - android:src="@drawable/ic_action_data"/> + osmand:srcCompat="@drawable/ic_action_data"/> @@ -78,7 +78,7 @@ android:layout_width="56dp" android:layout_height="56dp" android:scaleType="center" - android:src="@drawable/ic_world_globe_dark"/> + osmand:srcCompat="@drawable/ic_world_globe_dark"/> @@ -152,7 +152,7 @@ android:layout_width="56dp" android:layout_height="56dp" android:scaleType="center" - android:src="@drawable/ic_group"/> + osmand:srcCompat="@drawable/ic_group"/> + osmand:srcCompat="@drawable/ic_map"/> + osmand:srcCompat="@drawable/ic_action_bitcoin"/> + osmand:srcCompat="@drawable/ic_action_bitcoin"/> + osmand:srcCompat="@drawable/ic_group"/> + osmand:srcCompat="@drawable/ic_action_remove_dark"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/fragment_show_all_routes.xml b/OsmAnd/res/layout/fragment_show_all_routes.xml index 389eefc78b..dc4dd9742a 100644 --- a/OsmAnd/res/layout/fragment_show_all_routes.xml +++ b/OsmAnd/res/layout/fragment_show_all_routes.xml @@ -40,7 +40,7 @@ android:layout_marginStart="@dimen/content_padding_half" android:background="@drawable/btn_circle_transparent_full" android:contentDescription="@string/shared_string_back" - android:src="@drawable/ic_arrow_back" + osmand:srcCompat="@drawable/ic_arrow_back" android:tint="?attr/text_color_tab_active_white" /> @@ -133,7 +133,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/shared_string_close" android:scaleType="center" - android:src="@drawable/ic_arrow_back" + osmand:srcCompat="@drawable/ic_arrow_back" android:tint="?attr/text_color_tab_active_white" android:layout_marginEnd="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding" /> @@ -183,7 +183,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/print_route" android:scaleType="center" - android:src="@drawable/ic_action_gprint_dark" + osmand:srcCompat="@drawable/ic_action_gprint_dark" android:tint="?attr/text_color_tab_active_white" /> @@ -215,7 +215,7 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:scaleType="fitXY" - android:src="@drawable/bg_contextmenu_shadow" /> + osmand:srcCompat="@drawable/bg_contextmenu_shadow" /> diff --git a/OsmAnd/res/layout/fragment_simple_list.xml b/OsmAnd/res/layout/fragment_simple_list.xml index 2a193d183d..ff967140e4 100644 --- a/OsmAnd/res/layout/fragment_simple_list.xml +++ b/OsmAnd/res/layout/fragment_simple_list.xml @@ -18,7 +18,7 @@ style="@style/Widget.AppCompat.Button.Borderless" android:layout_width="52dp" android:layout_height="52dp" - android:src="@drawable/ic_arrow_back"/> + app:srcCompat="@drawable/ic_arrow_back"/> + app:srcCompat="@drawable/bg_shadow_onmap" /> @@ -345,7 +345,7 @@ android:layout_marginEnd="@dimen/content_padding" android:adjustViewBounds="true" android:scaleType="fitCenter" - android:src="@drawable/img_legend_slope" /> + app:srcCompat="@drawable/img_legend_slope" /> + app:srcCompat="@drawable/img_empty_state_terrain" /> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/global_preference_toolbar.xml b/OsmAnd/res/layout/global_preference_toolbar.xml index 2ad29a3a2f..4fcfbad367 100644 --- a/OsmAnd/res/layout/global_preference_toolbar.xml +++ b/OsmAnd/res/layout/global_preference_toolbar.xml @@ -30,7 +30,7 @@ android:layout_marginEnd="@dimen/content_padding" android:contentDescription="@string/access_shared_string_navigate_up" android:scaleType="fitCenter" - android:src="@drawable/ic_arrow_back" /> + app:srcCompat="@drawable/ic_arrow_back" /> + app:srcCompat="@drawable/ic_arrow_back" /> + osmand:srcCompat="@drawable/ic_action_remove_dark"/> diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml index ac2c321993..5c8204a1b3 100644 --- a/OsmAnd/res/layout/gpx_item_altitude.xml +++ b/OsmAnd/res/layout/gpx_item_altitude.xml @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:src="@drawable/ic_action_altitude_average"/> + osmand:srcCompat="@drawable/ic_action_altitude_average"/> + osmand:srcCompat="@drawable/ic_action_altitude_average"/> + osmand:srcCompat="@drawable/ic_action_altitude_ascent"/> + osmand:srcCompat="@drawable/ic_action_altitude_descent"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml index bc5ac53a2b..c3469f74ee 100644 --- a/OsmAnd/res/layout/gpx_item_general.xml +++ b/OsmAnd/res/layout/gpx_item_general.xml @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:src="@drawable/ic_action_polygom_dark"/> + osmand:srcCompat="@drawable/ic_action_polygom_dark"/> + osmand:srcCompat="@drawable/ic_action_time_start"/> + osmand:srcCompat="@drawable/ic_action_time_start"/> + osmand:srcCompat="@drawable/ic_action_time_start"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/gpx_item_list_header.xml b/OsmAnd/res/layout/gpx_item_list_header.xml index 7a881b66cf..4d1b8f4f54 100644 --- a/OsmAnd/res/layout/gpx_item_list_header.xml +++ b/OsmAnd/res/layout/gpx_item_list_header.xml @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" - android:src="@drawable/bg_shadow_list_top"/> + osmand:srcCompat="@drawable/bg_shadow_list_top"/> @@ -154,7 +154,7 @@ android:id="@+id/split_interval_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_action_arrow_drop_down"/> + osmand:srcCompat="@drawable/ic_action_arrow_drop_down"/> @@ -187,7 +187,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="@dimen/content_padding" - android:src="@drawable/ic_action_circle" + osmand:srcCompat="@drawable/ic_action_circle" android:paddingStart="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml index 6ca3a3f41a..031b6e2de9 100644 --- a/OsmAnd/res/layout/gpx_item_speed.xml +++ b/OsmAnd/res/layout/gpx_item_speed.xml @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:src="@drawable/ic_action_speed"/> + osmand:srcCompat="@drawable/ic_action_speed"/> + osmand:srcCompat="@drawable/ic_action_max_speed"/> + osmand:srcCompat="@drawable/ic_action_time_span"/> + osmand:srcCompat="@drawable/ic_action_polygom_dark"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/gpx_route_card.xml b/OsmAnd/res/layout/gpx_route_card.xml index 7cba5e7b2d..19bb70fe9a 100644 --- a/OsmAnd/res/layout/gpx_route_card.xml +++ b/OsmAnd/res/layout/gpx_route_card.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" - android:src="@drawable/bg_shadow_list_top" /> + osmand:srcCompat="@drawable/bg_shadow_list_top" /> @@ -102,7 +102,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" - android:src="@drawable/bg_shadow_list_bottom" /> + osmand:srcCompat="@drawable/bg_shadow_list_bottom" /> diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml index b75caa74ec..1599675955 100644 --- a/OsmAnd/res/layout/gpx_track_item.xml +++ b/OsmAnd/res/layout/gpx_track_item.xml @@ -1,5 +1,6 @@ @@ -84,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginRight="@dimen/gpx_small_icon_margin" android:layout_marginEnd="@dimen/gpx_small_icon_margin" - android:src="@drawable/ic_small_distance" /> + osmand:srcCompat="@drawable/ic_small_distance" /> + osmand:srcCompat="@drawable/ic_small_point" /> + osmand:srcCompat="@drawable/ic_small_time" /> - + \ 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 index 21e925e64b..763c1aacbd 100644 --- a/OsmAnd/res/layout/gpx_track_select_item.xml +++ b/OsmAnd/res/layout/gpx_track_select_item.xml @@ -1,5 +1,6 @@ @@ -57,7 +58,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/content_padding_half" android:layout_marginRight="@dimen/content_padding_half" - android:src="@drawable/ic_action_distance_16" + osmand:srcCompat="@drawable/ic_action_distance_16" android:contentDescription="@string/distance" /> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/history_card_item.xml b/OsmAnd/res/layout/history_card_item.xml index 0ad90cbafa..b9778ab83e 100644 --- a/OsmAnd/res/layout/history_card_item.xml +++ b/OsmAnd/res/layout/history_card_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_small_group" /> + osmand:srcCompat="@drawable/bg_shadow_list_bottom" /> diff --git a/OsmAnd/res/layout/layers_list_activity_item.xml b/OsmAnd/res/layout/layers_list_activity_item.xml index 908cdc111b..c389243b60 100644 --- a/OsmAnd/res/layout/layers_list_activity_item.xml +++ b/OsmAnd/res/layout/layers_list_activity_item.xml @@ -1,5 +1,6 @@ diff --git a/OsmAnd/res/layout/list_shadow_footer.xml b/OsmAnd/res/layout/list_shadow_footer.xml index 3d1697e5e4..0a9f9c620b 100644 --- a/OsmAnd/res/layout/list_shadow_footer.xml +++ b/OsmAnd/res/layout/list_shadow_footer.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/bg_shadow_list_bottom"/> + osmand:srcCompat="@drawable/bg_shadow_list_top"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml index cb2e9943ab..4866fa54f7 100644 --- a/OsmAnd/res/layout/live_updates_header.xml +++ b/OsmAnd/res/layout/live_updates_header.xml @@ -32,7 +32,7 @@ + app:srcCompat="@drawable/ic_action_osm_live"/> + app:srcCompat="@drawable/ic_action_done"/> diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml index 1d3043fb0a..06ab41bbf9 100644 --- a/OsmAnd/res/layout/local_index_list_item.xml +++ b/OsmAnd/res/layout/local_index_list_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_gpx_track" /> + osmand:srcCompat="@drawable/ic_overflow_menu_white" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/local_index_live_updates_list_item.xml b/OsmAnd/res/layout/local_index_live_updates_list_item.xml index 84bb83b093..1bb1c9f4fd 100644 --- a/OsmAnd/res/layout/local_index_live_updates_list_item.xml +++ b/OsmAnd/res/layout/local_index_live_updates_list_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_overflow_menu_white" /> diff --git a/OsmAnd/res/layout/make_better_title.xml b/OsmAnd/res/layout/make_better_title.xml index 1db04e7b95..1d4048e937 100644 --- a/OsmAnd/res/layout/make_better_title.xml +++ b/OsmAnd/res/layout/make_better_title.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginTop="26dp" android:layout_marginBottom="26dp" - android:src="@drawable/img_feedback" /> + osmand:srcCompat="@drawable/img_feedback" /> + osmand:srcCompat="@drawable/ic_action_building_number"/> @@ -528,7 +528,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/shared_string_collapse" android:scaleType="center" - android:src="@drawable/ic_arrow_back" + osmand:srcCompat="@drawable/ic_arrow_back" tools:visibility="visible"/> @@ -565,7 +565,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/shared_string_collapse" android:scaleType="center" - android:src="@drawable/ic_arrow_back" + osmand:srcCompat="@drawable/ic_arrow_back" tools:visibility="visible"/> + osmand:srcCompat="@drawable/warnings_limit"/> + osmand:srcCompat="@drawable/widget_coordinates_latitude_day" /> + osmand:srcCompat="@drawable/widget_coordinates_longitude_day" /> + osmand:srcCompat="@drawable/ic_arrow_back"/> + osmand:srcCompat="@drawable/ic_action_remove_dark"/> + osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/> + osmand:srcCompat="@drawable/ic_action_markers_list"/> @@ -563,7 +563,7 @@ android:id="@+id/map_marker_arrow_2nd" android:layout_width="66dp" android:layout_height="24dp" - android:src="@drawable/ic_arrow_marker_diretion"/> + osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/> @@ -51,7 +52,7 @@ android:layout_marginLeft="@dimen/map_widget_icon_margin" android:layout_marginRight="@dimen/map_widget_icon_margin" android:gravity="center" - android:src="@drawable/ic_action_remove_dark" + osmand:srcCompat="@drawable/ic_action_remove_dark" android:layout_marginEnd="@dimen/map_widget_icon_margin" android:layout_marginStart="@dimen/map_widget_icon_margin" /> diff --git a/OsmAnd/res/layout/map_marker_item.xml b/OsmAnd/res/layout/map_marker_item.xml index a7d6a62f65..eae3f73bfe 100644 --- a/OsmAnd/res/layout/map_marker_item.xml +++ b/OsmAnd/res/layout/map_marker_item.xml @@ -1,6 +1,7 @@ + osmand:srcCompat="@drawable/ic_action_fav_dark"/> @@ -119,7 +120,7 @@ android:contentDescription="@string/shared_string_more" android:focusable="false" android:scaleType="center" - android:src="@drawable/map_overflow_menu_white" + osmand:srcCompat="@drawable/map_overflow_menu_white" android:visibility="gone" android:layout_marginEnd="2dp" /> @@ -133,7 +134,7 @@ android:contentDescription="@string/shared_string_delete" android:focusable="false" android:scaleType="center" - android:src="@drawable/ic_action_remove_dark" + osmand:srcCompat="@drawable/ic_action_remove_dark" android:layout_marginEnd="2dp" /> diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml index 73eb422061..81e701e618 100644 --- a/OsmAnd/res/layout/map_marker_item_new.xml +++ b/OsmAnd/res/layout/map_marker_item_new.xml @@ -1,5 +1,6 @@ @@ -196,4 +197,4 @@ android:visibility="gone" tools:visibility="visible"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/map_marker_selection_fragment.xml b/OsmAnd/res/layout/map_marker_selection_fragment.xml index 2dc564e4d8..5985e177f4 100644 --- a/OsmAnd/res/layout/map_marker_selection_fragment.xml +++ b/OsmAnd/res/layout/map_marker_selection_fragment.xml @@ -18,7 +18,7 @@ style="@style/Widget.AppCompat.Button.Borderless" android:layout_width="52dp" android:layout_height="52dp" - android:src="@drawable/ic_arrow_back"/> + app:srcCompat="@drawable/ic_arrow_back"/> diff --git a/OsmAnd/res/layout/mapillary_install_dialog.xml b/OsmAnd/res/layout/mapillary_install_dialog.xml index 5418e05d33..480e287002 100644 --- a/OsmAnd/res/layout/mapillary_install_dialog.xml +++ b/OsmAnd/res/layout/mapillary_install_dialog.xml @@ -1,5 +1,6 @@ @@ -18,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:src="@drawable/ic_logo_mapillary"/> + osmand:srcCompat="@drawable/ic_logo_mapillary"/> @@ -33,7 +34,7 @@ android:layout_width="44dp" android:layout_height="44dp" android:background="?attr/selectableItemBackgroundBorderless" - android:src="@drawable/ic_arrow_back"/> + osmand:srcCompat="@drawable/ic_arrow_back"/> + osmand:srcCompat="@drawable/ic_arrow_forward"/> diff --git a/OsmAnd/res/layout/menu_obj_list_item.xml b/OsmAnd/res/layout/menu_obj_list_item.xml index fdd7f35080..16ac2b095c 100644 --- a/OsmAnd/res/layout/menu_obj_list_item.xml +++ b/OsmAnd/res/layout/menu_obj_list_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_building_number"/> diff --git a/OsmAnd/res/layout/move_marker_bottom_sheet.xml b/OsmAnd/res/layout/move_marker_bottom_sheet.xml index 56a5e71ac1..22ad09231e 100644 --- a/OsmAnd/res/layout/move_marker_bottom_sheet.xml +++ b/OsmAnd/res/layout/move_marker_bottom_sheet.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_photo_dark"/> @@ -30,7 +30,7 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:contentDescription="@string/quick_action_new_action" - android:src="@drawable/ic_action_marker_dark" + app:srcCompat="@drawable/ic_action_marker_dark" android:visibility="gone" app:backgroundTint="@color/fab_green" app:fabSize="mini" @@ -75,7 +75,7 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:contentDescription="@string/quick_action_new_action" - android:src="@drawable/ic_action_markers_dark" + app:srcCompat="@drawable/ic_action_markers_dark" android:visibility="gone" app:backgroundTint="@color/fab_green" app:fabSize="mini" @@ -120,7 +120,7 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:contentDescription="@string/quick_action_new_action" - android:src="@drawable/ic_action_polygom_dark" + app:srcCompat="@drawable/ic_action_polygom_dark" android:visibility="gone" app:backgroundTint="@color/fab_green" app:fabSize="mini" diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml index d34b8652ad..dfd6fd517c 100644 --- a/OsmAnd/res/layout/note.xml +++ b/OsmAnd/res/layout/note.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_overflow_menu_white"/> diff --git a/OsmAnd/res/layout/note_list_item.xml b/OsmAnd/res/layout/note_list_item.xml index 2b94700967..ba748ff94f 100644 --- a/OsmAnd/res/layout/note_list_item.xml +++ b/OsmAnd/res/layout/note_list_item.xml @@ -1,5 +1,6 @@ @@ -79,7 +80,7 @@ android:contentDescription="@string/shared_string_more" android:focusable="false" android:padding="@dimen/content_padding" - android:src="@drawable/ic_overflow_menu_white"/> + osmand:srcCompat="@drawable/ic_overflow_menu_white"/> @@ -94,4 +95,4 @@ android:visibility="gone" tools:visibility="visible"/> - + \ No newline at end of file diff --git a/OsmAnd/res/layout/open_time_list_item.xml b/OsmAnd/res/layout/open_time_list_item.xml index c588ed396b..d6386d0272 100644 --- a/OsmAnd/res/layout/open_time_list_item.xml +++ b/OsmAnd/res/layout/open_time_list_item.xml @@ -1,5 +1,6 @@ + osmand:srcCompat="@drawable/ic_action_time"/> + osmand:srcCompat="@drawable/ic_action_remove_dark"/>